diff --git a/Manifest b/Manifest
index 20afc4d900ac..3817454c89af 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29592 BLAKE2B 6e91188a7c99e09f86bfa48bb9cdf9141cc83575b63450f0b750ff9e3021b0a631aa6b9d67fda7e47602a5d71823d44161948c304da2cf696f3cbfa77fc3a132 SHA512 193c12d690586b1996897eb995c832fc54232f3b3a90fe98e1cdd568a27b4dfc350d1fd41fa396b04d2c61861f17c8a8b7a3e166add910689d860cfa5e915824
-TIMESTAMP 2022-06-23T07:09:38Z
+MANIFEST Manifest.files.gz 29544 BLAKE2B 2680e67f392df9a0a0489236f6fe3ca963889354070d40f528d276dddc1c62d895091d6f1724a687b0de3c9bb19f03dff77d818e9b51ce505c1f515ea12ac293 SHA512 58cae009db9886db90c4e4acb31bbaeca09bb5ea25a9a0e0f4fb4407f45d50a0993b7e471084f09cce14eb4558654ba316179cc496615f19dd9a76ab7d5b6685
+TIMESTAMP 2022-06-25T16:39:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmK0EbJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmK3OkxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAZCA/+KcTb3o1MmwVY8FAJGdtT0vz9RFS8P5Tff12zAPPhg26VgWpZGNWfUC6e
-moqjuPWIA1l1HmpmQrQoRsBEMOWY9H9eXSFDriNIwvbfEQivc/qUyRkdNYVRFHda
-uGQu2iPCn01FYB9vCuKDE3MNoK7kKzkC5HPh9uH63Q1gvLPUkh08u87PF+4rhHgH
-ilTZAGtoJSkM475ygcM+I2lIkJQJXSSR1lohnBqQy4tbU7utzTx1e8v1AZRTKIAS
-LuM0B1gLsK4upaR11jCcZ3ZSSAHN2cfHvObCCDa/dNmstnSUUrY8xoGimhtnAnsP
-MqvkWADMImhF3GRSXf0BDZwyp7K+jBnem1NFzy1DpzO7B2tkbZfJBkdf3SxqTYkQ
-w6mYOQWexC8Pv2XuYiZO4spMEgmJU4XLl8c2jJxErIs26WylQCT0QY143pOvlO7p
-Dq9tSfsucrbDukW8Q7JkGfPCOF4lA6FMqKCyNV6def0bPQcfBfTG8i8i90JEMACy
-71gwX3iYGjdImeFZvo4R36++LOedMXGVKHECrTEtcJuQxPEql55ShbhodDas6fbe
-yhQb/MsmlpHTxYxJj9mOQfFcaUrGseqIkqBDRn53cPWpNs0sK8Lw2/+Lz3RONYy/
-bFdEdaISZFe2MnpHcnp4cGiPKw9j4tQgNbG/gieGO7PBqHrTILE=
-=5As/
+klDS3hAAqU78hES4o3dk6vmLo5RdN3pTISGjQpWugxpx7FbGmGV4M6aR9gHjCYCJ
+PaaGMW2o2f6xzVe31WPFx8lCiJBfqVirowP/s/S1Jub3D/O8A9YL+HsjGii4+nVn
+3GnkuHsqHKjBn5aKb5KU2gc35AJ1WGfnqmqJ1a4bD93QU0tZrqoMLYHkNYgpqJuX
+TZ7XHUqcuvEra0C4nnV7f1TXpTm2rEyRFUlyJOD4K3aFLhqCPP/AVl/+CIji+qh5
+Nb9G3CwyoIT7JRP7s72zyavnCk5RqDw+lh1nsKolFFIj0+F43UV1DaiNf2YiWK0v
+UAykE3NpOSqi1T5KKcGjvkRP48fMzZPoF555o+pLKD0JJkE3bXGvOj7KZIcn9kBn
+b7SKDkyaJ23iYbCvA6X0VQf36Zio9jB7svUw8Xxsz3m7i68otWmXtHu34uxKHVZm
+1bC62OfsCzmAuIle7ZlliKzWN7hMNxrNm7BozL63+suG/7+2Tzs4ZLDPxhzCOpag
+ukO23z3hWAA8seEtl4AKjkoCI6Tj/0d68jk8+HfzVPE/zaZA7Ao1341lnuvZb6+i
+er9eUXNI/vFntyiBea2fZt8H2bk3/FuLmg9kkmEGoGPUp6G/OmqgADtyaRImZnrz
+CeR/IRWpCP9Z9n0obSfe0HZ5J4C7C6Vdy/RmmEmfHyQOP7uFehU=
+=17Qr
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index dd7c994c9c00..64aedba3d332 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 e99aa90e472a..5491ba7b116a 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 ca476260c8c0..ca78a860e565 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -1,6 +1,9 @@
 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-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 3880 BLAKE2B 3c2a99f34808ff4ab91a9d44cb04b38a7455c71ab3c85b6f3ad320e84e83fe9c0e323c65ff3fa417d8046fb217cc5355a58400d4a94f1a53d2c27c61b450c4b4 SHA512 c5cb11cab2b864d60a8707bfe203a448a0e46f50cf0342e911cf4d228eeef5cd7d8c72c531183967657174bab51e59088a1d4b6a05e87ec8c188edf31b8f9510
 EBUILD speech-tools-2.5.0.ebuild 3772 BLAKE2B b7a494b2a9cf6e356271c8db84c52394657f9747f9eb84780928ffd5e5476ad66e839ffec8385dbd6a0f58a2a759f05a69bbe10e62ac4ddb10727189517c2ec0 SHA512 d6a809b62fbaaaf3b38e608c0274b516340d14c10f2092a2eb1d5ab7b0a450cfe9e7cf60786bd94ec0598545d024a41b7300e58f7fde78880d8be0f01591595c
 MISC metadata.xml 483 BLAKE2B b5318b0e97d1e7e19848eeae2b447037e940cda1ca1c7cc4204cbf9d95d52a5fce5430efe94f0d8e3066a974b78d1a8abdc72580b7678ae86e30577e9545f787 SHA512 e7d6f2ccbebfb2ae9bf41577a3b1d902c7d711d5887d9a4233f7c5d42a57915e1874f97676c61d79fb5ececa0e7244f58533c17f098c717712ac274d60c14ee7
diff --git a/app-accessibility/speech-tools/files/speech-tools-2.5.0-drop-curses.patch b/app-accessibility/speech-tools/files/speech-tools-2.5.0-drop-curses.patch
new file mode 100644
index 000000000000..30b5448e820a
--- /dev/null
+++ b/app-accessibility/speech-tools/files/speech-tools-2.5.0-drop-curses.patch
@@ -0,0 +1,43 @@
+We already force in the correct detection via another patch and this
+logic (being dropped in this patch) assumes no -ltinfo.
+
+https://bugs.gentoo.org/837800
+--- a/configure.in
++++ b/configure.in
+@@ -42,12 +42,6 @@ AC_CHECK_TOOL(AR, ar)
+ 
+ AC_C_BIGENDIAN
+ 
+-AC_CHECK_LIB(ncurses, tputs, [TERMCAPLIB=-lncurses], [TERMCAPLIB=-lcurses])
+-dnl if test "$TERMCAPLIB" != "-ltermcap"; then
+-dnl    AC_CHECK_LIB(termcap, tputs, [TERMCAPLIB=-ltermcap], [TERMCAPLIB=-lncurses])
+-dnl 
+-AC_SUBST(TERMCAPLIB)
+-
+ dnl Which version of GCC do we have here
+ COMPILERTYPE=gcc
+ AC_TRY_COMPILE([#include <stdio.h>],
+diff --git a/config/config.in b/config/config.in
+index c7a268a..6c7f16a 100644
+--- a/config/config.in
++++ b/config/config.in
+@@ -98,7 +98,6 @@ LINUXAUDIO = @LINUXAUDIO@
+ ## It may not work under all systems, so may be optionally omitted.
+ INCLUDE_MODULES += EDITLINE
+ 
+-TERMCAPLIB = @TERMCAPLIB@
+ # speech recognition
+ #INCLUDE_MODULES += ASR
+ 
+diff --git a/config/modules/editline.mak b/config/modules/editline.mak
+index fe83c37..2d48b39 100644
+--- a/config/modules/editline.mak
++++ b/config/modules/editline.mak
+@@ -43,7 +43,6 @@ INCLUDE_EDITLINE=1
+ MOD_DESC_EDITLINE=Use editline for command line editing and history
+ 
+ IO_DEFINES   += -DSUPPORT_EDITLINE $(MODULE_EDITLINE_OPTIONS:%=-DEDITLINE_%)
+-MODULE_LIBS  += $(TERMCAPLIB)
+ 
+ ifeq ($(DIRNAME),siod)
+     CSRCS := $(CSRCS) el_complete.c editline.c el_sys_unix.c
diff --git a/app-accessibility/speech-tools/files/speech-tools-2.5.0-warnings.patch b/app-accessibility/speech-tools/files/speech-tools-2.5.0-warnings.patch
new file mode 100644
index 000000000000..4242700e6c2d
--- /dev/null
+++ b/app-accessibility/speech-tools/files/speech-tools-2.5.0-warnings.patch
@@ -0,0 +1,35 @@
+https://github.com/festvox/speech_tools/commit/4b677d6f3bc560248da369a86d5f2ec17c116da5
+(Just the strict aliasing hunk.)
+
+From 4b677d6f3bc560248da369a86d5f2ec17c116da5 Mon Sep 17 00:00:00 2001
+From: Sergio Oller <sergioller@gmail.com>
+Date: Sat, 29 Aug 2020 19:14:47 +0200
+Subject: [PATCH] Compile with gcc-9 without warnings (-Wall)
+
+--- a/speech_class/esps_utils.cc
++++ b/speech_class/esps_utils.cc
+@@ -1050,7 +1050,7 @@ enum EST_read_status read_esps_hdr(esps_hdr *uhdr,FILE *fd)
+ 	hdr->field_name[0] = wstrdup("samples");
+ 	fseek(fd,hdr->hdr_size,SEEK_SET);
+ 	/* In this cases its just in the header as a float */
+-	sd_sample_rate = *((float *)(void *)&fhdr.fil4[0]);
++	memcpy(&sd_sample_rate, &fhdr.fil4[0], sizeof(float));
+ 	add_fea_d(hdr,"record_freq",0,(double)sd_sample_rate);
+ 	*uhdr = hdr;
+ 	return format_ok;
+@@ -1215,11 +1215,13 @@ enum EST_write_status write_esps_hdr(esps_hdr hdr,FILE *fd)
+     fhdr.thirteen = 13;      /* must be for luck */
+     fhdr.sdr_size = 0;
+     fhdr.magic = ESPS_MAGIC;
+-    strncpy(fhdr.date,ctime(&tx),26);
++    strncpy(fhdr.date,ctime(&tx),25);
++    fhdr.date[25] = 0;
+     sprintf(fhdr.version,"1.91");  /* that's what all the others have */
+     sprintf(fhdr.prog,"EDST");
+     sprintf(fhdr.vers,"0.1");
+-    strncpy(fhdr.progcompdate,ctime(&tx),26);
++    strncpy(fhdr.progcompdate,ctime(&tx),25);
++    fhdr.progcompdate[25] = 0;
+     fhdr.num_samples = hdr->num_records;
+     fhdr.filler = 0;
+     /* in each record */
diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..76fc1ff30431
--- /dev/null
+++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+MY_P=${P/speech-/speech_}
+PATCHSET="r3"
+
+DESCRIPTION="Speech tools for Festival Text to Speech engine"
+HOMEPAGE="http://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"
+)
+
+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() {
+	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 375c91f6908f..207ce187e3f3 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index f5e2e29f761b..6a171b4887d0 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -2,5 +2,5 @@ AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c57
 DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 44acd51a2c18ae66878d64922947f2f24f0ddf8a5fa70718f788572032e18dafd06888fed3cf559e63e2a9e69d9b0a8dcc79e11fc9d8f216b5b073f769494727 SHA512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756
 DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
 EBUILD apache-tools-2.4.53-r1.ebuild 2423 BLAKE2B 5d4e00341e2809571e9ee0e76f09641487a68a82b93cf7b8dc23af359f62068207d7dbaf0748245c03869d989b0f9782e6a56c0c23a6b7e564f6785c365af6d1 SHA512 6d9787f2df850f1264c64fd8f4df19f8b85b83f9282e80d472296d9354b281bf5ab13e0449a0b562c0c333074a2e1714a8f53e8e47f30b5d0b6ce831bad6b41e
-EBUILD apache-tools-2.4.54.ebuild 2430 BLAKE2B afb531c8bfb13c8f23e6cfbd6410a92fae7f15a6b05d86a026845cb8f2811ce89eab7b244d21749a74bd2a2594a4f92383e7449623b6c6924cf26ff053b6e101 SHA512 fd57c40e8355726c2a72acfd4bd6ce8056992b537039d1829e5115f205da09256d0c1de47b95a55455c1d3284ada94c08ac832f07658c052c0ffa19122806bca
+EBUILD apache-tools-2.4.54.ebuild 2423 BLAKE2B 5d4e00341e2809571e9ee0e76f09641487a68a82b93cf7b8dc23af359f62068207d7dbaf0748245c03869d989b0f9782e6a56c0c23a6b7e564f6785c365af6d1 SHA512 6d9787f2df850f1264c64fd8f4df19f8b85b83f9282e80d472296d9354b281bf5ab13e0449a0b562c0c333074a2e1714a8f53e8e47f30b5d0b6ce831bad6b41e
 MISC metadata.xml 469 BLAKE2B d94d7a27ad1d65eb651c92ff82f5e8f4181737a65ad8dae29843693c4fd639d15b82e419f39ff12273c964b2cd4cbb6eb9850ef358e02b6ebe6a25a2fe2f5877 SHA512 409c831b4c337d40b71fd41a48c5aa9ad4e922baa86d931e3aa2bd556c2312154022fa5297daa03084da08d7f9739e37be87446f25c784c30b3df992b0165189
diff --git a/app-admin/apache-tools/apache-tools-2.4.54.ebuild b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
index 7acb2c3546d3..bf1562cee74c 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"
 
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index b94376f7bef3..bc2767ff529b 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,9 +1,15 @@
 DIST aws-cli-1.25.12.gh.tar.gz 2224456 BLAKE2B d6425983b09fc3942727108e188e184f48399388704ada03df1d65ddb9adffc9597a217b863766a862e96b59c03fdb3202e694289b54ee9298fe7e547639ecc3 SHA512 a77e0d082a8dacecadbd2fa6cc1143fa5148e075894565fe9a552e9d1a27fd068c72ae57eb5c628129bb024267111b76722cf2c40dc9f719db8d96232302b918
 DIST aws-cli-1.25.13.gh.tar.gz 2224352 BLAKE2B 0f6b94545f8504dcf6a458df28b39b3a909869033ccf04ad1ad3652e6606573002cbd3fed7f65756a140bac7d3b1ccddbc6fcc84391b194b3a987cf8534c4bdc SHA512 f494f9b31e91bb0e7446867efe4539f04ac91b12ad7f4db2f355d1a391ce7a8bd1d40f4afe04855d227414a7c2479ec6fdaf9a42f1959b28d205df48c2b4d723
 DIST aws-cli-1.25.14.gh.tar.gz 2225058 BLAKE2B 185fb35a574a73d1d43adef515dbc1e67e81bf3ba5c6511365d6633c1b3c72263b4bdd1c0449a319292fdfa2f0eaef52fd8322785f26fa7ed5da0231d5aba6b2 SHA512 e7d854cff3c68a7ad41c3f481d64b12761dffb5186cc8919ec92bd48e9f9946773382eb276722ffc9776f34a972f50773e758aaa5212c168960fff07a71196b1
+DIST aws-cli-1.25.15.gh.tar.gz 2225254 BLAKE2B afc4ef97b0c8eebaba3874ab5291cda8b971cc934379973b19e9ccc855b99a42be2a26737104e0eed151db280afb1c1a7866c9f8a376ec8e6a59d09372217cfa SHA512 b5dfb47b1b256b2c3ee2ca92e161f0e59afc955159e28d368ee947cc8a41765919828dcfcfd00f7024bb328f4ed698cf040f81747cc892c6c3914a1f7e97d875
+DIST aws-cli-1.25.16.gh.tar.gz 2225519 BLAKE2B 5800f49afe526f29b76f74078431235ab302237cbb3d6977c902d218fd65fb1eb341534020f1b8c495eb1834d3ef4c87fec7b4dee6ac8ceff4a528ec9bbf045b SHA512 4641ead6693a54d34dbd3426baaf8c389221d85aba950e21e1ba7ccbdc142633d0d4215598fe55865a90c98c4df8ea2eb78610fd0567ce49b82f32aac1941f3b
+DIST aws-cli-1.25.17.gh.tar.gz 2226115 BLAKE2B d07a9c7a8e13019fd728489d27465497ba31f53087ef09e5f816792267bcb58158fa0a7f71fc499d3e343b5b3a0da45cc3632f8c69345b8cd93ebc735f645672 SHA512 1a7f90e28d6702f9e73fe3a93e0d91e2c4ea3d93574f21a3ecde1148445fe6b5f98f217e2e61a1cbba50a07590f0ab0abd00390fb04cbb3db74dfff698224997
 DIST aws-cli-1.25.7.gh.tar.gz 2223153 BLAKE2B fcadda94fd721135f94b1538c4b27e41108064f6fd32f324d5436138e3d1b0ffcab53fcc545b01c461365d55c4bfa2a05d90e94c875c929a3227efae76452415 SHA512 194adacab0df87d8e4f0cdc71bb956bef6dc8b2de2e7e4416c9c079ff2b7c2bce7584ac1049428d0bcb134368b39c37c04bc5e6a8fc7540c44c64f3934ccaf21
 EBUILD awscli-1.25.12.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
 EBUILD awscli-1.25.13.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
 EBUILD awscli-1.25.14.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
+EBUILD awscli-1.25.15.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
+EBUILD awscli-1.25.16.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
+EBUILD awscli-1.25.17.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
 EBUILD awscli-1.25.7.ebuild 1811 BLAKE2B c35b439798c718974574befd5d1bd327aec0c8f3747e7de256d735738975d5e90ec0eb05fc97258bbffdfbc9c337f700cda71fed90383ac0bbad0661c8ecf8d3 SHA512 2821cefd21e2d9860ae0a87fa8ef4b5f50a24649b0a319af10e890155f11af13f75be1dd18729a800153e8d0a4610baf2c8d33b91c89b889843983e0599d39cc
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.15.ebuild b/app-admin/awscli/awscli-1.25.15.ebuild
new file mode 100644
index 000000000000..4154af977ee6
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.15.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 ~arm64 ~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}]
+"
+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() {
+	# 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/awscli/awscli-1.25.16.ebuild b/app-admin/awscli/awscli-1.25.16.ebuild
new file mode 100644
index 000000000000..4154af977ee6
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.16.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 ~arm64 ~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}]
+"
+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() {
+	# 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/awscli/awscli-1.25.17.ebuild b/app-admin/awscli/awscli-1.25.17.ebuild
new file mode 100644
index 000000000000..4154af977ee6
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.17.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 ~arm64 ~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}]
+"
+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() {
+	# 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/consul-template/Manifest b/app-admin/consul-template/Manifest
index 6c79f54f569c..412f9283a3dd 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -4,5 +4,8 @@ AUX consul-template.logrotated 103 BLAKE2B 66f91c1a2cd0c926da67e99ccf0535c6ff5ed
 AUX consul-template.service 398 BLAKE2B 94a30973f6e0ee114dc844bf9b83e423d72a2fc0a3bc0fb6a01668fdc268c7a4f7d550c67f2f6f5e5de3140d6f14aba99eb65702ee8e335e2c3750a8aba6d7ef SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1
 DIST consul-template-0.29.0-deps.tar.xz 37430348 BLAKE2B 9e0af3e245420bb3166a56bf2e570300ae0d35d9d93a6f6ae08bced79b26bae102339faa955a989f0617453cd5e40c6a3358a0b265ed49f4bc2dd7cb07e605c9 SHA512 fc3ed6150bb53c27c4a8e8e8b4d2d96cf4fada966016c8fbff48d4f61d392d08fc8bd53e9fa52256c84b1e5249a34e2fe361fd96a860841337a308bc3caa7f3a
 DIST consul-template-0.29.0.tar.gz 244446 BLAKE2B 9ff2b33d9a3ca296913bf4f5e6928b789341438a566b63e841e04b0ad528d13588bcdb34994a1d3a829c7d64593b9811480fcf9395d3527a09d473d90bdf4e23 SHA512 e562d89c753ca2bbd14ae57e084e7e2b0aac28c92c210357e22d32d5c3c138054a46f5fb8883a44f64bdd8e9654f457230cef3b24513fa7eeaefd177fd8004c7
+DIST consul-template-0.29.1-deps.tar.xz 59041120 BLAKE2B dd822c41cf9fdfe773ed48edbc02eb409b4840c9bd6f6b66c590d2fa6a44ccea3bcac89569abf318abd2c97e7515e600ee2f1f6c469c60d068959f90e3487831 SHA512 37fd93e9ce064251941626c6ac6b6770e7c019d82cd5f6c113d2adb09460a02fb1644af26714b34f9634e6312346edb98cd841aee6b6805f7d06a07fc7c997d7
+DIST consul-template-0.29.1.tar.gz 254592 BLAKE2B 4ad5e7c1bf2edc06d72ec1ed48f9546c698d22f8562c4c9924106891c44511b912abecc94517ed2359592b709f1f8fd05fcb00cea52893de29c62b34b61fd71e SHA512 edcfe45a3d98b9affda8b5d07fb375a647a78473c7041a87f1f5a2aa2faef2bfdef26a7037d228f6a86d0c446397e7452e7005ce16beff2bc68edabf2268a6f9
 EBUILD consul-template-0.29.0.ebuild 1263 BLAKE2B fbb76644ed420faeba6dfbf34315d6494bb2b2bc1390596d0afa1da5b10ba258841ea3e9726e9ce6a5e647e3ccabcbd6e01b45cbc4342d586fb36b9b08a5f0b4 SHA512 0197e8fc343e63bd8142b6a26cd560507d3860cb96c90f317721244f2153ba5e0f9d0660ee34b29ffb1802ab02337ebf2ad309415443981d5598263d1cb191a0
+EBUILD consul-template-0.29.1.ebuild 1263 BLAKE2B fbb76644ed420faeba6dfbf34315d6494bb2b2bc1390596d0afa1da5b10ba258841ea3e9726e9ce6a5e647e3ccabcbd6e01b45cbc4342d586fb36b9b08a5f0b4 SHA512 0197e8fc343e63bd8142b6a26cd560507d3860cb96c90f317721244f2153ba5e0f9d0660ee34b29ffb1802ab02337ebf2ad309415443981d5598263d1cb191a0
 MISC metadata.xml 317 BLAKE2B d2427e36d0eec88eb97a7db510b4b45659b3d07b24228903eb5ed80807167c66cde6a3f1e63b1f55117974242ea9c06a78d58cca62359c775750ee34fe328ca0 SHA512 1e6e09983a77466e8671cfd7c848df28c2f35830a28a11c6c78369234fd35f35cb1dce8cbedfc97d2e5b1c4258db730e94c4d452d88b9841dc37e306d68d65b2
diff --git a/app-admin/consul-template/consul-template-0.29.1.ebuild b/app-admin/consul-template/consul-template-0.29.1.ebuild
new file mode 100644
index 000000000000..612bb41f3539
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.29.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+DESCRIPTION="Generic template rendering and notifications with Consul"
+HOMEPAGE="https://github.com/hashicorp/consul-template"
+SRC_URI="https://github.com/hashicorp/consul-template/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="
+	acct-group/consul-template
+	acct-user/consul-template"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# TODO: debug test failures
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	# remove -s and -w from the linker flags
+	sed \
+		-e '/-s \\/d' \
+		-e '/-w \\/d' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake GOBIN="${S}"/bin dev
+}
+
+src_test() {
+	emake GOBIN="${S}"/bin test
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md README.md
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index af9406059eea..387e457a3980 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,5 +1,7 @@
 DIST entr-5.0.tar.gz 25480 BLAKE2B 5de00d6b1042667e209b2c33d7d019bad4833a0711a18d47eddb129ef60f5518c42fc2af3169510f57eb39f861d416ab67d7cd83e4a631cfcaa4cc7ac266f82d SHA512 f485efb7d05f1d099c85d8af2f313e3ed2f36720483afc3004479b5b8754c60c52a108b827efd017c674f01d6ced2878a317addef3960c8cdf9e6b142f2ad5fd
 DIST entr-5.1.tar.gz 25674 BLAKE2B e456c415198f4d5be49fd52785cd8cce41756d2ebe14c493891c3fa05f3a763c9e3be65538d3150b484e48e0d23615556dd6c45fdbefc7b2052fc36f265ca685 SHA512 b8ee7dae5bda503af814eb109a0180c9864fa1b1cf5a2fe53c9915b6536e9471f8293c63d138d881da7bf70dfee24a6c271b82ecb6ccb2cb6ea664cabedba202
+DIST entr-5.2.tar.gz 25834 BLAKE2B c14eddaaf26994679991c43b38dcea0f1cbf53ce517af462cfed9dea2c914d9c1719053cb3b9f28f04d0cbf8719fe5612963c1428832e02bd55545ba33c72556 SHA512 b12310b6695f0b3d3d830b651dd182ddf2321aad38f569066cc2e5b17570070e48eb4900725c88c1d31a8ff71099aba78fb7508ad60706265cbdf8f29257eaaa
 EBUILD entr-5.0.ebuild 575 BLAKE2B 24498e497a23e8b5ae5b96b0275b0fbcde28f9465ceccb7dead8a12fe9a13b7537ffbc4d1dec11eaaa7328b7dcac375e717d3ed9c7a9740c4c0be1458787eeb0 SHA512 363af574c8398b7c929c00f1d756a83d92ec658f8e674a853f1d7c53c93855baded13efccb6ffbb4f8919c2602ac90a7b982c61801c484e75f4244d7bb71edb4
 EBUILD entr-5.1.ebuild 575 BLAKE2B fa955429d501d1eb8cc6fec1d092209cc086020ec93c188f3943b8e5887cd7e93ea2d95e2de2fe58574284a704b980b88780a5c4a83a795713f97a48484b8826 SHA512 6c8b7e0b18a46ad3f52d30fce9dac7e3fad2fc8c909f9199aa052fccd29a4e745785cc2fc5ee6bdddfa6914a042728c32e4ccd93f7acd5977f28adff90395230
-MISC metadata.xml 378 BLAKE2B 7dfd6f3df156040cf1c245d5a8376d42fab7dd63d38eeaf173c61ad5174cdac63f80e96de17777b6214dc2c7e39a201e0370cc8caf7ceb2cf55f41077c415e99 SHA512 bacc3fb8f1db6ddeb1678314b2d184234e856ad0ad29df11b9d3a0885675b3b3e690a15b964a9d2522bdcf5ebf4c5288498c291d40328272c88806c29580337b
+EBUILD entr-5.2.ebuild 617 BLAKE2B d7d9ab3320abd3b5c63a3ef3dbbf8364917010d0d129f96f0ab99e528822dfb6e7cd88c8e076e86e766d9d07c851ef53fa36ddb237b270223d589a3fabbfab16 SHA512 e27c413032113adf65836233891fe7407c56bc23a724fcae144ae7755509d2421ce4fdb4cd05c6be777526ea8da697c6729d092cf4facc51a31014ac4680a4bb
+MISC metadata.xml 455 BLAKE2B 294fe2a1c6597cc0988c97a080f00c8dc1f48d96f87eecd329425d66f8bbb7e39b1152bcb7645f51b7cc0aa97186f05528c4766ae90e636ac5ab482dceac423c SHA512 d08a5678831d0d97c31588ffc0844acf137a0527d88c529a51d4c3a72f04ee71ea49450a79bd5a9a442c443c792b4d771bdff4551c9c64c2cacfd55048f40c94
diff --git a/app-admin/entr/entr-5.2.ebuild b/app-admin/entr/entr-5.2.ebuild
new file mode 100644
index 000000000000..b612d8978151
--- /dev/null
+++ b/app-admin/entr/entr-5.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="
+	https://eradman.com/entrproject/
+	https://github.com/eradman/entr
+"
+SRC_URI="https://eradman.com/entrproject/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+src_configure() {
+	sh configure || die
+	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
+}
+
+src_compile() {
+	export CC="$(tc-getCC)"
+	default
+}
+
+src_test() {
+	export CC="$(tc-getCC)"
+	default
+}
diff --git a/app-admin/entr/metadata.xml b/app-admin/entr/metadata.xml
index adfaae5d76c8..e0bb95651e8f 100644
--- a/app-admin/entr/metadata.xml
+++ b/app-admin/entr/metadata.xml
@@ -9,4 +9,7 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">eradman/entr</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index 35b6bf1d9915..2f931f5f295c 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -4,6 +4,6 @@ AUX rasdaemon.confd 109 BLAKE2B 20f78ff36701aa718e5dcb36b79949ea5f887ddc65219c33
 AUX rasdaemon.openrc-r2 424 BLAKE2B d3be2b06631ec3dc60e464b5fb38a4778e92a93fc284455f53f6b7c43a05d182b79f478362ed93a706b421ca99f6a21afdd2cbd53d125711bbf1d0f267304ace SHA512 2e30602222443e519cefc1f138dc537f5e22109fde2f8ebb0f8962abd926721389defc46cfa8db667db8618d4dc4257d36e9855367c3c8f2b7d28cb8684a4adf
 AUX sysconfig-fix-0.6.7.patch 1226 BLAKE2B 58c30284cb2d7fbf65a6f9233a9fc934f7d48b184cb3364aede9d4080dfab398c41e9f91b9c1728a3bab584ea0881d67857e9e04ba4c1c5e9dedf3c6e119a91a SHA512 3923737c47b04edc80eb5cb3b0cc5fca597fa4dfdbe42ffc262e7cedaf5debc73996befadf3fae65c1244857eabded5844c067ec0f5f3fe9468b24c5f4b780c2
 DIST rasdaemon-0.6.7.tar.bz2 422473 BLAKE2B 32a95ed9ca217fb69b197f88fa296bf0d3b4230a1ae11c60582911ff84abbe8b9a67b318774b8c4b765dbedbd4458eb220ca3b8ff4c9d065eb893a9a6a9916c5 SHA512 15beae5d4964c49b7b7f9e731948b5def9622fba5d7d17ce52a282d7834d256366cdf3cf427b82b2a6a8fd0c99f202f545000bdb06064fbae7ae0296aef0946c
-EBUILD rasdaemon-0.6.7-r1.ebuild 1498 BLAKE2B 5ce9cd638606bfbdacb737859d23fc8a529df3bafa2b9603c3388f9d66dd2bff857ebd52353e9b75ebef317706951dc461932146c33d1388f075f8d0e92c7594 SHA512 36e847a1e5a209415363ef0bfd993e2a55aef2a2026743b74591f07a9ee730540a5c451db38daed23920b93ea2296007a93d770a3cc8183ce168d45ecb644293
+EBUILD rasdaemon-0.6.7-r1.ebuild 1496 BLAKE2B a3da9b07cce0c7673877c8e46d8176a89da6eccf952494ead9c3abc4c13315279657de96be8b0c2b70be6ef3e323b073527ee9ba952f7873c333d5c1c6c1c838 SHA512 7c68b384e41416d41fa9aa0f73cad14dbb7ca9f655c763b4d30219dc7e6b8ba0546a308c6eb0249dd791511e33e454aa4417905e62a84228d2abc610cda91619
 EBUILD rasdaemon-0.6.7.ebuild 1268 BLAKE2B 34f2d2bb59ffb2a35c990980f1ff669712ef4a3d14e4e3270b0874b122a5323ca089ebf9df0558cac4ff88330b5b5c9ebdc9c1fac600f0b5147d2b3ab8843e45 SHA512 e7223ec552f72bc1c73b7a9831448a97b278f8654ca19449d08121fd93b3e80b541e4a34c6dbcc53ff887be3739866d0c9799357654089c65c3be9db59b3e010
 MISC metadata.xml 872 BLAKE2B 70a9674434222532c7a597ad6b1ad202dce198398271cd3d45cd5b7e13f904b72b05e95305048a46ec86416cdafb5b9989ae14f221675234ccab4f54350a2820 SHA512 66d320b2c1c6292a1bff84bfa4ee9f379b300b320fb7cf8a3a2985fa8c968569e6f7b2fc44643a9439735d1cdb4a8158ea6319129a640a7e8c9d657267df434f
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.7-r1.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.7-r1.ebuild
index 7a8d2aa43192..0ca8b21dd672 100644
--- a/app-admin/rasdaemon/rasdaemon-0.6.7-r1.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.6.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="sqlite"
 
 DEPEND=""
diff --git a/app-admin/selint/Manifest b/app-admin/selint/Manifest
index 09d4a5092655..105a4b24d645 100644
--- a/app-admin/selint/Manifest
+++ b/app-admin/selint/Manifest
@@ -1,8 +1,6 @@
-DIST selint-1.1.0.tar.gz 283926 BLAKE2B 0908f8830ce4b569c54e8c025dd92c39af59172fee0b8061f5b8cdaf61222979a78c3726a5647af9161ce7e4a7ddd5bee64772afecd2024368afa76294b3d317 SHA512 3af358e0f42a285a0360ce2b4db9014ef1e4f0b792623007f88cf510799080975d9e44817e8911bbd32b141704a7fd11e1b4d8f91e124d0fa91c38f71a978c91
 DIST selint-1.2.0.tar.gz 306527 BLAKE2B 842d796d3beea327ac937b977123a9248f317f0ab88e8187ff5ef7b7da2efd9b6c4bccda2dc1fd4661691904f90f346df0120f9398733e62942e70bef5c3c5ab SHA512 e289cb0a25454b1fd5f5435e11f3d956e6c545bbbbe79b7a47d40681746d8eb66bb78bdb541f2629a4f23435853568a8e52d10e6f8dde8e8ddb03f4493ea7504
 DIST selint-1.2.1.tar.gz 307680 BLAKE2B 792ab2f79bc449faa6f94c13ce86f805ef36ebd11873019b36ae5f3d7450017d699d046771fc8359442d8aa24b096e1767e78054b8b2173cab6ac9bf0bb30cad SHA512 2b790cb41cab7dddb34dc9b9365641ae94c22356e3e85b5319ec23090cba633ce09e05a9b97eaba8617208057971f8fbdc8bd360b32a1f7ad0178c11c8711888
-EBUILD selint-1.1.0.ebuild 780 BLAKE2B 9aeb1bb8c97df61caf76a1e75ec8987fb7ce1ec16fb304d40df4c64933b8c68eb03a11c9cd3408441d2865214137caf000c9bd4ab396e855171f4bb0df9d9393 SHA512 f450ecc6417569dc87349c9a2aba3c5fd46dd5c347f8c1ae5db8e75bd3af9981121f50e15d51cf68e0179691879bcd75559a6f261bccd111463cff92d1bfd272
-EBUILD selint-1.2.0.ebuild 801 BLAKE2B 37af626c9fdf16b921150155fec0842ec54056431fbb83c9cb3fe440cd83807a01752a5bbc5d179e840ffa36679f6feb0f7d49a0cff92e04e80e17187557f4a8 SHA512 6d21cee26e7cd811a19251ffcd4eaf81db548e783d9ceb634aeffabd4f76497013591c91e4626871c1b574d9f4db3a61ec0a944cbb0d05908c4f8fff55a48f7b
-EBUILD selint-1.2.1.ebuild 778 BLAKE2B be310eb6bfc4e31ad385f0ec8dbb25e296819ec362011691de1d158ca99d95ab87dbd8bb8dcbd0aadbeae8dbfcad4764842c36e8269950f0e7689aca778970ca SHA512 c2e5b15b4a1fc065e348a83a6baedb7194c0da1e7630041ded223827056b0599abf3731e2b73d8e29939a511802a4149f0c8dbd59740e6f8713791d0c93684da
-EBUILD selint-9999.ebuild 778 BLAKE2B be310eb6bfc4e31ad385f0ec8dbb25e296819ec362011691de1d158ca99d95ab87dbd8bb8dcbd0aadbeae8dbfcad4764842c36e8269950f0e7689aca778970ca SHA512 c2e5b15b4a1fc065e348a83a6baedb7194c0da1e7630041ded223827056b0599abf3731e2b73d8e29939a511802a4149f0c8dbd59740e6f8713791d0c93684da
+EBUILD selint-1.2.0.ebuild 895 BLAKE2B 6942794997a637033577cfe9140f273ea629ce61fb8778b0d5719f96e16613d6d1c53036fdd3ae2b399c8b4a7ac151933a5b5a5249a3e7058d776b0ab13ee6cc SHA512 15c10b251b31394a429d8e7dab14c8fd3a55e9c80bead91be7090ed45ca892037125841c93d4844bf8854e71c0562e77c6d0dc246d34f0f71c1e4d51fb43a048
+EBUILD selint-1.2.1.ebuild 881 BLAKE2B d27abc26dbbb00230fc21e964f59f6fbd259d01901ac7a9c72e454edf05bfda7da425b320ed4595204878b5920efd487f42fe330873cab336e76a583467eda27 SHA512 eaa98fe2912d670ab4ec96699f559742b5acd889110ccd35ffc8bb58309f213665db9620e914a9bc9f0f273dcbd6817f236031e590dcc1161506177ae913a3e7
+EBUILD selint-9999.ebuild 881 BLAKE2B d27abc26dbbb00230fc21e964f59f6fbd259d01901ac7a9c72e454edf05bfda7da425b320ed4595204878b5920efd487f42fe330873cab336e76a583467eda27 SHA512 eaa98fe2912d670ab4ec96699f559742b5acd889110ccd35ffc8bb58309f213665db9620e914a9bc9f0f273dcbd6817f236031e590dcc1161506177ae913a3e7
 MISC metadata.xml 336 BLAKE2B 7451193dc145fb614c82ffbb7cf7e27cc1bdd034eb7ed1eb0a57951267fab2c9850d84052a8161ff85ffdd7292a139024ea3ea391f7dc3637802375b66f466b3 SHA512 c0a0cbfc55ab57271951f401e963bce630ea74f4deb072e219b0d0fb1fa699d25e1ea9af81d619257ee0563d4eeb74fd0e857196c88e0204e6fce5969a881429
diff --git a/app-admin/selint/selint-1.1.0.ebuild b/app-admin/selint/selint-1.1.0.ebuild
deleted file mode 100644
index dadbf3ec6cb9..000000000000
--- a/app-admin/selint/selint-1.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Policy Analysis Tools for SELinux"
-HOMEPAGE="https://github.com/TresysTechnology/selint/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/TresysTechnology/selint.git"
-else
-	SRC_URI="https://github.com/TresysTechnology/selint/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/confuse:=
-	dev-libs/uthash"
-
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
-
-src_prepare() {
-	[[ ${PV} == 9999 ]] && eautoreconf
-
-	eapply_user
-}
-
-src_configure() {
-	econf $(use_with test check)
-}
diff --git a/app-admin/selint/selint-1.2.0.ebuild b/app-admin/selint/selint-1.2.0.ebuild
index e7fc31765fae..d8f4a20dbd0a 100644
--- a/app-admin/selint/selint-1.2.0.ebuild
+++ b/app-admin/selint/selint-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Static code analysis of refpolicy style SELinux policy"
 HOMEPAGE="https://github.com/TresysTechnology/selint/wiki"
@@ -23,7 +23,8 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/confuse:=
-	dev-libs/uthash"
+	dev-libs/uthash
+	elibc_musl? ( sys-libs/fts-standalone )"
 
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
@@ -35,5 +36,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use elibc_musl && append-libs "-lfts"
+
 	econf $(use_with test check)
 }
diff --git a/app-admin/selint/selint-1.2.1.ebuild b/app-admin/selint/selint-1.2.1.ebuild
index db21da9231ac..358b8be6eee1 100644
--- a/app-admin/selint/selint-1.2.1.ebuild
+++ b/app-admin/selint/selint-1.2.1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI="8"
 
+inherit flag-o-matic
+
 DESCRIPTION="Static code analysis of refpolicy style SELinux policy"
 HOMEPAGE="https://github.com/TresysTechnology/selint/wiki"
 
@@ -21,7 +23,8 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/confuse:=
-	dev-libs/uthash"
+	dev-libs/uthash
+	elibc_musl? ( sys-libs/fts-standalone )"
 
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
@@ -33,5 +36,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use elibc_musl && append-libs "-lfts"
+
 	econf $(use_with test check)
 }
diff --git a/app-admin/selint/selint-9999.ebuild b/app-admin/selint/selint-9999.ebuild
index db21da9231ac..358b8be6eee1 100644
--- a/app-admin/selint/selint-9999.ebuild
+++ b/app-admin/selint/selint-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI="8"
 
+inherit flag-o-matic
+
 DESCRIPTION="Static code analysis of refpolicy style SELinux policy"
 HOMEPAGE="https://github.com/TresysTechnology/selint/wiki"
 
@@ -21,7 +23,8 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/confuse:=
-	dev-libs/uthash"
+	dev-libs/uthash
+	elibc_musl? ( sys-libs/fts-standalone )"
 
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
@@ -33,5 +36,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use elibc_musl && append-libs "-lfts"
+
 	econf $(use_with test check)
 }
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 351f4abe90f6..a8bb86ca8b5d 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index 28e44099b03d..018a19b6e536 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -2,12 +2,10 @@ DIST Geekbench-2.4.2-LinuxARM.tar.gz 1921401 BLAKE2B 34d86178e35d586b79182b33203
 DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a148449a36845fe63320788432493581ec6bd5958bf178d83d68b532ffbe5c7ee13e92b0bb00c0aca968bb2e499453f1b7a7 SHA512 d84e13eb5fd28fb232a5f93aa76f4855adcb9ccffbcd90dacc3e2b45231afd82e78d40c63f729391e5d00e95c14653e83757faca4e543c6306dd913c4e0edb87
 DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
 DIST Geekbench-4.4.1-Linux.tar.gz 71076124 BLAKE2B 14c2b80c971798e7d2bb256e76c7ab9c48e8c1c389e2f7547a436f706ac4f21c1e52e564cd584893071ee2f9f0a4747cd03ea72cc728ff8e4f369d5cc794d77a SHA512 fa687d33a7d7a2d09c544e3d17de93f41cfa77915c708cd1ef0743f84f7f83df9d3f8df2872a8f85ed2c4c872e3cd41932685ffeb19cdb0ea047ab5116713420
-DIST Geekbench-5.4.4-Linux.tar.gz 93166494 BLAKE2B c49f399378c00af35df0b17a90af2a92c4366a8ad62f6743144b46a54e81cea77ed5e190b66db2e59f76ac6e47f4ba00d392ab0ac16cbd9e876e99297cc4b7c8 SHA512 46008903e34e7f118886ad391b11ca69d977e8e0cb84b7b78419b0689fe02b3c72d67e1698655cdddee039b102a2314dacd2329b5496f0406f465c6781b83aac
 DIST Geekbench-5.4.5-Linux.tar.gz 93182782 BLAKE2B c0da6e787700775f709966538d3c714eb20165838c565d1ee1d69ddec7f5ab25975462c1edeeedde94e70fdf5a19aad0bc23986f87e1d2299fd86464e9582fca SHA512 890a3749a6fe6eb395b0cd84b7ae869c30e89fc93c7634a52cca2b01e4fcdf071ddc3dc58a581dec8e6582d4336a5cea55d34b1a9ca03a847a412b8ec81a85a6
 EBUILD geekbench-2.4.2-r1.ebuild 1028 BLAKE2B 75e84bed9e787a465867397f183eb8bcbd100a91c9ce5610bbd4b11b92ebf13aef9227fa8c8c06012a773bb872daa20c9bfc4754aa6ef9f1d16121f2ed2815b6 SHA512 497985b5c7a877473fa89ead3e04dfba6bb8a1df2042eaedc1964ee5dfbc3c4685fb389a96d9b1cda93f4badb174719af7765646cd6b957ed657dbf50c08337a
 EBUILD geekbench-2.4.3-r1.ebuild 1088 BLAKE2B f6699780652748451d42b106a2c74b5113778066ff83b92bf216e9da4efe63527cd454f84046be456d6e9266f4ee85efb4c3655f45bbe4e4ace3ab9867cc847c SHA512 1f8b1640a4e121767e51b6c4fcd9ff77cd60fe37f5010fb7bbb670d763fc1166beaefb5ec74b4acf8390ccc19956d1f9945151af61c37f7f2767c5f47c53c2c6
 EBUILD geekbench-3.4.2-r1.ebuild 1088 BLAKE2B d822b727b3fe1703fb60d48dec922cb34d9585b1500f3068d24712261bee6fb3bc0c0837316e286d593ed399b91cef8d4debcbf2c52728fef7a1a4e1d5bf5ba9 SHA512 c1f2e1fe7d45cef07586c0a82e3893229376136a6aed394ea9ac5712c0d69216226c31ce10bb81c3d8d66f46d32a83869e9df14e065ff169c8f6c172c4f3cb85
 EBUILD geekbench-4.4.1-r1.ebuild 1082 BLAKE2B a2ffb958cf707996944a6a1afd1a84d0fb6ea200de5f9bb28e09d5df3ee8d8ee247b3607bb823ab3311f4ed40b7f91d6b793ec8f5f66f058559cd9c90bb9fcad SHA512 be426669bf92c82d74eb2539529925f8fbfcae05ed80bc7d004677f5ccffc8fae870897f2dca4f31321dfb940f6f0646d8b0a86bbb61eb1d17d3836bfa0a54aa
-EBUILD geekbench-5.4.4.ebuild 1029 BLAKE2B 21713100ea8c346ede61964d9abc8b11b46724a52734a11df2ec7b4ca5b22cfabf817ed2a5403db02f89261f85cf331638dfe1c4de1720a3983cfec4905a134b SHA512 9fa94c3d28bf46fcc9c20cd81ff9e35c441522ea670fb2e640b5c245cca66d4b3281002ecb3769e1484490bdba9d39e5f5568288efe063651eb1e78d44685d1d
-EBUILD geekbench-5.4.5.ebuild 1030 BLAKE2B 336f19c7ec2e1a338eb4495772392f8f48a0b8b85926ac90bd358c9334469c206f3eab88d7673f94b229d70b98a8e6c3003c47a2ee16654707b20bb2ce98d39c SHA512 86135ec2901655619b1ee09ebc6750c3351d3bcf8db8dd724294f2a4f829fcf84dd61cdfe7f92a6c0ae5be7052b45e3dadb3398002b3754f237c8c9d67ba663a
+EBUILD geekbench-5.4.5.ebuild 1029 BLAKE2B 21713100ea8c346ede61964d9abc8b11b46724a52734a11df2ec7b4ca5b22cfabf817ed2a5403db02f89261f85cf331638dfe1c4de1720a3983cfec4905a134b SHA512 9fa94c3d28bf46fcc9c20cd81ff9e35c441522ea670fb2e640b5c245cca66d4b3281002ecb3769e1484490bdba9d39e5f5568288efe063651eb1e78d44685d1d
 MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/app-benchmarks/geekbench/geekbench-5.4.4.ebuild b/app-benchmarks/geekbench/geekbench-5.4.4.ebuild
deleted file mode 100644
index 64adc3adf0b5..000000000000
--- a/app-benchmarks/geekbench/geekbench-5.4.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
-HOMEPAGE="https://www.geekbench.com/"
-SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
-S="${WORKDIR}/Geekbench-${PV}-Linux"
-
-KEYWORDS="-* amd64"
-LICENSE="geekbench"
-SLOT="5"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="
-	opt/geekbench5/geekbench5
-	opt/geekbench5/geekbench_x86_64
-"
-
-pkg_nofetch() {
-	elog "Please download ${A} from ${HOMEPAGE}/download/linux"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_install() {
-	exeinto /opt/geekbench5
-	doexe geekbench5 geekbench_x86_64
-
-	insinto /opt/geekbench5
-	doins geekbench.plar
-
-	dodir /opt/bin
-	dosym ../geekbench5/geekbench5 /opt/bin/geekbench5
-}
-
-pkg_postinst() {
-	elog "If you have purchased a commercial license, you can enter"
-	elog "your email address and your license key with the following command:"
-	elog "geekbench5 -r <email address> <license key>"
-}
diff --git a/app-benchmarks/geekbench/geekbench-5.4.5.ebuild b/app-benchmarks/geekbench/geekbench-5.4.5.ebuild
index ba46b34c5a0a..64adc3adf0b5 100644
--- a/app-benchmarks/geekbench/geekbench-5.4.5.ebuild
+++ b/app-benchmarks/geekbench/geekbench-5.4.5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.geekbench.com/"
 SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
 S="${WORKDIR}/Geekbench-${PV}-Linux"
 
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 LICENSE="geekbench"
 SLOT="5"
 
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 9f3ce7e3d08c..4017362b3f13 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,3 +1,3 @@
-DIST stress-ng-0.14.01.tar.gz 1113210 BLAKE2B 7fa5a499ef3aeaad9e5e78e9a564433c706618bbdc140e29e968d32a87c9740fdbac4175f9f6ca3002b31a82845e1598d5c18b2193e10b7db86cfa7bb9bd11fc SHA512 12dec034de738b77de2264b1d4202cc4966f1db5204bc10e3f43de54b50a577b3087b57ed4bc840dff39f0ea1ceeae47f50b25b6a391fa9ed231e422b5ccfef5
-EBUILD stress-ng-0.14.01.ebuild 1110 BLAKE2B 9381cc7072c431f2df95461ab62503ae7130aca4aff8b580266d7ca9bd9419f5ac46d6a44d056606d9e797b9f031d7cfd05e84d849d1d8b9c89cdca9764f5406 SHA512 30b38376b366fc46a7e42a5c307a5925e676826b7fbb75f0f936f3212eb892d4ca06c2249af0bcb9cb8b97848ce21fe083c318eae91aa44b24b5ac58fcf5c63e
+DIST stress-ng-0.14.02.tar.gz 3610303 BLAKE2B a21ac2c3b67b2ec7522c020d01ae50c51b1cfc7d357dde4bd1585fcf0eed77bb9b664805eec5b8cf84cf72383d444da91ed587d113d727c762b9611be4171c39 SHA512 80d6f6d9a8e521f2c58b6aa3680bf22f5e0e75e267f49cb3c30512e3387d1d71a31a932b2e6568166f77c7f2a36bed7902a1ed4cb6aded35f48372e916d64590
+EBUILD stress-ng-0.14.02.ebuild 1110 BLAKE2B 9381cc7072c431f2df95461ab62503ae7130aca4aff8b580266d7ca9bd9419f5ac46d6a44d056606d9e797b9f031d7cfd05e84d849d1d8b9c89cdca9764f5406 SHA512 30b38376b366fc46a7e42a5c307a5925e676826b7fbb75f0f936f3212eb892d4ca06c2249af0bcb9cb8b97848ce21fe083c318eae91aa44b24b5ac58fcf5c63e
 MISC metadata.xml 907 BLAKE2B a9669ec80f735f02c77ac78ceba8b49634346d92c1d10a1288559e2440241d8e75d6de970ae232f2d6b42f12258ffa826de513ba862eaba581faf5f44737d4e6 SHA512 12c241b1df81be6527cc5faa80cb177941dd25cfe3bd29ce8b9ba5a90457834a50c11a8d66b7bd6ad27a3959038d4eded4822ed85df924aa2f71bb9b9b667e13
diff --git a/app-benchmarks/stress-ng/stress-ng-0.14.01.ebuild b/app-benchmarks/stress-ng/stress-ng-0.14.02.ebuild
similarity index 100%
rename from app-benchmarks/stress-ng/stress-ng-0.14.01.ebuild
rename to app-benchmarks/stress-ng/stress-ng-0.14.02.ebuild
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ac0ca0991b2d..54ef43b6086f 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/libu2f-host/Manifest b/app-crypt/libu2f-host/Manifest
index d4efeb619b1f..7f4808fd9919 100644
--- a/app-crypt/libu2f-host/Manifest
+++ b/app-crypt/libu2f-host/Manifest
@@ -1,4 +1,5 @@
 AUX libu2f-host-1.1.10-json-boolean.patch 1101 BLAKE2B c603290ae3f34ac9c6eccbee080ac83d7fcea2dfad69f1088de39cc35165fe7333acafee0aac53c9d973fd0b266bb822a1a68f48e64a492dbb5440976c2ecaf3 SHA512 e8b516d797bbb136fe51c367248be6d1035de409156a35ce55c9e871b236178c610e36f5859121e7fddae28e17c44db9bfa21ce4584acb3c45c6f68fbaba46e2
 DIST libu2f-host-1.1.10.tar.xz 471676 BLAKE2B 5066eaaaeda3b8c015afa8946f0af3b1b90a34488d4c71811c0d8f57a3ed2e4c8cb3d82d2df147dcf13ac3c384522d22f25894ac3a2d994a75b288891a67640a SHA512 91c5bf3994f1d3c9bd144f54b14b0404d839c15bef3c318619decdf1bd37214bcff33927af78a9826ff7d0bc9907c912a0e31104ae68d3a727a8436f2a1dbf7a
+EBUILD libu2f-host-1.1.10-r1.ebuild 1046 BLAKE2B b4de90e961c5bcb303fc9c414e3d7f8ba107741063770b068301c08bec54308643e2ec024de3680bf3ce665cf1f07d5402c2dabcaf53ff80499fa7fa67a89fe8 SHA512 bab94b575027d9245e29aa927a64e02c415535f941ee22f67eb755cabc46ce884dc271ae74384d1defc0c416b29923f097d93c2791ef18049bf2f04c65407f6d
 EBUILD libu2f-host-1.1.10.ebuild 1044 BLAKE2B a1db95597cf045d25dd886289c476a27b7bf696f62e7796df6225ee5aa875020fdb5c70c4aa3c2f56447167fac6a700a7b13d35f9a2528b97e27930aafbfa0cb SHA512 2aba85c68c6b90e8a4606d9d704a16b09cdf9bd57fdf9ceb161d439b9b9ca1414fd98d92df5446a56ebbacc2aa234cc8d75e2f2055f1c99136e08a6835432bc3
 MISC metadata.xml 532 BLAKE2B ee0715bb0c5c993605e314456f9e2cf6aad97cec45e38836dbbcd51d557ee65da536c7f49fd04029e24d1d72d0011ef496346017cb8854b436d9ddc38efd3262 SHA512 c3dc0519b09376c82fa5bb589765ae5b88b680025224b22da23da508216253112ef66b6e0e14c1aebf79a7f67d88a6500f2106386a8f4eead97a79ef55204112
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.10-r1.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.10-r1.ebuild
new file mode 100644
index 000000000000..c49ed0d65a11
--- /dev/null
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.10-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info udev
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-host/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="systemd"
+
+DEPEND="dev-libs/hidapi
+	dev-libs/json-c:="
+# The U2F device node will be owned by group 'plugdev'
+# in non-systemd configurations
+RDEPEND="${DEPEND}
+	!systemd? ( acct-group/plugdev )
+	systemd? ( sys-apps/systemd[acl] )"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~HIDRAW"
+
+PATCHES=( "${FILESDIR}/${P}-json-boolean.patch" )
+
+src_install() {
+	default
+	if use kernel_linux; then
+		udev_dorules 70-u2f.rules
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	udev_reload
+
+	if ! use systemd; then
+		elog "Users must be a member of the 'plugdev' group"
+		elog "to be able to access U2F devices"
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index fbb4cbb955b0..47a3010f8930 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/aspell-da/Manifest b/app-dicts/aspell-da/Manifest
index b8048c846fcc..d1fbb4ea633b 100644
--- a/app-dicts/aspell-da/Manifest
+++ b/app-dicts/aspell-da/Manifest
@@ -1,3 +1,5 @@
+DIST aspell-da-4.0.tar.gz 4208911 BLAKE2B 828176450a1d6e5e2e9b07d16c785239a012fc8382d92fcddf6dec812abbf49048b2f1c15de6655e09d74d2f65cd1a43939b3bee8f036ccfdd441f66b5ea259e SHA512 bbc0c4cc0202f989770d84ac9b5ff688b4c8bf0fef7128c36e54c7e4d09e8233eeee986def9a5d75c05d2599eaf96db4be212f6dc758bd23f723f611bf545ba5
 DIST new_aspell-da-1.7.42.tar.bz2 235483 BLAKE2B 0d5ac9c7457b460410734a36e376387d9aaa4444771dcafb85c80b0d2ca4441b906ef485d5016e9d51985147b9759c4677664c01dd9d68c340ba947efac0d932 SHA512 97d3bc95800d5115ce640a3939bf6c94998f1090f1484da3ffb1104318200ca3650d2b32120c36030b87b4b929b95b8f764f6f51dee66ee916700318f6b4e755
 EBUILD aspell-da-1.7.42-r1.ebuild 399 BLAKE2B 77d0f4ebe23e6fbb04322d2afcb43cfe0b1e9e1886041be2dd1f6037733e16c98f349ef05b666c0a962268d4174c04a3cd0b01d38042e75eadfda9d56d31e625 SHA512 b250da94b6ab193c1e83f6d8be8883c963b4524193e1bce67bc3e303784b9120859790fc4125ad63fd33f5003e91cfdf082ecf73413d2497a384da156f2dc329
+EBUILD aspell-da-4.0.ebuild 455 BLAKE2B 22677c6069ea70d722417262460ce82baeaa228ef08baed2449c6aba65cbf108dcb5128ed452657fcab9ddbcbec8c08bdf3c24bfd9a277341e7a10153944ba55 SHA512 79ba6a15b5e6fd6b3afea99b5f69aa03708818acccdc92e51bd59f491c5f0b87a09161730d9523472b96182002ff27569258af60267e1312877b0e7e2635ad62
 MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-da/aspell-da-4.0.ebuild b/app-dicts/aspell-da/aspell-da-4.0.ebuild
new file mode 100644
index 000000000000..26c8f5f9d04d
--- /dev/null
+++ b/app-dicts/aspell-da/aspell-da-4.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ASPELL_LANG="Danish"
+
+inherit aspell-dict-r1
+
+HOMEPAGE="https://github.com/mortenivar/aspell-da"
+SRC_URI="https://github.com/mortenivar/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
diff --git a/app-dicts/aspell-pl/Manifest b/app-dicts/aspell-pl/Manifest
index bb2fbcb59c13..33f753241d08 100644
--- a/app-dicts/aspell-pl/Manifest
+++ b/app-dicts/aspell-pl/Manifest
@@ -1,3 +1,5 @@
 DIST sjp-aspell6-pl-6.0_20210731-0.tar.bz2 639979 BLAKE2B 52a0c1a2f8c7a260dc99acb52371bde4efcd3ac5327dbf668c099cfc071b4e0ced8f747b6136d69e750efa56c4e6ef85f9f8582947afecca68de53d0b8d07597 SHA512 e72bc953e9da7571d167423ad1cf46327f0be46fab7421f57c5d3250bffc506c7e6cc9957bf340bb03884725617b110af5cd4f5219ee42f1f2f8709a4329cc6d
+DIST sjp-aspell6-pl-6.0_20220601-0.tar.bz2 650672 BLAKE2B cf8212d0ecfa482fd60c4a1b39c3a45c9d47c522899bf243bbe5f0d2dbfe51b8e444950c59b25a210fa8c210a03db03374b24e64350dcf10ce63ab8354b8c026 SHA512 9d3eda4ede1f1ab24b4fc3c9be049fd74711e1a6cd8632d8c8d5248d96b63264cf67f7ed783595142cb632904c15f7f13b887f5ae6656744ae9cc97adfc1ac9e
 EBUILD aspell-pl-6.0.20210731.0-r1.ebuild 501 BLAKE2B ec6a7f1513b54ee5a80dd20641ee1f75a82e6fc20fee312ff2d13555a4b83f934a90667c13330f21edaff35fdcba27c700c0d7cea826c53ad0db4f90875342c3 SHA512 6025003626a72d7fe6d1c8e4d3676b2d8a0d1a845da13b5dfe4c9d9fb71b4c725c24a1a5c891235afc8d4d5dbd33b1b4dbcf2d0b99f0c3f944c8107521f2fd75
+EBUILD aspell-pl-6.0.20220601.0.ebuild 508 BLAKE2B 38e6dcbeadd15e6efefa6abbfbb264f03d3692fb92a8df1621bc9ea9835159d76eccfefa789fd4441ec458d1d0ce29e81ce0f0335b5fbd40f6a4161acf805272 SHA512 163e56f674b5a3b0692f1a435525725d7b5ddfc1c58a60874c179b047d868d8cd6ed9df4bdb147da8990b19ba1f414c1f10ab22f26a3e6a2cdf408ad48e7eb1f
 MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-pl/aspell-pl-6.0.20220601.0.ebuild b/app-dicts/aspell-pl/aspell-pl-6.0.20220601.0.ebuild
new file mode 100644
index 000000000000..3b9d01e9c8bd
--- /dev/null
+++ b/app-dicts/aspell-pl/aspell-pl-6.0.20220601.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ASPELL_LANG="Polish"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+HOMEPAGE="https://sjp.pl/slownik/en/"
+
+MY_P="sjp-${PN/aspell/aspell6}-$(ver_rs 2 _ 3 -)"
+SRC_URI="https://sjp.pl/slownik/ort/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P/sjp-/}"
+
+LICENSE="Apache-2.0 CC-BY-4.0 GPL-2 LGPL-2.1 MPL-1.1 "
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 7205aff1d072..3301b7221f0d 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/demap/Manifest b/app-emacs/demap/Manifest
new file mode 100644
index 000000000000..1a5c91e08d54
--- /dev/null
+++ b/app-emacs/demap/Manifest
@@ -0,0 +1,4 @@
+AUX 50demap-gentoo.el 115 BLAKE2B b51712456a86870f9fd88c87e58b7ac8851038cb2292496feeb28296f0f5151b439700628a2ed5a96c5f8a02e2347e83ea174ae067ad24360c94f9be3e59e09b SHA512 fdb4bdfac92519a2c609b35e4c9d35cb259914aa9e0d924de9eb9d6fef5adb546d22a456d01ad68952d638b38aa42e0674f6b235fc0f6340acce6ba410933478
+DIST demap.el-v1.4.0.tar.gz 26998 BLAKE2B 410cb79fffbe562861c2c91d3a8284303ae71edf5a3c331bd0c86b1aef7cfa18c731853c425bf208073da26815651e02e49faa2f93eeb667f53cf6c0a1920f08 SHA512 4f21e9135645df17fbb9a0d2f8031ad6ab0af23af9c8f4744c1510a534ea7c518bc6d0be4801484121b040e952f182d0b70dc3505e4e7534114f53a1e8ae1723
+EBUILD demap-1.4.0.ebuild 716 BLAKE2B b033e5ebd8d181614731ae593d1d31324e8df6fcb72925b6ef12c1d03f1f83658a32b4510b7a368d12bc9c47d06775c6b4a5737fb279beaf2a9c463a1c946715 SHA512 6c2b31b840177fdfe41bcf34e3bc998a1beda72c79a1a6a019b14a155bac6547937f6738df461191317950aaf9e7f1ef57e40d227ac391b3e790df22cd318e1f
+MISC metadata.xml 1133 BLAKE2B 19cef190c96aa372967158274040ecee70899a44e45d4d7f86ca0bf5ae55f22f4a845888f49ebfcdc4bd4f1d8e8b98da3c79c4d206b8d0fdbfe50bf6ec03aec0 SHA512 b8e5fdd607c9defede6de74c2c4567afbcdb5a531755e89da0eb7e58b7d1b7b04dfab62868ca9713c3664893bd0622bc8f918e885ba1bb79372749306715c3b1
diff --git a/app-emacs/demap/demap-1.4.0.ebuild b/app-emacs/demap/demap-1.4.0.ebuild
new file mode 100644
index 000000000000..8e23040b1ed6
--- /dev/null
+++ b/app-emacs/demap/demap-1.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Detachable minimap for Emacs"
+HOMEPAGE="https://gitlab.com/sawyerjgardner/demap.el/"
+SRC_URI="https://gitlab.com/sawyerjgardner/${PN}.el/-/archive/v${PV}/${PN}.el-v${PV}.tar.gz"
+S="${WORKDIR}"/${PN}.el-v${PV}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+# "make test" is just a practical check if "demap-open" works, maintainers of
+# this package could check themselves if it still works after installation.
+# Notice that we autolaod only the "demap-toggle" function (not "demap-open").
+RESTRICT="test"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/demap/files/50demap-gentoo.el b/app-emacs/demap/files/50demap-gentoo.el
new file mode 100644
index 000000000000..bcd35f5b7298
--- /dev/null
+++ b/app-emacs/demap/files/50demap-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'demap-toggle "demap"
+  "Toggle side window showing a minimap." t)
diff --git a/app-emacs/demap/metadata.xml b/app-emacs/demap/metadata.xml
new file mode 100644
index 000000000000..bf3219109fba
--- /dev/null
+++ b/app-emacs/demap/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    demap.el adds a minimap that shows a zoomed out view of the active window's
+    buffer. You can toggle showing the minimap in a side window with
+    "demap-toggle". This package has a few advantages over other minimap
+    packages: support for detaching minimaps and having them on a different
+    frame then the active window; support for multiple minimap buffers, with
+    their own buffer local definitions on what buffers it can show and how to
+    show them; having the minimap on the side of the frame rather then on the
+    side of the active window by default.
+  </longdescription>
+  <upstream>
+    <changelog>https://gitlab.com/sawyerjgardner/demap.el/-/releases/</changelog>
+    <bugs-to>https://gitlab.com/sawyerjgardner/demap.el/-/issues/</bugs-to>
+    <remote-id type="gitlab">sawyerjgardner/demap.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/dts-mode/Manifest b/app-emacs/dts-mode/Manifest
index 5d4628286b55..7f7845fbae5d 100644
--- a/app-emacs/dts-mode/Manifest
+++ b/app-emacs/dts-mode/Manifest
@@ -1,6 +1,8 @@
 AUX 50dts-mode-gentoo.el 304 BLAKE2B 1ec26155386af1029c583b7624df22b8d68bc6150a9293860b9249b5a9212c0bec49610d7b5cc78b730361d55cd19cdb1176925bb496da649d30587511eeab6e SHA512 141a7719e5f348bee8ea96de99428b538d81217b274246c9ee2cc992c5f85637684757c0cc5653072c7182aad2c020eb6d639e0821ef97c830a071107c60c1bf
 DIST dts-mode-0.1.0_pre20161103.tar.gz 2002 BLAKE2B 2dfe222c99d6d1876b6c5ae624f28b2d3fea0a4f8fd98bdebbdb697a03101f3ed1a4e260bb2013b1d40934fce29bc0461df12a0788b7dce189604473e4469819 SHA512 ac7ba1abd64c63f30d5cfd7fc61ca5f0f9ef368d1b8a213acbe897babf8409c551f58b828e4bfc8c862cbaac20634ce90727224f75c3846bde2d64a86c90485a
 DIST dts-mode-0.1.1.tar.xz 3164 BLAKE2B e3ff5455469c53286b9a5f23645122cf7c69d3e974dde6478ab35e2fb52f793884411b06d677b3639e4965f17dfc959ec8742cc44d2cea3fdf2cc6f3f9745de3 SHA512 8afcb815504b6287715e34ddd971d7b1dc17ebd359632cdbb6b120afce89a3f5c6a4396b9583f0058c75d83394499b21768c7f47fafceab79e85bfb30049d481
+DIST dts-mode-1.0.tar 20480 BLAKE2B c5f7f60c907d47d1984ce1961fb4cf9f8cd75052f0bbf0742c233e6e1a117c6525e4124c6ca55017cb300a57dd324b7eac7c2612c0580fed18188d4074b8666b SHA512 995c35629882b8bc78b5ebdaeb2a799019889b2d02ad8990d148f132b171ae4ce999bc0e768fd47d64831daa2b2d9a9ed13099885359106fbc9c7f63ca2659a6
 EBUILD dts-mode-0.1.0_pre20161103.ebuild 491 BLAKE2B 147137a7f68e04354d20ff9c890ea44e944d14218e0b4c5484ea277303dc510d310f79b14cc0253078b3e15bc94a2cf3e3b8e711863c43a9239be76d4499e6da SHA512 9983968864d1f450091e2200c8dcb1c71d1e2ba6804d1cde79b7659fa6681b24c173123f1c4118069d06acda1fa7612c8afd36c7e7bb5aac59adcc80fe344237
 EBUILD dts-mode-0.1.1.ebuild 515 BLAKE2B b0e940462c2a56a8a57ac0ddf2e0005bd62246fc95f724bfda9c3795ed5a76248c3454393c1cf077fdc658dd1f111e4a54a00ba74515feac38d8df6f4daba7f3 SHA512 a4f93e9f7a64689aa320557d1453a6d5c7f4b350edd58123de80728293f20843fe6206eca19b2abe0ba5155ceb33f03a221fe81a293cc91e0f2c8c8e574dc869
+EBUILD dts-mode-1.0.ebuild 455 BLAKE2B da88ffe34aa6bbe629e5632912aae144f1b3f1b838c49b48f6cd1dbaa3910eb510d3455ad39aec229fd91442aad9692038b0e85f7be601e5619f3bf97052e3f7 SHA512 afec6d3c72a8e582d3a2a812667949ea5e68029bbaa0a721e062a60efaf85f69fd4a086cd5f2f4f8e12ac19e892d76411f89e7150eea32952ef12025d2f16ee1
 MISC metadata.xml 362 BLAKE2B 86e839913d0159d77d21647ae35f2822d91c87de2fba75f8839772d047e8721ca6b302d09d40eb3437956532a5d4dbb735367fa1a4b5ef0ca7c7cb9fdd5fb04b SHA512 d5f8f0d19daaba51328bc6bd8c68a21c04eb5c2874d77ee357f7350e0fe852a5c74dbd0ae9cd38ce367f94eb5e9add48ecac02d472a45de21fc039d07aedfd2c
diff --git a/app-emacs/dts-mode/dts-mode-1.0.ebuild b/app-emacs/dts-mode/dts-mode-1.0.ebuild
new file mode 100644
index 000000000000..0c0140b04a56
--- /dev/null
+++ b/app-emacs/dts-mode/dts-mode-1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for devicetree sources"
+HOMEPAGE="https://github.com/bgamari/dts-mode
+	https://elpa.gnu.org/packages/dts-mode.html"
+
+SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ELISP_REMOVE="dts-mode-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS=( README.mkd )
diff --git a/app-emacs/ebib/Manifest b/app-emacs/ebib/Manifest
index 66290bcaeb50..3a3cb6a5e73f 100644
--- a/app-emacs/ebib/Manifest
+++ b/app-emacs/ebib/Manifest
@@ -1,6 +1,8 @@
 AUX 50ebib-gentoo.el 175 BLAKE2B 6e790273be0d32b188bf4e429da221e1a0f71036dccb521edb43340a88faf70046b27bc70128a05a81437dbd856f5966ad343f4aef2dffa72b44a1901d3199e8 SHA512 9be24ffce7327c3db49dbec7a1f3cc3610fdc4aac40c25da06906df25123173f3a4b05ec2d96d9ca2a1fc785bdd471ffba73654ee3b642be93c93b412f230fcb
 DIST ebib-2.35.1_p20220501.tar.gz 1043749 BLAKE2B 937b3e00f4f52c5b63949ae993e40ff340477c374914ce308256018d0c86fafb52cbacde74dab552303b6635ff87d57c29661a62971b0649f58a67e3b916a9c8 SHA512 d822edb2584effc6f385e2e71bf57d72e5763129fe84fec60bf1a9841822e3d59cc53a05cab293014dee7c63d14cbae43734a2070746f5c512e417a4085f3ef6
 DIST ebib-2.36.1.tar.gz 1044522 BLAKE2B c280b1123594e10a3cc1dbb67d4db5687d3042b8366b05cc6ab95deb7edc1cf50f6dc516028339d44502c8b1c91503672a511030ff6a895180d1b325566e1874 SHA512 48a54cee6f9ab5e2785c8a4b0f6dcce0ca8fc1f017ea6eb043717d22b326ccff077104fa2907fd9c29eeaafc38fc176e352ad3ca000bfbe2deafa46c54352318
+DIST ebib-2.38.tar.gz 1040337 BLAKE2B 97a61ecf5d4334dd39be287feaa44206d52d3d6687593b8eb2210427901890254b2cefa9cf37e9292f8ae2651c7c11ac0af2938f9a2854b98c3ee81ed6cfc7c4 SHA512 4a6b611759700e8181c09fa80cb631a024bf1d38d6950e040c3e476a194d02e893fe1fe9b749dd737a7eaf7fd9d4b8ecfe4d09be56e788b7692a4253dbbe838d
 EBUILD ebib-2.35.1_p20220501.ebuild 840 BLAKE2B 43d041da367e849ff2ae6883f417c48ac2ca5ec64036e3acca19fc6ece38f4ebb7a2364f2d31b756bd758986087d0e8b4027165fe68474d59edbf912dc755adb SHA512 d7d272bbe9b49950767d140507a2c215ecb963369c77e3ab2f0aa84daeb40e2dc97abf2269aeef71dae1bcbe72f121814673d53a3da59662461194516530b603
 EBUILD ebib-2.36.1.ebuild 772 BLAKE2B fed054ff141b43f06d810c343e8763a0538f0caebc1d20d5bc6cbdf51799e65126c8692336f5e41c21ae1004418c6cdd930fb55fb18c3fb72075a289a19c4f9b SHA512 4226453f712100f1c9378468f5b0fcfcd0cef670836b8b97311ef9514d15a1203c83c707c1dd57b96932d722800943ed11a64000c59eef7a180b5c1be6130e60
+EBUILD ebib-2.38.ebuild 772 BLAKE2B fed054ff141b43f06d810c343e8763a0538f0caebc1d20d5bc6cbdf51799e65126c8692336f5e41c21ae1004418c6cdd930fb55fb18c3fb72075a289a19c4f9b SHA512 4226453f712100f1c9378468f5b0fcfcd0cef670836b8b97311ef9514d15a1203c83c707c1dd57b96932d722800943ed11a64000c59eef7a180b5c1be6130e60
 MISC metadata.xml 730 BLAKE2B de17020c88b38b6d8e3753cbb4d554d1061fd73c39cf8e9e760f3de204c87bec6c3aca60213bc283a5d053da30225232100dadf711072a57b19863c55601fdca SHA512 d20f364400adcb23dc542cf08fed16b0b073fcd6ef7df27644f51d674215f51fc9520ad873ac6f2f783364471c7386d69f8d3ae88ecad8b6a1694e08e211f7b4
diff --git a/app-emacs/ebib/ebib-2.38.ebuild b/app-emacs/ebib/ebib-2.38.ebuild
new file mode 100644
index 000000000000..d708aa8ac4a8
--- /dev/null
+++ b/app-emacs/ebib/ebib-2.38.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="BibTeX database manager for Emacs"
+HOMEPAGE="https://joostkremers.github.io/ebib/
+	https://github.com/joostkremers/ebib/"
+SRC_URI="https://github.com/joostkremers/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-emacs/parsebib"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/ert-runner
+		app-emacs/with-simulated-input
+	)
+"
+
+DOCS=( README.md docs )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ert-runner -L . -L test --reporter ert+duration --script test || die
+}
+
+src_install() {
+	elisp_src_install
+	doinfo ${PN}.info
+}
diff --git a/app-emacs/lsp-mode/Manifest b/app-emacs/lsp-mode/Manifest
index 66b31e5e44e3..fdb2e6748b99 100644
--- a/app-emacs/lsp-mode/Manifest
+++ b/app-emacs/lsp-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50lsp-mode-gentoo.el 2081 BLAKE2B ac9eee2a41fa09e1ee72cabef2380b6095f469f1c668833b4d6d59964796a974457e2f85f4cdb7b66ea652ad23a6806326f9a43c20b4d1592fc1f19eb33a3773 SHA512 632fb2b9d0af9735c16fffbe6d0aca7ba0a494edd001ea289f17836e9ddd34d9ea60cf22035194e1837505cc214370be31e0dff0637a59361eeb6a4f2d12e816
 DIST lsp-mode-8.0.0.tar.gz 14703640 BLAKE2B ab7993772cfc127ee94ba4a0af75e8d7f6789ac22c76acce8df250b5579c1dd2f41e353b26cbdcf6e1a2e6a8d1f8a179d4736b67914cdec31c23032f93dffd3c SHA512 2620288142cea7b06ad2725b63e5db945b1d62d0b4c215e8d35d79d6c3f05bcdf2736dab34bd10c2b9f8928caf36ef617182c41c309e62e2ce8ddf45df376cbc
+DIST lsp-mode-8.0.0_p20220620.tar.gz 15464614 BLAKE2B 10e50a52e2a725b1a275b81514bb268619b128370f8989970c75c87bc37516588e798c5f2531b73689d9d102fbd6b965841c6d8a0c337cb8d9052b632a01e289 SHA512 d464418df6eb99d8a1f4cad8c9e31ca057286f846afbb0078fdff21cfc685ffc158b1b37d22224372bee67eb5298f20bb4db83ed466c09e4b4b3a83db865ef09
 EBUILD lsp-mode-8.0.0-r1.ebuild 1205 BLAKE2B 26abed125c70a373a1ac0cc9672af1e174dfd179ab2a5a4c47bb50f41a7d68a5606302e24e2cfb45360f436e65d3299e92af50aafd0ac47c89563ddcc5c3b107 SHA512 85958cca001fca56f0416d75dfab2d9b0e7a621c0f6864cf25770e25abe780256e43c16f4b7b6a88e3a58b2d0a6a04124f8f78d9ec641fa8b8181733424cf0a9
+EBUILD lsp-mode-8.0.0_p20220620.ebuild 1273 BLAKE2B 79c6c26ad8680450d778118052c50bfc015f213fa4a3ec9e7df12a07c6e37e4e75454e3e4f498f82428aea7d582e845e3608fa3c5ae2dde299183d7219807af6 SHA512 99bc2f3ac451ad7addbe69de4488a16aba0e39417b6d53279c9da6dce5ebc67e392e90f7ba40a0cf5d81eebea0c9c6477d62ae437081302ef128703c4e3f03aa
 MISC metadata.xml 364 BLAKE2B d28d1feb1f2948839ed9759bd1d7f22285218f301e2862e50b6a58aad591f81d8d94ff8bf2fce8c399c04839467e89b82c2487b2ff09a129f4636d81555db4f8 SHA512 1b9aff2f7852a2af981b93c1e2ca1a0df378e52d0a0817a7fe4a00e5c74721389979df9367a6e93c3a62ac02adb118fbdfff84272f9f902c5883d0759a422d4c
diff --git a/app-emacs/lsp-mode/lsp-mode-8.0.0_p20220620.ebuild b/app-emacs/lsp-mode/lsp-mode-8.0.0_p20220620.ebuild
new file mode 100644
index 000000000000..b87fe3e08a74
--- /dev/null
+++ b/app-emacs/lsp-mode/lsp-mode-8.0.0_p20220620.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=9957623d93b13fabaca8ba35b85da8fcceaeef69
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Emacs client/library for the Language Server Protocol"
+HOMEPAGE="https://emacs-lsp.github.io/lsp-mode/"
+SRC_URI="https://github.com/emacs-lsp/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-emacs/dash-2.18.0
+	>=app-emacs/f-0.20.0
+	app-emacs/ht
+	app-emacs/lv
+	app-emacs/markdown-mode
+	app-emacs/spinner
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/deferred
+		app-emacs/ecukes
+		app-emacs/el-mock
+		app-emacs/ert-runner
+		app-emacs/espuds
+		app-emacs/flycheck
+		app-emacs/undercover
+	)
+"
+
+DOCS=( AUTHORS CHANGELOG.org README.md refcard )
+BYTECOMPFLAGS="-L . -L clients"
+ELISP_REMOVE="test/lsp-clangd-test.el test/lsp-common-test.el
+	test/lsp-integration-test.el"  # Remove failing tests
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-compile clients/*.el
+}
+
+src_test() {
+	ert-runner -L clients --reporter ert+duration -t "!no-win" -t "!org" || die
+}
+
+src_install() {
+	elisp_src_install
+	elisp-install ${PN}/clients clients/*
+}
diff --git a/app-emacs/web-mode/Manifest b/app-emacs/web-mode/Manifest
new file mode 100644
index 000000000000..c853d1efc7c2
--- /dev/null
+++ b/app-emacs/web-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50web-mode-gentoo.el 114 BLAKE2B fde7e2b5189d353f81b7d29f98b5926ba212c088dfb6b444d81cae21b2167cb5604ce83e1d59860c2f138094515643592ef1e7259e484c6022d7981d4dec1ba5 SHA512 c2f35495eeb30ffe72282fe710ca20ef109aa2a6dc239a106e56ade5f16293b7846a3fce4a38f4583abc7757084246704cb6f914daddcdc5b208c49eae229d94
+DIST web-mode-17.2.1.tar.gz 155440 BLAKE2B bae77ca300f77ad4dd520b048194eb66b592e57086e9720ec98c59c30e06a4f86e55f74f427b5ae1bf7e8a2c7f243168ad9c38c9911dc3ab4f98bad0ee8632a2 SHA512 bfd68cae6a79f9a77b512c94cdb1ce0ffedb763ee741c4c5b1e59caaedf46b40ee2920dce5d1023689b9382d4573975f5d397fc9fc96232deb558d0952d7beef
+EBUILD web-mode-17.2.1.ebuild 425 BLAKE2B fa9d6973a093b119dafe01ca9ca692cadc563a0da19914f3ab04e2c7d44b627a541ecbf15c047a510910eb58d385c82b881c83580c9ea38ec68da5fd04b8fb75 SHA512 9d4f62701cf759fd9a9df87ba557ca6108fef0cc47f76d3dbbb1b8e223564e115c3bc342c5e32327aea104e17b92174b5b16ea5bb642621cf2918d6313f172d9
+MISC metadata.xml 917 BLAKE2B 9a9838fdf06c9a4177912c5f38d907dd9c132c5b0cf7e88a36ca2baa61a8ecc650bfafb928586e98fe738ad2ff46b6b42cf427763f5c38a996ee9de746b832d8 SHA512 b06a22fd3702e458610501c7e3f8c6cb3899f89d5d5e3386bcc2cb75c0b6471b2637962486c0e75d15f9e3f4909b2a7607d5d3f0f8d01c6218e6e75e26469e1d
diff --git a/app-emacs/web-mode/files/50web-mode-gentoo.el b/app-emacs/web-mode/files/50web-mode-gentoo.el
new file mode 100644
index 000000000000..93f8e6529970
--- /dev/null
+++ b/app-emacs/web-mode/files/50web-mode-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'web-mode "web-mode"
+  "Major mode for editing web templates." t)
diff --git a/app-emacs/web-mode/metadata.xml b/app-emacs/web-mode/metadata.xml
new file mode 100644
index 000000000000..8be48d9935f1
--- /dev/null
+++ b/app-emacs/web-mode/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    web-mode.el is an emacs major mode for editing web templates aka HTML files
+    embedding parts (CSS/JavaScript) and blocks (pre rendered by client/server
+    side engines). web-mode.el is compatible with many template engines: PHP,
+    JSP, ASP, Django, Twig, Jinja, Mustache, ERB, FreeMarker, Velocity,
+    Cheetah, Smarty, CTemplate, Mustache, Blade, ErlyDTL, Go Template, Dust.js,
+    Google Closure (soy), React/JSX, Angularjs, ejs, Nunjucks, etc.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/fxbois/web-mode/issues/</bugs-to>
+    <remote-id type="github">fxbois/web-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/web-mode/web-mode-17.2.1.ebuild b/app-emacs/web-mode/web-mode-17.2.1.ebuild
new file mode 100644
index 000000000000..edb07d0bd07e
--- /dev/null
+++ b/app-emacs/web-mode/web-mode-17.2.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Web template editing mode for Emacs"
+HOMEPAGE="https://web-mode.org/ https://github.com/fxbois/web-mode/"
+SRC_URI="https://github.com/fxbois/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 4e3c528b7a32..c678075c9691 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/glean/Manifest b/app-emulation/glean/Manifest
index ff51a69940c5..f67f6eabad8f 100644
--- a/app-emulation/glean/Manifest
+++ b/app-emulation/glean/Manifest
@@ -1,6 +1,8 @@
 AUX glean.initd 241 BLAKE2B ea451713203da8dd61eef5155e2ab2d5fa7be5d9cd210ce2d0ce890fe54af05b461671702d1a2b60b8e6b8e0cb0f4d12f90ff2884409e9f2a3dcc380ba48bb60 SHA512 a5af77b16e1864158dfe858f932dd4eecb5633bd71fbdd00085863e56bd1862d7eba4500d0f4ac8c692b06750fcfe3f9f5b2bb7a4ca6a4ba72dbc43bb12856c5
 DIST glean-1.18.2.tar.gz 67642 BLAKE2B b346fc63b361e7c7bf0b8fc100da4a047004950aff3e17fce96d47ae5a7887828a09f4b107f2af1afcf9d866e5bc0857049ddd2d9c49413e9fe4b61d1de99fd3 SHA512 de80c06952ebbbc24c8cf198f61be788fb32974652c8253787ed5a165e26bb162b48c84836779420bb7c331edeb50a7796f5a2ff578d2e612068c5fbadd343c7
 DIST glean-1.19.0.tar.gz 68806 BLAKE2B 14569fafe05ee0abd626c8302d54721d321b1c69bd0e72bb850c2fab7d7c49a0c5f27c20e4542e5c32a818d51f1fc29e8a14ff730ebbc4619399e710e6b9f9d4 SHA512 a4d063a921f6dac51d2e610121d359f289817cf57a52fadd6b8fd2c8c7f761433920c5d43b415edcaf3c4956bb67b3c19274aa6ec061b057a6bcb975d2662cd0
+DIST glean-1.23.0.tar.gz 76426 BLAKE2B bca6d2da0393bb28392d3c9ab7708cf4b053e4736203b9c26bc278a52c6a829abead13ecb63ebb60ade9a4127ebba9dd560b75b765c3a168ea389025b07638a0 SHA512 4eca5ccd18bd7864fdecd35b483e5da6a0854c076d0266f802b70b7838de61790c9237f8928807a45d6845fa8ca9a37e2228653326759204483803b28de191ee
 EBUILD glean-1.18.2.ebuild 583 BLAKE2B ef1f2f39b65bca15a5d2ed9ffec7b18595f6ac22d58e406544f693eaccb953f7ff2c1c7168b29dbb5b6ff2f410abb01d28d223a36256a8d031bb5ab6d8cfe03a SHA512 678b4218234ba65d95b9cf8d62a79ae8c9c26de8cc258990754e6a533cb7f87e9377476b9aecf86e4823eaaa97ca36962009f640a483b7461eec0c99662a3b8d
-EBUILD glean-1.19.0.ebuild 585 BLAKE2B 3638fd76040326d2494fc5105a0525df8a7c2c239a1b91a04e4d15916d3fc984b7796917e35f9ff38b06aab90489a37f94a3d858a8e542b59ec4c57e3ec09157 SHA512 6c85f871f086ab03752b3292e55b9c3d246b321ae80c425e0c6de00301448f30464389afb84862f94d60803a27451ce4a77a41fd648d9ddd066d46df5b494ad7
+EBUILD glean-1.19.0.ebuild 583 BLAKE2B ef1f2f39b65bca15a5d2ed9ffec7b18595f6ac22d58e406544f693eaccb953f7ff2c1c7168b29dbb5b6ff2f410abb01d28d223a36256a8d031bb5ab6d8cfe03a SHA512 678b4218234ba65d95b9cf8d62a79ae8c9c26de8cc258990754e6a533cb7f87e9377476b9aecf86e4823eaaa97ca36962009f640a483b7461eec0c99662a3b8d
+EBUILD glean-1.23.0.ebuild 585 BLAKE2B 3638fd76040326d2494fc5105a0525df8a7c2c239a1b91a04e4d15916d3fc984b7796917e35f9ff38b06aab90489a37f94a3d858a8e542b59ec4c57e3ec09157 SHA512 6c85f871f086ab03752b3292e55b9c3d246b321ae80c425e0c6de00301448f30464389afb84862f94d60803a27451ce4a77a41fd648d9ddd066d46df5b494ad7
 MISC metadata.xml 698 BLAKE2B a0702c57b38fbe6c2f8493833895d6a411ac75d35b6e216338dd51fb2f13dc35756174ad8f5b6e36ec584046973fb8644cc32c0c010184f945065fe58eb95d1e SHA512 4e9e178d4030e02fa469412886fb40cecebc4611daf31028840a36b55521992c278780f7a5cd1dd57faa4d98eabcdd7bdc925aacfed3aa3235c87f1906259e26
diff --git a/app-emulation/glean/glean-1.19.0.ebuild b/app-emulation/glean/glean-1.19.0.ebuild
index 2d07441e5a1c..bd5b679fef7c 100644
--- a/app-emulation/glean/glean-1.19.0.ebuild
+++ b/app-emulation/glean/glean-1.19.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
diff --git a/app-emulation/glean/glean-1.23.0.ebuild b/app-emulation/glean/glean-1.23.0.ebuild
new file mode 100644
index 000000000000..2d07441e5a1c
--- /dev/null
+++ b/app-emulation/glean/glean-1.23.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Simple program to write static config from config-drive"
+HOMEPAGE="https://opendev.org/opendev/glean"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index a8a79adaa44d..6c8f815c4180 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -36,6 +36,6 @@ EBUILD libvirt-8.0.0-r2.ebuild 8802 BLAKE2B 473763cf6d30b1d9f7132e0430c9af615dd2
 EBUILD libvirt-8.1.0.ebuild 8787 BLAKE2B c131f96900497a858c4f15ab9352f4ea339074aaa33b612479a4986b2b6e622b7a2ec403a630dd21dad6be82d69aaf37407427fb859552dfb6ca0476e49419a6 SHA512 23f89d9142cd492b3b4c19985383c6e4d97a787b47fb5c61672eb06f94ae379c298e6d56f70bf63101353c9fbb2d70cfa1fe06c29af78ebf69c7ad0bfc2a1757
 EBUILD libvirt-8.2.0.ebuild 8817 BLAKE2B 1f849e58e6fb66c5b732b16b4df83fb73ec36c75857803ebec17a23489f247ea61fa30fe3afc10b6ce22040ed5916e5f6106205c9c0d4fdce35a1305aa5ec30e SHA512 431c2a164bc956cb9b468aaa35534a1b4c532537340274d963bb4cd555288ccdca4369a3001133e87dd2d20eb6a93e9b14c9c34ecf3f0ea80ceadeb2211984d6
 EBUILD libvirt-8.3.0.ebuild 8948 BLAKE2B 4dffb4d34aafa8a4998ddc3ef9e26b18e5188f1c836ca75d68b75909bae70a9c52a9e03311b08e8e39ee498e243d2557e37f4024e376fc40565f55f778f3c3e7 SHA512 39568ef7a362fa13e7e9958246d02a919174f07381b44fe44134ecc6ef00a1ee81e836e3e12be391bba7e0510aa4651a6816aaaf2f5340f398dea54656e5b248
-EBUILD libvirt-8.4.0.ebuild 8948 BLAKE2B 4dffb4d34aafa8a4998ddc3ef9e26b18e5188f1c836ca75d68b75909bae70a9c52a9e03311b08e8e39ee498e243d2557e37f4024e376fc40565f55f778f3c3e7 SHA512 39568ef7a362fa13e7e9958246d02a919174f07381b44fe44134ecc6ef00a1ee81e836e3e12be391bba7e0510aa4651a6816aaaf2f5340f398dea54656e5b248
+EBUILD libvirt-8.4.0.ebuild 8953 BLAKE2B afa854c0c31cf705e401fb5733d52c3ac720c52c62dd7517ef79d791c8e93a71b5f2c1628a49ab9d6e314bdf343304aaf9cb79ec56a5b2cb99309055e7a785f8 SHA512 77c6cac11ece2fd8a01193ab1da4cfaa7ac6f7addc4500054f93a649faac4f119400056c79a835f56e29417fbaa683e7f4dc8b73d03585dadcf8926b6be22ade
 EBUILD libvirt-9999.ebuild 8948 BLAKE2B 4dffb4d34aafa8a4998ddc3ef9e26b18e5188f1c836ca75d68b75909bae70a9c52a9e03311b08e8e39ee498e243d2557e37f4024e376fc40565f55f778f3c3e7 SHA512 39568ef7a362fa13e7e9958246d02a919174f07381b44fe44134ecc6ef00a1ee81e836e3e12be391bba7e0510aa4651a6816aaaf2f5340f398dea54656e5b248
 MISC metadata.xml 3612 BLAKE2B ddfb61f1cf36a2761040cc9f51c6bb1ffe2697b3d7b4bb5859c9db37da1e4402bae12a26e7ce591e4f68da6d026b9e36a7b8926801d122ac3982a74ae90c0e2b SHA512 ec7ceff58d0a7542d0c8d07ce3905a98390347e5a0966373d6cbe496b51fe52851dcf62f9fbd25fea669114bb4013b52bd09e38c52a1742fa3d157690b3a560c
diff --git a/app-emulation/libvirt/libvirt-8.4.0.ebuild b/app-emulation/libvirt/libvirt-8.4.0.ebuild
index 6128a61b974d..1ac6f7431bdb 100644
--- a/app-emulation/libvirt/libvirt-8.4.0.ebuild
+++ b/app-emulation/libvirt/libvirt-8.4.0.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
 		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="C toolkit to manipulate virtual machines"
diff --git a/app-emulation/spice-vdagent/Manifest b/app-emulation/spice-vdagent/Manifest
index 32d5a0eee71e..a267a7366cf7 100644
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@@ -5,5 +5,5 @@ DIST spice-vdagent-0.21.0.tar.bz2 164103 BLAKE2B 298122b334f880ffb8d77d3a7d822b7
 DIST spice-vdagent-0.22.1.tar.bz2 165560 BLAKE2B 4fd4318592d20d305d515c65d7491b90ac79bcc7f5bdfafd9df7858bdce24aa57c79f2121bbf9cbadec8e6297890f4b8598b9abcadcce5a9f39712b96deaa396 SHA512 5a4d2661145f33a0583880a128d925b15ca5aec05df83271c80f8baa0fcdd28fab0242301bc38443ccddf70fbdcfd76b5d30bb5a6b4b7c895c3cea0eb38bdf92
 EBUILD spice-vdagent-0.19.0-r1.ebuild 1420 BLAKE2B 5fdc3fe425aee257302f00416e82637fe8a612c21a15ded9b3ebd27bc50833607b25d920d3489a5d52e2897a968d906ced5684b996dc0014b9d2183068503501 SHA512 7945e81a166b6de6cd0f4b112fda21605473f35f27ce85777c7e31b798bc548cc2cdeccf53ae6936eb96e8a9c8a4f7d5259039c29f751fa5717c964dacc94044
 EBUILD spice-vdagent-0.21.0.ebuild 1487 BLAKE2B 77fabde2fad9b2178a5cdc0efc57a6968343d9c0937fb6256e2dfdfbce9ea7d98f8beac5451cb4bb3d659e49df83e542488053df644a7732df480f3a53ee19a5 SHA512 99eaa2b77f8273d36ba906ade6cb7b80c18c86ae92cfb969854ac747e546399a2549a42ce6af82e850a7a8d3dccb6fc6cd6b79392c07c428fc1bfbd558a03e08
-EBUILD spice-vdagent-0.22.1.ebuild 1485 BLAKE2B 4deef44c5db2bb46e4ca864960bef98a54bc122f7c07d9a5e4ac4ce415cae41f22240ece70974724e81bde8009bc60a4de5a7d86fd2c667e7ea95d0602e9068e SHA512 f4f6fe13e683f96be1cc800eeb21f93aa60d84307c2b606efe30e6c18349a8f4ace7fe4001ec5e9cd7b34024a88ab7e36b1ee796aee18958f56c716a4e66f8c6
+EBUILD spice-vdagent-0.22.1.ebuild 1492 BLAKE2B edcc7a1e82f5fc2ef42cbcc8d296180b6befa7cd56f48ead6363254f5e5645170aa72aaa7e5d301c9e93619f342daea666e5ec0ca8d63b518dabdb5bc2f57a16 SHA512 87363a27d0221199ef30458e46312f7e5eb6359aa10e06f7a2bfe2698a165a51510842d1d276537885033aa8291c10daa4e11f59f3bdac93eefca8a4d0f0a2d7
 MISC metadata.xml 272 BLAKE2B 27a9c4c06a3f01a09abd1c554d9682f0248cd486fa866be62e1e63fcd59c57df6ab036d307b91c4c509bf1190aa5a1620c5995e98fb518bad215eb94b024e2f6 SHA512 aaaaf0683baa09807a821ff4eff365008ee8f7cd7852fb042e7d0aa40cfcc8b192f3bd7bdee6c4cdaad2621b9ad42ea0a5784eb93e0923641e02f8aa24e562fe
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.22.1.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.22.1.ebuild
index 9290aa9102f0..6b3fd1e10224 100644
--- a/app-emulation/spice-vdagent/spice-vdagent-0.22.1.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.22.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="gtk selinux systemd"
 
 DEPEND="
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 2c088a8e0469..259f1fb36936 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-java/Manifest b/app-eselect/eselect-java/Manifest
index f567db2ec51b..14b2a5365ac4 100644
--- a/app-eselect/eselect-java/Manifest
+++ b/app-eselect/eselect-java/Manifest
@@ -1,3 +1,5 @@
 DIST eselect-java-0.4.3.tar.bz2 13799 BLAKE2B 353035ef1c0b3e1cd79021c9198bedf29fdcb3f13fdfb2e5a8384796f2a48236d671f07d7657409273dd1f52e37272d91383d2a14d64ed0cedb686a8e277b009 SHA512 40b10768f00f03c49e1b60aab615658ac1d986444aaf487ca74f7c14edb5dce62d85fc3ce049e857d0ec2eaea496afa17c45de59e7179331f112eb51cbe451e5
+DIST eselect-java-0.5.0.tar.bz2 14271 BLAKE2B dc285ad17b62043cc5085a586547a06a12c09f5a80f25dc423db9cb806baaa669a55106f605973fcae7103e35ec673ae2e3a6119730b1789e816a09079deabc8 SHA512 89724b96125911f0abc0363e0b2c9df75d0d52df1a5e16e80efa20a8de39b1bc0d411d297581b3440c944f498688e5dcffe5432f5e46836115d2eb620f31c03a
 EBUILD eselect-java-0.4.3.ebuild 1137 BLAKE2B 23e53bcd19631221f9afb67a326e54a5fa630f0cab37114c61d2d9c9535df88ccc3eadb70bb8b9d54cf7b5a1b9c965be5560d7610573aa4fc70ab7e062456a59 SHA512 4557a383fb8e3c1901324d53b18fe9a77d4fbb7a495d593d02a8c9d1ef5b62084e1ca417d648d262072ca9896e6a5eb70bc852356de27553d5144c2b4070d044
+EBUILD eselect-java-0.5.0.ebuild 1111 BLAKE2B edcc0db2d18be063f994d182499fd52ee90fe0c5518c771623d8e5e7731badc7637720f06c37c2a9c5263c1d029430c22bdf1ed70a842e51584e831c63acb88e SHA512 eb4f418115856aacec069e75c971ee7524c07d35b48d38bbc09bd1960cf8c6db09e62e9ba71e1dc771f0bb415990ef16fadc74af19a595aefa51ae83db4e69bb
 MISC metadata.xml 256 BLAKE2B 06034a9ec5059f1276335c4e4c5ec5203bccdecd555ff0c8c1d9d19db69f1540efc0c2265f4598fcd207d1b656a390c34908acd72600176a202d76ce64605270 SHA512 94123950f1f7bc7ec13f90d1c3f9f4c04deb2ac8997673683acf491733eb329a8b67658bd2fcfd11d2648823cbe4493ba14f0e549f711b477086d7ac98400e4e
diff --git a/app-eselect/eselect-java/eselect-java-0.5.0.ebuild b/app-eselect/eselect-java/eselect-java-0.5.0.ebuild
new file mode 100644
index 000000000000..ef497b375a18
--- /dev/null
+++ b/app-eselect/eselect-java/eselect-java-0.5.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A set of eselect modules for Java"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="app-admin/eselect"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_postinst() {
+	local REMOVED=0
+
+	rm -v "${EROOT}"/usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1
+	rm -v "${EROOT}"/etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1
+
+	if [[ ${REMOVED} = 1 ]]; then
+		elog "The eselect java-nsplugin module has been removed and your configuration"
+		elog "has been cleaned up. From now on, you may only install either Oracle or"
+		elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an"
+		elog "Oracle VM. See the README installed with icedtea-web for more details."
+	fi
+}
diff --git a/app-eselect/eselect-rust/Manifest b/app-eselect/eselect-rust/Manifest
index 8ed29c7eeff4..c4b98ac9b3a9 100644
--- a/app-eselect/eselect-rust/Manifest
+++ b/app-eselect/eselect-rust/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-rust-20210703.tar.bz2 4253 BLAKE2B 1d04c00db1794148b6d908c44172b8958f5ae2c7753875675387eea175ce914b7315452923a819d1b77bf22f10493ba9704c70d48388faa080b6af49efccb956 SHA512 b8f4f03f299a8415019746964347dffc5520dfcf79fd9d059bf600f63045ab80f8692509f0358be427c676ce98692ac8342b6f447aef21ce4d7ca048741b5e47
-EBUILD eselect-rust-20210703.ebuild 757 BLAKE2B 6ac58e7399ef34df635677f1000196472c483581f2e121efa9f56b45bf5360bae02a9d4366cf2ae1820e9054ced3b3f743cec34383e3654ecd7cadf6edf94d4c SHA512 352c260d67f7348c3c83eba62a916cf1f37e81cb737c4fe15cde33480c2570a3f663cb5ef27eb6db8dc1ce1bfd9bae7845c278b085b02577852ad41c3b9d9777
+EBUILD eselect-rust-20210703.ebuild 764 BLAKE2B 2c0e38dbcc35882eaed4ed8a9c75ffe5f44edf7a0021d45c6e6461ba123be73eedafc7c11b15ebfd2d66d6d78bcee0b47283752ee18f08243442da40ecd62107 SHA512 9d43137e25b0664edf40be20658b167556fece719125580aa90f887b48cc8cdeb3c0853f1ae9f66aad4999961bbd85e540d2b5107e9a0063b644d606d00b3a7d
 MISC metadata.xml 241 BLAKE2B 25fbb97f8e3f0f806a5625b95d6c4bc3d7f945ab1537e865bd96edf1fd321708e8c8f2e099178b1053c52059d7601725d2afa85e64d588e6044f6b62cd502709 SHA512 3b0b95e0cf8ca7927648420463bcb44a9416c5664a1658ecce9e0c76dc786eff108884aad08af9c8188e41bf37afc6eed8e4c66ac5934b40ebaa88e4f802f6b8
diff --git a/app-eselect/eselect-rust/eselect-rust-20210703.ebuild b/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
index d1403550df94..18b15d4d3866 100644
--- a/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
+++ b/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Rust versions"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index f81fe39cb721..21ca1bfd6ea1 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
index db650cc5c385..a4c729c22b91 100644
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@@ -1,5 +1,3 @@
-DIST ibus-anthy-1.5.13.tar.gz 265252 BLAKE2B d35299dba3260b85f80f259e0a40ea1ec061ed8082b6e5c872eab6398b6242342b2ee4da0c3b191aa428ae2d8dc652b0e414fd0c9f7b93ca8dcd6303c0586b4d SHA512 058feb49b2fe50ae3ca959f4754b8070f3ebc1e6727fef4bca791aa45a23c95018000e2a8bca496d6592b052298a6fb2869a07c2cc56cc473c81cc437efa175b
 DIST ibus-anthy-1.5.14.tar.gz 267418 BLAKE2B a4da45588d8736f10ccf26af52179da85bd3a17a8f1fbdba622058d1eaed933b0102fe12357613574e377df323145487838c3f74c052c813462b435905d5c941 SHA512 4d06d4e177df62d22c61bf6ebfda04ddbf545ea1947d0c315e3dfe5e48d9ddc57e5fcc89919ae3b9f7430e6124a5dfb1295f4ca7362fbc35714d627f80fae6d8
-EBUILD ibus-anthy-1.5.13.ebuild 1310 BLAKE2B 448f52507f33bbcea960398d1ff9e2b177c54bd3523ea63cd3ad034758cbfbc4708b668bd368fc0fb9cd73027f4d290a765f97d4f2cbf03a0fbc403dde28cb7b SHA512 0cbd544a986bce8d41829ec6b3d391ef1bd09e9a8ae7ea382aca72410d778e28e11ffae3c725f94833aaff6f2c132549d288a46a318307ac1e5b24096764bbb2
-EBUILD ibus-anthy-1.5.14.ebuild 1312 BLAKE2B 491e76a279bc1a25acc93ff98db1b6b742ad09d79c3b6f25d84ae5f9cd243f986ce6fd4d719cea1b37e8047dc03f807c2f405050fbea349d0f776350759aceaf SHA512 ae3879999fbbb0696fa1e9a35456c1dab3da437b24b75bf2831a8c9fc0f874a5073071bd4d1a3e3c12c481d4f0bad8b962b9c5711f1a2e72f3b02ef5e09db729
+EBUILD ibus-anthy-1.5.14.ebuild 1310 BLAKE2B 4e41d7d064501a7812c9bd0d9bdce36bdd4bb7fbc34cbf69f417e66a1967801eafd72ade6b8d70cd5454d389e84954dda6f24fd7f34420f8be67fbb69c275964 SHA512 5c8cabf065ad64aecd1c5a333d797c6f033b232be7299db3d816006a2154bc0b9eb94c46e6f4e6246a6383d7dffcaabd63f5144095764f7e4793906115a50b75
 MISC metadata.xml 325 BLAKE2B ae0af274a4321f66c02696f5f6440ce55a1a8406efe0f5c17c76606ab536b157f528eb93508d1ac95a893a54ada06c538d627754f8795271e3bb99eb4bbfdcc1 SHA512 64b47eae1d72f07324b98eb1dbc9a2a4b7cc0c74172e0df55e9d5abdaf10ebe1d90f4217b973979e3b53c5a21084fcad6785203a7b4280dc0706d4e6d1bd74f6
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.13.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.13.ebuild
deleted file mode 100644
index 308e6241c021..000000000000
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.13.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="Japanese Anthy engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/anthy
-	$(python_gen_cond_dep '
-		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-	gnome2_environment_reset
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--enable-private-png \
-		--with-layout=default \
-		--with-python=${EPYTHON}
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	python_optimize
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version app-dicts/kasumi; then
-		elog "app-dicts/kasumi is not required but probably useful for you."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild
index d11f1e980d89..1627d81dac2b 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ibus/${PN}/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index 2a6fb3ebcb13..091e001bfbda 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,3 +1,5 @@
 DIST ibus-libpinyin-1.11.92.tar.gz 1730065 BLAKE2B 376bec6fa7616364c8ed4dc5b269edabda892ba4759ff03e93b4099c99440925126800ea3bf11eef91ea62c558fa7dbf05f3d68be5e25e701aaaeb37618b90a8 SHA512 b875b2fed6875806971b91e2abc62cdab1f70baef78840915f89466a7bcf3d1dfc70438ba85e7580bba92dec0ade50a2b05955fe6cd148bffd3888fa69f1c851
+DIST ibus-libpinyin-1.12.1.tar.gz 1766803 BLAKE2B 1de8a51b52688dede32c572b39bd379296480ab2b0f909357465370e346bdf50f4cade5ab3f105f62a74e59cf2dc5e8d5235aedde7571b70d3c5dcee86d2e36b SHA512 ad6e7507bdb468d506071135449383e5bd4fc878bcffda4be6e4e7915b79dbaf919d2fa941b92b177dc7790bd895eaa9a6d04a2610f85e1e80e8eb50f188211d
 EBUILD ibus-libpinyin-1.11.92-r1.ebuild 1454 BLAKE2B 5af4b8432eda1aee0b498a3eeef53e3e7aa94252c7b44f252f6facfe4fe2cb4a60c779af9e95bc95b4fc29d614b83d61ae6bd4a871d2347595fe1b7cc87f0a08 SHA512 3da11471352e76016197604e5f26beb0868d0b307d9b5918c890e15329afb9e770e866f310c95b32f4da52728c0e6cb0ecb507f71b0bfbefaeda7e479ce80ed8
+EBUILD ibus-libpinyin-1.12.1.ebuild 1456 BLAKE2B c8926b46682e0b4b1b72711738d2c64938c576343e5ca53b4cb7d41c8300e130a05f9bd5aec8d6f3fbc75df5cf95846a1212dd4399dfca0b8e2b6718f2880129 SHA512 64919ed1e6a49df528558976a8238e672bf0d8209a5bf173c49c6606c2a0ac44f0cff7d770b62e9adb2de9c25c8c656d6f13d2a1782426495f15cb1e426e3ded
 MISC metadata.xml 834 BLAKE2B ac644e5ceced4364c282f0766cfc5d85dfc14fc19fff46e96dee2aa8ff48c1c5d84dd496e3f83951983f311cbab0ea84652fab3e3a87e870dab999cf46821452 SHA512 dd1629baeddeb1ee4ab1670a4e29af865a75e40b7c6b58e9029af5900d5de9bfb98f71ccaf7eae508f0849ac85f4530d8770cc392d9bb8c31a881f8154ac5761
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild
new file mode 100644
index 000000000000..7f8fdf0ab762
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2015-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools gnome2-utils lua-single python-single-r1
+
+DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
+HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
+SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost lua opencc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	lua? ( ${LUA_REQUIRED_USE} )"
+
+BDEPEND="dev-db/sqlite:3
+	virtual/pkgconfig"
+
+DEPEND="${PYTHON_DEPS}
+	>=app-i18n/libpinyin-2.2.1:=
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	virtual/libintl
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	boost? ( dev-libs/boost:= )
+	lua? ( ${LUA_DEPS} )
+	opencc? ( app-i18n/opencc:= )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "/^appdatadir/s:/appdata:/metainfo:" \
+		data/Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-english-input-mode \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable opencc)
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 275f508d14a3..78d270b362f2 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,7 +1,7 @@
 DIST ibus-typing-booster-2.15.25.tar.gz 10785373 BLAKE2B 555105c9da7a813491e3ab8cbea0a8b52239c7ffb39dc7a6ea47e461d81515ba3cdf1adfe8d8cebd74bb2b00775eac3b19956aa9e4c4b696e6083418e2b73e91 SHA512 927f118eac1a641f658b82ef72ec8cd728727910f6c2bd77a14d9195a8203fd40b771e68a04d7ea7c5f5c1f2cd4ff37b7e041282e63f301348b60af462e041ea
 DIST ibus-typing-booster-2.16.0.tar.gz 10811558 BLAKE2B d171972f3c6242234ce73112e4ea8fde9e713e102a7fb2111017e7489811c1128146582e2a9a60f49dfca8b5282949415fb33e79b7c1be16521dba2dd03536fa SHA512 a90ea11a72d770765ef55ff6fc288bf6ddfa5e5ae1c7393f195ed3466a207022872f5e27f9629101b8b31e26c84dc8512e4cd261b2c503fd98daa8438e47dfb9
-DIST ibus-typing-booster-2.16.3.tar.gz 10815318 BLAKE2B 66c58060494fdd2f459c68374bf1c0a5d70b76e1ad07f2daa14c9459c20574e1f6737ab7a516233ef70ffa8f1ea9a3b98def7f17adaab5bb0111fa4ebc6d2aa2 SHA512 658eb972136c16dd703fa8b0e378d4ca511ba7a80ace39617eed7939607e37b7f94eaf6560514a474aec47e40d415fe3733728617237751c132ef17e46be963c
+DIST ibus-typing-booster-2.16.5.tar.gz 10818223 BLAKE2B 10223d4d6bb40e05f6fc7a94470b3a54ac7f0b99e0b71ae1b93d61c26727540b8964c3b3a5fbd02ad5b48d18c93186d2135174dc419ad7605dad423cef4d00eb SHA512 036fcbe699f251b23e143a0a6fe7bcfc1bf9a244b9662d80d24b8f4ab7e1ed044a355f0a7c205b35bf864f38aec59283bc0967e18657360fbb553b33b286e13f
 EBUILD ibus-typing-booster-2.15.25.ebuild 1150 BLAKE2B 7dbb9179f77c4a6d5dc619a9a33488c048bf4caee8dae5d58781c2210cff7b063f9b1192dd865e3820f38168e5559284783c97e16b7774e6c7a87f6e872b7b62 SHA512 6887d95b52245276feced655d8e0fe407c618fbe60eb48fc5abb44402498aaeab25b6639f0f460d67fe546476ab36cd2c381e127f03ac63a35a0e8f11f3d81d5
 EBUILD ibus-typing-booster-2.16.0.ebuild 1152 BLAKE2B 02705b507534b72948c798a9f6d714574b90a7f46d8722f75f95216d5866f0fdbd4acb77b1c8a18470c594445c6ba585b344bf0e0719ecd6fb181ad5a3a49b71 SHA512 55892d6d65034d285589b718ae2512cf3de0a85ab0560ed8189bd8dd80de08f6a385c28b6a5aa5adb3e6fc1662daa965257f4eb3cfa1032dbf371b8c902142bc
-EBUILD ibus-typing-booster-2.16.3.ebuild 1152 BLAKE2B 02705b507534b72948c798a9f6d714574b90a7f46d8722f75f95216d5866f0fdbd4acb77b1c8a18470c594445c6ba585b344bf0e0719ecd6fb181ad5a3a49b71 SHA512 55892d6d65034d285589b718ae2512cf3de0a85ab0560ed8189bd8dd80de08f6a385c28b6a5aa5adb3e6fc1662daa965257f4eb3cfa1032dbf371b8c902142bc
+EBUILD ibus-typing-booster-2.16.5.ebuild 1152 BLAKE2B 02705b507534b72948c798a9f6d714574b90a7f46d8722f75f95216d5866f0fdbd4acb77b1c8a18470c594445c6ba585b344bf0e0719ecd6fb181ad5a3a49b71 SHA512 55892d6d65034d285589b718ae2512cf3de0a85ab0560ed8189bd8dd80de08f6a385c28b6a5aa5adb3e6fc1662daa965257f4eb3cfa1032dbf371b8c902142bc
 MISC metadata.xml 331 BLAKE2B e076fda3780cbfebae0a799bcc320de0417dfc2a726320c014d253163625da4fd629b180442449368e316e134bf2024f7e03373f2ca0342c4b63a11c63475697 SHA512 f79eaa01a0ad3005064928ef7fbaed4bc98f8850ca36b23309096647b6158c7500e0075f149e4e764a89af99a8fe342eb6a1d9b83a347557300545ecf870e4d8
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.3.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.5.ebuild
similarity index 100%
rename from app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.3.ebuild
rename to app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.5.ebuild
diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest
index e35e76bede23..e051d457909e 100644
--- a/app-i18n/libpinyin/Manifest
+++ b/app-i18n/libpinyin/Manifest
@@ -1,6 +1,8 @@
 DIST libpinyin-2.3.0.tar.gz 256549 BLAKE2B 621176ab14dfe8fb3c32e3ae0b727b8070b5fdcc3a79f8f3c646538151601c7fefe0b2778a54c50faabaf3026d9c029eaa52a0e04144d37f347ca571fd532908 SHA512 5cfe2d70c15dc532fa970a28b70da403f2d848747501bdbdf43c481f8165d6290cb1de086d2ef7af653edfe3fb164d4e8d9cf655302e2aa759709e6031b117b2
+DIST libpinyin-2.6.2.tar.gz 260101 BLAKE2B 7ba61c5bfe68991866112bbb63383bd7062164f92d63150b42c30f39d383f62a339a13eafa1596d1988d8e308c93ccc0f45cceeb557ce329788da507eed3e2ab SHA512 839907bed9bc796185fbe7d7b30ab84bc9bd45212797c75081475791aa62ad3465509ecc5fabe6ea27d02be9d2ca61764a472684b011b0c211bd5f4f26a0f9ca
 DIST libpinyin-model17.text.tar.gz 20278815 BLAKE2B d02a587ab29e1115843d8c2318ef70cf7c2318d5c60ef8135860c611935285fa0f061a21d7e85dd87f6efe957742e21e34a77a7b245b58945cdd478759b0e19f SHA512 d0bf8d476a63e33e292046754161316f00bfea71ebd06fca85b3845fe535431f01458282f505380cae018050aa6a08b14a7bc0684ba372dc79ee14391f47e8a1
 DIST libpinyin-model19.text.tar.gz 20279012 BLAKE2B d8721d106235ef6fb99ad8dd4f4911bb23bf66f0259b01c39fd8ee829f0a63f326894802d62e51531a10f453dff1f4bb6e3e1648cf4aeac8213dccd10fc8ca4d SHA512 93c70423ba14faa3402bce775f82769dd4ee3a49083beddc540825f88facbd847328e9d01d99473adb7cf26de0f853e2b2e14fe849b1c49531134d1ca4ed2ef2
 EBUILD libpinyin-2.3.0.ebuild 1396 BLAKE2B 572d949e4718597eb9de387f1f0d3b3c0f00612b94ce59afef40ab5c8f1baa5c0e48f8b4b37b620b97014004ac67691bfcb267f45d7c8b0cd22c7b47dd10ab2e SHA512 8fac54ea183a925e861589c752279527e74ec7a4614c5a4227458aa1f0986f70ee412fd9797d6bf1ef275d8d2cdf9266a3ffc3a775cad2bbe5c1bba503aa2e4e
+EBUILD libpinyin-2.6.2.ebuild 1398 BLAKE2B 62f807ea6dc5de0c6fd5ac8efe868a590b7276474f714c0830f690d5eb0bf87dbefbd0f3dd5e33e8cebe09811d6c1c4bad6edb90aa5c7da7ee5a0fac05124a97 SHA512 28fa996aab602507f8a13d2714f2273ed3e660ced2a9a67333e786fe9a328668aea5e88c3080fb4b241c93278f1e70fcdec5b61a88ae840684e623cda49bfd2b
 EBUILD libpinyin-9999.ebuild 1371 BLAKE2B 387ed25199ff3c1d8e38ac48a270266e238b40caeb67a54517ba4106b031874efe9fd1775d1b0fc82eb8ba3bc4af773e41d0ffaed51d1082aa530ebb775d57aa SHA512 7d9a872d32124a3541643a04ecaff43d5a6215dce70aadf95f3e5d775dcb690be73ae2bda40baf17c75b2c9097ecc546206847234b4061ddb4f2595f5e4e60ef
 MISC metadata.xml 521 BLAKE2B 829486b393163e4b4ac78807b37a57199f3fd07e94db186ba5a067b8a641412d8d83b95c56a4e0a56295b3c74f10277f1f4aa1a8be908596cb1252e13123341e SHA512 d93c02e8293534ca8a627e0504e5a0d69bd0c4b45b9395331183a35f4f4c81b267b80eb10d0c81a64628277e4770002e61c27e28c50fe84a6c390c473b73f41e
diff --git a/app-i18n/libpinyin/libpinyin-2.6.2.ebuild b/app-i18n/libpinyin/libpinyin-2.6.2.ebuild
new file mode 100644
index 000000000000..e156b7a81667
--- /dev/null
+++ b/app-i18n/libpinyin/libpinyin-2.6.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2012-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/libpinyin/libpinyin"
+fi
+
+LIBPINYIN_MODEL_VERSION="19"
+
+DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao"
+HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/13"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/glib:2
+	sys-libs/db:="
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die
+	ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libzhuyin \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 91fa5515e973..39c593d583a5 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,10 +1,4 @@
-AUX opencc-stop-copy.patch 625 BLAKE2B ab2f98a03bb079ad116994c4d05e59e3638f648b3e03ea4e6a357a8658612a1425f2578989c0086e31d749e3533ffb814457071582f9fbf3fbcdf0d184892940 SHA512 e34388bc5d1841e3655c6209e31cf18957a9a02f23d49d9b1f184e48005cf5d5c108656439900f0d79fc1801700872a433ab761154abc424b717e12a616487ca
-AUX opencc-test.patch 202 BLAKE2B 1dd3bc35c1f8644cd4f27ce8a5b5dea3b0ef2750612f112d7dc6de658634ad5151972b80c7b2ede9f41ea98ac7a2d29eaeb961132c862f66dd160dc2dd522a6d SHA512 5318058587b41fb7021ffce64d4b999b1beed294ce4c00137fb4b0396dd2cb471af789bceb8a8076b1d4ec2226d3c3fdf8b3d3d6a1f5d80936cf2407b8bdd3ec
-DIST opencc-1.0.5.tar.gz 1598354 BLAKE2B a66b32b96dab543d8401960ff0548a4e3f9414606513941426eacf105bca0755a7b364c68b7eb996ef82444e52f849d2f8151353a14fb97a358ad1463fbea2d3 SHA512 3fbefbafe5c3c2491032158577ab97b5a3edf6ea98a03a7250deba082b72c3112ad4a3396d1a469936ec32e1d141f0a2236001c2891ac9c793add2b082596cc1
-DIST opencc-1.1.2.tar.gz 2804665 BLAKE2B 9b8be92cfdc2f565c9dc27745724c739e674239f2e3925a1ccdfcbf83e0d1857430d72e91a064c09456e69c00d79e47179801b21a4c7c6fd5dc6d0d16f1bcb98 SHA512 56c84bc472b39eb0b23bac6df5aada2c2ed5fd2fbe653c1ae89d392ec0b74741a15de93c748883ec3c0779396e790a1197f6e3b267b524f111459d45daeb5d4b
 DIST opencc-1.1.3.tar.gz 2805430 BLAKE2B 060ca820676a92ddfddc362488031e1ada538626a1fbeb8d178a0ef059b99f606cb0f1151857579221942183820bf34c6f96517d13d4ae8dc3f81846537b668d SHA512 90da656fa4790c58932ad2240a076cc4a9e8cf70ac73d83e0d299e84472deb6491a823966a7686ed1487ef8405909981b9a12b661d8de7f086bd4b498594abac
-EBUILD opencc-1.0.5.ebuild 1377 BLAKE2B 4d38a897f7d9d42be4c9e84bc33342deea38b9cdbd617fc70bde26e3e172c9a8ab27c46547c94d734951b353c9b8a9b506acd25a3c8b14a6ab0dce804256b313 SHA512 5fa0e68dea35abc4c8c5caa567e04c7de16ce705cf1e965cce417d43f8981b29d9d87673c05942406e98f6ada609908a2ba89df8659bc3e9e513de1c3b089fbe
-EBUILD opencc-1.1.2.ebuild 1773 BLAKE2B 7f1a25ed703c5b24e47e5c9365cd05d8ebede64f0f38a65f1be379bd905996a9f76136a267aa0d5830d3c532e99304dc7d0d28795a04d6a73ab7a4d14bf4e09a SHA512 435e65ce7188ac891a0ae9ac42adf1eb7441ba0df19125da716b43f673bbee47120be03f837f68ed0eda599a6f6a78c9391e3ecb5b2bececff7744d7f2931ef1
 EBUILD opencc-1.1.3.ebuild 1584 BLAKE2B 2648b515e72bb61064e0cdf0ac2adc8823dc13dd604d6795ad6640b5558ab1e63f4df023f61ff5b2ba417b95e04674534fd0051f97fa48f98fb3657e1d98fae4 SHA512 9ac4e2157b1338188652c77b33dd6f3077f25d6c22df74c98673b944ce88d506acea7dff257abf1132e0fd2d3114a5232206e46eb2762ce60b086b48a88b7e6f
 EBUILD opencc-9999.ebuild 1533 BLAKE2B 7af70265939b180ea374cdf1f94160257c9bd3ba4c1f26eb70e1a2663e102466d0300ada0008aa29bf8788f1656d8b63475dcfbbb6ef89925b1ef671ff942a2e SHA512 a73dfa1a151602462a0406925963102224874bcff1eebfc277b461d0910310a69dff10ff0c9e5ce0bc5f0acf00f2bd7b9fc293090fbe00cc78c4c67d1e870b27
 MISC metadata.xml 624 BLAKE2B 0fc3325d54820e80e6800c408c9590b0ad55587f94f1cde371c1c2f5396eb650dc53e3d568eeab3e92739c5db142e698119dea51ccacaaed106765d03db9242c SHA512 562f4b08443ed1a7e9ff97b412d5e050ebb6d9e89cd6609302fdaa903cacd5a031f12360c7cbc2504b027b08d3690a119568760621cfeea0294916366bf5261c
diff --git a/app-i18n/opencc/files/opencc-stop-copy.patch b/app-i18n/opencc/files/opencc-stop-copy.patch
deleted file mode 100644
index 4793951dd251..000000000000
--- a/app-i18n/opencc/files/opencc-stop-copy.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-We don't need this copy command on Linux (or other than Visual Studio
-build).  Since it is colliding each other on parallel build, drop the
-command for now.
-
-See https://bugs.gentoo.org/666904
-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index 1516775..2deb764 100644
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -109,8 +109,6 @@ foreach(DICT ${DICTS})
-       ${DICT}.ocd
-     COMMENT
-       "Building ${DICT}.ocd"
--    COMMAND
--      ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>"
-     COMMAND
-       ${OPENCC_DICT_BIN}
-         --input ${DICT_${DICT}_INPUT}
diff --git a/app-i18n/opencc/files/opencc-test.patch b/app-i18n/opencc/files/opencc-test.patch
deleted file mode 100644
index dd6e91b984d2..000000000000
--- a/app-i18n/opencc/files/opencc-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/PhraseExtractTest.cpp
-+++ b/src/PhraseExtractTest.cpp
-@@ -16,6 +16,8 @@
-  * limitations under the License.
-  */
- 
-+#include <cmath>
-+
- #include "PhraseExtract.hpp"
- #include "TestUtils.hpp"
- 
diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
deleted file mode 100644
index 3fcb5271474d..000000000000
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2010-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit cmake python-any-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/BYVoid/OpenCC"
-fi
-
-DESCRIPTION="Library for conversion between Traditional and Simplified Chinese characters"
-HOMEPAGE="https://github.com/BYVoid/OpenCC"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-# OpenCC: Apache-2.0
-# deps/darts-clone: BSD-2
-# deps/gtest-1.7.0: BSD
-# deps/rapidjson-0.11: MIT
-# deps/tclap-1.2.1: MIT
-LICENSE="Apache-2.0 BSD-2 MIT test? ( BSD )"
-SLOT="0/2"
-KEYWORDS="amd64 arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )"
-DEPEND=""
-RDEPEND=""
-
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/OpenCC-ver.${PV}"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${PN}-test.patch"
-	"${FILESDIR}/${PN}-stop-copy.patch"
-)
-
-DOCS=(AUTHORS NEWS.md README.md)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc ON OFF)
-		-DBUILD_SHARED_LIBS=ON
-		-DENABLE_GTEST=$(usex test ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/app-i18n/opencc/opencc-1.1.2.ebuild b/app-i18n/opencc/opencc-1.1.2.ebuild
deleted file mode 100644
index 2b180e682ba7..000000000000
--- a/app-i18n/opencc/opencc-1.1.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2010-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-any-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/BYVoid/OpenCC"
-fi
-
-DESCRIPTION="Library for conversion between Traditional and Simplified Chinese characters"
-HOMEPAGE="https://github.com/BYVoid/OpenCC"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0/1.1"
-KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )"
-DEPEND="dev-cpp/tclap
-	dev-libs/darts
-	dev-libs/marisa:0=
-	dev-libs/rapidjson
-	test? (
-		dev-cpp/gtest
-		!hppa? ( !sparc? ( dev-cpp/benchmark ) )
-	)"
-RDEPEND="dev-libs/marisa:0="
-
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/OpenCC-ver.${PV}"
-fi
-
-DOCS=(AUTHORS NEWS.md README.md)
-
-src_prepare() {
-	rm -r deps || die
-
-	cmake_src_prepare
-
-	sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i doc/CMakeLists.txt || die
-
-	# https://github.com/BYVoid/OpenCC/issues/550
-	# https://github.com/BYVoid/OpenCC/commit/736b93d3d16fdf0548bdaae2922569199615e919
-	sed -e "s:#ifdef ENABLE_DARTS:#if 1:" -i src/Common.hpp || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc ON OFF)
-		-DENABLE_BENCHMARK=$(if use test && has_version -d dev-cpp/benchmark; then echo ON; else echo OFF; fi)
-		-DENABLE_GTEST=$(usex test ON OFF)
-		-DUSE_SYSTEM_DARTS=ON
-		-DUSE_SYSTEM_GOOGLE_BENCHMARK=ON
-		-DUSE_SYSTEM_GTEST=ON
-		-DUSE_SYSTEM_MARISA=ON
-		-DUSE_SYSTEM_RAPIDJSON=ON
-		-DUSE_SYSTEM_TCLAP=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/app-i18n/pyzy/Manifest b/app-i18n/pyzy/Manifest
index 698a63b8f4f5..cf17b77f5bd6 100644
--- a/app-i18n/pyzy/Manifest
+++ b/app-i18n/pyzy/Manifest
@@ -1,5 +1,5 @@
 DIST pyzy-0.1.0-patches.tar.xz 5288 BLAKE2B 9a6c86aeedd496ae8372bb0640cb1e03386408a0b00a4c51a6223c4fba23f59631267eb0b7c707a11662025ded410609d17ba39327e0ca5011f48bea3422cd79 SHA512 3a3b9fc317f1c5f59bbe83f3ce58fc76a50bcee798118d66571ba31d504e73fbe7a6976f03ae28f9712c0ba641386ac69390a86185464371728782a62b98291f
 DIST pyzy-0.1.0.tar.xz 752248 BLAKE2B 5f927cfea31f8cd67cb3e7af9b48c6f48a7707e8324b6b211c3baea0e07683df1da3c8683a5f9aa5073277229ee4d712174f95a764b4dcc5dc5f40330791561e SHA512 18d78bc70229caad44fdba4b7971014979da0aeb35841cea9577d05e5eca871dfe40d285a926ac05a247c8a0b8ab34fd721dcd34517200c5cc75b6b1ed545b35
 DIST pyzy-database-1.0.0.tar.bz2 9977983 BLAKE2B 86f9ee48d584f33ada1ee5380efdaefd85750290caada320c4c9a21206b8fb50fe6a43b931fb41a8c3bc24853bb7843e23d1778b40e6eae68fa4ec383f2b4dcc SHA512 5a7248870407f7f92c418ada49a275062325f2eb33a7eb4b91492e4b706ae70ba931b04377a758ce429fa64cd22e8bee2ac4279d4f205bbce406248eda1decf7
-EBUILD pyzy-0.1.0-r3.ebuild 1226 BLAKE2B 99d225fec9a1d7dbcc42a1966fa2673628cd885225b3d04cc02ed35ed18922a50eba076115683af08d85058bd1e6240aa9ec5094e7382560d2bce8d692fd83e6 SHA512 8d82032c57c43ba072affc7dfab734b9ece0083ada9f59e98b1d9980fa0f0ec636a14770921525974eae15dda94ceeb3f74cf294367795125c36c0ca15dbca7c
+EBUILD pyzy-0.1.0-r3.ebuild 1226 BLAKE2B ba913f74847fd9ee32c0af0fc8368c96acf99b8e808739121823ce18444156104ff32f5f875d0b736e6caed765cbf4ff89f8303a16a2d9cbff537cff1858b9a2 SHA512 40446054b0868ba9949de65269403608ceca13c4bad65d4d03b5af9208246a444e109db780817c290e199772329136434770b448fcf35be62b6a4e6482a95fc1
 MISC metadata.xml 650 BLAKE2B 9aa1686850306d58efcf0b2d64247f0aa6fd588a988700aa3eac21c08b9aa958571038bdf0774a383db6c8950bb0f62a3fba80d1aec134b57a7a605c037b70ad SHA512 98b3bac13ba2166dcccc681adf5106a3d5278c5aa162ba0c8e71878767520d4cc2b5383f434bb7747c9ca97c96592f927674cc48d732a5d77d660d5147f058f7
diff --git a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild b/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
index 6bd7a06a0091..4944ecf856d5 100644
--- a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
+++ b/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools python-any-r1
 
diff --git a/app-i18n/yaskkserv2/Manifest b/app-i18n/yaskkserv2/Manifest
index db81665fc2e0..2dc15ec94d57 100644
--- a/app-i18n/yaskkserv2/Manifest
+++ b/app-i18n/yaskkserv2/Manifest
@@ -2,34 +2,50 @@ AUX yaskkserv2.confd 49 BLAKE2B 1e0af12edd4d1c7cd3460091d3fa1b4f33c12c5e5d5c9caa
 AUX yaskkserv2.initd 314 BLAKE2B 6a54e240dc71c01dad1351a0609363a4403cf8da5eb406acd82952b77a1024279aec20422a2dc3a1975a8d5d8e4eaf987a8956981b2028183e8165d7d9daea27 SHA512 9d5aed94446ef6a1a4d9fc925ba3791972d75b677ec2fa9ded2211696ce5b592e235d84d50a808dfe9d6a78b9105cd3a48157cbd379387e86e9c2b4f65634b95
 AUX yaskkserv2.service 266 BLAKE2B 88a1cac14652b9bafea240cf930165273d9e5f1231517b174f42c1e3ba81d6a643c8d9d1e982606c2da878d806fc08472c0194687455f38639b7bf6165522a25 SHA512 f9474304b66398790099723d3fe4d5ce47b67661d3c618be1a3d2b9967000cd8f63c15713fd55831888a023b91f2f9293267fc7a6051edaf1b37b9ab16d02bb4
 DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
+DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST arrayvec-0.4.11.crate 26439 BLAKE2B 5ea27434d57f37f7ea3e7d94acc1a3450ec464bd62e2d377cd378f4faa13078244afc53284bf2838ea0f62802801961d6915f202eea951a8792e9fe825424be9 SHA512 6919f07fce0aa834b75ecc722476d05580a7dd58e8119b0ead5077d6501ee69ffef71016b6e63ed0617ce2d29a6fa1a4f5431d7aa20340c9f3f2e4c9c93d49c4
 DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
 DIST autocfg-0.1.6.crate 11439 BLAKE2B e0eb7a3176bb5ac27b8de466c5fcdfedb9ad32f4d2b52c0385550902d59d01c716a53179708bdeb250a91690edeb70ab81d91090ff0fd89a731dd365621aa496 SHA512 ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST backtrace-0.3.37.crate 67955 BLAKE2B af9deeda806a9c47084df102ed6f5e6d57a81db9ac410678684c7026069be43bc4efd15bbf4b042d5aea9d85d619168484396d1dfc2ed83a69eeb29d750b6158 SHA512 d32ef8fa11cffeee298f7468f8f9b6d3492cdd805679fa72600115df7dd7e0ae65378ed7aa767a75a90743e278018cfb9631842e7eb633869d77485405dc520b
 DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
 DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
+DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bincode-1.1.4.crate 14412 BLAKE2B e1ccc8e9954893c3f4efec56522281050b9567090fc37f6bcdd28804eccaf4e619892b1d64c9da6b555ffe10c9c47414414bcfff589cfa80e3fba5b086b513cb SHA512 31f32a3dfcb76f113b2e993938b4c708d98d3c75efa9414d74168b2ef8af544bfe64fe39dbc4ea556842ec11100c56f14bbad15aaab919c67a7c5be1aa584f28
+DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
 DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST block-buffer-0.10.2.crate 10258 BLAKE2B d3ad2f9f0379e04320e954e1a2226949d83cc1acdda806b98329a5ddcfdbbafdf511907d99ad7daae271a2981ad0c39de218968c22c3487e21a32817d41c23fa SHA512 8f1d99af7c08bf3b54ba7383cf0272eb5a8137f6244bc2d7e6d6761016614514ad7d27c5c51946c5cd7becd84b320f62fc2770e7aa07038d370505c29e032078
 DIST boxfnonce-0.1.1.crate 9698 BLAKE2B 678cd597d002850a2ed7ae430b23fb71f7218cda3a874339f98e698c570fb1be466862db1365e80f62d0b5d9c0561cf65fed004ed460896f1f9dbb704c4c3cff SHA512 e027de23cb7c58fcf47dcdf1dc2adf7477408f2b4e6303b51a72e2b87de232d4898dcc064f43d7bd86e337f7e1b0c1f6324daa1cb8e9ba0e530674fb358eecc6
+DIST bumpalo-3.10.0.crate 78915 BLAKE2B 94515190837765b47feaf94946c7e4da5b84e6faf7975bd5452bd9388d34e51c84315b80bc15b37c7f4ea8b4aaa0112707cdfc82d0651eeb8b63d2e7bd247660 SHA512 60c686534588524250ea7cb43510dba69d24999769b719127ee07f6015530ac2c5778d9b93477ab075bfc15c13e3ef9adc29ac24059067ac32e109347cd509f8
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
+DIST bytes-1.1.0.crate 49640 BLAKE2B b3140dd49dc222cd0405e405da9629038eb7d71dd4c22c8d6419ade041dc1118aa46df38f3426a36a44d8e5591c368ae32a89e71850dca7e810bbfff4441c37d SHA512 d34441ea146ccaf55da4d5c645f8ffbd008eeb3204dafd5961771abc85df52751dfd1af3975fb5c91eb83d9a43da4f3589bc3aa07c8d715906d8158f3092af2d
 DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb99995b923c52edf99c49a76222978d0a96c020a5a1199c971133fc1f8629b562088b34fd283b7b5da7800848f85ab SHA512 d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14
 DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST clap-3.2.4.crate 208372 BLAKE2B 5cbf38ab3a7022ad02efeb535675a6813bc0cc81e966be0968d50a044053dc6436eab105d45f45df205d903592d6ede4cb49528d05233c2b6d01ebb4310e518a SHA512 88998d5121a558ceefed5ed70a53f7760cc8f017d2f0c8c26c42e467ba1765d75f036600c4d764f8161c50744768bb3d9d21df6836deac043e5b5d61d516eeb0
+DIST clap_lex-0.2.2.crate 9657 BLAKE2B 74f6ed5c674664f0b81eb6d61427c0bd4bb2a2e7159aa00c2839a32e360f41fdf388c1455b52658a97900bb1b8d729bdd4f00cc5313e3115234e65a0704ed3fd SHA512 ea1d37bfb29412409db06c1991413dfbb83e393d74c3cdeca80ff317a423f41891510f6ed471f7cb7dd97288393726b14645287ae59cdf7be41f3a1bc9a3991e
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST cookie-0.12.0.crate 25953 BLAKE2B 630dcb365132e952c81813a772f94266230fb1e83cac63d39713aefb0a4fc6449c144a7e9630ba8aa65194bbd732fb42b3fc150530f950ddeb6a2d6373a78197 SHA512 4a802118306d25f1e53444e143913ca2a14a9e5584b26c5aca67b5ce0ac5111c4469fc5d7ee6b5877f8ac59143739b749edac83ceedcef7b53ba1e15cd97a821
 DIST cookie_store-0.7.0.crate 25211 BLAKE2B 1c201c5baace2c595b2bd7c214140d1c97fab1c4143eb91adcdcaaba4cba8f1c97ebc8ecea626c77a1b482ca6c326f220920458c11f23e5a497b75f220c9bff3 SHA512 40584ddc3189ee798b5ba262934d0a48455376d9cab4d715e6c4dd476b75c62ec09fe0c2f1b748b266d20f2b84fd97e58cf1ec88cc6b245290a572fb29fbc4d4
 DIST core-foundation-0.6.4.crate 25233 BLAKE2B 720cb670e0ce589fcb75e583c3f70b54669407481f61b67bb5df1a5056f07c88f568f2adeb65188004424b26b623ac42b03d830239571c15f241216e55fd8dfa SHA512 5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632
+DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072
 DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07
+DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
+DIST cpufeatures-0.2.2.crate 10655 BLAKE2B 7e068032f818af691ce1bbeacc1e79af17284cf6d1b9896fd146b2b87ebab7b12e7a9ec93b28f77106856c1d11a565e4a64f8dc60c30b401c08836097f587530 SHA512 a771a86e2fa26033b27d22fe250968cd80cc64031838d1c111ad5c69951d5f29de0cad375965c7c2cbceda2a005dedaf6df15c699041c9d0cf65a1c2033f69c5
 DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
 DIST crossbeam-deque-0.7.1.crate 19407 BLAKE2B e2fa467b88ef0d6c7f6656bd87ade1306665bb5b56b1e494ed3a7bc59050ebf847de4c57c5dcc5d63688b60edd3645300cf4b3a2020280dcf0e47f434a9f3221 SHA512 6ea3f138aecb4e84b4f9754fa6abc164b5b558987b15bd34562b70cf93ffd9015d017f62098e578236ad8bc1db652b9bfa624edffd5a99f10c3618c3927d3fe2
 DIST crossbeam-epoch-0.7.2.crate 38134 BLAKE2B 1a71b24f507e95c9552a3d5906bdfa77add4723144e1f5275dad65a5de7cd82305eb2c4ad0d99b3f08a06ce050dbcfefff08790a4a65744f4d578c7106abc671 SHA512 672817b282692fa8dfd0e366853d72a2c14c43d54b8059a7b4761315bff20c342629ec1e64ca0e80e1e401cbd625b259d182546779291899334f1d9db56f1fc8
 DIST crossbeam-queue-0.1.2.crate 14104 BLAKE2B b084846e3adaefb33991770d53130b361f2dfa76ac9f4793618643afff09c4ebeae1545c33c59211d09427bf8d13d13d3ed0965211568884b0b2042e5542327d SHA512 f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444
 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
+DIST crypto-common-0.1.3.crate 8556 BLAKE2B 980c3d820633b62d3aa08e00b4737dc44ed08db3c2cae4f14aa4ad769b6a84d5eca03ed3d8a4d35cacfc051ba9cf23826bc098400996a80cd5a264abae873d0b SHA512 d32fa67b9baafc32ce6f4d97d54deb7f1b4453849bf549384689b0ce8d417407d11f405793e7765ea47dfa86c8d6df5661bd17793c145351731c39f8124d1a2f
 DIST daemonize-0.4.1.crate 14494 BLAKE2B 807b6270122b78cbd19792101d9be258b87b316d5bea4a25b4c600debe0a89f43ff69f4f9eb1366f905fc9d1adf4b1cfcb140a725769b1e04930d1eb6e906bd0 SHA512 acde0f361ad152e523877ebc714f4e5706b3c506914612ea8b2cace473df58c6153b327011acdfe039379d1bf13f45173092cf6ead3190fb77b5c27bd91e74de
+DIST digest-0.10.3.crate 18990 BLAKE2B 871a9939e5a4352781dfcb1bef82aba66ddc32e77a2db5e43488302ac3836adfc87869921e95a2af63e46699419e20d526453ee31f3d7b2171198dc23922dec2 SHA512 bfc9b24e4a6e3df91669a36f8ddcdcfb643e22b3102a200d56bbe88d94e8f1f1e52f5ac29f06253913fbd977b149a3e775c95175b93950340946152f6525803e
 DIST dtoa-0.4.4.crate 14818 BLAKE2B b7abe646e02193a30ba17e17aa8ef19c59c4d925d8988b5f40c73f1c07ef3b9c5e6572a953d99b10ec24b100aabdb5d9d9968ea9864ccb2bba52f0fa2379c23f SHA512 d2ca487cf950dbab9cfa20eb8b712e07276e40f2cb8b0c5c56f60719ae18d8a1c7fbed2bbea869255b0d5286b9890ad6fc6b3d7be2cc13af28c84c2882de8044
 DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
 DIST encoding_rs-0.8.20.crate 1403599 BLAKE2B 23b3ed8c65d0002abd7d2deaf6ac04ef9bce374adb6ad3f4ca993a0f487d57543188ad8b58756d5268bcb130f0a4d6c7e3199c9c9c0c952510cb0ca925cdfc4f SHA512 601e0a8ac8eb39def2336463b38de3052123f62653e22f5a48b8015912f946ab7e78610eca65e7663b2158c908e7f7f4f9f6b48f188c18319ef5594fb7e86e9d
@@ -38,59 +54,99 @@ DIST error-chain-0.11.0.crate 27207 BLAKE2B e50c4e2d6a173e9866311bb81adbde4bddd6
 DIST error-chain-0.12.1.crate 27906 BLAKE2B 66c54c3448b8968a70395861469d7b80aa101210a3c96d2f28b0933fce6d77ec28f4ee18d7666402abc8162f567029fe93f7dc80b93644ef6e488ad4062832bf SHA512 1a8baeac9f4d96214a878b5c80ec2c5753c2232a166515c96ad6a42424bbe32410f2acd3aefa70d9dda7036e1965d83aeb9fd1a393b11464fed751aaebc9bbdc
 DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
 DIST failure_derive-0.1.5.crate 4884 BLAKE2B f09bc82f9fb489950d886ed1276ffefe06e916389d034aa3b82521445829e7fcee102e1c03030df9cc55e4b1f14c933ab83faee8be910037d33f15d15ef9c86e SHA512 c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a
+DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
 DIST flate2-1.0.11.crate 68628 BLAKE2B a375952ec5ad14050e741fab7d62a56413bf50961c2c4e174bdc978b2e17681d4ae0398cdceeb5d4500e60c6b0a7d8b4c3692545bd2305d73a20d50874fcb7b6 SHA512 d2d67be2fa687d4a4e2f4486a14e95d2d73704e862940b9cf0072378916d8e41b70081d30ada2184827740450f5f73edd35ba3d960931e3edb4da8ffb4e35a4a
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST futures-0.1.29.crate 158346 BLAKE2B 943336cf753166f852f9dcbeb8e0b76d1d26cf6d688449a99f9f1885912cbc79327115514ad93d28bbdf1b8a91b2d22f8f62d7e5f5feb61f3024e9a749e11da5 SHA512 16b16ff65c75cc565c5364406f5d9c0d120a07a520f6ea2dc86aaf4644b9ad6fb32bc021b44fb7c74246cb7a700b3df3bfa813908541eec079bd7eb7beee0200
+DIST futures-channel-0.3.21.crate 31961 BLAKE2B e99f37cdeac080c8bad2203fd24b48eb62918166104ad6cc531c8f69d3e0c3a5898ca27f19693e2c143c9049a7d244f9af49c16fecba12233f9ff3f1d01e35b0 SHA512 1c10398657949b53b6df196cc44d8e4b3acf53b4d216be6f5f631d8d4b500f5c344e2cc7d5a5642ced6c5480511884611be6d429f56a0ede4a716b9c5770cb76
+DIST futures-core-0.3.21.crate 14601 BLAKE2B 73cf4c422202a34cc9916509939fab35c79093a6c1aeb99e35763727ebf7d3a06ae203684d75cc74183126f0cd95dec1530f136ffa2a0e69354c554883e3af1f SHA512 b60e7892436ae28fd2240f17816f934f6caeac663d67b8efc7d519ebb4b0bd921f0b732b6176bd4b472d2fbe346d39a37ba394401e15afa93af8294ceea90976
 DIST futures-cpupool-0.1.8.crate 10583 BLAKE2B 5832359dc451551a3cb77e48b73054ec1505e28e04b2307af5d8e17a3be9e0552941deaaa94d477082b924daade1a2aeb15a0e095629e29ce983b0788a15251a SHA512 49d7a75e2e0a6a6d2103212a9ad9474119f4f33cf3748b605dfbb461ec822330115cada6bbf6457f2093f4af4cc04b4db63dbab8c0faa8b25ee31fea29f660e6
+DIST futures-io-0.3.21.crate 8902 BLAKE2B e673342d3fae38e5a6a20c426cb1127353b4f15459b4c27965566f7f2f13f0773ac6ec850b0d679bea37d68219edf6cdf9d1d0eed37665f4ff51c6060b81466c SHA512 dde0b79c4ba208b4c92c699457efbd515d331ab612e7b7df735b3b8f2ab79c012b1ba329ddaf488d68c69dbd119aa231b833b81cbcc0cc2f55c656f68dc22bd8
+DIST futures-sink-0.3.21.crate 7843 BLAKE2B e4b2ac98e89063b23f5e278cad1df6b1b8f96d4f0df0cb035ce964b91e97f88c7a1a4942ec4010cb4da5f4a3552487eac048a6bfcef637bf1f83398d7f38758e SHA512 9bc0198495b5a1b3ed25fcf7b053a235bba0a43a4226bf085d9027537a57add1686ef61179bf2a2d4189945cb5a05a8d64ba6e6e647c56245666d51e138d113f
+DIST futures-task-0.3.21.crate 11815 BLAKE2B ec3f2e2c025e9a482d86912099e68722099c22c0024669906036504d0e70998cb9cb5fd4074928d21847334611ccfcbe6d3e2f686c4d4d7d4436f1e7f501b8fb SHA512 8f3b27865d8c7a290471903297e3c0b52caebfaa55550a4738d7915008b893fce67c7d9ae5c5bd03f2a42ee72a96aa0245c4bee70fc06977b3493eb81bca2033
+DIST futures-util-0.3.21.crate 153768 BLAKE2B b3bc5632bbc7616d33f74361d68f83e0cb051125475101c84212ea2bd03307e927cd125e2f93eeb0f84946cc45d3964a590dcbfcfff88d3ce1970f127e71aed3 SHA512 ff952fb74a54e793de943e3aee2ac771357bf9f1aa5de89af128868c46a6b44e414fc4ea97f2d9b201ff7ff41023e119f1adf90d314343ff53ab987c3e07f5d4
+DIST generic-array-0.14.5.crate 28915 BLAKE2B 0a8c7f20ec91d218fad8a9a87b0700564744ccbdc2f1eb84bc363fd55e86a5ad68c68e446b100752238d45abd7c005f1994bc26e079270d42635c6e296e96f29 SHA512 30c86b24222503245b494c5f88cdf8115ba08c73df55930bb01bafcea22560f4d20e38c348c3896d6e1ef03209cc1571745881b4a77fd28f66b0cc435f5249a2
 DIST getrandom-0.1.12.crate 23809 BLAKE2B 9669147c455bd03bd15f304eb7019b218cbc482af850ac3cb4378327de5afabd50826a686d51b00437d740ac4e3a0bfc761c54ed295806ac8b77ae6848742346 SHA512 0577f21f0ff01154453da92dd125c3bdea12a2bb2e7f5581add4306e28dfc448a0c084e9e64a0ef1da7baf8415965ea4ee32a5ef38d5af8ce4c6addab3cb0518
 DIST h2-0.1.26.crate 153921 BLAKE2B 4a84716e37abeeebbf0771720c5af636576cff47158eca1c7bc76f21c0531b41a75bf3ad7b6bd88aca960e96e15679a7908720d316321e319021624834a97c4c SHA512 37686cbb102eeb15de3f76d0607cf64210b11f5272ed83dbbb145650fbf11916027be3acb487cbb3e02654469b9f78167a7f18551f39af142e659cb149363d49
+DIST h2-0.3.13.crate 161962 BLAKE2B e8fcea52f4b6020c8c7d84b440977beede9f655f85d01b58348a9b9e78bdc5ef7a34e59e89c24291917390b568e229ed5b280e68be7c4e6e9793f0b967268271 SHA512 480484b75b22060146fe373a61136585bb71fade1a99231de4bdd123ecd11e4a3237e7d8da1b952556b7e832f1d6299bf4b833361368a243cce4c23c53ea26dc
+DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST http-0.1.18.crate 101326 BLAKE2B fa8dcf6cb5dbafb5883dd27110cf583c4e656852170abba050568ced0241d4d62e0c299d9bcb50b707b495ed0ffbbf3688d7a5a5f29e6aac07657fdd0f279b58 SHA512 850145ca90272d5f474cc9998bdb173bd94a2a16cb08383815d30d9eb941b9fdb8b0d1a342a4c24bbf94d9e63336f4e10b2b95f5dcaeb26392efeef143cb0726
+DIST http-0.2.8.crate 105591 BLAKE2B 254dff38c4d7dff28e4ddee0769a2f5e2e9e4abc6aab38e965cb7efa4069d1b59d422f30fdc73b5db5bb6c3fd02633dbfdbefd59bfd6ba352c3e5c9241d39d97 SHA512 8e8d01803552299807b07a9fddb45d92af089e43344eecacf2bee07b0e745f33558d26a5cde987ac0dd50f939fdac2de6855c8b44f7362e86d05efdde8a7d956
 DIST http-body-0.1.0.crate 4618 BLAKE2B 2320b5b52a64cfa32550ffeebd950fb56135a0dbb8e43122521a760cfd574083b19a5a41ead0809f5ae764d797eca7007397931b2e63a79dbd9b4a26055d81bd SHA512 b1c9fff799f6581160ef232ceff82a0c222a9f1ed3ec24760fb6b156d42739e06512086e4819323aee7e19b1d0b30ac8915f775f9c36d63b4f901546d331cc80
+DIST http-body-0.4.5.crate 9242 BLAKE2B decb7a27f123c38afc1f7f36ad570bac6d5513e57334870621477c17e0363a8abe4d6a3360bb1c87707d188be66ff100f42237727304e07d8515c1faaa179d48 SHA512 d01de0747155283331086f2849d1dccc0387feda576f60d84cdd1bc8817ac82ae131c294b5cf9ddabb7ac91bfdef67bc2ea5fcbbb04f41b473d4c5f5b2ac13d5
 DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457
+DIST httparse-1.7.1.crate 29379 BLAKE2B 2e938694bb1afb0bcd79d19637a4dfd9201b217661fda14dff7b6652666e14fbdea6454743778530ea12d3c51ab51944981d29aa06ebf6e58e493684886be2dd SHA512 6db3892a754a49d9d529859acdacd548a71203eafc29c485b83006650a26f82b6e34969bd5e11d3f259259eae4d71bbdd0992fc7cad78a9a6f102977d057a8ba
+DIST httpdate-1.0.2.crate 10673 BLAKE2B fbe2230262cd041e1ea8d6f9782376c25b0e841d711961464fd5cdae0e9effa33f50841d8adceb6b9753cdab911f3456c86bed0d2b8acc9be5f81da8e62a1b9c SHA512 4d650dbe7ec1d0f457bab71cd009fd92ee296fbe0a6b0c0ce4d71aa3bee720094a03968c08e542be60869350e05b4a1739542c6415e401407345f5643e15f8fd
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST hyper-0.12.35.crate 127971 BLAKE2B bd2b1cf87d30fba32fe96312164b5a55d595bb6f6495df4c0b219f9756c1ae9180f9380191ca202f5cfc49002416ccf05d4799bba62c7038578c59860c36a4ec SHA512 40f3285b4de23ac8404b191a44a78399ed3186d9e6abf77d759615cc4678292411df798cbe4c2d5405677cd5c108468c015d6b42fd8d833484f8ca9c1128f68c
+DIST hyper-0.14.19.crate 182288 BLAKE2B 6b5a400fb60177ff911093507f0194e169e73ad33071bff90a7e3b69d7fb1a731cc5e7b45ce5b9ece216e7891c4682c9fec488630160f6ae162a3d6240594f21 SHA512 a900cb046b27c43963f558a7bbb509f3aab01daaa4845aecabcbdc7344ac7a2231a225012a81747bfd0a74a993df8caa7191b00530916be9e1d7362ce2dea269
 DIST hyper-tls-0.3.2.crate 8901 BLAKE2B 2b3810160156c584057101a25c8f7decec4fb4632631f4c048353d3d2f90a37cec7b20a85ceef61941f02c5264932c8d0255823c2d615825d2499951f5e25a0c SHA512 9179878b95e8e390b17d45bb02c24219066405f671fddc4e044ecac0a00646e9ae03e7cda31b0f6f7beddd8fbccfc873d28d52e6b46aab2d252a2472302a483c
+DIST hyper-tls-0.5.0.crate 13257 BLAKE2B 50cbe4ca7c1862fd3fff192de070341dd32bfb9f108b516e1e261ec8da7c4f7972b7b66e3d45c1497733a913b0281bef706994270ec8bd03eba7368612127aa4 SHA512 45dc16cc9ce48706e0b3575dca35ba1b6b3084dda8c2cc489d126e1c4f0bb96a9b2baa860d09f68c5e0a48c2a69e3eaf62f4f0406fffc4efefcd79d26c82896e
 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
 DIST indexmap-1.2.0.crate 46101 BLAKE2B da8be80f85b1f43beb487840cfda9feda8f71ceb14120af3efc642ca57ec18b227d4ff34ba1d8869d23ce4dd210f1e5d94835cd3e7b6ac059b071ad2aa36fe9e SHA512 de0fa70403f5874133c0b9c97892ffa65b3adf4a1e307fff7039e3a37be0a07de5133d33edeb4d1ac9791b6ead7bffc53f2cf5876a732fadd58977d6d36bed38
+DIST indexmap-1.8.2.crate 53219 BLAKE2B 6af0e386dcb4306505d93cae23fd47601c3e1c7159058f02ac435b312697da40538b1cbb0d17c3f2c4be579a4b0a9e8b59c2e145677a69c2f885d3d24afd5229 SHA512 f7780b2a478e2b95568bfa1d10167a02bd174fb9bbbf8ea84e6ff185a03d43be0ef403c2106df8289d399657584abfac6039d7cdb96b52300d7016452808c0f0
+DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
+DIST ipnet-2.5.0.crate 25808 BLAKE2B 8fbc550daddf083d3d4e90941a807d5f15bf0b95931e2f47db25eb3284f4c7bbab655f2a88682911bc00543c24131aab6c514ed30a2fab8b751975eb5f43ad33 SHA512 40c841c71694d47f77757860c62a1b109bfb2e2d490e9b6d441d39116f7bda57e7be866d25348c1afb522f4b1caa75122fef79dfe9e3fec824345f3cc54376f9
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+DIST itoa-1.0.2.crate 11112 BLAKE2B e277db8e2f506d4d20b6888b609d9726d594e1cb2c9f21df60a8cf8dcbad1808d8c1bdb0b7857ce7734b92c0f23fb1ec56f8564e779f27eea953d0ffbfcd3f84 SHA512 44a732a102d60b58e72fe76c43a1d185fa12ff08d04eeacf03234368552f84d3de87a2ea0a6e7a56b8cfa74cb6f6697005afcee26f45afe0c2fc7dce5da3b593
+DIST js-sys-0.3.58.crate 78794 BLAKE2B d664fda1e19a7ebb621596cd4773e7ebe86b3749ec8e0e45477d170aa472a80a75bd0ca7f6ca47c9aace5e3962451039b1bf44615ac77ee4db21f46d673943e5 SHA512 74656493c36d9110aae99f58cf1f72a1c89bd971c574ceef8194f68387bcefaa5e93aee736b41a1de1c192113257bd544948dd79a227b5451d13ba2319b58a15
 DIST json-0.12.0.crate 46747 BLAKE2B 7fd6d6a548950160c8beec12d575480f793b3adcf6909a4c26de4f02846e1c444bb34a92e01012531e9d6b6e94043e015419f81b2427c6b54d205273c5753026 SHA512 6c0365ed00a41eadae2de44c75ee518b9f2c57e8a12b2d606796e900c20277bd5fa13c9661442a9f17961a2f5503b600ac49a15a84c93f243035452cf72fc56b
+DIST json-0.12.4.crate 105942 BLAKE2B 0e3dc93a53ab2e1ba489ea37976b40b6f430648a7d0a91a26481ba6e4e6befa377ff832db3f554a27630e4763c87b55358ee89c455c4414b78fae45a625154df SHA512 bcdf6d873decccc66e018e21775ceed6c0e389c6d0b2011071368321789a38867e1d641d92c9607e3fabc6e8d6b260ec0ccc2a9bc545184bb3e63bae6731a39e
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
 DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
 DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a23788821f2ba816b5e5b7a6b09d543c630a946b956811dd199144bf43568b52da5ebdd5e8b674e489f9efd2234d SHA512 e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde
 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.5.1.crate 5958 BLAKE2B 2ac071da35c45d498889d38805223b46a0ec81b3fcd95da85ffc0f4512ca45f1eaa9fcffa8931e92fd11d16806a887d62d8bf15d2f3f759cf9c27695595d0881 SHA512 8bd14c74a65464061acc5594eb108e630e8dd7a9dedccfab0606c255bd43e7b30241ba0bea11bfa80f9afd8fdbf0879ad7d998628f938a558716ec10da31008e
 DIST mime-0.3.14.crate 15035 BLAKE2B ab9fcc2247637465d99006899fc120ff60fb4b61f603ea65b15da594bef80ed2b9788e2d893126ed46c5e8cecc0aad2a93be855a043f9224ac07c07fd601734d SHA512 7079ac27a2a7c5534ab8af24f1d84ce78d9b3906a56107198e5ac43e7b6cc74a980a38bffee0f988e7b4a9b8d3bc052797bcbaecfae4c9470073ac34674f6471
+DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST mime_guess-2.0.1.crate 26646 BLAKE2B e0ef30850cb07de190677229161bb9ce37c7f7cfeda2cd2c54c6ebf8b7009e56a9c84935c55e5ed0430f546d4b259867132a702bcd29d3f25a2dd1b3a59da5ca SHA512 c4d83d8c05b1173c531eea48073762dcc5e80efc2609e06dfc1413ae2f3a3f7d89e533453aeaa75182a8b663c51c7ad0d4eb0b5b4450afc8e11fd74b84a9799f
 DIST miniz_oxide-0.3.2.crate 54536 BLAKE2B c804e4a261ef2444ae539ced683af5d0358baf625d7e8a16979b7ae2f10549d08ed97cd1d3ccc2ab4b96867326775b769b451e5dbac168cc9494be627eda9e6d SHA512 ea5eb9236a8797892f0f4bdda07c37cb8a6e48cd2fa8e81e2a07c13961675688307f77533e79cda65a72312451ff46b31cf167507456e4186e2b19a86cf14b95
 DIST mio-0.6.19.crate 128192 BLAKE2B 26c821eef0aa49c80e4919d80a795971655b9726c24ce0a5b0716d89c0e254bfdf3a7d4e591ab70474dd9bdb92a48be9d74ff4d7beb3ae158accedcf780525cc SHA512 a6eeb93a34a4a4d486a821763cf660d6c5d3dcb08a7f1cd32a04d918d5196cd50cc29b30c5a97eeca68ab1cda50bf36a50c2c787e08ae3d2a2b9134350acd097
+DIST mio-0.8.3.crate 92506 BLAKE2B 4ae9e7f68921d7102274cd8afe2dbdd59393f9a0f63a1d4a1d9418ba8978e31d521ea73eac7ed1b27bf31d67450952b28964f6d35b14eabf2325c08aee43bbea SHA512 c6eaff99cbfe797dd97e6d29da09a6bbb2a46b3f3ddab7d75fb756950d463545199d13ccb2d51d367a2499d18f88500fce8084b82b2f020865dec0d9d9ccdfbb
 DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
+DIST native-tls-0.2.10.crate 28590 BLAKE2B c2dda4aab348cf0fe436bbece790ceac9d1b5425555aa40d09a5560058a22a931843e905ccf9e8cbbcda87ac7a7a4146b77ba369f6f7d7043598ea0088140feb SHA512 1cc30c3e16e103e49d585d017fb09962798d33dc4186a5dd3a28f224d3645e8301d4f5cab9b667a27dee88a49233b69974b41ee4aec2bb32ae0745e27b92b352
 DIST native-tls-0.2.3.crate 29087 BLAKE2B 0304db852e3b1261a791a5a8aba5dc6fd2e13bc32e6ade5ab0f58403583ea45324a4ae4359061c2a9137cc7f127404ef663702a22fe64f2489691de71eafc914 SHA512 9964d627c922261ea730076a2c8447784e0ceebd8e6218f5a61093021f10682c2fa25815c10711831b7d41c84b7c77cc1128a663669058882b0af6d70ac0bc09
 DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87bf507701ddf1b00208e7a321d34882282fa650a52f6b9d878605a6fc3be461fbb7e10182dda04a04e5806 SHA512 e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9
 DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
 DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
+DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
+DIST once_cell-1.12.0.crate 31549 BLAKE2B 72a6c2efe279abce207096dfc47d207adae34764642f742bcbddcd8ebab9f78f6c2ea7750bd670844de5f6989e4951904b5f624281c28346cb6c41c585137e91 SHA512 02da0e6eccee2d5246fff5e6323bd7eff0f4641801be5e5910763929a5e9d8b62c07f81001c405cc6aff03f68a14ed5bfebd9900bbdd09568bd1ab9ca9b73093
 DIST once_cell-1.4.1.crate 24366 BLAKE2B ad569e1d79ec41800a62a84be50d1624efc19e2d08757964e84eaf8b1bc341988636723de8f0c87b37cf72dd4a4fed9a4623c6deb2577172c3d85fd6849685ea SHA512 7d075cb115e6146a9e08e27fe123865bb54fb73c1da6c84f3ac991ff9f6f83bbb55245a9741279a12b72f143e3ed4ada3da7b13764e7655dfe64b70c5d6c1958
 DIST openssl-0.10.24.crate 182149 BLAKE2B 048d0c86c718b856cd2cb9a3ec0ab4074603439b23d17ec6511a5b1f37c8a6804157cfa1129fe14842559eab705029642f6aabe78a84b4ad3c13bfe9ed812c2b SHA512 2127ff5f9b8feb3b567362ea9988a125f39e524432c629481e5ab27f08e2bec20147fb14bfa2d10cecf357fef5f6d6447e8d045f157bac7c1a4e0175903e19ec
+DIST openssl-0.10.40.crate 217120 BLAKE2B 7470af72e060a4dd087468dd8f092f7519978e49e3a9e7df78cd1ae8d33819a4a14aea078d113772528f3eb4134c019fda9458656b25b9483352b1a19259acf9 SHA512 c07b2fa47cec33ad3abfbfdfe0c8c99ce00aafed5437f864e9be1d151c8f82e52c54ba565ab710693f108429f48df2ce0d2955f54b1926d808ea56fa168afcf9
+DIST openssl-macros-0.1.0.crate 5566 BLAKE2B 51116df0f86274435f41b8bfd2b385d5a6464560a05c214445dde5cb414999d200c55e5529fa98e95abfbf26bdfe31c88708ddfa2a81671341792059ea703c07 SHA512 7e37a0c05781da13bbaf4c056c19d032a93820cc324f9f6e5743bfcbfb30e057501af1bc7cbf5f07e3a05191678cd5ae5bc4d6832f02ce75bfb03c027d18abfd
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
 DIST openssl-sys-0.9.49.crate 44767 BLAKE2B 613926e3f88379061c570917d24dfe5bb18af33ad339af5d76a498f3d9c1ed73362bcae34d1e95142ca747a74a2896303f33d34532f0cbc6ac39588522ce0466 SHA512 814febad99cc74eb5fee60d58d685b2c956893db8f3f4994a6f5226261c8dc8ab569067959aec2aaf3fc684eaef6654f102a1f82a215e42b4a087c357693b6a4
+DIST openssl-sys-0.9.74.crate 59808 BLAKE2B e616a0194828afe67d617e4032ed354385935ff7aa40eb495781b38b134226d5c5cfc5f9405e6273c96622245b6d4771a71b7b9512e3be7feba9a2ce88b66ecd SHA512 18015ce4dc8f15f3c371d393f4654db11b6e5ecaadbdf6cd9f020ee9aee29f3fa12a8dd74d432d8e8b5889162491b722f855b02fbf0892c8f2003bc4e692254e
+DIST os_str_bytes-6.1.0.crate 21150 BLAKE2B a3bea67d5dfdc3bdf535b8576a49b3b76aac6fb5e0c9b672910756cf2d8062694b973f4d38365e7e17237efe0429ef942adb0416f8a9fbeb18bac68e1ec250a4 SHA512 b15a901533380be745e3d3ee34d36e192bcf32c8ca66b0aeb77da66b931773b9bd818bd5485c142f8733e7af7d41958957d9ed8f8c6e405b89be69df625364f5
 DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba
 DIST parking_lot-0.7.1.crate 32670 BLAKE2B 46faa97dd3e3e5625fc40de75eb75f17512ba63ff5ef3ee380fc549bc08b3a119a91622cc67014b9c072ae0f5ab05b10f52c24486fc03633d850ce22812dfe4f SHA512 d83d3c457e15ffce500d4fc82d0b9840ea2ed36d43d4eca841b05b0a9ee73ff6fcce07ccc3a6f0d06d950d7beff85db0c3d13dc1461adfef390d6b3d85367bed
 DIST parking_lot_core-0.4.0.crate 26817 BLAKE2B f8a733cd6e14a2ad40adf498a3aa23bf3ad06e788f440bb435c544e5ff9750dab963ce4fc673014e54a851ed541975116f18f102f935e21912fc5b65a6aaef19 SHA512 25c0389e9d3d88725398fb304d3a4c20a3da0bf0d67f12c7cdca38f8068dc6ea7b57341579136cf4792cbb92fd64dd33cd91412463f4df8902e1b8c87ca08d08
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
+DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
+DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.16.crate 14429 BLAKE2B f850910fd54891c39bb4187c5ea49997e0628858d7c1f579cea719b8a2c47beb907b3f6e72056c8d8eb037314f4c5a129280504a7c1e8c676fae48241ee6dfdd SHA512 13431f3f8cda05615c91be2fcb8eb2fba085b46df70c5dce773748ffc15f0b48a45858aa69c37c173ce6353b028851f94f03ded58649c641e66a1c1a65b60572
+DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
 DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
 DIST proc-macro2-1.0.3.crate 34868 BLAKE2B f97fa38afb8abca38d814673e0cc7d17e3bf623984afa7fc2601636508d8b32160fff4079d2e266e2d2e4519d0d8942e88cbabcde54a869dde0a7f0961d2afaa SHA512 ff4e32e42d206191741880e362e39e33149fec4f94cb38e2693e956e4c0dd680dba4712f436fddbc092a7ebef23b7cd4693345fb93d5b9713a516960c2bfd82e
+DIST proc-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32aa686f2d9c47f0da2a5381981e70e45f1b689023891c2543ce633c593a68a629c6414fbb3c2266e4cd99b8660048 SHA512 cd1572831493f83eb51985eed06d8ef5c0ea96ce4231d5ce3be5af9db97e7dd24400332d3b80e0e9c808091fc11889340dd86d8783ff3d9681dc53b876f49a0e
 DIST publicsuffix-1.5.3.crate 16886 BLAKE2B d734f9b6fb5ce32b864e09fa541fbca6c7646c56196c2ae9fe3f7b47fb3ea4af5ec6208ad4e908681faf504c415433cef5f702fdaf65180f0a293e40ab1b85b4 SHA512 6ce7c1e37190892d454f9b858041640eac6749a392264cecf6a64696dddcdb038a9b81b580991aa0727b1b015e05e0b7582baea17b82ed327eea30ca01cd555c
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
@@ -111,79 +167,130 @@ DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b01
 DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
 DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
 DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
+DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST reqwest-0.11.11.crate 142667 BLAKE2B a246903e1cf6e6d5f5262df99cd22b2d363bf2bdefd96456d3d818ce70523263c1487cc2352a60914476e301224438f0691d1ad21ad7ceeb4ec925245e145adc SHA512 62b59d6114b6aa1c2fc936940e940ce9f66416024ea046970deb30dbf5f261edd5b073b3890b6ef11edc41b4e414429eaea391ff1dddffafe178d71605a7f447
 DIST reqwest-0.9.20.crate 105224 BLAKE2B b75633f08592303cd755758f0744637bc798614f9c9f81f5c20f529cc862efd6feac437d3ed9c50d16b448795a1701819cd0cfd854f6946946c506d6139b88c8 SHA512 c6683099c79ab48acd2b7abb903686f64e985bd239f3e348a7c6f80d248e3f2860d7f8eeca768244c8925794e96f6253d786e91d94b926bad2581f22f5a824e0
 DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
 DIST rustc-hash-1.0.1.crate 8976 BLAKE2B 847953648136fe54213e169b7ff414a42984ba9a591a52b3347c5b4a8503920b884b586d01573a975c464821d8667b631b49e83107573afb77503299a0bc9387 SHA512 e90af9d21da88c4da1deed8d5de65cedaae659819d0f5be8972a125b86d62d72ad710745f195a7a04a92442a6684ca9e7e85c734935852718434577df3dbb34b
+DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
 DIST schannel-0.1.16.crate 39153 BLAKE2B f06cb0dcb3d93ac1debf396b23faf5df2b87ce98732ccf5c0ef78af0c36fc9825f2b716f0a5772dc71cd2b2e6ecb477a81c2dbfb6bbd4f84bf3d1187dd7cf187 SHA512 11bb68e759e2ac0bb57a214e64d86fcc49903dc70f9e0582ac4bd0343e94da44d8d34d22649ffae41dc975b4390e7d10f3adcf79d9fe8c9fc95c747c58947b2b
+DIST schannel-0.1.20.crate 41579 BLAKE2B a7924b4bf0f130e2aa4668cad3c7112e39e028fdcb04259c6926fac4875f8061a9148da5f001dc49051310ed8e6ab341da0990ccf0a7cbd4dccce8da54c1ca46 SHA512 19f217fd4571a0d0fcf52060a8639e0ce7114719aa23fb0aa2ab5a531e8f8be0a21af55ef45c8da804101e5a62f15669e66fe005c4cd5bb24def09f1b4afe059
 DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
 DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
 DIST security-framework-0.3.1.crate 46179 BLAKE2B 99cd9d5555908ecd082a7f934cae218b4dc106c799c7d4458e1e470169a657692170c2860a0c04eea89ad219280619e9cd4535e240a0bf2cd5286959b147f3f9 SHA512 69b1e32cc4cdd3a069e9f1de08d6b5563a90e094e0fce07b4949386072632cdfa5ee7711ae16904148936dafebd77321160b28acce239f0cbd5547ba1d77edc5
+DIST security-framework-2.6.1.crate 71688 BLAKE2B 45236a76721bde18400aa286263b5dc389db66a02a5b8feb38fc6ca576fca305cdc5f7e7d6984ebef1379209740ebef3180c4598d5117b04394562de5ceb52d8 SHA512 e4690acf5609f52c89cbe0b577c68a22caf0763d8dc781817010e695824dae44dc27f58c9ffec4254a8461e88040892b89f9628d6a71102d06ab5441b84800a4
 DIST security-framework-sys-0.3.1.crate 9283 BLAKE2B 723d2df6a0d6cfffce0435feaba479159833e6a07fd851a6062ee0f5a65e23a7a07781a6596daad50a6e540e943c3df16eecbaf93e9785f6464eeeeac8d67e46 SHA512 28c731aba35ff80dedf73978ba18f47a80ed308ad6f123467ab435f825680386f665d06f93a5703b8dd0b6893f805f5ae6875a0a7c8669a478c71c69448b2a54
+DIST security-framework-sys-2.6.1.crate 17717 BLAKE2B 5951228dab98af742825a30584e38aafb096d1580375c960feb1ccce7163c6e42802fba4212f556ea8b8b09b1b40bdeec0bcf4af1d7eb4b05fbd271aa3a4cd01 SHA512 7315c0d67d2e792932cd6634cbb9da5021c8d9a1a1e96b9d92c6718d73be3aafbc5613cb355fa1a3d1860f13c62e829bc220b43ad18d739ea1b5aece0cab470a
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.101.crate 73115 BLAKE2B 6b80a6e7f8965c412c6f5db62cf3782329818c59c43c9947ad9a33be56b334feb0fc0afae4722f368d708236e2763ee2b1e71b323b3e961880f99f2e178a82a6 SHA512 3b6e2f8fc965ae2055a8eea007b3aa47715fdbd653cd0af81ada557559316ca65d7f3c75c3c5db0841aabcb2d4336092d339258829df11716b10a0c14597c678
+DIST serde-1.0.137.crate 76182 BLAKE2B dffef53be259eeb051a375e532c3748219f8219413af0615debdbbce61c5ca17be13b06c0bbbd7a85a696b4bc76ae8e252d880b01ecf540b758fc10f11415b21 SHA512 28223488e18826f83a7e90029aebc0722e0cd238a2c0c021e5a162d0f5deaa494713fad10f7ac79c8e14de856af931b6d83cb3efcfd0885837fc71e35ee38a2b
 DIST serde_derive-1.0.101.crate 49736 BLAKE2B 247c6284e362d9a31eee6c92b257fd70733669627628cbdc921dbecc384d1a328fc8a37a8f5b96a84498d5fb4514374760ccccfcee1f3e809d35da5677cf4932 SHA512 08a014ff70718db11c5e3b8420d2b31379c14004b55c4521149030a00c3a623a358c3442815e492a2cd28d6a32002aa1c828cae2b5366f82d68c1e342eba0417
+DIST serde_derive-1.0.137.crate 54831 BLAKE2B 19a0324c18bd00da4feabcf83dd78de2ff7a1905abb82d5600c6128a8351f5ccc37df21e0135601167a51ea1e6691bd22957c2bbd9da637653c7673dbb808d24 SHA512 ee47d3bad717ae16118c43e6f308a0e264bde80caab8f8649bef96ed3f7aa0f9b6a479311df22ecdc7bbcdade65f7b03b79100f8b86caf02f9a0bc77ce01035a
 DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
 DIST serde_urlencoded-0.5.5.crate 12429 BLAKE2B e91e4c6a41d2077a45656814b6291de75dd361e0be39bc952ddb23e06b1b2f29f0fb612fef472bbf6fe10b089639417b3aa8603ca09c70b471c6804e8772c0c0 SHA512 9c4a82907619aa211a5768628ae1cc749980b2df267f325cc1457031720d4166edb0b67e2144324e7f655384000583ac2ddeda33f7ab995a390324e2ef4de145
+DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
+DIST sha1-0.10.1.crate 11785 BLAKE2B faef32bb5503f712d0eacd65b07cf793010a462f5fb7beb23e3768097ae5cff3537709b500e822d67bd95d70fe33163aa74fd791dfcc8ffb5bea0d4b39a1b9c7 SHA512 5f32cfff707d08dfcf0c826ddd723fbdb7e1e29614f6b303c2707dd75ef3b599a5e2b48ebdd570e2e731b02dbcbe2557e91f2d1c5cb44d0afb3d8a46c38c89a4
 DIST sha1-0.6.0.crate 9244 BLAKE2B d992f1803fc17f8f8081ccbafd07ebb9d78056a705444b45dd51b2f57cbdaaf071685b8e6ad9f4fa21e032cc78b4305c8101b079594c7bf6e67894bb798b16b3 SHA512 32081c99a0cd5fd6e651deb711eb4c9a8bc71c12e26b25a72b2dba9a3286502e56b23d068a2899764ce1cc0c615c2c1b22a6c7aae63e07a758745b533e70ff0c
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST smallvec-0.6.10.crate 22064 BLAKE2B 41a7ccd12c9b7e1dfaf43a9cee22c60d160b35a08024554cf8d68b59498a6e3fcd0e8146815bb61a6e1727b209ec85813127ab8520f8ef47716913a6ce6cd952 SHA512 802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4
+DIST socket2-0.4.4.crate 44048 BLAKE2B b2b1aad2995e44944b98ff3291479fb74e8cc965f866e692821427e488c68282290773dcd77da0542c45daf231a5e676d20e59a1d4568b8dde2da2f16425feb2 SHA512 6624fb9b933763c22e6114a8f72c6af0969912717017dd5b13f1b5df19faa1b160376c12e8c8023c435281f6a7864e802f3c4c535de8a345fe206652104f2cd5
 DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
 DIST string-0.2.1.crate 5081 BLAKE2B 27f02ed6a6545eac02d0b98852b2c362711dffe6dace552a24f8f3d69b8c9b0b60a147837c538f2fbdaeaab16b27eb7c554e9bc1aad6c2563b08f3c1a759ef9e SHA512 4d7ab65f12d63065e895947285d5aa1b9003324002b0f657e7ded975c90eebd63c1033ae9a01969c42d446b0ea878571af62776bcb4a8834cace173f908c76cd
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
 DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
+DIST syn-1.0.96.crate 236896 BLAKE2B 57445f4925169212c3b794312f388c2829bc343fd60f37f60d46bc944c946c02476b1ec64f17ec8b91e84c112dbbf04bf64feba9a3fd3512dad0d4b3376f4869 SHA512 f53b9e97b6b19d18a35d13aaa9c58b8fdd0da96443aaad76ed027e9ac7d438b574ae052b02b9bef410f25fbab851a5af3cc64fafaefffe47932827e6ca02209c
 DIST synstructure-0.10.2.crate 17988 BLAKE2B 62bdc896819ba1f0820286dda3596e265dc7ebeda83595d89ad6baf584046242f774141b25ee4cd9b120bd7c392973a99d307abbe956b50eddbd05e9b7b7ce72 SHA512 48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458
 DIST syslog-4.0.1.crate 7131 BLAKE2B a6555d6eed6a0701cca7d58554f2ee612a5d18975dc1979414ac536128e0e7d4a67dde0ad2e40b5ffec823f7edd55dc45d646097fcd457fa6124de95411b4c55 SHA512 faff2117fbf377343149e30a4b338fdd799fb7e4bf425962c2523423f8322aae75f180e4a4c42f1497239400cc60a49cfcf65c00c48433ac956ff17e52063341
 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
 DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
+DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
 DIST thiserror-1.0.20.crate 15950 BLAKE2B 747ff4ccdaddbbcc80225164b203cacc8669796e3c1515db9011f053486ce8d77a4560ae58756641fde7465ae6c818ddbb5b60641d1e5ae288ddcc549eef1848 SHA512 7f8e201f8d173112c7009fffa79e6d2bda5614cfb0439b81a9a990b777261de792d7e7750d75f7638bd58e6d72d183cffbada902595f425f037d6df04c0528a9
+DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431
 DIST thiserror-impl-1.0.20.crate 13197 BLAKE2B f7da61d0dea4864bc3fbccad178b67f85223ab9f9529c118b07229d55a2568f23888041f2cd813efe51dacf8e01de62397092f56c43c640ba97a32dae2b7cd6d SHA512 3ca4dbdeff76c12c5a716d811891ce14bb16013749a45b8d8fae9cdc599e304065665dab051713d7e8e5bd2d2485ff9fa0904ca3cb5bf9e19f2cf66b42f10209
+DIST thiserror-impl-1.0.31.crate 15283 BLAKE2B ad7afdfbbf9c42a08dfbd5a2385883bc0bd855c123040cb187f8ec633456a7912f9e46559b41e4943bcca86043adcee08ddd9c61ec04ab6fcd78ebb42c1d1d10 SHA512 a265be50ae209775abb812f0e9b8c5af7a639514149d9f50f4a95bcedabd3666076bf7764351ea6f1836eb8a0e3c67c0b76abd26b27b0a853132fef011543e1e
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
 DIST tokio-0.1.22.crate 70031 BLAKE2B 44a6d1ff8bbedfea304e4f44b5c4bf998876a632adfe611c3d851aa64ad092b7b0150c2b39ebeae8bb34cca6824922300bb3fb762cce6b5a1fcfa852ed8d86f1 SHA512 d92b8527bbeec84bb306686a7d29b705c36b59e9c0995154ed95d483c84952c838691f8c11615f481abb6c4fba470ba8968860a74a88b77dd67ccf659bf4e4e1
+DIST tokio-1.19.2.crate 581250 BLAKE2B 4ea9699f8fd132b3fcfd58d61516a08bd26e26fc575f14b5eeea6b90312b6d90f9d2ed926d6f3376ca83608c9858668faae04ea89bf053bc4d03a78edc788f6f SHA512 db20c31ee19bfccf91b7f5c6495a1d49ca9492828b0d6d3877fb586fdddce369d6f828e05c04fd826c246235accf05fbfb0819965fc5c99aff23477f0bf71acd
 DIST tokio-buf-0.1.1.crate 10815 BLAKE2B 0d3970a3722e3be109f8808bb7e26db618ceb22a8a1156ce219e6af9930b7f9f9948dab61fa4fa146e5eefcb7deb1332fcd643e0c3e64a879ce32305d0efeb94 SHA512 42f5db4f9ff1d0c6728c9ca899b85e40eaa92910d23f01dd7570c5988178879f3977ee2ad14f0f224562fa73ff8b01687dc963def2c62e93ac471903d5ce4e81
 DIST tokio-current-thread-0.1.6.crate 19339 BLAKE2B c3fe401178089864fe59286566b84a325d8a4101b0b72dda11fefef945d5e14b5e6b6c7de7d87cf222f0ea3d1c95aa65f2c43fe37c2e766f8d70da66c7d060ec SHA512 321d8b99ea18827400a6b7899755eea5a8299e53985f5640a6fd82bf6c3c5c45c68e9d125666968976d05be407d6c15401380870adc231233cc532eb979353f6
 DIST tokio-executor-0.1.8.crate 11775 BLAKE2B 0cef2a4848f624ef8c3a450b06d8530ca64be193980cf1cf6f4c1c74b6602e9e0f47ac070caded410a843938d2c3defe8696e4a27329d42d04ca9cb4f6d7811c SHA512 b6340dfa0cb67da1b00288b3250cfa4f0b55907d3448768f99a7cfcd46ebd1155c84cd35659d740501f0575e9c5b660a2f769335acc14da7dd5cea59b10b6334
 DIST tokio-io-0.1.12.crate 33555 BLAKE2B 5646f1d0c226d223fdbf648d95cd690ad6f755c5dfa9a6bc4d5fe4b5df634029db6178d852d3a4c2d481d06eec763985186753088157557871e5ba6e8aa650af SHA512 57c675ade48f2885ab8f42dac7297bf4bc5f7abef2302f7964dc145ce29d503c09e3ff890de01aedcf0c860fe22d2161f9837d658457695b6205e601fac74149
+DIST tokio-native-tls-0.3.0.crate 20759 BLAKE2B 5073c5d93f5fa08170ffc76e21404b67100df5d944daa9cfe73420d4cb2409ca2617a0b1c25058a8b356b51fc4815972692aed7baa47ee3a11574a3109ce1691 SHA512 a8aa7586f15a3347ba9152497db84a098e751797c06df1a75d9b108689e14d6692b4efc6e5b49b5bf8f8fdb3bfc4f1157f56b3b0c9d9e753a8b31a61e65dfc4d
 DIST tokio-reactor-0.1.9.crate 20657 BLAKE2B 433b1302ab41d1c028c1fa726b796d41484526400801df2375de04faa1699cece0d55717f8ba4fc292d33fbc7fb343f766c1d474a36e36d72947bc7572e27a24 SHA512 134c78b449646f1b7cf9dc87de0f39ebfdb894103e0271a2b5115320add04de02aa1899206f332f111a9471f1f54776fe89e3ff879648fa206100b2be12e24e1
 DIST tokio-sync-0.1.6.crate 41598 BLAKE2B 855421bc62d8e09358c40c6692f770e78d2dc7acecfdac499d31aefd4feb70b93c104ae46fd7b64196d7667b232ca5debaa71d9f09d20b497a5b170133f87a8f SHA512 bebfe2173d544595cbc162fce2afe1574f267a08b77c8e056358cc4e959a94f1e899e47e76927e374ab1f51751079b283e0d13479a4a40c7f754cacad2578a1f
 DIST tokio-tcp-0.1.3.crate 12629 BLAKE2B 16a2763eeb2b65edd07f9b998535812efaa25584bfed5fd66fb1b2952893fa3ed330f597032b4140daf9635ba4f49e77aeabc2cea82c997dfc971bd97fa4f5d0 SHA512 ae42facabed1589764a8e4f789dabf5c7adfb3a67880a8bb6d7b0b6c082302a84b6acd8ec5f444dc59284407acad61518d60818eaeb34f874380f9593d540336
 DIST tokio-threadpool-0.1.15.crate 50047 BLAKE2B 74c7be4e542b9505052e29a97e0516a6d0ff3c9588da744881890cfa576d2c707f11c32a751169aac52d2478fd9108cad5b978c94cda639cf29338243943c797 SHA512 aa36de397b8a0dc9376073bcb2e661ff5fddf2754b391b854d8683398cf56a69e79a6dbd3f6e76d9d851752757a75b79673cff36b9e1987ed4c30dd38f9d483f
 DIST tokio-timer-0.2.11.crate 37578 BLAKE2B e9dd19db8bbba5edf74f7354d4d5e489780b5dbf009be095e7f00bb9e2276e10ebb643605beb6ffb035d1a7a0cfb23eede14e5ebdd228ee05ad9244ac3d1273d SHA512 2bb534417425b88dd1b90231cffb89a8ab97512f1ea9e26cd4afeab5f3aa691433062f093a6789222d1892532a9cf29e1016fc668ce2939536f89e0441740d57
+DIST tokio-util-0.7.3.crate 90513 BLAKE2B 529ae21466e00f3f5d4b31419af5e560d3c1383f84db249891c3b5dfc228eab76f9c685016674fcb2cc4dfe77ddf12496369a7cdab5fd4ba4a60762a7df9593e SHA512 5c179fe85af6323c4080fdeb119847078b896e5416c0ea6440090ac829bb02f4b9cf4c983ede8eeb8bd628ab9f8acd96d02e2be0ac8d7449fc4011abb2894982
+DIST tower-service-0.3.1.crate 6299 BLAKE2B f56562faebe3a933f39f8e2093af65378bd307c59f9695408510ea9ca2230c68228c6726a0a2c7c42943002837dd9d86ce0a1d4b7849ba5c61df28df7632d909 SHA512 d23f9db2d6632f561970b55eaeaac22a20c8b9af18931cd564db193688eb2a2973127b440e175cfd7358f3d0ead53f7a759e34b7b86c293751079af9c2181ba7
+DIST tracing-0.1.35.crate 72680 BLAKE2B e3f07d2c7bdc72b6845be0a18473a3a24ec0d5212a88eb1bae34795319b6500d6b8c52ff674842f5ded1f0c8cf983977a66964c16779ce1511a2e0d81cc3855a SHA512 939f649d1578e569b974ced1f28678e494f4c42fa5e6c981f38188dcb2d960f71140627e4f60b86d926d44473b311bc855e85f8d90e43932ec3ac7eca7c02394
+DIST tracing-core-0.1.27.crate 58328 BLAKE2B 3461f13caa1042fc63d7defed2e3f49a286d870e0dee51776a90ee8558a2036781c5561923afd9b858b8029bc95a224bef973009b928c9ae050fe4a20d42a8d7 SHA512 8627b2cf4285e461b47288d885ac627bc6cef1083111e1413e2608dccb9c65e55fd2cf1a979d8a507891cf8bf11de40af32a434e9ddec4ff57f7d4c04e3bede0
 DIST try-lock-0.2.2.crate 3638 BLAKE2B fdd33b9760b12db5c90dd9c34980e62d061e1a691eab760ed80dafdcd1ae82055b4ccac7313babb43dc9f2f38d3cac3bbf3f586b26f407fbd035c5c3dfca168d SHA512 aeb54abe3cc02d5dfd0d13010558454e5caab2568bd923a035dfef5ed5d3394b4bab9f7ab21dbaf82f1c20ccd95955bcf6ac2bdc976a824d9508d6f2a27ef330
 DIST try_from-0.3.2.crate 4264 BLAKE2B 13a4f1698e711981c183478b4bd4138cc90e8451000e56c965691e7d0be96e3cd7ae78aca891ae4a0d6726ef9a1d3beb26e4a4c18042b409a232a467ac36c11a SHA512 a619b8fefaf8c25037f1e2e7f8e64506144c8a7080ad930138fc3c4a2541dc7fc83ffd9c9a8c762ddd57028072cfd8dcb9db0c590e3ac30a4863f8d4fbb63739
 DIST twoway-0.2.0.crate 30569 BLAKE2B f8f9f15b531a91aecb4e52ec228b5c3845edb263813841c566d75f43c955831aaf5e4c058794f489127c01bf4dd16c47783f4430348c1c5db1c4e104827556ee SHA512 1d2f75492089b9233756bec05eefccf09c7c602a3a12ab4b880fe712ff5b3328cba5bbc608e970576f3cb20b088dfb8551ab74a2f17a64132941ccc87076d5fd
+DIST twoway-0.2.2.crate 30454 BLAKE2B 3d349c555e0df87b6fe4910611c5759e6ffc5287dc1994ea47c8e17ce0d636f0ba219d73aa68af21a560d926caa4a417ac0d4b6d2d60b6f2832b9849339b77a8 SHA512 dcaa31226ca9c0d67e6eb85fbf97c8089ffae66daacd55cb043677807a76b09c6e4b6533b6c6c9ee06b0a09ac7b9d1c3bbd3ad31cb2d4748f59a784fc489d9f2
+DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
 DIST unchecked-index-0.2.2.crate 8325 BLAKE2B 25c7bbee1d3b90bad05a91131ce1647a48b97e08a745e9cc8b829e1e9c2e1a6b650715ae7747105df07096607fc929ad7b8d54f06e23c662c1750bb4c7e7ca1b SHA512 3634e077fab98284e6e99bbb1fa6691f58d2c39ece67c65c89f8142820f0bb1836553a107f49eec0c72455c47807bd8bc1aba940029a6e27b4b79b9be79b2ca5
 DIST unicase-2.5.1.crate 23105 BLAKE2B 70e6c6b61e4a1e4de56174eacd08cef19d68202d40f403a0958d56690546a4b72f2fd0957a1d591bbe49fe6f6f5acf8c1b03b7eb884873b469c61aee7466335d SHA512 fe77fe7dacc1a340a760f3f474b2bcaf3cc0ad1b71ae6b5811dab77faaaf8bdf4bc8158682254971702bd648769ec776689560f4c2ed5c8c544cc04ace4608fd
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-ident-1.0.1.crate 33770 BLAKE2B e028e9f1d6c01a7a37c8f9ecd6b1d99041b45674bc7699066bb7479822cb8d5a1b4083db1117d9d44ab05096d8a37a9bd5d93dfe8cc5db6bb58950b4f5d5c8e8 SHA512 505650712a51c6f309c97bf72029de1eede33c71b84de9733f5f987859a61225e3d07d369b85a89797d870ea436f30b5b5046306f3d5fd672551a4b30c43e428
 DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
 DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
 DIST url-2.1.0.crate 64776 BLAKE2B aefc8cd2be90818c757312c354a0bd39ae08a52fb7d5a2a4552ffac3488a4bbc60c3f502ea5cd861aefbab02b0748e4bf35c49592b8fba4377cc17207c666d0c SHA512 1736f512039771b4a365df84937f039e1a0a3c90b827614af47403934ccc4af60077ae13ab585bfb1dc5bd88222edfc890b4ac2ab31872adca2e31bdf5ae45c3
+DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 DIST uuid-0.7.4.crate 36325 BLAKE2B cc27afbfb37e01cf83ffbfe239e175019cc1ba77ac14d6392bff833b3482712a8d808cf17aa4e922a24e4728cfa60bc96bf03b0053b0126b65fb7fb583adc1c3 SHA512 5c0d5f85b05db505ba6736437c78fc62e7a961ec1fd7d262749c282ae41bc1b1adda373644790de64ebebf59a200f8e610767f3e5fe0caf87305ecd5a229c265
+DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST vcpkg-0.2.7.crate 11012 BLAKE2B 3d97c24c3ddafc4c5c56d54e682c828782d6900a10caa48552892c174e897c6b92d0477a2515df889c25297e43dc57538684cd761b8ff9f6855f6a6b748f4446 SHA512 d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST want-0.2.0.crate 6265 BLAKE2B 4db642e6016fcb0e2b1ae595836af4ccfa3798a1333b71347ea5fb30c95dd6aa0fb8dc827fffe274503e284abb0bc73ad11955f26dd77c5c265cc4a041ffb698 SHA512 1264e8095ba41b6cde85517538449d99f05a40207437bad9b618af3668ad675a3517b3d190e8b962820e2c302146d8d0571b665a1176c090ed75a4e83e8c5b59
+DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
+DIST wasm-bindgen-0.2.81.crate 165467 BLAKE2B 4b02ad703362d89c280bff92552a632b6cc50a586db4a476fa4f476118b94a89707712c1f6ff65c49a4d6001e9c9e16922a35e36b315b8f544e261ceb43dd5a4 SHA512 dd9a9902789dc8c7c3a8107c52018783b505efcc534c94c95ce55ad735c51489c928f767c319d97f78868a58d4aff7a71b2d1513350c30adb9122401b493906b
+DIST wasm-bindgen-backend-0.2.81.crate 25737 BLAKE2B dbfbd09a4d5a1c585fbd8cf8a29dd375c887e77fb5759c74bfbf0dbf012a0340df06f063e1a4908a80a2ff8298689cfb92ef67707e5d2e163abe155523c2029c SHA512 0d3b14b530adb2a32ad3ea169f0555973a25232613ff4269600dc1e86a6d75e4717be2388f132b6bab9a12625f645f644f59dc30a0b4ff3f20c20106083bcfa3
+DIST wasm-bindgen-futures-0.4.31.crate 15217 BLAKE2B 6f41e097fcfbd569401b678792dd5976b764a5f4715da859cc08edd1a4a3de91da16994868526fac0fb6bde1c13ef1f184fe87919aeae3c6e37d335a5be548a3 SHA512 038aaadabb4924e9c7a07d33dc9aea921c11becddde36eadfa6217a8e3e8c266f954aaaa900c5b99d8bb06709a6b4469912a3a8d2f12988b6c64db4b074175c2
+DIST wasm-bindgen-macro-0.2.81.crate 11796 BLAKE2B 3fb6a60ca59279d3921dd65f7e7d4d91a457e31524671d465c5ce8fb31db7f28f49d80fc0161c2faa9f5a7dbad4c44584f0fed6177e8908de2a421951c62479d SHA512 f1164f7a4413685ec34e22c462b4a4cbaa79eba47079d90b7e15304db222afcc8e966f3bc994a231f21e29ba68a844b3e6622f840e0c335d09201c1dfa046ea3
+DIST wasm-bindgen-macro-support-0.2.81.crate 17855 BLAKE2B 2afb7807913ba01d99ea93030461842b7eeb405f4be0f0d671e1d430b6cc0aa111518c9549b71c8a94dda418c149050fc9d0613e10cdc7fd0dce354d87b8c4c0 SHA512 1fac5ac8b546e4fe55484649d7e2a39537b49797e20a2859a17ac98cc8c25cb3d91dca09e94c33651b9963efed6045ddd79bf646489bbd11065c62e66a59cda4
+DIST wasm-bindgen-shared-0.2.81.crate 7194 BLAKE2B bc31b0e75cafc2dcd207ffcf44b9ae84de4e5bebebe471404736352e9aaa1c2da45e22892a548c05cda24750be028dcaf66e6529d1ff2f833986ab2085b74fb9 SHA512 5ca631a720623e42caf737d3f8faa4961a051eb71b6b0854e4f697f753889cd58df980962d39650acce7712449ae50cf86effa542bd85e451cdb86767aa7ab34
+DIST web-sys-0.3.58.crate 696212 BLAKE2B a76b29a2a1b46239e1e6b134004bf43bd127466d9920077196e59b3ff419e059f433f94a68c24f3a6361d4f751ad3b69c6bfa67cacec0f0a2a58c87f319cd475 SHA512 58215a0d34bf0478514affa8d85f46017ab565b1dafd36f98a1d0f93e04f909b8b09348c06a189700111b5a8bee2049640a3a3a1433c4939e60bb12f32092b05
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
+DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
+DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
+DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
+DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
+DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
+DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c
 DIST winreg-0.6.2.crate 19338 BLAKE2B d866995d54b69077efc1bb900235a4c00d9e69779cb365ad2fc97686a6c13de6a91d6204856ea35a18b86a7f32e8d4ac1ea2d2c096d7dd3e42f78400752cd3e2 SHA512 a2b6a7a0fcdb1f81dab62e1626089b6fd753a2233f9496505420ccb7997765c34293ce07b724b8179646345e0f6819eca88a6c167a03d8439a386fe53e184102
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 DIST yaskkserv2-0.1.1.tar.gz 179125 BLAKE2B 28f55e7f584f977b1bc767af69211229d707752fb67782d75b9826c7cff7fda0c33efe9700fc95eae42eb7bd0d964df0f37e037416f0c1ac51182db3f788b413 SHA512 6c7749f7f36bf67ce5864b359eae1d3b6bf40bde7376c825274274cd42103e5c536ef000d8a00968a5a3d2099745f238d314b30352a2906cb315a710744549dd
+DIST yaskkserv2-0.1.3.tar.gz 179293 BLAKE2B 4beaf1389b1126f66d9d6c8eb9da0bce97f00ac2fc738bda2c00c77a4171ef67773402f2ffdd60373a59bae248ed889d206cb6dcf32e73e1ae90559071f59b3e SHA512 57d3675fae72d3d5c81a527b5deb156164faf3e38224daaec1be98c471ddf2e605771eeeff2f91c79e6c464b185dc838026bb16514beb5c92049bece06a52ac2
 DIST yaskkserv2-testdata-202110.tar.xz 6789332 BLAKE2B fc7c44ca9899972095f37f01e9c08c95c763ff3fa027a785f8d979e4a8c6f0ad2defc965e1d3263d9fbc595368ab83022a2b615712b0795854538a68c138fc93 SHA512 351a5a67014bfcf0f8ed16ba171c59936e26c3aad960a44484304a0df86d26b2a6f75a3c4762149c5dbcc7c7717cc29559e7ce1b2f0e79f913c33501ee63e3c2
 EBUILD yaskkserv2-0.1.1-r1.ebuild 4698 BLAKE2B caf0f27e3921ec913c9eb01169e1b5ef91062e211f8173f23e6104e64b211bdd1ed5d57b63b9685ecf5c869f334c08a129158f276e50d38642bcc07038bf5590 SHA512 3f4b5367062f360b6e2af118710b3ab12050b41131d71d5d6f23c11183f6ea3df62a6cd521d9273316005c813ae32f3f91cc29f151c8aa3c7a22afc178db2177
+EBUILD yaskkserv2-0.1.3.ebuild 4326 BLAKE2B f4bc93513a81becaa533b4d5d0705e21bb29fe7a34ffc0cd25ca53bc4b4b9ee72f7dd19fe8c3acea6eec0a5f57f152539ec750df9c2e322806fc875d193cb2f1 SHA512 79e9935cc61740843a38a19d4ebf929c83701d277806e6d42bc22dfe291a14abcdbec29497c5d5197c626bb8d8af372743f482e1feb2d5051afd85bdc3fac308
 MISC metadata.xml 319 BLAKE2B 8dbf2c5097b7ad970f993abbff0032ea96967ce7fdc52daa575051315afb06d7d9672a84d9f302364a335374a32ff02887282bea59ab794f6d4052bf6cb1c5f2 SHA512 464009ebdc81836c45ca9397f5fcfc544f1208077ae4e342ff23388e7b3da829eb4296285ed08399efb1d7fa26f1f307b52bf380c8da66f5dcc4a73e8b5356e6
diff --git a/app-i18n/yaskkserv2/yaskkserv2-0.1.3.ebuild b/app-i18n/yaskkserv2/yaskkserv2-0.1.3.ebuild
new file mode 100644
index 000000000000..bfa5d1ad36c1
--- /dev/null
+++ b/app-i18n/yaskkserv2/yaskkserv2-0.1.3.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+CRATES="
+aho-corasick-0.7.18
+atty-0.2.13
+autocfg-1.1.0
+backtrace-0.3.37
+backtrace-sys-0.1.31
+base64-0.13.0
+bincode-1.3.3
+bitflags-1.3.2
+block-buffer-0.10.2
+boxfnonce-0.1.1
+bumpalo-3.10.0
+bytes-1.1.0
+c2-chacha-0.2.2
+cc-1.0.45
+cfg-if-0.1.9
+cfg-if-1.0.0
+clap-3.2.4
+clap_lex-0.2.2
+core-foundation-0.9.3
+core-foundation-sys-0.8.3
+cpufeatures-0.2.2
+crypto-common-0.1.3
+daemonize-0.4.1
+digest-0.10.3
+encoding_rs-0.8.20
+env_logger-0.7.1
+error-chain-0.11.0
+fastrand-1.7.0
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+form_urlencoded-1.0.1
+futures-channel-0.3.21
+futures-core-0.3.21
+futures-io-0.3.21
+futures-sink-0.3.21
+futures-task-0.3.21
+futures-util-0.3.21
+generic-array-0.14.5
+getrandom-0.1.12
+h2-0.3.13
+hashbrown-0.11.2
+hermit-abi-0.1.19
+http-0.2.8
+http-body-0.4.5
+httparse-1.7.1
+httpdate-1.0.2
+humantime-1.3.0
+hyper-0.14.19
+hyper-tls-0.5.0
+idna-0.2.0
+indexmap-1.8.2
+instant-0.1.12
+ipnet-2.5.0
+itoa-0.4.4
+itoa-1.0.2
+js-sys-0.3.58
+json-0.12.4
+lazy_static-1.4.0
+libc-0.2.126
+log-0.4.11
+matches-0.1.8
+memchr-2.5.0
+mime-0.3.16
+mio-0.8.3
+native-tls-0.2.10
+num_cpus-1.13.1
+once_cell-1.12.0
+openssl-0.10.40
+openssl-macros-0.1.0
+openssl-probe-0.1.5
+openssl-sys-0.9.74
+os_str_bytes-6.1.0
+percent-encoding-2.1.0
+pin-project-lite-0.2.9
+pin-utils-0.1.0
+pkg-config-0.3.25
+ppv-lite86-0.2.5
+proc-macro2-1.0.39
+quick-error-1.2.3
+quote-1.0.2
+rand-0.7.2
+rand_chacha-0.2.1
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.56
+redox_syscall-0.2.13
+regex-1.5.6
+regex-syntax-0.6.26
+remove_dir_all-0.5.2
+reqwest-0.11.11
+rustc-demangle-0.1.16
+rustc-hash-1.1.0
+ryu-1.0.0
+schannel-0.1.20
+security-framework-2.6.1
+security-framework-sys-2.6.1
+serde-1.0.137
+serde_derive-1.0.137
+serde_json-1.0.40
+serde_urlencoded-0.7.1
+sha1-0.10.1
+slab-0.4.2
+smallvec-0.6.10
+socket2-0.4.4
+strsim-0.10.0
+syn-1.0.96
+syslog-4.0.1
+tempfile-3.3.0
+termcolor-1.1.3
+textwrap-0.15.0
+thiserror-1.0.31
+thiserror-impl-1.0.31
+time-0.1.42
+tokio-1.19.2
+tokio-native-tls-0.3.0
+tokio-util-0.7.3
+tower-service-0.3.1
+tracing-0.1.35
+tracing-core-0.1.27
+try-lock-0.2.2
+twoway-0.2.2
+typenum-1.15.0
+unchecked-index-0.2.2
+unicode-bidi-0.3.4
+unicode-ident-1.0.1
+unicode-normalization-0.1.8
+url-2.2.2
+vcpkg-0.2.15
+version_check-0.9.4
+want-0.3.0
+wasi-0.11.0+wasi-snapshot-preview1
+wasi-0.7.0
+wasm-bindgen-0.2.81
+wasm-bindgen-backend-0.2.81
+wasm-bindgen-futures-0.4.31
+wasm-bindgen-macro-0.2.81
+wasm-bindgen-macro-support-0.2.81
+wasm-bindgen-shared-0.2.81
+web-sys-0.3.58
+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.36.1
+windows_aarch64_msvc-0.36.1
+windows_i686_gnu-0.36.1
+windows_i686_msvc-0.36.1
+windows_x86_64_gnu-0.36.1
+windows_x86_64_msvc-0.36.1
+winreg-0.10.1
+"
+TESTDATA="${PN}-testdata-202110"
+
+inherit cargo systemd
+
+DESCRIPTION="Yet Another SKK server"
+HOMEPAGE="https://github.com/wachikun/yaskkserv2"
+SRC_URI="https://github.com/wachikun/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+	test? ( https://dev.gentoo.org/~hattya/distfiles/${TESTDATA}.tar.xz )"
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-libs/openssl:0="
+RDEPEND="${DEPEND}
+	app-i18n/skk-jisyo"
+BDEPEND="test? (
+	app-emacs/ddskk
+	app-i18n/yaskkserv
+)"
+
+QA_FLAGS_IGNORED=".*"
+
+src_prepare() {
+	default
+
+	sed -i "/^dictionary =/s|= .*|= ${EPREFIX}/usr/lib/${PN}/default.euc|" etc/${PN}.conf
+	export OPENSSL_NO_VENDOR=true
+}
+
+src_test() {
+	export YASKKSERV2_TEST_DIRECTORY="${T}"/${PN}
+	mkdir -p "${YASKKSERV2_TEST_DIRECTORY}" || die
+	cp -r "${WORKDIR}"/${TESTDATA}/* "${YASKKSERV2_TEST_DIRECTORY}" || die
+	cargo_src_test
+}
+
+src_install() {
+	dosbin target/release/${PN}
+	dobin  target/release/${PN}_make_dictionary
+	einstalldocs
+
+	keepdir /usr/lib/${PN}
+
+	insinto /etc
+	doins etc/${PN}.conf
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_preinst() {
+	"${ED}"/usr/bin/${PN}_make_dictionary --dictionary-filename "${ED}"/usr/lib/${PN}/default.euc         "${EPREFIX}"/usr/share/skk/SKK-JISYO.L || die
+	"${ED}"/usr/bin/${PN}_make_dictionary --dictionary-filename "${ED}"/usr/lib/${PN}/default.utf8 --utf8 "${EPREFIX}"/usr/share/skk/SKK-JISYO.L || die
+}
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index ff48f64258e7..e7f2f61fdb86 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index 148588b610c2..857ebcfc34df 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -4,5 +4,5 @@ AUX collectd.initd-r3 1877 BLAKE2B 8e81c314abdd366a7583dd18bdad10c9d7da14589c030
 AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d246c3e512c1733133fcc8da41b3ab2a0051b4da78c53e6629b2ad8085872dec1d4c28e397c88cafe3a90 SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e
 AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668
 DIST collectd-5.12.0.tar.bz2 1902756 BLAKE2B 9567c55b47c0ea5b7836c0d858c16a637c4a2054486a9d9ca6cd9951a92381bdf4f49d7dc0be0c9c9131802120d0af2e542a3997f01484c89ba135b3c46db795 SHA512 7a15e4c0ae587db4987d673a790a4f3bea1cab29ce24a506fb21fa7bd2f60bfec70867eaa1c1395cb5b0e0ae81a024fb6109b064da0ef50e7c146d2198871c70
-EBUILD collectd-5.12.0-r7.ebuild 19965 BLAKE2B f869ed7931dedbacc2dbb1e03fe6d6abcca813a980610e7b34bf110aecaf5228f1618103c470488675b33224b7846b8a05909b34c1d5cb516483f7e3e96319fc SHA512 4227e23c5d613d6e40791ecca8e46b6d06786e359dedb650da32c67c74e9c8db212e2f38cf8fa318a3ab6381dfee79fd6c62cb0b04314d8a2b2471189e610308
+EBUILD collectd-5.12.0-r7.ebuild 19947 BLAKE2B c0bcd824576ecba911be3c0b2ff58aca8f64281a986bfa4282d853a78046a1a36e9abd9b33e5c97d16dcc7c316690e75f5751a2d57022b4c658c9091098e61d2 SHA512 27d4da2e232487788bdab8982b32d0dfe514176fa90ca1090d65d711424833a2f484f831be149a40a5758d10e31e74efa9987d1a6e66a85d8dffe44774fb80f4
 MISC metadata.xml 1515 BLAKE2B 318f796bfacb0e1facbd60f80fc9176e24f06661fc4dce4acda3a218aab10766231566a9ae58f9985770513fb53a52e9ea5e985aba0bcff62c042c75fb662c70 SHA512 4c886d89143d2862a3d915e5b0ef14382c76d758a306fa9971a762fdae400086175c470045e85775f028947156a4bb40a09bd9810c56dda08662e835cba3b45c
diff --git a/app-metrics/collectd/collectd-5.12.0-r7.ebuild b/app-metrics/collectd/collectd-5.12.0-r7.ebuild
index 7d56a636cd36..1b25586eb8fc 100644
--- a/app-metrics/collectd/collectd-5.12.0-r7.ebuild
+++ b/app-metrics/collectd/collectd-5.12.0-r7.ebuild
@@ -5,10 +5,9 @@ EAPI="7"
 
 JAVA_PKG_OPT_USE="collectd_plugins_java"
 LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
-inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info lua-single \
-	multilib perl-functions python-single-r1 systemd tmpfiles udev
+inherit autotools fcaps java-pkg-opt-2 linux-info lua-single perl-functions python-single-r1 systemd tmpfiles udev
 
 DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
 
@@ -17,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm x86"
+KEYWORDS="~alpha amd64 arm ~arm64 x86"
 IUSE="contrib debug java perl selinux static-libs udev xfs"
 
 # The plugin lists have to follow here since they extend IUSE
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b9a7618d4fbd..350474af74d9 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index fa15b7b2ddff..2a807f0a5b74 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -1,43 +1,7 @@
-DIST nnn-1.9.tar.gz 43405 BLAKE2B c085f13883eb379cc04b225d3a6bdbc95dcfb200a0c338bea82b64841918f41560a0b53ed49be0cf8eaec852eb1575d050197ece197fd655c2a3ba1c6cf20d57 SHA512 44eb3d569429ee27e35c0a1299e7cb248072b470b462a361eec3364163f03f577a1b28819cddfc9a85002d6ae90c61cc0633f0548c58cb154dfd8e6491c73369
-DIST nnn-2.0.tar.gz 45791 BLAKE2B dd6eb88302d39b1d5f321b3fa3a19f97c70477178f7c5678433be47fb8091ba6fa5b78f99dc2e15fb8d2c46fc012bab86b3b3ae1dd162357589e0926ed126d55 SHA512 73d6c0747461648e01b8145451a14a531002e0d005c59a3bef9d6d1a6cfc4ba7210a15879e92037af2c0e1d4c728b9c30894d7b029dedb2925634b4925ce2d72
-DIST nnn-2.1.tar.gz 48481 BLAKE2B cbf5dbcb2548e21996f3fa5b5399a56644d1e7aed6023c4ca4c2b960b2bab8833b9f8f1bfafb6d2cc2257730ebe1b3a80e0a253d81f154580888517fbfc50341 SHA512 4ce20944df613706545cffb70896b9c494ed0304a591b1ffdae4886ac3783c2c1ab321b336b9873bd8b1382bc9c6ae8e0226f7abb98fb461ed64b28e1302d8f2
-DIST nnn-2.2.tar.gz 50955 BLAKE2B 010b68c20e7ce4ccc8df65192d7be0a76cb5a84973093dc97bd853a7f525904157d59f5db96ab0dd690c7fd340a90e8aab222003d51ceb8de8febebe62ba1c49 SHA512 0144c9f9c29c2ff3818cf14532354e8182f872580ce7c5a06ab8595b4354edc3a4ede3afc667cd0561a3de4d2f34965a9c057f7ac9555d86feff83abaaca5793
-DIST nnn-2.3.tar.gz 56286 BLAKE2B cc1d79ccf467ba47fc4b50f335e7f2a9b1962555afacc4996c986c9b962950c1f645ce9b0f0e7555a842f429dfc80a24522613d5f447c5edff13111baa57df02 SHA512 416eb08a40534ff4b92b8757c75d8e599d2ea1cbfe7cdedaccac42fd819b1f15e3da839181b232036b1d63dd8bf7c82df801cb4c456e8917fbe47a9a25fae361
-DIST nnn-2.4.tar.gz 62510 BLAKE2B 40a445bcf840afd4dcd5c4e94d1ca3af9aad6a8b8c801d97420a4f5f237bbc41cc7157bc43cd3c9ce83b04af3dbd7c6ecf467cf690922cfe36cfeff5f87ef365 SHA512 b285b14bb73e81a8480b19be7adf0b6efebc632cae82cddf9f040e644dd07dfef4e5c27df2e318aaa21eb1ac4d9e20b6d89f66b8e9b481160bc49f1302806722
-DIST nnn-2.5.tar.gz 71811 BLAKE2B 9b9f926fbcb6ed89a971eaa53ebffdda1de4da29bb540807fb15eb1a9b468181783fc9db56b69105d0825f640d203a6615c4c804f4b45fbc30b854eecd146fcf SHA512 eb50b5368811a9b93caa385a94b2e6a63705bd0ba1db4dc9a3a628a42d11547d53095736e4afa6f73037064b2ef883fe9a60cb048279ba0dd9889503de7e5167
-DIST nnn-2.6.tar.gz 78668 BLAKE2B 5ac152e7a401d215ef0d833ecd6e67f193392ddb98f249b0b56257a6657b454bb03b73ae374a72f854c73bb423e4b39135de277e1785d480590ebe3b812b3a6b SHA512 dbb445d5f3bd64640c053d04cab7c7c6aa82034c4715236129b6079c69db57c870cf255d454aeb224c85ac9d52835999403285f1d4a4c72ea8a3d439a4e9e1eb
-DIST nnn-2.7.tar.gz 78047 BLAKE2B 9187663f59b26edcafb5b467e071a4810de465f944b97aa3e05be1875e7eb7eeedaf2efcd6b2efc29084599994984a0212f055f23903b5a6e736822971bac8f0 SHA512 432d268caf501349cf2ed95b7b889d373c43d8efba3ca72dabcab579b1f39546bcef55dff07b1d2d56b9a0b56da6c4461d37c66db6e66895b051c616b9b77ccb
-DIST nnn-2.8.1.tar.gz 91069 BLAKE2B 3dd7d794edec4d2a648201c9ed2182bddc597e1663bb4ce22f76e40653cc21d20c143ed84f21971d709916cec8695c7b66832cdbc6a9cb34e87a608369db1b77 SHA512 b669136c1a0e1f0346e86430acb59af8328eda83b0c1a9d8079b886d632556aac9a19a362dc8373f2558cc54c7f4bedb3e56cb16a3a08d560b9ccd14ada36bd8
-DIST nnn-2.9.tar.gz 97998 BLAKE2B 4affc609e2fa6c21547c6f9b97778a4c5d6f9dcfac3d3eb8c08c76362dd18c163aec1d2a72c4450bbdab26abf9a4dd1da7e0a74bd6be8cdab87e21046270ed6b SHA512 7bc64901a317de79cb9e29502cda70b59ca681ddde53385521a08e49cbc32fa10bb76ceef2e911838c0bb7be4f5018dce4a1906e77c0ca9f1ec8164c82da7bb2
-DIST nnn-3.0.tar.gz 102636 BLAKE2B 7756fa859198b61dacea5fade8d89f7903d012fac40034d544dc6d1b044362e3d1cce01f014af274cdc13ca40c6b95ce72f735b33053c553772aab6a4c16138a SHA512 a8092e1e5970e1f48baf04a3f9f7064b2efd61bc54bf993b0545c1c2148d775c29328b8e51d5b3f94340de82a468be8547bdd6bb40023811bbcfb755d611435f
-DIST nnn-3.1.tar.gz 110005 BLAKE2B 13acf91c3333c00a1524e4bc819870768272509b6d6aebe177f26a90d27a64dc7ffd9725d94e6edeac30b261f6d63e03757f116d3f4e293ed0b06e41f66157c7 SHA512 f17bdcf95bba3eb50d20cb06725022bcdc2fae34a365e55dea1baa49e40c567e175a3d5c66fcf70f560e64a8933f0ed9a8ca39af67fd39edcb81c82be5aedca9
-DIST nnn-3.2.tar.gz 143122 BLAKE2B 1d5cb823d274e0ca8d15be75a6df149697d81abd5c60a4b7c6335317d77f5a071b917e3322b618924ad792defe3333d38e58fda0195bc0ed79bf72df371171b5 SHA512 9cdc8d0d74162ddd4b90f69a4f558a25845732497ebdb129159fda658a799a949fe237013bf69a2d6a649433254ba2ed4c65f8f10cddd119f713c1d5518ea378
-DIST nnn-3.3.tar.gz 148795 BLAKE2B 71aa01c6882b3ea95331cb97d309218b65b8a1ab515a026a49b90b9dfd3cf5eed9b1337bb1d1d39a4b3f9e21f4d2bc0f24b29c380b8b66a9e9d5e42139bfa387 SHA512 34b772b4a876f7b31fb7badc1d7854faacebf266e4bda29cba0d2ee8e6728b5e7a842a0964a7d28d82d39053c8325dcafe6dafeaae43e7a7cfcc0e5d5dc719e9
-DIST nnn-3.4.tar.gz 194844 BLAKE2B 5b41196af67720a3485bd68b6c08e4ab41e8308d5ed0e279ed4b215acf1cbe0e10ee3a39b47b74115111003ef5a3d9871c71bb54e3778bfbc6597eb7de751deb SHA512 91b19e9a4581c6367b5c90b8294232fb77d86df348a6b4bce0df2336cac14493bf48cad52e02e5b6b0027c2ea14e3b9f15cc70d78abe82687172169b958ca918
-DIST nnn-3.5.tar.gz 205980 BLAKE2B 4c49fb0feb4f04075fd64d0b42643256cceec84185df2fa78d5d1fc04177b446b443ea3843434d844206ebc120820ff97b33f7703a76aed85af044f14f985621 SHA512 87710ca251906d22afc8d329675675c81fdf1d6e71f4f4991ab36868105906b6d45c2c84dd118beafa79644a0677a66bfa346ffe9a4516082d899c5148c5cffd
-DIST nnn-3.6.tar.gz 204688 BLAKE2B 475bd783333bbb55f0c64a3028712792f9376f6a604ba18a7aef3735f1afc5aa91f419f3f41b2c14d525d02fb30db6ca7078fe56f4c7cce2f97c32079be129ea SHA512 e997e2279c495c7235fdfd51ffcc36949686889424686f050329c7f127c62f3ddc807a758ee1b18b00a1884eeaf9f94195d02b2d0e2d76ae1523b8bf2cef1232
 DIST nnn-4.0.tar.gz 214555 BLAKE2B b0490662bad07213ff79b8865b8d9672d1ff98d93e3705e0aa45d103c151274934dc0cff66731f7b157007a81b9dbb5d9f3edb6a17daddcfb265f73b6faa400e SHA512 fde552a31674c9bf50a2e98de4456621bdc97aee36cd5efd7ad0cc33959965d01469fb20b12868ebffd4c8da79990b502e26895cb5b047ac8821e2ca09b0a234
 DIST nnn-4.3.tar.gz 236606 BLAKE2B cec0a73a40fae76e478c3299e2ae8a613c2e1b16e009d4f69cc3c9c9f6ea5df4048fc7f941ae6369293cf56df9b91a496531f4b34bf05f1dbbf8fab9120ffe78 SHA512 588af174d86db14acf5d1e2ac42f88ca5c6f0e105996a58771e7e0f989f224616e7a12d74fecc96540a9782db0cf8857c21bf0f50df4ee3b4b5c641291c64575
 DIST nnn-4.5.tar.gz 242191 BLAKE2B 2a1564520222bc51df64c495ffa7a22fc3200f4572281e4b4e998e999b41c171f4b832502a054741040fa9d87d0da0d0d23949c0d867fc4c2830722045654c3d SHA512 ab64f0e6211b14e90a4632bb0da9a1214635c9a06718c7c434d344d69d1087b4d5d978d44f38c1b03bb555e3055ca5033bcbca40927135757a468e6f1b99046e
-EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
-EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
-EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
-EBUILD nnn-2.2.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
-EBUILD nnn-2.3.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
-EBUILD nnn-2.4.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
-EBUILD nnn-2.5.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
-EBUILD nnn-2.6.ebuild 850 BLAKE2B 7b6263289c1dc43792eb29dc73fedeac07b4e588f1bf859db76865d07a485b57a873630dd2808c3f4185b09de196da72cde083b1a55f1992529c8aa158a04158 SHA512 52ab6fb05dc13ea1379cc75319e2fe7ca35554bb9dd0136305ac7dc3eb2c5a446563bdb054a79838601c169e3b3fc0f46b52b965d7ca5e3e82c355e36e59ed02
-EBUILD nnn-2.7.ebuild 850 BLAKE2B fd14ce9e17a83c505bcfb5a1909e66c18e47a8820c3d09539ac65715b123e15246109d8f159876bc960d334494316b3c85d2bd679ccf4abb50ca0ea897d779da SHA512 928592c3bc539ae2a181d5e5cef191e83d300c24190200cc97dfaded520bba5f1d3dd193d94dcb8733f2b4552cadcb5f2aae50f84a40b3fb0f2b27782b77f3c7
-EBUILD nnn-2.8.1.ebuild 850 BLAKE2B fd14ce9e17a83c505bcfb5a1909e66c18e47a8820c3d09539ac65715b123e15246109d8f159876bc960d334494316b3c85d2bd679ccf4abb50ca0ea897d779da SHA512 928592c3bc539ae2a181d5e5cef191e83d300c24190200cc97dfaded520bba5f1d3dd193d94dcb8733f2b4552cadcb5f2aae50f84a40b3fb0f2b27782b77f3c7
-EBUILD nnn-2.9.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
-EBUILD nnn-3.0.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
-EBUILD nnn-3.1.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
-EBUILD nnn-3.2.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
-EBUILD nnn-3.3.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
-EBUILD nnn-3.4.ebuild 857 BLAKE2B 5d83ed554d1f63667bca5f3bb3d39b06594693bb3a2a59f62e16477ce2f42144e43e8b0f0412fcc7d7f4bf04054e539ce3f86eb791c0ac0f314d4de7fbc83be2 SHA512 01fddb20ef06517970f9af68bf87a2cd79eaaa5da312f6a6f811213ff64a952bae3aeb095150adba3596b2b255d4979c6f43547e891e2d9b4e3338afc3497efc
-EBUILD nnn-3.5.ebuild 857 BLAKE2B 5d83ed554d1f63667bca5f3bb3d39b06594693bb3a2a59f62e16477ce2f42144e43e8b0f0412fcc7d7f4bf04054e539ce3f86eb791c0ac0f314d4de7fbc83be2 SHA512 01fddb20ef06517970f9af68bf87a2cd79eaaa5da312f6a6f811213ff64a952bae3aeb095150adba3596b2b255d4979c6f43547e891e2d9b4e3338afc3497efc
-EBUILD nnn-3.6.ebuild 1050 BLAKE2B ab4ac86b9c72e0bbb44b3e08ad26b6953bdef7272387cd58019806c4e722a210c19c8afa504b7753fa4905dba70b4bdcf59bb92746a73d515e63de1f76d8c5ba SHA512 8200e20e253a0970859fa53451f7e811fe7dbe8e7d2bf2631e81e58aff97271c325ce36bf1acc62542d96e2baf3fe26a628702516140dce94935e7303ff9e4c6
 EBUILD nnn-4.0.ebuild 1050 BLAKE2B ab4ac86b9c72e0bbb44b3e08ad26b6953bdef7272387cd58019806c4e722a210c19c8afa504b7753fa4905dba70b4bdcf59bb92746a73d515e63de1f76d8c5ba SHA512 8200e20e253a0970859fa53451f7e811fe7dbe8e7d2bf2631e81e58aff97271c325ce36bf1acc62542d96e2baf3fe26a628702516140dce94935e7303ff9e4c6
 EBUILD nnn-4.3.ebuild 1050 BLAKE2B f4c3accb8482ebec73a9af0768c20208866f527d4262e8a9127d03b1be42175dfb542ffdb1fc7e67908a57c700912532912029f332562cdc676bb1554d401a4d SHA512 db2c9a11d2a7e6d1fcdbf30e1aa948f180ab48b61d68cfc76f2ae6841b5c44953083fed8dfed7f53fb5c1a709e7f28ec732f7ce4e2b228480c16151c7ca8ac1b
-EBUILD nnn-4.5.ebuild 1050 BLAKE2B fa98a38f462e4f72947e174cafa7aaada7377e9a54d862f76f66bef59aee3f8c6ae5f3057e8aec217f2319e8f665e1b9b8ce0d18f6614cc8dca3ff80612649a3 SHA512 c896f5c94b18cd19d998fe804365ca3391ccbd3ebff1be73c1feac1b5bdc2a47011814f233fdffa89af740580f1eb7254968bbe8bab28afbab68e2c697eb64dc
+EBUILD nnn-4.5.ebuild 1142 BLAKE2B dcb84476bba7d2a15e85ecde4b8690c8044c6166f5d492c2a735994fba8a345f6ad8bcbce0cc666139e9ab89655bf5a131f50b4ff74410c58dcf98e1fc50c60b SHA512 7fe598b02ee9188472aecfc3ff8ff896d9354cc57c563f17a7f8b77244d65ed7886d334a63c81c3c5ff22334eafdc3dc515d789d365e5cc7d386d7331a4f83b7
 MISC metadata.xml 244 BLAKE2B 94b04f9b5ade506f66b25651b1fdabfaf11febaff3175956406893e90548e87145186ef43a617e24803bd22d9da3f90ea8d72cfea7847aea521974b3138e92ad SHA512 20225e64357a690e86df86aa4d784300459d28b775e3989f77fd31e752ef968de63e41b59bb3c78b331e817f9eceab6dd6ef01131451753a1b5d3a309770611a
diff --git a/app-misc/nnn/nnn-1.9.ebuild b/app-misc/nnn/nnn-1.9.ebuild
deleted file mode 100644
index 1f92d72054e7..000000000000
--- a/app-misc/nnn/nnn-1.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins scripts/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins scripts/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-2.0.ebuild b/app-misc/nnn/nnn-2.0.ebuild
deleted file mode 100644
index 4d054798eaa7..000000000000
--- a/app-misc/nnn/nnn-2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins scripts/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins scripts/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-2.1.ebuild b/app-misc/nnn/nnn-2.1.ebuild
deleted file mode 100644
index 4d054798eaa7..000000000000
--- a/app-misc/nnn/nnn-2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins scripts/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins scripts/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-2.2.ebuild b/app-misc/nnn/nnn-2.2.ebuild
deleted file mode 100644
index 8caa1e33b705..000000000000
--- a/app-misc/nnn/nnn-2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins scripts/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins scripts/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-2.3.ebuild b/app-misc/nnn/nnn-2.3.ebuild
deleted file mode 100644
index 8caa1e33b705..000000000000
--- a/app-misc/nnn/nnn-2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins scripts/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins scripts/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-2.4.ebuild b/app-misc/nnn/nnn-2.4.ebuild
deleted file mode 100644
index 8caa1e33b705..000000000000
--- a/app-misc/nnn/nnn-2.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins scripts/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins scripts/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-2.5.ebuild b/app-misc/nnn/nnn-2.5.ebuild
deleted file mode 100644
index 8caa1e33b705..000000000000
--- a/app-misc/nnn/nnn-2.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins scripts/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins scripts/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-2.6.ebuild b/app-misc/nnn/nnn-2.6.ebuild
deleted file mode 100644
index 469c9e951d71..000000000000
--- a/app-misc/nnn/nnn-2.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins misc/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins misc/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-2.7.ebuild b/app-misc/nnn/nnn-2.7.ebuild
deleted file mode 100644
index 6ca9e1095ee0..000000000000
--- a/app-misc/nnn/nnn-2.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins misc/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins misc/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-2.8.1.ebuild b/app-misc/nnn/nnn-2.8.1.ebuild
deleted file mode 100644
index 6ca9e1095ee0..000000000000
--- a/app-misc/nnn/nnn-2.8.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins misc/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins misc/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-2.9.ebuild b/app-misc/nnn/nnn-2.9.ebuild
deleted file mode 100644
index 88ef20531476..000000000000
--- a/app-misc/nnn/nnn-2.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins misc/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins misc/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-3.0.ebuild b/app-misc/nnn/nnn-3.0.ebuild
deleted file mode 100644
index 88ef20531476..000000000000
--- a/app-misc/nnn/nnn-3.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins misc/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins misc/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-3.1.ebuild b/app-misc/nnn/nnn-3.1.ebuild
deleted file mode 100644
index 88ef20531476..000000000000
--- a/app-misc/nnn/nnn-3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins misc/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins misc/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-3.2.ebuild b/app-misc/nnn/nnn-3.2.ebuild
deleted file mode 100644
index 88ef20531476..000000000000
--- a/app-misc/nnn/nnn-3.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins misc/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins misc/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-3.3.ebuild b/app-misc/nnn/nnn-3.3.ebuild
deleted file mode 100644
index 88ef20531476..000000000000
--- a/app-misc/nnn/nnn-3.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins misc/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins misc/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-3.4.ebuild b/app-misc/nnn/nnn-3.4.ebuild
deleted file mode 100644
index bf0ab9b6eb44..000000000000
--- a/app-misc/nnn/nnn-3.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins misc/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins misc/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-3.5.ebuild b/app-misc/nnn/nnn-3.5.ebuild
deleted file mode 100644
index bf0ab9b6eb44..000000000000
--- a/app-misc/nnn/nnn-3.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/strip/d' Makefile || die "sed failed"
-
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins misc/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins misc/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
diff --git a/app-misc/nnn/nnn-3.6.ebuild b/app-misc/nnn/nnn-3.6.ebuild
deleted file mode 100644
index 0bd65a6f5bf1..000000000000
--- a/app-misc/nnn/nnn-3.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="The missing terminal file browser for X"
-HOMEPAGE="https://github.com/jarun/nnn"
-SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	tc-export CC
-	sed -i -e '/install: all/install:/' Makefile || die "sed failed"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install-desktop
-
-	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins misc/auto-completion/fish/nnn.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins misc/auto-completion/zsh/_nnn
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-misc/nnn/nnn-4.5.ebuild b/app-misc/nnn/nnn-4.5.ebuild
index 57340dc98f35..dbb2eb13d5a1 100644
--- a/app-misc/nnn/nnn-4.5.ebuild
+++ b/app-misc/nnn/nnn-4.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit bash-completion-r1 toolchain-funcs xdg-utils
+inherit bash-completion-r1 flag-o-matic toolchain-funcs xdg-utils
 
 DESCRIPTION="The missing terminal file browser for X"
 HOMEPAGE="https://github.com/jarun/nnn"
@@ -13,13 +13,15 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
-DEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0="
+DEPEND="sys-libs/ncurses:=
+	sys-libs/readline:=
+	elibc_musl? ( sys-libs/fts-standalone )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
 	tc-export CC
+	use elibc_musl && append-flags "-lfts"
 	sed -i -e '/install: all/install:/' Makefile || die "sed failed"
 }
 
diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index cc21d5672fc3..ef8b1f1a63f2 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,3 +1,4 @@
 DIST pdfpc-4.5.0.tar.gz 7754665 BLAKE2B 952a1694811ff80ab6b2e46b440182407ce16a727ebc1f1492cf1f86c25fe1827e926eb5baf59376f46b8e7bea6e00e4f1343930cd043445f7d2966a958b4a6c SHA512 142a276dc410bd1aac90b27d1b10d165de225d5cec73ab39d7f7061e5d8ac7526e3f537b61f15e904bba8d135a72c5567dfa350e454006435ad3647d22c58221
+EBUILD pdfpc-4.5.0-r1.ebuild 1588 BLAKE2B 2511f3c16aff221f4c9fb51a5de92fc94a67eeab054ebfddf857113196b2546387f85153a5c507e5c5d5c1d52baedd25399662b153fc65a7c87506fdd4fde992 SHA512 192387afea23feb5ed51c7c1a55484c02309c793fbbb11d7a61a38f772491157035be5f0a6ac82af84d2a2b4da1d0f86e64bcb8917f1745c4375404eeb8719c5
 EBUILD pdfpc-4.5.0.ebuild 1595 BLAKE2B 4d10a085070e01ced31dd0415f7af315f7694b5292243191ddd9c2355d8ea08f2310d65ea6ff8ac44aacd763829a0f30525f6e6e00f97ea27e3e217a7a8ff1df SHA512 4e5f7f6a61205d3bcfb8de2153fc13936ef5c0e0e74af0125e21c1e6383c9e61224b003f5c7965794fb9dcce6f42ec26994e86e11ed7be43a9c11ae1bc633723
 MISC metadata.xml 291 BLAKE2B 270a4048fd986dea045aa9de37187a68f155d632d903fcb1b5c306a9f039ff0ba581b09f387356e9346e11265ade120b48635e90adfb764edae6f3b70e976fce SHA512 47e9b6e188d9f3227c61d3950c50ffe22850e16024b69ffd138514109f140ef3557156b2935483f4a688e80712a6af182378283857a7b1d81446de339639f9db
diff --git a/app-misc/pdfpc/pdfpc-4.5.0-r1.ebuild b/app-misc/pdfpc/pdfpc-4.5.0-r1.ebuild
new file mode 100644
index 000000000000..19911fdc5956
--- /dev/null
+++ b/app-misc/pdfpc/pdfpc-4.5.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_MIN_API_VERSION="0.50"
+VALA_MAX_API_VERSION="0.56" # append versions in sed line if increased
+
+#COMMIT_ID=""
+
+inherit cmake vala
+
+DESCRIPTION="Presenter console with multi-monitor support for PDF files"
+HOMEPAGE="https://pdfpc.github.io https://github.com/pdfpc/pdfpc"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]]; then
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gstreamer"
+
+RDEPEND="
+	app-text/discount
+	app-text/poppler:=[cairo]
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8=
+	gnome-base/librsvg
+	net-libs/webkit-gtk:4=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/pango
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-plugins/gst-plugins-gtk:1.0=
+		media-plugins/gst-plugins-cairo:1.0=
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="$(vala_depend)"
+
+DOCS=(
+	CHANGELOG.rst
+	FAQ.rst
+	README.rst
+	SUPPORT.rst
+)
+
+src_prepare() {
+	cmake_src_prepare
+	vala_setup
+	sed -i -e "/find_program/s/valac/& &-0.56 &-0.54 &-0.52 &-0.50/" \
+		cmake/vala/FindVala.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMOVIES=$(usex gstreamer on off)
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+	)
+	cmake_src_configure
+}
diff --git a/app-misc/scrub/Manifest b/app-misc/scrub/Manifest
index e1bf364184b2..ae509a6d373f 100644
--- a/app-misc/scrub/Manifest
+++ b/app-misc/scrub/Manifest
@@ -1,3 +1,3 @@
 DIST scrub-2.6.1.tar.gz 362536 BLAKE2B 5342f0b6ffc361e7f581f80f5fd721cd7ed0ccab4591a0c1442476847a51182d869794e5543b06af9f834ebf87ab963c7ce771a6aceef6983c91e814ab86b4fd SHA512 6e434b9d81c5ac473188c37af790c808771204203b3f04a5ca316c6a890f872d1beb73ce4713546e14ae91287d7adaf2fbfa44a30af634c2b3af890e2a0e8640
-EBUILD scrub-2.6.1.ebuild 392 BLAKE2B 8040da0ad38e3da3985eaa7c9641b35596b19303859ba9795a41c34322a5d8026dccac3ffd92b0c76e565d3607a0bcd8479c15785fe8aab4ac60498ce9172dc9 SHA512 79d0feb3eee6d81daa07f2c4a2c3eaff9a1f17c43edfd46a950c9132daa0c3b59c217a4f193f89b3580324bda8eade97c2349fd08dd0ff374e494b9cbd201156
+EBUILD scrub-2.6.1.ebuild 397 BLAKE2B ed880d7b83b0e71346cecaea24edc4ae795918bf1d990cc57602179c18db28f7ccaabe2e3722bf73d817c51cb3e04f0356216edde8c13e1c994ab5df603fc9d1 SHA512 9b6b275fb38e9de843335f27d8fb41cb07ba67f38fef39c64ac8f99ce0c6d51fc5410e1a24cf51295cb17af8523b4ddfe024f2f0040222532f79751c9567d153
 MISC metadata.xml 428 BLAKE2B 3b0dafd4c5c4c5f8b1f630ae20e6a33f1858e1465e20c920487fb1ade63de415787ac2e405cc1652c21508bb012a0333e810cb58d7610f02a684fcf1794e9915 SHA512 5868d55250b339a6cf8835f95efc6dbbcad2ee323415a910d78f261964ab3968708841f5ee9a649493c7e8446560037d0516e0c109a86b89ad943c404eaf3b62
diff --git a/app-misc/scrub/scrub-2.6.1.ebuild b/app-misc/scrub/scrub-2.6.1.ebuild
index 32311ea10b7d..547ab898ec2f 100644
--- a/app-misc/scrub/scrub-2.6.1.ebuild
+++ b/app-misc/scrub/scrub-2.6.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/chaos/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 3464f324c83f..7b81a103ee1b 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/kalendar/Manifest b/app-office/kalendar/Manifest
index 8910a5d555ec..b46768fbda9e 100644
--- a/app-office/kalendar/Manifest
+++ b/app-office/kalendar/Manifest
@@ -1,3 +1,3 @@
 DIST kalendar-22.04.2.tar.xz 259152 BLAKE2B 296ccfe705f4eff4e9969b07a34f4d04a9ed9a924869d58c22c42540aba2f85f1b2b0df8d5a01d581e6582f659db7e4375e5ef0557a6c5e619a38b216feb5211 SHA512 641636f97d7c6d3aa5ac9526e5fc6ac844b2ab4eee41fecc919150553c91e5a352da0b494d074f686850ee85512644b78b17e603bc3f914c005d576f571d7d61
-EBUILD kalendar-22.04.2.ebuild 1464 BLAKE2B c2151573f2c10f6c3ce002bcc1230a977536d41b5be5fe8b0f701b78319c1a6fc875219dff54c6f81e8f7a59bd89d8722d153ebab4c3a15c4a7b1c1276d590b5 SHA512 a405df58534b7198b30f7a0ccb7441a3d8dd12e53a252b2db529c07ffebad9cb09e9c96fab208c6a2a786671a3893e16c02719a064ed8f6c86ef438772b36e9b
+EBUILD kalendar-22.04.2.ebuild 1471 BLAKE2B 12e242fb0846411176b5f201468c3098b480b4eaf600d7252fad4bc08de3d850d368152f8f3fa0e266bb69c62fc019dcbd542ac2ddaed3c1a17530185f77a598 SHA512 9f9988bcb314a911b7f58fa1217705e7fa94a79f812d078a3ef2a895aea43c7ef3f219963861e91666672633526a91c984bd4e58d0831406193167585dd89783
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-office/kalendar/kalendar-22.04.2.ebuild b/app-office/kalendar/kalendar-22.04.2.ebuild
index 4935eb96b902..bd7d0c1c4f7e 100644
--- a/app-office/kalendar/kalendar-22.04.2.ebuild
+++ b/app-office/kalendar/kalendar-22.04.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/kalendar/"
 
 LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 # All of the tests involve interacting with akonadi right now (as of 22.04)
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index adfc08f385e6..609405e1bf26 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 1542fc3fddbf..ec2cf339a1cb 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,10 +1,4 @@
 AUX implementations.txt 868 BLAKE2B d7319947a1e548f877a3fd2799cb9f5387d8c6d6787073edcc4763a15220c5dec2fcad48f81de0505569615dd5b67541a330044af61e4035cd4a697e4b989d46 SHA512 ff34a2a4c31799c21e1eb9001da8be85bd84b1e956e1905271b8c9e4b1e44cd9703b72dccf665c1122cd706da5e0b65e9ce409227f39c53d61cb24a2f1e17cd8
-DIST gpyutils-0.6.1.tar.gz 23914 BLAKE2B 1e799ce33a949037b68262cb7a6ca5fd99b4ca4ec74c3044bfb31ea08b59906a21f6c96cdf99330f6af16d68be6ee7ab49c3cf05979691899abaacc9d62032eb SHA512 74d984e496ccfa7124cfefd9f8f79d5fab4bb4dbf5e61f4400b39367dd54e23b871f286eef28007a5c255b862533a34948449bbf7aed55cf8fe315e76ac876ea
-DIST gpyutils-0.7.1.tar.gz 18464 BLAKE2B 6f19aeddbae7b64a3f523b7bbad45ddeef6ba22b6261fd0bf6ac280f962de338a3ba4da509685c5ce665d96b9d25e1175d65c0229f9b901924d7848010b0363d SHA512 46b60c52996c39139e51241abf08034c1fe16189df9d37a9517a1ccd22410bf7646c274a875a576d703973d2ae5846b26799a1ab0adbc22e363d8de32424362e
-DIST gpyutils-0.8.1.gh.tar.gz 19750 BLAKE2B 90d4b917765bf138ebbe09cc0640996d88bc3092ec2e78e07408f8b13363089141f25d12f84a7a519982f7327e2d6c52913376df7da5f2900b364a0c135cf822 SHA512 43a4c6411d881f2b7a35a6370c73676bb5c33fb2c9c47d2e5cdd9778034c142babe3f86d12efd8491930ce5bab04b73eb65560f8808d3b6ba39258b11bcb2b3d
 DIST gpyutils-0.8.2.gh.tar.gz 20247 BLAKE2B acbde89975e233ebd7d7dcaba629d35c09a9064be48ae1d529e9f5f814b9486e9a208506ff194894dcf827069cf24faa81efa14258866fb32cf5946dafadaf6f SHA512 932500c730635ed1f8f529012f7c65c48385d92db4a673abc0145fdbb14edf8c8b5a5ed4a4c7f892e7df310b92cd8fa0532af95340096f2bd4ef7047d6b6163b
-EBUILD gpyutils-0.6.1.ebuild 533 BLAKE2B ea2261a01292c724986700c55c155ee2fa725590b949863a138d1ea30a34d531c176bfd8349a695833fd42d9f6654ec164da8896a3963594b582767e756951aa SHA512 d57486c1ef169e2e15e58d8457e0e1871fc8ce6e9d12a62f74ab252d68e31253bf78e95c57b911950b4acc16bace02b42a2f21855436f8e05d79fa88cf44f81d
-EBUILD gpyutils-0.7.1.ebuild 627 BLAKE2B 69f921c66f5ef45d6598e835f36f3d737bb2224d66a0b252df32317705e139b9f96f25167cf2fb3c7ded89e9154308803fb645405481d18e07192e2d45b42190 SHA512 de973565dff80898baa03e362d9f2881f20af9dbd81d4f5ebac59cc4017a72eb1fb4e194d89aadf5f8ffe2891bb808e336cda4caf40008cfdbcc404f7ecf9d2e
-EBUILD gpyutils-0.8.1.ebuild 575 BLAKE2B 4bb7294fa54083c6d35e3011d7153d2252232e141c0c999617fe37301b34cfedc073f49d3fa983e141da73fbb657c32f6a9aaea165c61d0a7166d32efcdfb304 SHA512 10026a4726aa59d16de842063099a06c976f217669707e439e041b795265500cd0ffddfdeacfe3ed3198fc60124a91a0749668dfbbde37cfde6baccbff3094f1
-EBUILD gpyutils-0.8.2.ebuild 575 BLAKE2B 4bb7294fa54083c6d35e3011d7153d2252232e141c0c999617fe37301b34cfedc073f49d3fa983e141da73fbb657c32f6a9aaea165c61d0a7166d32efcdfb304 SHA512 10026a4726aa59d16de842063099a06c976f217669707e439e041b795265500cd0ffddfdeacfe3ed3198fc60124a91a0749668dfbbde37cfde6baccbff3094f1
+EBUILD gpyutils-0.8.2.ebuild 573 BLAKE2B 26a82edd9df60a4e93b4b778b74bb4df232a3943fb900699b3a20de252fe6cb2bb95e6261671f68a16ccf851450bf710e896687f04f41aec55f2c16ad547bed8 SHA512 13f4a6aae13f88f878548b9f3336ee89a298459af38ab08114a3d83c9cf272753915b7dc9e90666da63fc276b911678649d7c9e04c2d59fb09911f74d6678b59
 MISC metadata.xml 601 BLAKE2B 55e9b56b636971035d53b432dcdc5100127f286512a3d2c7568baf91970656803db20ec62ae8161fc2dfb0c27343ed8d869c73d71f0889860d4b648faaa9a96e SHA512 7f7e83d43dbe3fe944178e1547737973ff2012510aca40a8f30b9a081db894d23ad0126047f418f9fbe7748a8ea6133487af07e2f0f26ba5d04fe6a918853820
diff --git a/app-portage/gpyutils/gpyutils-0.6.1.ebuild b/app-portage/gpyutils/gpyutils-0.6.1.ebuild
deleted file mode 100644
index caf527892cce..000000000000
--- a/app-portage/gpyutils/gpyutils-0.6.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
-SRC_URI="
-	https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gpyutils/gpyutils-0.7.1.ebuild b/app-portage/gpyutils/gpyutils-0.7.1.ebuild
deleted file mode 100644
index ffc17d681522..000000000000
--- a/app-portage/gpyutils/gpyutils-0.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="
-	https://github.com/mgorny/gpyutils/
-	https://pypi.org/project/gpyutils/
-"
-SRC_URI="
-	https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest --doctest-modules gpyutils
-}
diff --git a/app-portage/gpyutils/gpyutils-0.8.1.ebuild b/app-portage/gpyutils/gpyutils-0.8.1.ebuild
deleted file mode 100644
index 7981acdda5c2..000000000000
--- a/app-portage/gpyutils/gpyutils-0.8.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="
-	https://github.com/mgorny/gpyutils/
-	https://pypi.org/project/gpyutils/
-"
-SRC_URI="
-	https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/app-portage/gpyutils/gpyutils-0.8.2.ebuild b/app-portage/gpyutils/gpyutils-0.8.2.ebuild
index 7981acdda5c2..d3a036a6fda0 100644
--- a/app-portage/gpyutils/gpyutils-0.8.2.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.8.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 71979a8a52ca..852d957a1b4b 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,6 +1,8 @@
 AUX iwdevtools-0.10.1-diff-off-by-one.patch 674 BLAKE2B dd43504fb924a4a4300d93af80c704a043ed5c5819bad64394bae1c52ba9c5f3b09bcc520798369bfac591a1233a1689d6845e5951285af19c40dafb7ea46264 SHA512 80029ec4559b2dd067e99eb0aeab6c366563fcefb6215d9e8df24e4b435e888d735b0675e34e63a2c9bb7e80958b4c4b11e31d8f855aaec436e47dd8b373a8e2
 AUX iwdevtools-0.10.1-ldpath-regression.patch 840 BLAKE2B 9276d0c413bd377bc97856653eb1e8037a6a41efda68d287d91ffa19c30d986106af2ca862cb9372e6a0a80caf073b371e73058d57653405f7147e8e34ef7322 SHA512 26f58b46f70d9646bcb7f6f5e4279cb1be73b5b12cb0a47bc0411ec076ba822df2e212a7756505845e005e138b1b9989073d4c842f710d53d200715a72b20e03
 DIST iwdevtools-0.10.1.tar.gz 61117 BLAKE2B fd5508a40a854987db7f2ecc0e68e100cd6a8b6cc5b90a9901bbf6c16336ebc497861e05a6c1683ac9082aa9f12a03cb47f7116da793fbd8e105ed78aae2bbb3 SHA512 0f04850f15edc8af368a87bbc665c62d5588f4220c2d15ca5c0dd00d2c8135f7e1294217c8aec313650b7b7aae6433b87bdc32306c2c4c6e6747e55a13adbbe0
+DIST iwdevtools-0.11.0.tar.gz 81975 BLAKE2B 241c04488cc3da265c1c5a0cbf90ddb938b4e0da10942094f25dcb1d32a0da314a80fba1fc99b1ec54a449905be8eddab896d67194d8e511c1a7378856fd7df2 SHA512 cccbe9461f27233e228529a5fe9c729620647b1e134c723f407bdd23b4fa85f04c6294fc6579a22667dec65b20ad1c26ac9d71b214407c49463aeed6fbaed7d1
 EBUILD iwdevtools-0.10.1-r2.ebuild 1941 BLAKE2B 2f8bb7e3e85bdd622b2cec6b86c8a2ca5f575b0d6a27cae516ce188df5f06e49d0264874271c4ba792feb2173db9239ed77a034e33b6e4323490401daadee9ee SHA512 ad94f0baf09bd0d01bc5478bbfc6a5596cbe3c7839f9d83920b5d34db3bbca5c2c4d1b026940e266357ec7faf33f78377cce9b801bc6cd5c40620b5ebdd8572b
+EBUILD iwdevtools-0.11.0.ebuild 1892 BLAKE2B 199e7b292e2f6afc3526fb223856f3b5f0922f1ca11a51ee2cc336406e028a778361c170e38b60cd5f873e30149d2b5087d06f845204087d22f356ce601c6622 SHA512 c50c52a5c7ed22a0fa724364a7c9bb102ba9e66b04226d882c585b8581966b8fefdcef63fa896d196b45e081284303f348ae162a895771002180f787611274d3
 EBUILD iwdevtools-9999.ebuild 1806 BLAKE2B 90e7cd55d1f57c126a6c59489b4bfacf39266a48875370659693efcdd90fef644bbc21e67ecb21c665000139b28008c3d0979796b7f2f2312ca2deebb3860250 SHA512 56e8546414c77b124a5da1b334833384bf2e78adfc385918f6a05a336d1a22cae705d3e526846b8e7a483f929fb9327288d9527c9c157a607a69c362743d9d11
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/iwdevtools-0.11.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.11.0.ebuild
new file mode 100644
index 000000000000..c5565f4af071
--- /dev/null
+++ b/app-portage/iwdevtools/iwdevtools-0.11.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature
+
+DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
+HOMEPAGE="https://github.com/ionenwks/iwdevtools"
+SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/pax-utils
+	app-portage/portage-utils
+	>=app-shells/bash-5.1
+	dev-libs/libxml2:2
+	sys-apps/diffutils
+	sys-apps/file
+	sys-apps/portage
+	|| ( sys-apps/util-linux app-misc/getopt )"
+BDEPEND="
+	sys-apps/help2man
+	|| ( sys-apps/util-linux app-misc/getopt )
+	test? ( ${RDEPEND} )"
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir=${PF}
+		-Deprefix="${EPREFIX}"
+		-Dshellcheck=false
+		$(meson_use test)
+	)
+
+	has_version sys-apps/util-linux || emesonargs+=( -Dgetopt=getopt-long )
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Optional portage integration relies on using /etc/portage/bashrc."
+		elog "The example bashrc can be used as-is if not already using one:"
+		elog
+		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+		elog
+		elog "Otherwise, inspect the tools' --help output and the example to integrate"
+		elog "(if not defining the same phase functions, the example can be sourced)."
+		elog
+		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
+		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
+		elog
+		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
+		elog
+		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
+	fi
+}
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index 986c320ca25b..274b9f8b9be9 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,5 +1,7 @@
 DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf3fab3dbd478b02129dbe71f2d09445efa9b82792e3e654725c5e87a4ca00d37a3d924f8bd6f2decdf74148d1069c8 SHA512 ff2b88bf568f79182275e2c85cafbeee7cbeb0226225a7c3289f0a1d7a8b5eae9d41c69b099bb7e0cc9b0300b23afea43c3ac1baa13f37c696159bb1b3ac05f8
+DIST mirrorselect-2.3.0.tar.gz 18039 BLAKE2B eebc4a02257b734c3dfd05cee541369689b92548b5421e977dd451442e8c83e426a03845a46e92eaa01507e0cba2b3679c97db2c00f012619cf9f551cfa1e1af SHA512 fc040bf6a9cc79f781157c7b65c6366c86dd54d583b4286845e3d037a2709c376e9132889e9dbe2cd40846cd7bd138aae7111d1a442a421101db756cc259b535
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
 EBUILD mirrorselect-2.2.6-r2.ebuild 1507 BLAKE2B 91374318bbdfb338811209f38db391a0d629af3157f65bde835d7f7844a4afbfed3346e04d8a39ea43d5ce21643424d0bdb78d2671e6ed70e4b3d6d89551e5c1 SHA512 87a34ec1476748a68df5b10fbc3e241ec39740566a0f52af3169265c2d6b7e71720edfc38543a8f52ebe1eb880e0049d9ae53574d8e04c892477681481367db9
+EBUILD mirrorselect-2.3.0.ebuild 1112 BLAKE2B f58b41ab17f42d95f9d923fe208c9f4424b53a8eaac8e55a0425a95f2835ca655ffed10643415a3ab870e189e90dfa80a5b9927881c791f396a7f90e19b1b219 SHA512 81b016ac837bac72e5c09ad83ceff233ac5c9e3de6e74850c63e6e397b3156dcf47cea2aab431e00f7eb3d6618525db329dfd6884859f5de4cd60f070df1e5a2
 EBUILD mirrorselect-9999.ebuild 1153 BLAKE2B ca42aec3a908267d192e7b74a82e3ae17fe254c1f9a3070273ae625c3398dd0bcecbe9abc79915f2137ff3fb213c8056fab579ffbb3b7139e232c8a2c8e03e7d SHA512 6def50cf976060cf3329fae96fc906f9322313b3a31d83854857ffa895aaffa193a9aa6a457135336657839e245378905b055506d3d48438bd9edfe890f1604f
 MISC metadata.xml 495 BLAKE2B ebc7faf279e0a14f107411622bb0855c36c2229ed8357d7abea7cc7ea6e49a7ae7d136d476c33c02da46bb93614adadf87d6b6e19d1698d14c78942f9eace139 SHA512 5e8f9c4e185318f2de112e02c2c15662553ccae75f35a14023eac9e55ade710a45f0f6b78d98c899fa7604043e28f0ec2109889459aca46b3708c97c444d858d
diff --git a/app-portage/mirrorselect/mirrorselect-2.3.0.ebuild b/app-portage/mirrorselect/mirrorselect-2.3.0.ebuild
new file mode 100644
index 000000000000..140f530d2904
--- /dev/null
+++ b/app-portage/mirrorselect/mirrorselect-2.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Mirrorselect"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
+	https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="ipv6"
+
+RDEPEND="
+	dev-util/dialog
+	>=net-analyzer/netselect-0.4[ipv6(+)?]
+	>=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	python_setup
+	eprefixify setup.py mirrorselect/main.py
+	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test || die "tests failed under ${EPYTHON}"
+}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index a77a967c61a7..5cb89111be6b 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/starship/Manifest b/app-shells/starship/Manifest
index dae19084c51e..3eff7f612e43 100644
--- a/app-shells/starship/Manifest
+++ b/app-shells/starship/Manifest
@@ -417,5 +417,5 @@ DIST zvariant_derive-3.1.2.crate 10123 BLAKE2B ff3efe92c18652d479740de238621801f
 EBUILD starship-1.3.0.ebuild 5361 BLAKE2B 39e640395a1ec3e27ed6038d757fd1df90f1e9d6bb19bb0c5328caeba9fde020b8d110ad3ce4984789b54885db8cc7dcdfd22e5a8d964e16992292e85fcbb706 SHA512 dbbe2d6ca80e7228a3e73d6ab7a90edc20bdb8ebf397c0e60cdf1942e37cc1b21885e94e05ff4c6647a0124ec2312a150ebd5dee104d8602789b3c933d2e76c6
 EBUILD starship-1.4.2.ebuild 5375 BLAKE2B 58d2b1e4de0a063c70dd6cf8424d480a88fc16845e463f186a81bf1592a783fb346e13ec3ab5a9d23a74c8bea6f0191d5b217ee22e90962f20ba97e8dc1a3c18 SHA512 ebcfd8bc3b6aadd7bcdb7010bb66ae6fe0b328a9002b3488418c7ae2a857962b773757a8b1bd9c9252ac480cb8dd737aad670544c9852c08050b955f5b767689
 EBUILD starship-1.5.4.ebuild 5270 BLAKE2B f5472ac3eeb614b238cf2a44010cd69951b34076f09587b709f119c0d8f0d917802f8f9c1b082c2c2e6dca20af4f6998b2760d18df73061b4e4ab399f24b1361 SHA512 f7d6fd6538afe3c0c76ad7d345ccbce74d283497066baf01b866cae3502b0b6ef96c00679071cd597c9e01b586801f683ea4487de9797e4f4b9d0454aa9c3d90
-EBUILD starship-1.6.3.ebuild 6055 BLAKE2B df8315299774c3ca72118ad7760029dd85c1fd2941204214e9d02faeedc35ebbe5e9cd5bbc272fb7d7c3456b45ab6a675646c14c2d58622206221a5e08199d28 SHA512 6e13e33c15bb0865f89a44746e79064c9874451ecf52f796f51d0c8cc1a468c14c43eb92cb1770c1d794ef51eb2c397a6fca19084eab81b9d08cdbebfc03b84e
+EBUILD starship-1.6.3.ebuild 6054 BLAKE2B 8d2259d06fed9c425185a709f6d5312c8263ada2e2868e54b0baf142bf0f95ce888d37c6fb7822770e9c9d1bf893dce236894c24c403396bc4f7669ed098a44a SHA512 ab6092104fee2de4424b418ef26a5077095f090ceeb0cc4042c6497fef5cee5768410fea4ed13fbff3f33cdf4e973bdafbb36ce7a108143045f1172be2c2d9a4
 MISC metadata.xml 738 BLAKE2B 84ca83a5db6b67fe44f8a192499231851af9b7a7d1d279d4a2660147bee375332e3818633c310a0d9848e714e326e8fe6fe2c2dc7a8e99dd643a637bc46efb71 SHA512 f9ce6f2d5d4fc1cffc524ee25df289e33574a98b32b35ab7221e9ea193835ca6038c87093218d0a5ccb43fbb28e524535b8280491da8e72d88d1f1a96b3c7bb2
diff --git a/app-shells/starship/starship-1.6.3.ebuild b/app-shells/starship/starship-1.6.3.ebuild
index 8c769e1c1ef6..ae3c020e1ac1 100644
--- a/app-shells/starship/starship-1.6.3.ebuild
+++ b/app-shells/starship/starship-1.6.3.ebuild
@@ -309,7 +309,7 @@ LICENSE="
 	WTFPL-2
 "
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND=">=virtual/rust-1.59"
 DEPEND=">=dev-libs/libgit2-1.2.0:="
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index d6a3639c9f49..aa6f05819a72 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 1066234b9b30..44e2a922bf02 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
-EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2341 BLAKE2B 6b650cd47b119613e244addf3cee71c50f4c90d4c4bee724a04f0393c55621eb8c805964147aa17f504cc7237f92111f7adeeb514e10ef91ffcc10ec11cbaf5b SHA512 95c5129e7bb5fc413176f00ea8451a9cebf0d52c44c353bcf00e00880df77d9eb7aa3eb2e1b758cbf125e5e8352bb5312fbf458a80ea9dd1547096bae1d0fb9f
+EBUILD docbook-xsl-stylesheets-1.79.1-r3.ebuild 2251 BLAKE2B 66f47268adea4ed47b73e211a38447b441723367f85ae93c11bf1803089f199f92f841d51e4c8ac2d549b422c6990d11cdc283d6ef3c9d3dc05f66b94dc7506d SHA512 52f1925aeee4d249235a9866840d4baf4638e4385e818ca22796be1b90f3f1a4af8c3e9b476bc6cc0fafabecc2105430357127be32e49f9f657f7df16831a393
 MISC metadata.xml 414 BLAKE2B f10f5576731ded90514b956bb032bf6472634a509e709e998b0120ced275cea6d7027b18623b8f7d8198b6137a9566eab1b0462626a20693655c791b9763952e SHA512 f844b8d60c1c3413b8eb647bdffba6fb08e09e7f62df9e122ad6d69f9f67ec67711a66ec840f1ef92edefef83bd5e77103a10b0feeeb4a08f98680274c3dd93a
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r3.ebuild
similarity index 81%
rename from app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
rename to app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r3.ebuild
index ba35adf04592..82ed385947cd 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
+EAPI=8
 
+USE_RUBY="ruby26 ruby27"
 inherit ruby-single
 
 DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
@@ -13,22 +13,20 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="XSL Stylesheets for Docbook"
 HOMEPAGE="https://github.com/docbook/wiki/wiki"
 SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 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="ruby"
+# Makefile is broken since 1.76.0
+RESTRICT="test"
 
 RDEPEND="
 	>=app-text/build-docbook-catalog-1.1
 	ruby? ( ${RUBY_DEPS} )
 "
 
-S="${WORKDIR}/${MY_P}"
-
-# Makefile is broken since 1.76.0
-RESTRICT=test
-
 PATCHES=(
 	"${FILESDIR}"/nonrecursive-string-subst.patch
 )
@@ -66,30 +64,25 @@ src_install() {
 	for i in */; do
 		i=${i%/}
 
-		cd "${S}"/${i}
 		for doc in ChangeLog README; do
-			if [ -e "$doc" ]; then
-				mv ${doc} ${doc}.${i}
-				dodoc ${doc}.${i}
-				rm ${doc}.${i}
+			if [[ -e ${i}/${doc} ]]; then
+				newdoc ${i}/${doc} ${doc}.${i}
+				rm ${i}/${doc} || die
 			fi
 		done
 
-		doins -r "${S}"/${i}
+		doins -r ${i}
 	done
 
 	if use ruby; then
 		local cmd="dbtoepub${MY_PN#docbook-xsl}"
 
-		# we can't use a symlink or it'll look for the library in the
-		# wrong path.
-		dodir /usr/bin
-		cat - > "${ED%/}"/usr/bin/${cmd} <<EOF
-#!/usr/bin/env ruby
+		# we can't use a symlink or it'll look for the library in the wrong path
+		newbin - ${cmd} <<-EOF
+			#!/usr/bin/env ruby
 
-load "${EPREFIX}${DOCBOOKDIR}/epub/bin/dbtoepub"
-EOF
-		fperms 0755 /usr/bin/${cmd}
+			load "${EPREFIX}${DOCBOOKDIR}/epub/bin/dbtoepub"
+		EOF
 	fi
 }
 
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
index c7b3832b5bb2..ad3e9421e103 100644
--- a/app-text/psutils/Manifest
+++ b/app-text/psutils/Manifest
@@ -1,5 +1,5 @@
-AUX psutils-1.17-makefile.patch 1686 BLAKE2B 0bbabd32d8a921ab2b776ef3fb0c5e97b2c919a9f01702a466a3da90ad456abc60c16c05ad2db0d15a0656099f0f2f3ad445df26da149094dba69a216c1ac3ba SHA512 c443b5ee1c83fca83516930eb6bace198d81756d94a254b8445b7f8aea929846dbec08e2c45ad11c016b0ac23a588bcfbd7ea862954d35dc8a2bd85e7ef80163
+AUX psutils-1.17-makefile.patch 6367 BLAKE2B 72ea65d478993bf2c8b0f9254fdac6ef705d6dbd69a7e2fc85a8be4147abd4a67d16f55a1eeaa6f3e3b6d286a40cb4ff3948d1c572a379c5b9cc2ee7d7f3c536 SHA512 6e82c1d219d80de1245d94f5b6fec37f178c3121cf3add5b2895b2dda2fe01b48ea214c7983229601c224d6145f6c7997cdb2a3bfd2a51f2c5bd9e4e6afa763a
 AUX psutils-1.17-no-fixmacps.patch 1176 BLAKE2B fdf9653e881e05340445560ba5cb3303bc42e46a1605ee19d675023174aa7bf73d9b4cc37ba3bbafee9b3829974981ff58284acf7079f9b2a3fedbac9d28b2af SHA512 707ebb4594b341044e27cd3fb35402b4d3144eb52f9baffcc633dbde69b53717da148b6c03074411cb95dcf50b48ba87df4ad6c2ec3b24f37b0951c40012efdc
 DIST psutils_1.17.dfsg.orig.tar.gz 40296 BLAKE2B c74cde600e841e876892f3c0cfd20ab5d1ed87135e0bc952b19baf90315b95f89bf177b66deeeb91862fc2c620f688ba49972673bf9f4b4ff250590f0b2fc848 SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3
-EBUILD psutils-1.17-r4.ebuild 845 BLAKE2B 2e0b0b0ae1c9a1cef158db267fc10411484b2f0ea9f115a61e3afd44e70ed18f55129f594d752217579c41cc2025db819efd7633ac250661efe02c5fcd7b6437 SHA512 66f0c4ad7f1743864bb223705f40ce8258f1c4cbca0b8fbd63e007a030cc0c601a19ea30b5a9e770b87cb758816f5323b40a750131042e8b3a360348fe14273c
+EBUILD psutils-1.17-r5.ebuild 845 BLAKE2B 2e0b0b0ae1c9a1cef158db267fc10411484b2f0ea9f115a61e3afd44e70ed18f55129f594d752217579c41cc2025db819efd7633ac250661efe02c5fcd7b6437 SHA512 66f0c4ad7f1743864bb223705f40ce8258f1c4cbca0b8fbd63e007a030cc0c601a19ea30b5a9e770b87cb758816f5323b40a750131042e8b3a360348fe14273c
 MISC metadata.xml 246 BLAKE2B b56c934f8eecd3492d6abe15cf5883fdbc1979c37abbc5ad196e345ee17bb865db5eab10ac7de93bbfce94c4e865bf6b86d5f8bc081b5cb1d3d58d1158b81921 SHA512 b61f56c5e078714565ff9e33c81217e788f78bae9cf10d6ca78a82703a8e08119dff3afa68306eced0b7c62db9220d28efa4c9782e943c991e30b25b9ead82f5
diff --git a/app-text/psutils/files/psutils-1.17-makefile.patch b/app-text/psutils/files/psutils-1.17-makefile.patch
index 241ea284c66e..8e8f03208f78 100644
--- a/app-text/psutils/files/psutils-1.17-makefile.patch
+++ b/app-text/psutils/files/psutils-1.17-makefile.patch
@@ -10,7 +10,7 @@
 -INCLUDEDIR = /usr/local/share/psutils
 -PERL = /usr/local/bin/perl
 +INCLUDEDIR = $(DESTDIR)$(EPREFIX)/usr/share/psutils
-+PERL = perl
++PERL = "/usr/bin/env perl"
  
  BINMODE = 0755
  MANMODE = 0644
@@ -58,3 +58,153 @@
  
  pstops.o: psutil.h patchlev.h psspec.h pserror.h pstops.c
  
+@@ -99,116 +92,116 @@
+ 	cp $? $@
+ 
+ psmerge: psmerge.pl
+-	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++	perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ 	$(CHMOD) $(BINMODE) $@
+ 
+ fixfmps: fixfmps.pl
+-	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++	perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ 	$(CHMOD) $(BINMODE) $@
+ 
+ fixmacps: fixmacps.pl
+-	$(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
++	perl maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
+ 	$(CHMOD) $(BINMODE) $@
+ 
+ fixpsditps: fixpsditps.pl
+-	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++	perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ 	$(CHMOD) $(BINMODE) $@
+ 
+ fixpspps: fixpspps.pl
+-	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++	perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ 	$(CHMOD) $(BINMODE) $@
+ 
+ fixscribeps: fixscribeps.pl
+-	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++	perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ 	$(CHMOD) $(BINMODE) $@
+ 
+ fixtpps: fixtpps.pl
+-	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++	perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ 	$(CHMOD) $(BINMODE) $@
+ 
+ fixwfwps: fixwfwps.pl
+-	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++	perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ 	$(CHMOD) $(BINMODE) $@
+ 
+ fixwpps: fixwpps.pl
+-	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++	perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ 	$(CHMOD) $(BINMODE) $@
+ 
+ fixwwps: fixwwps.pl
+-	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++	perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ 	$(CHMOD) $(BINMODE) $@
+ 
+ fixdlsrps: fixdlsrps.pl
+-	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++	perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ 	$(CHMOD) $(BINMODE) $@
+ 
+ extractres: extractres.pl
+-	$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
++	perl maketext OS=$(OS) PERL=$(PERL) $? > $@
+ 	$(CHMOD) $(BINMODE) $@
+ 
+ includeres: includeres.pl
+-	$(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
++	perl maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
+ 	$(CHMOD) $(BINMODE) $@
+ 
+ epsffit.$(MANEXT): epsffit.man
+-	$(PERL) maketext MAN="$(MANPAGES)" $? > $@
++	perl maketext MAN="$(MANPAGES)" $? > $@
+ 
+ psnup.$(MANEXT): psnup.man
+-	$(PERL) maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@
++	perl maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@
+ 
+ psresize.$(MANEXT): psresize.man
+-	$(PERL) maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@
++	perl maketext MAN="$(MANPAGES)" PAPER=$(PAPER) $? > $@
+ 
+ psbook.$(MANEXT): psbook.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++	perl maketext "MAN=$(MANPAGES)" $? > $@
+ 
+ psselect.$(MANEXT): psselect.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++	perl maketext "MAN=$(MANPAGES)" $? > $@
+ 
+ pstops.$(MANEXT): pstops.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" PAPER=$(PAPER) $? > $@
++	perl maketext "MAN=$(MANPAGES)" PAPER=$(PAPER) $? > $@
+ 
+ psmerge.$(MANEXT): psmerge.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++	perl maketext "MAN=$(MANPAGES)" $? > $@
+ 
+ fixfmps.$(MANEXT): fixfmps.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++	perl maketext "MAN=$(MANPAGES)" $? > $@
+ 
+ fixmacps.$(MANEXT): fixmacps.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
++	perl maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
+ 
+ fixpsditps.$(MANEXT): fixpsditps.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++	perl maketext "MAN=$(MANPAGES)" $? > $@
+ 
+ fixpspps.$(MANEXT): fixpspps.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++	perl maketext "MAN=$(MANPAGES)" $? > $@
+ 
+ fixscribeps.$(MANEXT): fixscribeps.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++	perl maketext "MAN=$(MANPAGES)" $? > $@
+ 
+ fixtpps.$(MANEXT): fixtpps.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++	perl maketext "MAN=$(MANPAGES)" $? > $@
+ 
+ fixwfwps.$(MANEXT): fixwfwps.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++	perl maketext "MAN=$(MANPAGES)" $? > $@
+ 
+ fixwpps.$(MANEXT): fixwpps.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++	perl maketext "MAN=$(MANPAGES)" $? > $@
+ 
+ fixwwps.$(MANEXT): fixwwps.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++	perl maketext "MAN=$(MANPAGES)" $? > $@
+ 
+ fixdlsrps.$(MANEXT): fixdlsrps.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++	perl maketext "MAN=$(MANPAGES)" $? > $@
+ 
+ extractres.$(MANEXT): extractres.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++	perl maketext "MAN=$(MANPAGES)" $? > $@
+ 
+ includeres.$(MANEXT): includeres.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
++	perl maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
+ 
+ getafm.$(MANEXT): getafm.man
+-	$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
++	perl maketext "MAN=$(MANPAGES)" $? > $@
+ 
+ clean:
+ 	rm -f *.o
diff --git a/app-text/psutils/psutils-1.17-r4.ebuild b/app-text/psutils/psutils-1.17-r5.ebuild
similarity index 100%
rename from app-text/psutils/psutils-1.17-r4.ebuild
rename to app-text/psutils/psutils-1.17-r5.ebuild
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index eb39db0a4dab..9f0334960c19 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/vspec/Manifest b/app-vim/vspec/Manifest
index b9192cb0b65e..f31ef8cb7987 100644
--- a/app-vim/vspec/Manifest
+++ b/app-vim/vspec/Manifest
@@ -1,3 +1,3 @@
 DIST vspec-1.9.2.tar.gz 28882 BLAKE2B 016b91e2eb9ef5b6d8ebf563ddd620ce9e57dc4a9d013a67b3d5cf644325c49f02aaef8b3a114b6802494ca026989ff56ab1f0cb5e398f6cc9eb91fee96797ea SHA512 0c453743f73cfc5990fcb7222cc6fc1b96b93b15b4ef701562f84ae8ef2961c0e2e256f32a400218518463b932a3efdba33e3ca0b418f3ac6969ab38aeaf348c
-EBUILD vspec-1.9.2.ebuild 1192 BLAKE2B 0141225e4b7b393a0885b6583a96b01543fbe692497bc3a58489feffa6717c59ea55228ab7abd89a36b84287eba935e8519b60e5a7b6713f9af0ca4c9081dabe SHA512 477c37d1ce43687aaa406cad54b6e4f33ec1956a90f7e75f3b98fc6e5891cb820be21ef5a717ef6e6ebc2121f8bae8cde478b27a824631fc8306ca6230182448
+EBUILD vspec-1.9.2.ebuild 1199 BLAKE2B 6dea3b958451acf85108d03653ca5429cecfc95cdb9bf30c205340b462b70a33382e5c5bae388bb7d91d67a2e3e11782a408cbdf5c54b7ada4ed97f5d4a0b01e SHA512 5666820d62b56bb4af71e5cdcbd613fdbe661442e095624fb841db97438db6a89c297be5453c8457d8d4474f4eef326b498e6b52ce7217210cc368faa01ec124
 MISC metadata.xml 397 BLAKE2B 26d086c79b35cd480bc59bcba74bf3f0df7310fda8150f0933e2dee235a66ee59f8145750a2523f8e84e7cd52065145143afc6296b019b8a2b46b23af1b772b0 SHA512 35626f98c412577f37a9e85f824fbcc2fd57f0b7d6735feb0e6212192641f4fe3f873aeb99243bd5d767e471dde1b5868256d6626574aa74551dd712a641f07a
diff --git a/app-vim/vspec/vspec-1.9.2.ebuild b/app-vim/vspec/vspec-1.9.2.ebuild
index 03193b3b04a1..5dcd6e400cb4 100644
--- a/app-vim/vspec/vspec-1.9.2.ebuild
+++ b/app-vim/vspec/vspec-1.9.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/kana/vim-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 S="${WORKDIR}/vim-${P}"
 
 LICENSE="MIT"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 957bba87c595..e7a25708721b 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/sqldeveloper/Manifest b/dev-db/sqldeveloper/Manifest
index 1d64b408b1e2..121f9bd9440a 100644
--- a/dev-db/sqldeveloper/Manifest
+++ b/dev-db/sqldeveloper/Manifest
@@ -1,7 +1,4 @@
-AUX sqldeveloper 325 BLAKE2B e89acd5441362bc693296e2fef189e637944413094169c09be73bb1f514393f0239c7f4c5b186dd0e34bd1bda9730f4bb2e029b166f1db740ac34eff25097c84 SHA512 ab1d70c5b693efe5e6270d7fcd0ba7ef30852ed98fe88a1853c5b415178c51bbb754a4da6964b5e57e87c38015cc90ac2fc04b7aa121b660300434523457bad2
 AUX sqldeveloper-r1 407 BLAKE2B 26bf826e6ccf1cd45b52e7cdf6e694d88570118c0e98cab83f66f078ed79fea36fb3fa6df67dc271a74faad4307996c4968f6d316d9fc71d1a5360804f39782e SHA512 cf089f58c9de3677dbaa7b0c4bdd81e234bffac4c25f5a433c7854068ca33b5a4165d8a5d24188890d5d8c60c209adee5267a255505b978a5a7f73646fd1dfbe
 DIST sqldeveloper-21.4.3.063.0100-no-jre.zip 469919055 BLAKE2B 402fbb25c44c2205db1f8ecf3649028aee01d00f73c8f45cf4f415f42d1c507f9f4b5b23b6068165d7667897e1c314272f583dc6da02e70660c64422acee08c9 SHA512 4ab25d596ad383c4d09f315f3a9c43c285a36528e544b8052b8cc5cbed0c13fcd68ad12f660dc66ec087c7044accde6cdfac48518a86bc9c4cb2b89a8bb621fd
-DIST sqldeveloper-4.2.0.17.089.1709-no-jre.zip 348604841 BLAKE2B 0c3adff04f148102e6460c7550f787329c7e5a69aca0b81c2de4725b9c9ea27c03bb2f588671a95371aa3612839805f2042855b443bb5635c70d0e0b2140295b SHA512 4d1e270376ae125a60146228e35fcb2cb615d593c0e9f2ca98e4deef4d8fd1ddff59cf15064d63e33e77125f49e8da9fe317ed1fd96a9b00a699bf6c5e739874
 EBUILD sqldeveloper-21.4.3.063.0100.ebuild 2955 BLAKE2B 7893bd2fc18ef046b472e1439f4d0215e1d5cefae041bde716bfa355119522a039a94aa37f834ce9b03522d16d01b2be39fbe31468afc1c0c2c11bfc0be5c948 SHA512 de14aa3347e6d1be732dc87be906a735b96da3a311cf9cc189ef67acefaeb31204b47af68c04657becab4f5d8e019094f548029a671b5dd6aa89699c3c86306a
-EBUILD sqldeveloper-4.2.0.17.089.1709.ebuild 3218 BLAKE2B 3640beb6c918d9e2110eb409b4d51de29d1d74a2e1b37cce43b1dd14a74c712b6edf6842e005c697f9da13cc1e7327f0576d722c030c19ff99f9a8fa8b54a1a1 SHA512 27700ffcb3b832074bdd962133b4ca4fe8c6e5be26783a9999aa1b8e9809f82cfca4713265e493d31691d292760fba1e1a8388800aec19fdcc224b5be9ef54b0
 MISC metadata.xml 496 BLAKE2B 46b421a2174ce825577a96c41ad103162b6b11127fa1512b12946e46e9698fbe24d1338e38e553ed49f28474497c4acfe2834dd70dee92ce4f34bad01f64ef5f SHA512 0cf75c543496d84e707cbfd146e95ba46ec3dc2779bfff990e2844200ff223d747fb30a6f90a988dd9d07efd060ecc27f9b5c3edcda15c51d3a23ccbd3abb3e8
diff --git a/dev-db/sqldeveloper/files/sqldeveloper b/dev-db/sqldeveloper/files/sqldeveloper
deleted file mode 100644
index eba773e10267..000000000000
--- a/dev-db/sqldeveloper/files/sqldeveloper
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# skip their stupid [ -f `which java` ] test, which will always fail on Gentoo
-export APP_SKIP_J2SE_TEST=1
-export JAVA_HOME=$(java-config -o)
-
-cd /opt/sqldeveloper/sqldeveloper/bin && bash sqldeveloper $@
diff --git a/dev-db/sqldeveloper/sqldeveloper-4.2.0.17.089.1709.ebuild b/dev-db/sqldeveloper/sqldeveloper-4.2.0.17.089.1709.ebuild
deleted file mode 100644
index 4bac238ce42b..000000000000
--- a/dev-db/sqldeveloper/sqldeveloper-4.2.0.17.089.1709.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Oracle SQL Developer is a graphical tool for database development"
-HOMEPAGE="http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html"
-SRC_URI="${P}-no-jre.zip"
-
-RESTRICT="fetch"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="mssql mysql sybase"
-
-DEPEND="
-	app-arch/unzip
-	mssql? ( dev-java/jtds:1.3 )
-	mysql? ( dev-java/jdbc-mysql:0 )
-	sybase? ( dev-java/jtds:1.3 )"
-RDEPEND=">=virtual/jdk-1.8
-	${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-QA_PREBUILT="
-opt/${PN}/netbeans/platform/modules/lib/amd64/linux/*.so
-opt/${PN}/netbeans/platform/modules/lib/i386/linux/*.so
-"
-
-pkg_nofetch() {
-	eerror "Please go to"
-	eerror "	${HOMEPAGE}"
-	eerror "and download"
-	eerror "	Oracle SQL Developer for other platforms"
-	eerror "		${SRC_URI}"
-	eerror "and move it to your DISTDIR directory."
-}
-
-src_prepare() {
-	# we don't need these, do we?
-	find ./ \( -iname "*.exe" -or -iname "*.dll" -or -iname "*.bat" \) -exec rm {} +
-
-	# they both use jtds, enabling one of them also enables the other one
-	if use mssql && ! use sybase; then
-		einfo "You requested MSSQL support, this also enables Sybase support."
-	fi
-	if use sybase && ! use mssql; then
-		einfo "You requested Sybase support, this also enables MSSQL support."
-	fi
-
-	if use mssql || use sybase; then
-		echo "AddJavaLibFile $(java-pkg_getjars jtds-1.3)" >> sqldeveloper/bin/sqldeveloper.conf || die
-	fi
-
-	if use mysql; then
-		echo "AddJavaLibFile $(java-pkg_getjars jdbc-mysql)" >> sqldeveloper/bin/sqldeveloper.conf || die
-	fi
-}
-
-src_install() {
-	dodir /opt/${PN}
-	# NOTE For future version to get that line (what to copy) go to the unpacked sources dir
-	# using `bash` and press Meta+_ (i.e. Meta+Shift+-) -- that is a builtin bash feature ;-)
-	cp -r {configuration,d{ataminer,ropins,vt},e{quinox,xternal},ide,j{avavm,d{bc,ev},lib,views},modules,netbeans,ords,rdbms,s{leepycat,ql{developer,j},vnkit}} \
-		"${D}"/opt/${PN}/ || die "Install failed"
-
-	newbin "${FILESDIR}"/${PN}-r1 ${PN}
-
-	newicon icon.png ${PN}-32x32.png
-	make_desktop_entry ${PN} "Oracle SQL Developer" ${PN}-32x32
-
-	# This is normally called automatically by java-pkg_dojar, which
-	# hasn't been used above. We need to create package.env to help the
-	# launcher select the correct VM.
-	java-pkg_do_write_
-}
-
-pkg_postinst() {
-	# this temporary fixes FileNotFoundException with datamodeler
-	# this is more like a workaround than permanent fix
-	mkdir -p /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log || die
-	touch /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log/datamodeler.log || die
-	chmod -R 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/log/datamodeler.log || die
-
-	# this fixes another datamodeler FileNotFoundException
-	# also more like a workaround than permanent fix
-	chmod 1777 /opt/sqldeveloper/sqldeveloper/extensions/oracle.datamodeler/types/dr_custom_scripts.xml || die
-
-	echo
-	einfo "If you want to use the TNS connection type you need to set up the"
-	einfo "TNS_ADMIN environment variable to point to the directory your"
-	einfo "tnsnames.ora resides in."
-	echo
-}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 50e0c5818508..6298c47e51e6 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index f591e08699f9..7302d5f033ba 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,3 +1,6 @@
+AUX platformio-5.2.5-fix-semantic-version-dep.patch 267 BLAKE2B d15be62a0a01a82ca217d614029c1bafaeda6dc078d975a36f1036da9d453f584b1ca8d8487a0f8995d6eea27a1b34403e53f3ff96ac506d40a5a056b9dc29c5 SHA512 ca59d2df4667a5ec59f35f0b6071fa60d81d24a3fe90129634e802cc850fa4d05380806b3e71192110d96df119f82f27a75eaca41df4d31dac5ffd0c9bba44c1
 DIST platformio-5.2.5.tar.gz 254813 BLAKE2B 96911a64f8e73567820ef2c7b2297ed9e32c36c65c49572af6037c2666da4072bdf920dc31e8de7e07296eb7f1b407c47191d68a80ed212a9c351dfca604b408 SHA512 cf939254c231bb2cb97ac509175b7235a6a2ba447e55a2d9a59a9fe610656743c190f00cb7bfa1fc2e6b64487be7f02a193e2f270236bbb9200537f19175dc22
-EBUILD platformio-5.2.5-r1.ebuild 2546 BLAKE2B 3b290185b67fa64ed7f0530a801577a3eac024c30801b6290aa843ca837335eb42d94e4f9e920fa3bb37f1f62372bac16d24a65a692bed480c784c5c5eb50e2a SHA512 add9d9d7cd52e142b2b9e54a6f6246799061430c81ee891ff361a633b4c9ac0113dd2144aebbcdbb3d9d9997db5f131213d6a1fe6a5ef8f831a733a0c5d07781
+DIST platformio-6.0.2.tar.gz 285452 BLAKE2B c70523837b5118fcc1209a36a425fb6ab0aac73e56732916ff3d39fe87d50a47bf7d31d77324f491093ed366b1b3e4f88274e973bc896b164f5a07687a53bd12 SHA512 a2e48ad9ca22024a06509a9e36e5a7586088d0e8abd67d309d1988a8a112a41e301f077f1b466b5db390dc4048add570acd5bb762bbf22db69715dead0d8fc89
+EBUILD platformio-5.2.5-r2.ebuild 2617 BLAKE2B 48f779ce26c27e31beb69349cd8cf621d49112e93eb9f8bd3450afa04ef2e2c9879317436b104bc5992c59ec661323628a6c93d4640088a280a3f9a0af2ae2f5 SHA512 54680dda63927f8435ebc8f302f16cbccbd96d6440d581a51fd472ad513f8c3a62c2f1c78ffa7a840d6993354d383746f1d1a44fd55f4f479bff7358d4d82a64
+EBUILD platformio-6.0.2.ebuild 3221 BLAKE2B fed27e95a092cc7a28dd42d595320ff601ff2493afbbf522edd0c79fe9fd98262b863e5fab7892708269d04353284f7228606b775dab52ec818a1b433722dadb SHA512 70c0fe0ecaa281a109273a88cb6bd35b57321d39ddf0870dcacc153db71b020de7d8519e1bc4a5c5a05832f506a15f767e736ace6cf745df82dbf802f8c6e45e
 MISC metadata.xml 249 BLAKE2B 0d8c6b8e9873180a796f77c5194270389ae642d0d888d7fa1bbada89861dc1ba1bd9f238acd76f7a07a3eb694ac8bdb19927012814a03ed8d3e87f40676979d1 SHA512 1ac8ddbe837cb8db85bb6e4ee59a6e98554c04231c54cb5158fbe7dda3230aaeb02ab66ff374f5bb348e84159588b0740c43acd99ed590939db70bbd2f15d265
diff --git a/dev-embedded/platformio/files/platformio-5.2.5-fix-semantic-version-dep.patch b/dev-embedded/platformio/files/platformio-5.2.5-fix-semantic-version-dep.patch
new file mode 100644
index 000000000000..1fa92fed8784
--- /dev/null
+++ b/dev-embedded/platformio/files/platformio-5.2.5-fix-semantic-version-dep.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/853247
+--- a/setup.py
++++ b/setup.py
+@@ -35,7 +35,7 @@ minimal_requirements = [
+     "pyelftools>=0.27,<1",
+     "pyserial==3.*",
+     "requests==2.*",
+-    "semantic_version==2.9.*",
++    "semantic_version==2.*",
+     "tabulate==0.8.*",
+ ]
+ 
diff --git a/dev-embedded/platformio/platformio-5.2.5-r1.ebuild b/dev-embedded/platformio/platformio-5.2.5-r2.ebuild
similarity index 97%
rename from dev-embedded/platformio/platformio-5.2.5-r1.ebuild
rename to dev-embedded/platformio/platformio-5.2.5-r2.ebuild
index 9c73bc3fd57d..9c0cbfa5bbd5 100644
--- a/dev-embedded/platformio/platformio-5.2.5-r1.ebuild
+++ b/dev-embedded/platformio/platformio-5.2.5-r2.ebuild
@@ -68,6 +68,10 @@ EPYTEST_IGNORE=(
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.5-fix-semantic-version-dep.patch
+)
+
 src_prepare() {
 	# Allow newer versions of zeroconf, Bug #831181.
 	# Also wsproto.
diff --git a/dev-embedded/platformio/platformio-6.0.2.ebuild b/dev-embedded/platformio/platformio-6.0.2.ebuild
new file mode 100644
index 000000000000..bf24334631e4
--- /dev/null
+++ b/dev-embedded/platformio/platformio-6.0.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 udev
+
+DESCRIPTION="An open source ecosystem for IoT development"
+HOMEPAGE="https://platformio.org/"
+SRC_URI="https://github.com/platformio/platformio-core/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-core-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		<dev-python/aiofiles-0.9[${PYTHON_USEDEP}]
+		dev-python/ajsonrpc[${PYTHON_USEDEP}]
+		<dev-python/bottle-0.13[${PYTHON_USEDEP}]
+		>=dev-python/click-8[${PYTHON_USEDEP}]
+		<dev-python/click-9[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		>=dev-python/pyserial-3[${PYTHON_USEDEP}]
+		<dev-python/pyserial-4[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.4[${PYTHON_USEDEP}]
+		<dev-python/requests-3[${PYTHON_USEDEP}]
+		>=dev-python/semantic_version-2.9[${PYTHON_USEDEP}]
+		<dev-python/semantic_version-3[${PYTHON_USEDEP}]
+		>=dev-python/tabulate-0.8.3[${PYTHON_USEDEP}]
+		<dev-python/tabulate-1[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		>=dev-python/pyelftools-0.25[${PYTHON_USEDEP}]
+		<dev-python/pyelftools-1[${PYTHON_USEDEP}]
+		>=dev-python/marshmallow-2.20.5[${PYTHON_USEDEP}]
+		=dev-python/starlette-0.18*[${PYTHON_USEDEP}]
+		=dev-python/uvicorn-0.17*[${PYTHON_USEDEP}]
+		dev-python/wsproto[${PYTHON_USEDEP}]
+		>=dev-python/zeroconf-0.37[${PYTHON_USEDEP}]
+	')
+	virtual/udev"
+DEPEND="virtual/udev"
+BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/jsondiff[${PYTHON_USEDEP}]') )"
+
+# This list could be refined a bit to have individual tests which need network
+# (within EPYTEST_DESELECT) but so many need it that it doesn't seem worth it right now.
+EPYTEST_IGNORE=(
+	# Requires network access
+	tests/test_builder.py
+	tests/package/test_manager.py
+	tests/package/test_manifest.py
+	tests/commands/test_platform.py
+	tests/commands/test_test.py
+	tests/commands/test_ci.py
+	tests/commands/test_init.py
+	tests/commands/test_lib.py
+	tests/commands/test_lib_complex.py
+	tests/commands/test_boards.py
+	tests/commands/test_check.py
+	tests/commands/test_run.py
+	tests/commands/pkg/test_exec.py
+	tests/commands/pkg/test_list.py
+	tests/commands/pkg/test_outdated.py
+	tests/commands/pkg/test_search.py
+	tests/commands/pkg/test_show.py
+	tests/commands/pkg/test_install.py
+	tests/commands/pkg/test_uninstall.py
+	tests/commands/pkg/test_update.py
+	tests/misc/ino2cpp/test_ino2cpp.py
+	tests/test_maintenance.py
+	tests/test_misc.py
+)
+
+EPYTEST_DESELECT=(
+	# Requires network access
+	tests/misc/test_maintenance.py::test_check_pio_upgrade
+	tests/misc/test_misc.py::test_ping_internet_ips
+	tests/misc/test_misc.py::test_api_cache
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Allow newer versions of zeroconf, Bug #831181.
+	# Also wsproto.
+	# ... and semantic_version, bug #853247.
+	sed \
+		-e '/zeroconf/s/<[0-9.*]*//' \
+		-e '/wsproto/s/==.*/"/' \
+		-e '/semantic_version/s/==[0-9.*]*//' \
+		-i setup.py || die
+
+	default
+}
+
+python_test() {
+	epytest -k "not skip_ci"
+}
+
+src_install() {
+	distutils-r1_src_install
+	udev_dorules scripts/99-platformio-udev.rules
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9092e54c1a62..5dfef3ef9f29 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index b6efb6130ee8..26dbe3f648d9 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1,5 +1,5 @@
 DIST jackson-annotations-2.13.2.tar.gz 1983139 BLAKE2B 511f62548ad3daa4aad265502e5c5e63cf3d60186b96f96ab2ebb3a904a8cca9e5eadfa31ac2fee1a8ce62c7ba51b4a722e9e46c9bbc390291048b0a852b8f30 SHA512 b024b5bff985a6104a122c58735249f3c3fa8e9ddb678283d876ff3750b72872bac13258456cca18828cda65e03eee85a9ef816f924fdbbec211fd03c7652439
 DIST jackson-annotations-2.13.3.tar.gz 1984205 BLAKE2B c577fcdcb40c44cf1cb08ebe467318ca4e4fff9fdeaf756360ef202275a48b5f5a93135439567261651b5731f523588f0c29a17c05ba6d03fec0f19ed19d9c5b SHA512 c00aec542c8ddea999fb60536cb2cab3edbf4f1d20b29e404d62add54a22546ca195ab7faeda4a2cd1d3a827f10420ccafe1dfb0065742f46aecfc2d00f2c1fc
 EBUILD jackson-annotations-2.13.2-r1.ebuild 1402 BLAKE2B 548af705f47014f0708f3589371963feeb95c78064bd10abf795404a63b8b18164eadc24350fbefe4e35af1676c981531c9618cdd78b135228d02300bc0f4306 SHA512 7e880816698679bc136680bafed450fdb6fc76e2a9011415f6d41f12aaf08145d8a6f7d44a1bdfd4c4c35cfb9685637ee734b0823671e447fcce538c4181d095
-EBUILD jackson-annotations-2.13.3.ebuild 1406 BLAKE2B d25a5cb8fb97d82508cc4a8c91d3ef05c2d6d489e0e55e67bae65dcd10e81c1ec70c31246b7a959451e16f9fae94375875579dcc233fa8288e6e79f8e712a2aa SHA512 9f19a483b78ee026e8c7fbf5484d12e991c087f528787ddff1c5b7b5079bbf761a4672a12642f9bdbc2f309e6604afac1e256f097dc13e33ed9401388d61739b
+EBUILD jackson-annotations-2.13.3.ebuild 1404 BLAKE2B 72f2cfbf0c4056d11d33bc80d2cd050f9545237e4f80bf394b57f81effcad9ec9b3bd728d0cb38de2809b809f0f8ff5ed89c66b914726a5c63356c5c3e2ca19e SHA512 2023e9f5d52b79842148d875103fbab673a3dd029074ea6c889b73e6e01035ad75f01c2224d87751763101164a736e9737c5f617ae6ddd96b34fb714033ea968
 MISC metadata.xml 341 BLAKE2B 1a6bf9fc13afb0c6d95cb0752f40474fff4135031e2771f3c0555cd7961e23ea7c026d6cf905acb505ceb2aa4fad01ea5dfac310004b51828b1383dd9a44f9bb SHA512 51655fad0847b2bbc92ed31310c155f26edf6dc41da35cbe239c99eea205a054f6bf7a7839201b8f8fb397110b50935d7c069f3baa7650970580a0c9ef156f12
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild
index 8647b3427d13..efcf510776c4 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.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-java/jackson-core/Manifest b/dev-java/jackson-core/Manifest
index 37aad2c81219..0bf7cd2ead9c 100644
--- a/dev-java/jackson-core/Manifest
+++ b/dev-java/jackson-core/Manifest
@@ -1,5 +1,5 @@
 DIST jackson-core-2.13.2.tar.gz 12267420 BLAKE2B 4acaef320fbd08bd3d3ae835eb4a96771b1f25aade7433e4c87beac0f6e365e641eea8c70ed7d3884159bd6990286b80891b57ac967ee292ee639cb2b56b66e1 SHA512 8e424ea255a6cd78c550300b0ff18d5e63945a3608dab2803211da2df5eb99fbd249779b2d051569b421c393e073d88a21b01c02a25b9647bcc8545f2d8cc1ee
 DIST jackson-core-2.13.3.tar.gz 12268319 BLAKE2B 8053988b060cd625670c643d9ba12d9ceae72dffa583bfc78e87044ac723c78bc44dfbdbaca0331098116a43b273dac844721a9e44ba1a536cc457f841d89b56 SHA512 9e7a9ec54073fa6faac36914c496df38bb6c201a37ade2b32306561b71e1b78a0ec4f48b006d4fb10cbde21979a16d117706b59338ada7aedcb593ba5c31ea52
 EBUILD jackson-core-2.13.2-r1.ebuild 2085 BLAKE2B 2b1f0ac60f7e5af2798d3964a0326dcaefb80afe44ffed6d821c71b8987464904af24f79d1a1295d16994bccd01a8ddfd60c8d1d556250704c25b0c4030237b5 SHA512 d2f77b838b807187845c92c5fc5ce0f72fb74cd7177b6dc75db8ce551187b7d8be74a86617c9fb0b9850ed6bf4110330a5ed2c0c1e0300b4575ba36aecf8df31
-EBUILD jackson-core-2.13.3.ebuild 2090 BLAKE2B 73fc5a0bef3cd7c90018bf283e246d891d911c0ccf7f87cc165e552d8752b4b2d6ef3cb099a7b96f647fca460dd486a5992ec67f5f5a510ddc41f1a854da172b SHA512 d6fb738a7257df323263e41ce86c4415c9ae9f50f7f092db25696fd22c0899eee5af240707cc722d73d9dac2230436cb6f8bd7ae566a530227177e7e928d7e50
+EBUILD jackson-core-2.13.3.ebuild 2088 BLAKE2B e2d8f488ce8282c4fe96d8e895bcaf1340cac587eb4be35e6b5af9698802329191e454039e4ef85d61fd1b51cb8ed0746bde20321deb53c723b14cc7e3adc4e7 SHA512 49561fc9962129259afe03022024ded0dfc04193f8684f82fbe1fa1507b7f7c5334d74e4e7afebedcf9d352d9a1cc3882e7dbb66400f9cddd84fc3767cd7cfe3
 MISC metadata.xml 312 BLAKE2B b1beb51833c35e3ab2191a3c722768a34ec6cbf3ee240d67381b5137aabc0bb8be862f32638f35c1ba84a75498bb66303223c1d43b7d48c8bfe143ee837d6338 SHA512 b85d17092438f67523cf8c3c861de1183e061f55620342239bd662e5e90058f82fb501ba24bf2c1de6ebbe512ae4559d4b746a575261cbf2feb142e120118372
diff --git a/dev-java/jackson-core/jackson-core-2.13.3.ebuild b/dev-java/jackson-core/jackson-core-2.13.3.ebuild
index 74130a9fb332..657905868708 100644
--- a/dev-java/jackson-core/jackson-core-2.13.3.ebuild
+++ b/dev-java/jackson-core/jackson-core-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-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-java/jackson-databind/Manifest b/dev-java/jackson-databind/Manifest
index 6b1ed807d327..5c851ce71c25 100644
--- a/dev-java/jackson-databind/Manifest
+++ b/dev-java/jackson-databind/Manifest
@@ -1,5 +1,5 @@
 DIST jackson-databind-2.13.2.2.tar.gz 48061394 BLAKE2B c67b0a23c5fcff881d91ddec14877a5ec16c13eebfc76b34c1666bc9ebc73f573d279d1951ff2be96c612fa87281e08332047bb6c75df73184249b7ebb552d16 SHA512 0c3550aa3ada1c5fcd2f19076670c7ddffde59542b10fa270d1c7bd54d7866f0f10c256738ed76815af55c8531f7553f8b977c461fe710f759811b0ffa660245
 DIST jackson-databind-2.13.3.tar.gz 48056095 BLAKE2B 04751cd99eae3bbf3c3a30993506f05b47a85782f52e2cf51f50de9bcb5e9c3718d6ba6105667226272d644dcac6aeeb3ce06dc7ae737adf0392a7a7eafef2aa SHA512 785db6cab20ee74ff90815b8a1afedcbf10f13f60c336a61c20513757cbcde80c073d5f4dc60d390a72600a2b5719cca22b4c71220707dd4edd67dd87f6a7ac9
 EBUILD jackson-databind-2.13.2.2.ebuild 2683 BLAKE2B cd06eb72c55748afbea1396f9d901282cf68821c8ba21ab043a2c53217c5a50bb8d17b765a0ab9bd2eb9fc217bbe1cb7e361e2bcd24431c2cff1b970fad6729a SHA512 e5fa3f32c2dd426bba241ea8dc324776d1faedc867d362e2c12dc9a22b0b9ddfa2765a537574b7edda3262537dd9d679d088dc27fc515d11bf48a71783437e5c
-EBUILD jackson-databind-2.13.3.ebuild 2679 BLAKE2B 6ee8d4562bd63fac1cdf12dcb4b846e7e8dd12eab2781b4532ab266b74a51f9ebb330f1384bcaf2d9d0d292f8dc5b7c491ddf560ef4b9d2454fea9191948f493 SHA512 5852396310d7b20fa3363255e902754ef7b3ed3da0e85196874dca1a14ef68e1aa4b233c553cb7968e6d7c272810491f263dd37ecea65556013e880f07b9070d
+EBUILD jackson-databind-2.13.3.ebuild 2677 BLAKE2B b9915371133b04a82d59a491d25dba51d73aceea563ccc1fc31819f310224c3ac6381b31a121a65ec7e98793637188b87a52196490d060151ebca264e7ad9b28 SHA512 02c2d32c147891833e12b1bab5ffffda3cd9fc11d4c93907a4c40e377fffadf63e341941ac561c4cb161cb3f635245db7b4646d1093a35c9aa070ffb9c41b899
 MISC metadata.xml 316 BLAKE2B 06c857b21b1c39450aefd3a56ee67e0a9c57ce28f434e0af285397bf9c0a73801983b71415c1dd3ee1b53e9b1bf855d81b204559ccfe5bda7cf0703975a8420e SHA512 3308a8e0872865b0da8c3c5720364f786764d6cb751b6ad465dc450338b8c3f672b8266ab957a27609363d507b7f711ccb0edb921388a8f50cba73424fc85253
diff --git a/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild b/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild
index ca932bc8bb82..6a34f6927b74 100644
--- a/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild
+++ b/dev-java/jackson-databind/jackson-databind-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Dependencies like powermock-{core,module-junit4,api-mockito2} are not available in ::gentoo
 RESTRICT="test"
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
index 7de132213699..f00f3deea55e 100644
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ b/dev-java/jackson-dataformat-xml/Manifest
@@ -2,5 +2,5 @@ DIST jackson-dataformat-xml-2.13.2.tar.gz 3201222 BLAKE2B c4db7ae5f3f3fc41bb3890
 DIST jackson-dataformat-xml-2.13.3.tar.gz 3201473 BLAKE2B 90f6b98325e3ae43e7ba560b077ee8fc8e5ad5004fd23b7c10a2c2a3ec7a674b700b80766690d2442820f87698fa5e33c440c2aa12cd521b7566e78eca50bbaa SHA512 52e26e1a398d90f75ef61d074ed1d149b9f13555f1878703b3148ed008f29f8802586a6020f3c1427a748a73b9a4ca56d86ffd769cf6cb7317a69e039345eefa
 EBUILD jackson-dataformat-xml-2.13.2-r1.ebuild 3894 BLAKE2B 4f434f5e3d3ae85ed54c775973c6cb5f5767c2a9e5bc33918af5212fb970eee445902845c0b32ff73f80bfc8ddd58820ce994fb7c8cd6a9f214fe5b776dc97ee SHA512 6f74638693506f4e76c4f91c8adefe8eb8e239c7480b6408d06a267ede82cb703184a1256339a2042bfc8aae01b4a74413c1c7e5091358fc1830724e9e08feb7
 EBUILD jackson-dataformat-xml-2.13.3-r1.ebuild 3896 BLAKE2B e1302ea9708b24ddd1d7a37adb4a09c736940dd7be95f74a10a7f9c1442ee505e2398e491919a468097c4c46be9d5c86c09a27de9ac89a7cedf0e41811e54fa0 SHA512 7b2e0e3ccae805a68c9cc2ee88cb8413929e8c6d4ef238533adcef6568fc9bfe2f8b2cd1aa795ba1b9035093ff28f40707cd1dcfac7609ce647fbe76cce41418
-EBUILD jackson-dataformat-xml-2.13.3.ebuild 3896 BLAKE2B d91c19dad30e1907795601f86e5a18fa5d800f66585ff6fa934f49897771b04906ee39c5ba98f332ae760967f5d3289eba75de4feeeb4129104a7dd719cfeee1 SHA512 473e46724d53895c0f4a54473c527e4b3b074310c67c26b9cbc49aeb31b2a2903915182e2fab029cf917d6e0b692a853849ba3dd06e0e796f8a41bbb919b6c08
+EBUILD jackson-dataformat-xml-2.13.3.ebuild 3894 BLAKE2B fd9c43e80882a30d7adfed83ca121d9cb540b98a142e0b44859f0a5216f330ef0240c6d3bd5d8c67d308b2888c9ae2646e81469bac12356f4bbd21fc12664fdb SHA512 852056549ed81f58dd3860758f12cf2aecce63b87b88e13b5cdaf71c64cb759fa45e5d416626055a44f13e55f2c7c253e3ee4f4e450930b6767a6d2647ab35ae
 MISC metadata.xml 487 BLAKE2B 0e5e73be66b890aab37fce8ccd162c168c7cff415c418a30f5cdcc76624499633abfd366f86ece75de208b981a03364566659e37c2b3a34ad90a01f3577a707a SHA512 b920c1d3b8d8f6023df6c100ba4b36282c7cbfdad4a4690055d70cd3dac8d0da91f236a38565bee798342dd94c49cf2c9ce125282a7e5fd818321e28d288b3f1
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild
index 84ad15ca6ede..2c613fbdaa52 100644
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild
+++ b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index 65f705c729f4..aca94d91f3f2 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -1,5 +1,5 @@
 DIST jackson-dataformats-text-2.13.2.tar.gz 3528945 BLAKE2B 5dc38706b714121478e82b2f4bc0b3831fa84708b708c08c20d4744c4fc7130149d8dace5c20437514ce9431b1c39183f4d283717f4ad5876fac3651c53ea096 SHA512 1101aabc4b3b652ff90c23186fada6391db9cb4cb5ec6ba9ff78cd91b73ef3b632f38027e192d739d8e47f7ed2726ac03d8c3a1d20d416dfaac3b50ca11abb67
 DIST jackson-dataformats-text-2.13.3.tar.gz 3528981 BLAKE2B 98593f45e663905c15ab5cb37152c95d69a0121515990fac0c66f640d93af83cd51802e2856a4e8df6b82c0121ac4fcd20774fd6a3841e019e1da56c599ed9a9 SHA512 77fad3e6ab5ad55d3a46ffaee3482e9f0dbfa36ce67d5ad31e0b7cde667536387f1dce5bc8296733a28efb09f423785aca7291d9ba85a67ca2b94ef4c8766d7f
 EBUILD jackson-dataformat-yaml-2.13.2-r1.ebuild 2664 BLAKE2B e7e368a3c5b1cb4b73860121127c57b4f21eee4341de035df8cfa72df952724701958609438439cf464b80d343a0b98383a25a4a6661c684d2402aff6725b420 SHA512 719b514aaa346e42ef0c3833e975025ce5dbb6887a6aa5b031471803d2d68306d5de6972677fe014f0dc2b570738329a1d6bd6904216c5dfece650186cf4ae01
-EBUILD jackson-dataformat-yaml-2.13.3.ebuild 2666 BLAKE2B d68d44a6617b8c477c34920a1b86f56b8e2a64c107f9dc8947df51e7897d7bab9df22783b1845dbf7d7cee510ac85aab04ec7039b54d6e5db7303d1c09fa6590 SHA512 397585863e682ead80b44ca2a0b3b0206c6fd92429c56476b8ad610b02a48fc2e49d5a59d8144ffa49b63ea14475938401402cd477a0d27536b7da88741d5062
+EBUILD jackson-dataformat-yaml-2.13.3.ebuild 2664 BLAKE2B d3e04f13a436fe73566bc431e47cf40f7bbef077c41a7f6f5475ccd34fc941d42058df1d687283b9ea982f0c32956043465f73e40f9c4fba65eac22a05859aee SHA512 b6df3010b1c2829076e45042509b6216b6b7bfdd6147d49d9a5acf74b558266cdb98cba8eeadbabba936fda57f8096b4c53625d89381d8a135cb600e273b9b54
 MISC metadata.xml 398 BLAKE2B 35f92ae137b3d4f6528c3987d1f9a4e8a1492688a687b4fb133b9ac5c02e6dcbde37807569463d8eebf26c078f55199e5848efcd6e11104599e5895044b61d8d SHA512 621d9b0635a22bed22305b4a7724e96beefdb57ff6b2553612f3e4feeeef080d02bc48dd0fcf3cbb3a2f4723c89bf8824f18adff1501fd3876c73e4e85fa20f1
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
index 564d367c92aa..5e75be3da4be 100644
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
+++ b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-d
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/jackson-module-jakarta-xmlbind/Manifest b/dev-java/jackson-module-jakarta-xmlbind/Manifest
index cd19cf7f4c63..bf51cb75043f 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/Manifest
+++ b/dev-java/jackson-module-jakarta-xmlbind/Manifest
@@ -2,5 +2,5 @@ DIST jackson-module-jakarta-xmlbind-2.13.2.tar.gz 2146359 BLAKE2B 242d148b194574
 DIST jackson-module-jakarta-xmlbind-2.13.3.tar.gz 2145569 BLAKE2B 13864e4272d40e8425232482a67a2bc720ff294e93ec623589bd0b7286e2c63c2b724bc1033eb19437cdea23db0b11142380715fc300c32e8af9dba22eeed407 SHA512 2807a9e1d3531f3553a2ab6bb64e0ece2809ca9d2facae320dbd38efe0797cdc7ab11e9b284122d75a98a50eda9bc0cfb0f098ca0921e3bf67a0e38b5252a14d
 EBUILD jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild 2793 BLAKE2B 74c68733494b6ddec21d334f52e166df316db33e7c0d15a580d2cfd61676c12abe1abb58a98043ef2804c5f847c28d39aa8387c091f61741de6ec93919aa3f3c SHA512 c6f9c14be15c0d58771d2695508ea590fdc50384ff592642a5fa7c6cfa3eda2b24da22ae255f7c34f026886e46387aefaa7e3e0aed0b278d1fcf3f93702c89a8
 EBUILD jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild 2888 BLAKE2B d8c0b8adb7576aa03a4a3999308ae374bfc67ef9c9ddde6b092372fcb759848852de520b0c699cf238d8ac98c673ceb661c95ba8e25e666a8a82456c6b44981e SHA512 516ca0ae25dd319c66057256e8ff35fd96b32a8e6c9b89299e5515070d852ec6b5cfbad053ccb980a617bbc89afc4b483379646498f0be566c024cf34ec43e87
-EBUILD jackson-module-jakarta-xmlbind-2.13.3.ebuild 2768 BLAKE2B 4411956b8cce81f7a8f04ad5052db997ed1790a10a750a0830934b55a6cdc453389c3688a5fd5f11fcba72901250a70b3807fea04e5c49c6efaade504c9e2e71 SHA512 e190b8a3fb671503654fd87cbe196bfdadb2b0aac57b51d344b7e83a112889d370d3a48bd1226e54ca23c5517460ba5a596d0a9eb124bba1e48d37476e92fb7b
+EBUILD jackson-module-jakarta-xmlbind-2.13.3.ebuild 2766 BLAKE2B d442d46c8941dd0f061dc86ed2276369be83a47eddd5dc8982f29d6cf04d54a83f3f82f39fa3b13b0b490d85acc3e7b7d2ebf2c9accfebe60cdb02f2c2b64613 SHA512 ba7133da91b84f82000d4395db83b6824f3e024cefd9243a55f4afd838dd681d61d37b5ffe2744502849269418d27aa3b49150681c8a57a959af3d72598cc431
 MISC metadata.xml 506 BLAKE2B 4e62bddea5ad8f7e6b73de9a173dbc8416b309caf4e4f9801496712f1cc88bdab646d237e48c3f55c99d95c198056b6642cf19070805f694b3a8e996e9bd0528 SHA512 96825b1a8ec0808f4dfa4a2482a1c184acab23d624ab178be8df496c67ff3ca5cd7cf012e6e7017721a3355a6ff3265d6f76734a655bfb261d3530781825f5d5
diff --git a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
index 9e256235e172..baf70d9cdfe8 100644
--- a/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
+++ b/dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/FasterXML/jackson-modules-base/archive/jackson-modul
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # We don't have jaxb-runtime:3.0.1
 RESTRICT="test"
diff --git a/dev-java/janino/Manifest b/dev-java/janino/Manifest
index cf75a84031b9..66375ed5fae1 100644
--- a/dev-java/janino/Manifest
+++ b/dev-java/janino/Manifest
@@ -1,5 +1,3 @@
-DIST janino-3.1.6.tar.gz 1730264 BLAKE2B a4e15b7b9a9d17b8762f5964171a01da3ce6f1045b8830c9a6e9a0d35c5096376fd667103360791f6848c762177f48f858e4e6233205fb6ff8258e6582211b89 SHA512 6e729733f74e0cc24db56c4030de8751c131c94b3abf0519288cc7539b5dda45de8c33e8dd37d8e70565ad0c3a3122cac7c73d77bc5f92a16db0b0f7ea7436d3
 DIST janino-3.1.7.tar.gz 1747439 BLAKE2B 6e42a9d5cc079c2cf17b76c1d76420ff3fa0027b54736f23e0aa2c5062f4dad19c1ac7efa678fa06cee369a01125a64a4ee32e4120e60ecd8a56d47aa4f69503 SHA512 541925fc10f5fbefde45e60cec1925e3d6f5b7244a6b9de251b5483224bee05c16182e2bf137a00349cbdb6c209ce18b2203ca066e5a7a1f146efa255f5f7799
-EBUILD janino-3.1.6.ebuild 2446 BLAKE2B 9e5e43ec6aa0c4a598f10b7af951ffc7b0d230e8ac1610e24f73cd1009e076e8d49890fe25e85dcd3dd20fac4a1403113c5954f3dc207cd837446d368c7bcd07 SHA512 a06fa3ec0f5ef19efb5d8da3d8d1dd3e2abd8dd58e8ef8bf8db8187824b7afea6f6fbfc7b52194a417c2b81e9fd309b736ccbf58fb180554fdcbd87352ad5791
 EBUILD janino-3.1.7.ebuild 2531 BLAKE2B ae499ba288a32289cc580df385fb0ad4c5c8a91a3cc6438dacf7c27f1fbbf9ed777dbbbfd75e7e092d0f453a396cdd45803b8cc5087b039b265a48c8244cfec1 SHA512 f8a736543205c5f471196d02cd01af3b5746118f091ee12e024ce2b2d8c4438d6bcfab5476c1c3a75c37a89e95811e9a39d947ad629f3eab3402c1dd8614ed4f
 MISC metadata.xml 402 BLAKE2B 24ce6bf4574089a37f3f65f463269ffaa05cc5491b630b69ce205d62967d9dda038caa1af286974c908921c57819e59c4f63a1377c3c6d4dc5ab87fbc20286da SHA512 c26dddfc7e65fcfe8cd2d359acecc410592cbe1b73453110b3c27b360676d3ecdd247e05c936bef1125d19d97e78ccaeaff9707f52be882e5dd14b9b1b04df56
diff --git a/dev-java/janino/janino-3.1.6.ebuild b/dev-java/janino/janino-3.1.6.ebuild
deleted file mode 100644
index 11ef65f524c8..000000000000
--- a/dev-java/janino/janino-3.1.6.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom janino/pom.xml --download-uri https://codeload.github.com/janino-compiler/janino/tar.gz/v3.1.6 --slot 0 --keywords "~amd64" --ebuild JANjanino-3.1.6.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.codehaus.janino:janino:3.1.6"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An embedded compiler for run-time compilation purposes"
-HOMEPAGE="https://janino-compiler.github.io/janino/"
-SRC_URI="https://codeload.github.com/janino-compiler/janino/tar.gz/v${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: janino/pom.xml
-# org.codehaus.janino:commons-compiler:3.1.6 -> !!!groupId-not-found!!!
-
-# Compile dependencies
-# POM: janino/pom.xml
-# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
-# POM: janino/pom.xml
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	dev-java/ant-core:0
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${P}/janino"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_compile() {
-	JAVA_SRC_DIR="../commons-compiler/src/main/java"
-	JAVA_JAR_FILENAME="commons-compiler.jar"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":commons-compiler.jar"
-	rm -r target || die
-
-	JAVA_CLASSPATH_EXTRA="ant-core"
-	JAVA_SRC_DIR="src/main/java"
-	JAVA_RESOURCE_DIRS="src/main/resources"
-	JAVA_JAR_FILENAME="janino.jar"
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":janino.jar"
-	rm -r target || die
-
-	if use doc; then
-		JAVA_SRC_DIR=(
-			"../commons-compiler/src/main/java"
-			"src/main/java"
-		)
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_test() {
-	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-	JAVA_TEST_SRC_DIR="../commons-compiler/src/test/java"
-	JAVA_TEST_RESOURCE_DIRS="../commons-compiler/src/test/resources"
-	java-pkg-simple_src_test
-
-	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-	JAVA_TEST_SRC_DIR="src/test/java"
-	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default
-
-	java-pkg_dojar "commons-compiler.jar"
-	java-pkg_dojar "janino.jar"
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-
-	if use source; then
-		java-pkg_dosrc "../commons-compiler/src/main/java/*"
-		java-pkg_dosrc "src/main/java/*"
-	fi
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 36a04638b423..b0abc162b5c6 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/ammonite-repl-bin/Manifest b/dev-lang/ammonite-repl-bin/Manifest
index 095771b63a5f..7f7c3cb1abac 100644
--- a/dev-lang/ammonite-repl-bin/Manifest
+++ b/dev-lang/ammonite-repl-bin/Manifest
@@ -1,5 +1,3 @@
-DIST ammonite-repl-bin-2.5.3 48419355 BLAKE2B dece0bec04f5d394470dbf393570a86674488a7191fb3285cfb4c97734e64a0bbaef1197535f134bbf8b1f03ab5847e14e9053a68649a166cdec93bee34acf27 SHA512 3ad296f1c2a5b8a6b6a7772f2f2bebab71a4e41b3e3a9b66ef65af5b39f3db6866cc07b620b0f4e64cdc21f059e17494541a03af4314f759187744229f24bee9
 DIST ammonite-repl-bin-2.5.4 48438500 BLAKE2B 386ab32fc122267d17d377201a73e001ca40eb9c3254527e0819ae399cdcda90c5ada8d4773e16a1a930ba839e374dfd0d9848ccf1da75e5f6e385bf870f27a1 SHA512 cd1b382e2a5eb2ca93ad0640d9806e5770516f8fbd1c2a468e2bb333ab648916ed7b86efdf5d5e674176eee09532cf0a9b5af57021695c37b4862abb546966db
-EBUILD ammonite-repl-bin-2.5.3.ebuild 488 BLAKE2B 05ad6d6fb22301faf5e650cfd9a980bb4fb09a5b5091dda73c77531f38df2c4f692f3fa134c5e2cc32f3a725681a5eda97b886c078e141187538bce16833ec49 SHA512 86d12b80b2c0cd67663c052dea02f584a554a4315f4fd7f71e1f66e20356f927b7636a262e4ea30bfe86ae2f25956bc1e57cf90e494c2f9ae4c25e2cff62c03a
-EBUILD ammonite-repl-bin-2.5.4.ebuild 490 BLAKE2B 4c7918665203b828d5184f3b99bdb246194119385fc902e7282dbbcf21372b3489d1885503e559e98acffef750a865f9f0f87c1f3af942715986b1682a68ce13 SHA512 54238b37a3a3e6c1c9527082d5a3eb2afa683a8f6a353d8fecc804be588b0f7d30af9873a5cd0d131ab1ede3761402acc51a41c3b9ccf281c559175a32368017
+EBUILD ammonite-repl-bin-2.5.4.ebuild 488 BLAKE2B 05ad6d6fb22301faf5e650cfd9a980bb4fb09a5b5091dda73c77531f38df2c4f692f3fa134c5e2cc32f3a725681a5eda97b886c078e141187538bce16833ec49 SHA512 86d12b80b2c0cd67663c052dea02f584a554a4315f4fd7f71e1f66e20356f927b7636a262e4ea30bfe86ae2f25956bc1e57cf90e494c2f9ae4c25e2cff62c03a
 MISC metadata.xml 533 BLAKE2B 483f7b62b48af32612e4e7154e52d42b8ea16e74cf9b4ff1c22c94ccb589e601a7e58ddc1f95a41f16dec78fa34ae203803d90b7b05d45569069f00657b1be9e SHA512 5bd1cab75fa4d2edb659e6d654a271d7f42aa8cdcea58dd2b9aad03b9ec93fca443fe9dc49335248c0d1480b3edc77ea7fc5c4d4df43e26814e834d241f04161
diff --git a/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.3.ebuild b/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.3.ebuild
deleted file mode 100644
index 6cae7d9be42f..000000000000
--- a/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SCALA_VERSION="2.13"
-
-DESCRIPTION="Scala language-based scripting and REPL"
-HOMEPAGE="https://ammonite.io/"
-SRC_URI="https://github.com/com-lihaoyi/Ammonite/releases/download/${PV}/${SCALA_VERSION}-${PV} -> ${P}"
-
-KEYWORDS="amd64 x86"
-LICENSE="MIT"
-SLOT="0"
-
-S="${WORKDIR}"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	newbin "${DISTDIR}"/${P} amm
-}
diff --git a/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.4.ebuild b/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.4.ebuild
index 3cb6ca4d0ff0..6cae7d9be42f 100644
--- a/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.4.ebuild
+++ b/dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Scala language-based scripting and REPL"
 HOMEPAGE="https://ammonite.io/"
 SRC_URI="https://github.com/com-lihaoyi/Ammonite/releases/download/${PV}/${SCALA_VERSION}-${PV} -> ${P}"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-lang/execline/Manifest b/dev-lang/execline/Manifest
index e6ec839599e4..47e8ee5ce225 100644
--- a/dev-lang/execline/Manifest
+++ b/dev-lang/execline/Manifest
@@ -1,3 +1,5 @@
 DIST execline-2.8.3.0.tar.gz 98448 BLAKE2B f3dc1a194838f7973044b2d86e6026936697be4f34f9b01f5dfc98ddabfbde3dad7cfe95afd63f65cb266994b922d7d4c94368cf5dca2a2494fd0033b4ed6032 SHA512 40f4697a8165616848ed36dcb31a5859dee55a47439d13908a387550e8f53ca8fffe3bcb3e0462cb93f694c8fb483b14e152f92e6f9d0d536cdab9d94be9c53a
-EBUILD execline-2.8.3.0.ebuild 1133 BLAKE2B 98488d28e888392d47e63758836e9f230426ad3f51ec7949d597f1a8cb9a2327aee40cffcf9356b10b9599479f29eccaa165aa5f4092139b7e5fb7ed0cf04b44 SHA512 be36521ef51a25fb44257379bc47a83ef5d7d07fa491f1ab11858598357750766e103220003389a473a14c921df41912e195cb189624583796262c83fcc4ac71
+DIST execline-2.9.0.0.tar.gz 100225 BLAKE2B a0b0bdde6b827272e55a64a58b28b85d4ec0ecf96eae59f553b7914642d184bc77864f31a84e4584d482893c3851eca419270b41ecc3c4f331e8ef768c90b474 SHA512 bd491ef38c439cfe469a3aeda6d462930b1edcbf04a1118851161c30fcd3521e8ec98ef53261f9216c6f210a6816d6dd7cff6dcc853a5d2f28d963f8083aed84
+EBUILD execline-2.8.3.0-r1.ebuild 1136 BLAKE2B c23a21b61aabba7399e23177e2085fbf9ee68862ae270fb90c6ff0d75523794eeb6d0f4c4e11f3b70780b9f1130012e925242ff59efe990fec0942ad47382a5c SHA512 43f6e1594f7b58a58513a679c83bd0ad69d4904e3dd59bd189a358938122ca81cd5972d151ddfdb6e799f5b8f6572dadafc27a7581eb60ab041ad48b75f37fbd
+EBUILD execline-2.9.0.0.ebuild 998 BLAKE2B 69cddb50020819c05806d4a9651d3797c2646a4cf674bb55372b63e40f420a74378320b4fe7ec93ee42b03da0dc0c1ea660a4fc46151399db22df00b0cda542b SHA512 eb68daf9b2275090171b044b255ed0a51ab0c2bd82d2aa1df0fe30ed5a7a4d95de6567cd718cc447677af0aca635d4c022678b71f55fc8c50729cbd3a52fdd9c
 MISC metadata.xml 730 BLAKE2B 0144183b0f42cc421c44f8cfc4e0b5dc6b1639e4279facd59b70ba76d8399e63a9b5d053fca41fbcf987d6b5b8ae1c653430f3fa2d63488f6f73c134344d0a75 SHA512 b30e6f0bcb3499104c0cfcfd5687f6ac1016e89d4ffd8ebdf8409eaeaaae6dce9c4fcf6f97824846527b95cfb61a812bffe7017304ca94af74d7bde6ed0586f1
diff --git a/dev-lang/execline/execline-2.8.3.0.ebuild b/dev-lang/execline/execline-2.8.3.0-r1.ebuild
similarity index 94%
rename from dev-lang/execline/execline-2.8.3.0.ebuild
rename to dev-lang/execline/execline-2.8.3.0-r1.ebuild
index 2db001f8d0f1..62307e392904 100644
--- a/dev-lang/execline/execline-2.8.3.0.ebuild
+++ b/dev-lang/execline/execline-2.8.3.0-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND=">=dev-libs/skalibs-2.11.2.0:=[static-libs?]"
+RDEPEND=">=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?]"
 DEPEND="${RDEPEND}"
 
 HTML_DOCS=( doc/. )
diff --git a/dev-lang/execline/execline-2.9.0.0.ebuild b/dev-lang/execline/execline-2.9.0.0.ebuild
new file mode 100644
index 000000000000..7881d1093e25
--- /dev/null
+++ b/dev-lang/execline/execline-2.9.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A non-interactive scripting language"
+HOMEPAGE="https://www.skarnet.org/software/execline/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		--disable-allstatic
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/dev-lang/gforth/Manifest b/dev-lang/gforth/Manifest
index ce319bf58566..18e7c54c207a 100644
--- a/dev-lang/gforth/Manifest
+++ b/dev-lang/gforth/Manifest
@@ -4,5 +4,5 @@ AUX gforth-0.7.3-CFLAGS-LDFLAGS.patch 1097 BLAKE2B aa66797e6ebd04966f67275a8b0d9
 AUX gforth-0.7.3-rdynamic-auto.patch 634 BLAKE2B c824db023b690ef4e196715589017f2d74d607cefa8fd6a29e987a3df90aaf4e09f4ea7cc3475b93c8ea1f308049a117eb8ea258cc50e962ce5e501b513b3419 SHA512 32ad96b1de651088b375fa9b8decdd8f03f7c492ad6a11e7cbdc574557b2fe7458180ae71919e1f76c6175d443d50582c94876489af0c961a167b40b3d1a4b7d
 AUX gforth-0.7.3-rdynamic.patch 578 BLAKE2B 10e978a2f4edef4d66e839d2f9d047526e54235ed8c6a1a0b754a38149c2a2db2481bee898dfbc209cf8559b6f2cc408b13d594b7007b7710f3c619549321197 SHA512 2bb1491b82b87bcd387822da501078daad171950cf870f8644d909a848a4843e3fa99d8782d16524353edbffb71f704ff7bf5fa7bf326501f7dde2c294b2c8ee
 DIST gforth-0.7.3.tar.gz 2523433 BLAKE2B 1ba9095af7958aabf0d671f982c483f2046392fd9872678a58f314357875d286bee7f0d7bc38e9b21331acda80fd285c0489fed44d59c148ff6ec6b6bea7c174 SHA512 f034234acfb0fc727f28b564432219a100b916c6df4b847794a55b2fc3b8ed8714eca6de0df67c7c427b7c2bb4dd00f65cfd34e6eb60181e41ab84fea30304e4
-EBUILD gforth-0.7.3-r2.ebuild 1648 BLAKE2B 4b7ebfe9e2b8e81e0d566db1f653e2798296ef7817d2f7d5fba769bcf4949ac2f8b3cc9ec41ffedd27047451a9f43d2fe0d83df8c8dc76e9c688f1a56abdcfb5 SHA512 4335fc3e1fa53af6a4a05edb7e017ddf32257b4047e79f68834bc8ce0d93b2c551bfc2dd42ff9ba29e2cf75964aea911b4775e784ec1d7369156b37203efaa1e
+EBUILD gforth-0.7.3-r2.ebuild 1653 BLAKE2B f797bbcd0b42ecce8bb45359386105eb03e743bc1cb3ad1320055da6c076467f6f10932ae175c15d481a9819ee0d23e5e9b67d970b80a98c0618c332511f9b9b SHA512 0edaa963becbe7976e960dec15194d0f94b44bf3addc8b2ba6fa15ea6a17e590709e5f607ffa75f5a5746c0db8b7be0c1a883a3e45b4547dc680c9fc4c6bba49
 MISC metadata.xml 243 BLAKE2B 4fda5b7957b10262e59d99d603e6ae53c3f3918800665006ae11c825d1709d41f80b8df4f0ae7d02aa04eef13a88ad0f5a4475d9b00296edf197c11d0558b972 SHA512 1deca6a3ffd886a96cc4ba4a65ac44dad8a713e0f552705ed7be18aff282bdb769367310f66e8d10dec76f40466d6bd72808da00c90c67d488e490d47557221f
diff --git a/dev-lang/gforth/gforth-0.7.3-r2.ebuild b/dev-lang/gforth/gforth-0.7.3-r2.ebuild
index 503dc8016dc5..201a852c376d 100644
--- a/dev-lang/gforth/gforth-0.7.3-r2.ebuild
+++ b/dev-lang/gforth/gforth-0.7.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gforth/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="+check emacs"
 
 DEPEND="dev-libs/ffcall
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index a12fc92be574..6abf5ade25fe 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -15,6 +15,6 @@ EBUILD perl-5.34.0-r10.ebuild 25937 BLAKE2B bb47ec2a7285786444059b4bdbe0d042edc4
 EBUILD perl-5.34.0-r11.ebuild 25943 BLAKE2B 4608ec616c9109d4b7489ef51279b7b02cd82bb772cafa901de54940edd99b975dac51667a1053663e9bd0be95c53c4ca3d57f8c140479e467ad2034a2679b1c SHA512 54370926c8b81b5800a09709fccdb2c59e405c5909f235e40cde0955fd79896e813f3003ab60f1bc4febd8ece638347be4f2cf462e640f5f14e3ffa107e45a9f
 EBUILD perl-5.34.0-r9.ebuild 25681 BLAKE2B 40f1b6ac52be6e8df0b387a6024110a4c52c75e06ba3b8281ad1864b0c42bb7eb7ca98ff3fcbf6897d0fca79e90513d4fc2eea3015669ba67878155ea5ce986d SHA512 8ebea7faa3ae639845b44b64266eb643c5cdeb9df41a6ba529f7f5fabcc3944570a9c132bc1a186abf2d46e9436c55e4deca7f76a2bcdd8a945d3f469c317be9
 EBUILD perl-5.34.1-r2.ebuild 25771 BLAKE2B 3875ad6fa3de0ff25f96a2e76bc0e56a5760c169abbd6f44a0c85f36c22a32dd02dbc8b75903353404fa7d11e10c9049a2d98896477728047bdc847f7641544f SHA512 ae09f9195ce3cdecc9aa43759527f62bc4d0002ea21c659f29186ec1e2dd7eeccb58d947567a225ac8961a84fea590c7ec49bc1b51401651c9580613351b9aae
-EBUILD perl-5.34.1-r3.ebuild 26310 BLAKE2B 3ace06ca9eaff1fc44da2461f50a9ff2e35e15b5237a1811ec4f44d055bef4e8725a62a4c88ed4d50f00c7e8c3c7ece0f8e6f59fc65f3748a5497edfab067cfe SHA512 605df9272e25bb8418e2bbaf51d3bb44423e1cb044a321e4c6877af3ad20e21d7d70d469287ec22496626bf48beaae5205f8ab0465d1638433a8c2647fac85b4
+EBUILD perl-5.34.1-r3.ebuild 26309 BLAKE2B 05be3cb2c0860cc59559bb502331dc49cf8d6908e9adca14474ca64f6f24a0cd5701463264910f6622135b75c4b9b1f8a34c7c0cf2da86abb5e38e321a78cd11 SHA512 f401b9cb0b285a91c97b3b0c1b39777a86567e43b7334cf071b877b086016ea33c979693a9a92f57719dfcb8e67f0c996b8bc91c06150d7377efd926ac67b5f3
 EBUILD perl-5.36.0.ebuild 25533 BLAKE2B 8d15f3430f9d865a588b67e86bfa1a4b31e40ff5e3179a4ef5145bce3e9cf6a578f5a18b84edba177a298389d40f5c75becbb2345c14e02bd62833b2d5e6339e SHA512 3d3a6ca1914e0957e79d3990e1953e7ca074b126e149c285afdac456f819b79d568ac67da0381c7a0295912b38b808dd802baa8f6100573d9f04c6ace2d74539
 MISC metadata.xml 518 BLAKE2B 5c47c68840fa1444118ba11372d74675a68d178e30ee2b2ba179f1bee8fb97bc7178b34015c29b0688f88391ca9ee2c2f229cfa7b7bc812d2ece9721f8b84d6f SHA512 03980f6925a60032872acea0fb2693a2651b81b8656ad3a7b4adfb129bcd925cc6470e2dab293ba9618e8dd45f0ba76c2d8f4c908182747b0266fa02a268b734
diff --git a/dev-lang/perl/perl-5.34.1-r3.ebuild b/dev-lang/perl/perl-5.34.1-r3.ebuild
index 7586718e0855..c92f6b9c1571 100644
--- a/dev-lang/perl/perl-5.34.1-r3.ebuild
+++ b/dev-lang/perl/perl-5.34.1-r3.ebuild
@@ -58,7 +58,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; 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"
+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"
 fi
 
 IUSE="berkdb debug doc gdbm ithreads minimal quadmath"
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a24b0cb806d8..2d763da78115 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -24,10 +24,10 @@ DIST python-gentoo-patches-3.9.12.tar.xz 12848 BLAKE2B 5dd66fa94b136a463d2c4be3a
 DIST python-gentoo-patches-3.9.13.tar.xz 12836 BLAKE2B ba687a3d6e00baf4d9640ab78a29c3e21bf1872b5019198991521cf37bb0780f592db742ee4fdfe6bfb1cab1c1f6587889dfdb024cae72766b6c83c2ffe319be SHA512 e393992ff92625771c6ffeb500637862f0163c689c685fd245a6e5bbdd3128154ce439ecab56eaf1359e67ea0d173dfb19f65a4098ea2266922bfb43aba517dc
 EBUILD python-2.7.18_p15.ebuild 9827 BLAKE2B 77ebeacfa236e518ec0c0a791e0da60f8158d369e870c88ce69d1eef25cdc99e658903abf313452b849254e97b4c9f583e0edb75ec845faf5b47fb2fc3173ce4 SHA512 19219cd43391d8d53838c9b0e15b30f8ccb5d5a23503a213cc961ff2fa545cd17a5ecc6ce253e2a01534db3bc931be212969c40885c2e99f203c23a5ecb689a1
 EBUILD python-3.10.4.ebuild 11761 BLAKE2B a51875cab569a32b2f311b33c9abca0707e4c3d7866c66019487bcd223dc9b75b4bd3f5eb2a62bf25c9dd11ca5af5dd626b8a01f16caac02f098b91c782a27da SHA512 cb2eb41022a7486cfc1ced18da412598509335df9db17c1333bed4679bd8dfff827bad9858bed7d1085cd2a14cddaebef739ffcade5e327737540372a879bef3
-EBUILD python-3.10.5.ebuild 11704 BLAKE2B bd19b5d7aa25aea806037cd0b08ac0300791278e500d8600a3effd5ad25977d448e6507f609be4ad41ca337c6a9be333a76ef97c19650aeef8697e116c9a52ce SHA512 c1a708900c9b36613d6402d69c156e91130464550f5224a51192ced1ec9da2e0cabd2845437e31535b4b5cfe153bd1c39551f79a33bd1f0cb1de31ca5ee40ee3
+EBUILD python-3.10.5.ebuild 11703 BLAKE2B 6c5831136571fb1dac4a1b77976df561ce6f2096f6445708523920b160b32486379326e8351c6c2f316756a63aa7d4712c2ffd0d469790a352287f7d676101f7 SHA512 77478066d37d42b11063bced7e991b9094a7465f3acc8979dde946a9b4a5539ad1fcd0a1ca079527378b15b5f98b5ec68f55e182602e743a8cc883f0662f0793
 EBUILD python-3.11.0_beta3.ebuild 13176 BLAKE2B f3ff342908575b3e8651f5eba8b7428f60b8f799f44f46f5f04f98e82b82b5ac85127e90475b0d3d9653f9b56e15fa606437c0a8bf98c2affe5a4bc65845f24f SHA512 f9d84559aec861e6e1426914da6b0430878d2bb141def8c064f06d21431ffb8b915b905802505dfc1a98d555c4d3bb130ee45247b717b38c5ea9f7a9056da1ba
 EBUILD python-3.8.13.ebuild 10279 BLAKE2B dc700b2729f44840d33306fa0e50565d3c134ff74db39c83aebcc9994899479736bad15897e4135904bf7a6f4914c40e9b73caa64a0376aba10664d07c351227 SHA512 51b826ed0c99f777b684341141c83fca557942496a670aa4385f6c8c6379e445d7ec953c2f1b9562d5b4ee921038677f597c27fc8f355f076d72f66e6ae6ee9e
 EBUILD python-3.8.13_p2.ebuild 10221 BLAKE2B 3786b6c9b08b68fcbd778570d03889ff4f521fca8f10963e93e6f475df063226962dc9dca9bc0754f4afaa5b600bfe3f0c76f8bbbfe4fcc4f3026957d249db9c SHA512 bd4782819b48a06657dc0382655ad49d928f503f9dc7bc708c76dab34617975938f71644e7b4f54f9935c0b232016842bf5847d9c3c0a1aefc0aecd2052e85e8
 EBUILD python-3.9.12.ebuild 11522 BLAKE2B a1847835a23e863957ab089d1449a01c377ce9e1460ab3ed3453d863d6ad38824802bed23490dfa27c88615c1d70b8690d086997da143987657bf595d592ef2b SHA512 0e0d46e25e1f353152daddd3d67b870f393124a48e1cb9f9f464b3174d5254cba2580e7351dcba91558885cda7342e843a2e69631100bf6d15d791fadc3d8d2b
-EBUILD python-3.9.13.ebuild 11469 BLAKE2B 6b622120bf0af58d2bb2982e5837f3df3f1c804ed9f11c582fb1b8ae34f3843cc5c12accc95df8ca1d44b0f5c6ff0ee7ab9fdcea2c65da0af0a97bb5980bed64 SHA512 b9340a4defc014a339d770870216f7a08d1c0b5701e4f93372d9fd9eb5519711e5718976287a02850df451c96daf2b97708e5d6d22d0928f4167e6b86fd277ec
+EBUILD python-3.9.13.ebuild 11463 BLAKE2B b6336e19223fc99ad006f846d397c39200ffdfc72b14fb3d02ec7a3e6e79749e08bf1be90b6138dd6f2ebd703491b2ed2fe6e7dee784d1ae309c072751a0c8f6 SHA512 c6dcb2aa5f91db7b2c7c2c10ad06d4d7d9d78ba6ce8e6998f13a54b0f851f9e5828f9cca64963beb6953da1448a4d2145f2f1c0d278ac33152606c98f6aabda7
 MISC metadata.xml 740 BLAKE2B 31abd8d03440517adf39f29f36e87f821dbf029602f40d4b252b1ec8e6a52955ad9325fe66a9a3bd2e9c4436e6c6865853f75c3169016c7a44327a06b07694df SHA512 b601a773d5fe4e29d43e9ce5d857bb525b706b95745056a74a2476a37f182075363cb44814f9d6f73b8be08a63d75ec322b608463796c6eef7aa8d636a2350b8
diff --git a/dev-lang/python/python-3.10.5.ebuild b/dev-lang/python/python-3.10.5.ebuild
index e7e35f34bca0..05c9d1ad9dfd 100644
--- a/dev-lang/python/python-3.10.5.ebuild
+++ b/dev-lang/python/python-3.10.5.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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="bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.9.13.ebuild b/dev-lang/python/python-3.9.13.ebuild
index 9bcc97a9cb47..65fa4e8dc98f 100644
--- a/dev-lang/python/python-3.9.13.ebuild
+++ b/dev-lang/python/python-3.9.13.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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="bluetooth build examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index bd43639e3fab..4d08ad1869ea 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -90,6 +90,7 @@ DIST rust-1.61.0-riscv64gc-unknown-linux-gnu.tar.xz 190408604 BLAKE2B 1f37d88201
 DIST rust-1.61.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B c413b2f55e3d45dbfccf193f5cb9f6866abf895d23c850e3744a0bd897c2c812f57457211efaab7416c0d8fc079cc4feaa35de879ad76356a961e704e711be46 SHA512 0155b4e0ba86cc190b85f2f82e8ee75c14825e52e05ab3446283512f0b42f113d85ef89d72e0929382637dc0a44ef72f06552957285463c2edd7f83d9c8234ff
 DIST rust-1.61.0-s390x-unknown-linux-gnu.tar.xz 214196912 BLAKE2B 31eeaabdbca2fa837610179eafd0cb6cde2ce8d4feb57e86cd1fc8962e1f8b84bf067d7782414380616d5b56fef5db19c91c54c89f5dd935debf6ed2d3841466 SHA512 7de0ea08c4834e60d12098d92d4366689c0b959f58667bc68e35ad3c976011e8d9375566cebd9260933e13bd74105d297dabf40a0d09b34f83905d4cb9995f7f
 DIST rust-1.61.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 617bfd93b883cc36c8504ac326813511bee205a508489be168060863d967efe9a2e8276c3834d872f419317047ba83624c996be9d6f913be58f9feab66f292b2 SHA512 933689de3c1fabc31dd1910844479b3505e1a8b8474fdaeb4936df118a6da4f9597c45f0a0056d5c1efc33ae8ffb2910f5aa07b91afbd231ad7c20f0c79ceeb4
+DIST rust-1.61.0-sparc64-unknown-linux-gnu.tar.xz 76632772 BLAKE2B 2e8c0ce511735bb4c6bb4b51b164e2f93e8a9c23d94d0ec126bc2f51b1ab5d526327b337301f5adcc7c2a717f1df9f482d853a49cd677616849c72f472c06742 SHA512 c4fc82b6382c95017b8f18754641b617ff544781ff9e032cd1ce3f748fa3ab24c461e002dca967f5c6c65f53cffba0c49746b42383209d11dd07db3a4dd238ff
 DIST rust-1.61.0-x86_64-unknown-linux-gnu.tar.xz 157592468 BLAKE2B 0877c0794280a5ab7e74553c02cebad67e36148a3f34a709973310d89d7ea65dc8ecfa8b9c461e4f96939ed2ff09b7bacbef0b4fcf409758a0429bc431f87ebe SHA512 365191453f37775cf8bed66e12224294d4d99f3bacc635c3c13f05bf8585838a04b602c2fef7964f26a6cc35ab432a5c0a9745e9ffad0a83b0c761ec02de3484
 DIST rust-1.61.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 5296a8df210a4cf2fd7dffcba1ae6bd8cda9e408ff4c55d997199c2890b9faab9e8d6d22a3c0961786bb80231836047929621edf9043d474b352fe28bd9192e8 SHA512 cb97e84cd793aa8676c41297d8da14125855c008815e65d8191868eb88241ccb408c6f9ae85b7ba8de1a02ea8923f5e042f4fea662fa593e5ec03505b41ee52d
 DIST rust-1.61.0-x86_64-unknown-linux-musl.tar.xz 259724324 BLAKE2B d005bd2794d196136c42842fbb7bc64d827898b5713f768cf0e88be5a40e3906139027ee58571cfccd8d2c864f672d1986da28c72f0d1c4a7f78d18efe14385e SHA512 96d09ac3a48bb2956dd6bf219e605c68327a94d09e72290ee74781c4886dce93b217163fb08dac0ce69bfaa2e3ab8cccd4a26d10b9df4c3162822a38e355bdb6
@@ -99,5 +100,5 @@ DIST rust-src-1.60.0.tar.xz 2898184 BLAKE2B 5810f14110398bc41342ec620a77da34c805
 DIST rust-src-1.61.0.tar.xz 2353184 BLAKE2B 6f5671173b89eddc4e1a36e58e5937b832ab6952c2601b16427c614c5e7bc7ab60b28d54f33e9c2578ce2d5b3db641097ddbf912ba0145c4f77a1d14115ed703 SHA512 8eb1462896cfd0c731de4f4be6fe68127bb4faa443c53289a34b92ff7778ee8711281cfe29b2c1367c0b3fdb9f6b7dba21dfbd40b968aebaaa51eb219357b4a3
 EBUILD rust-bin-1.59.0.ebuild 6408 BLAKE2B 6e90ac8111f916b0314508392292a4ceb92ff55add41d27dfb6a2338c7baa8f19a4f5626673ad1780078f43357d1654950df2b23b998dc117dbaf49f168be6d1 SHA512 4fbe98143c4ee4131505ee5b4d8a5a463919d9e172931798b540bd79d6203b550d09473df80128844b6cdb6f8fd2b293ecc5f8b0c7634e5723b2d54a9980140a
 EBUILD rust-bin-1.60.0.ebuild 6441 BLAKE2B 20e13211584ff99a3f26f146e9d08dba49534a3ad9700280f9240dbe9ab6534e01e2f00ec4ff8c692fd24608be7e39f63886dfade88251ab659e888f10581718 SHA512 312fb2999e1e0ae51c0c3b17965438af8e7002ef6901e9245471aa5c8387f55a09402231f0ba258b359bac5245e6cc287a0bd3e145f8773797ea442af583b45b
-EBUILD rust-bin-1.61.0.ebuild 6447 BLAKE2B bba147f8a49f35d665a9d01126ed04e8025ca642495362bd4ee34d6d2f44b0ec7670c5a31ff600c3804b0dda0cdca8dcf8e0f0e4c81fa9757ece3f02be1e454b SHA512 a09a1557e74c35356635127c246493fee99301b4d025162e5d18b7c2b9b57bc2e2e3d79d392517eb53d9febb83c441b0e6f14ee2d85ed674b5ac67e034cb0e68
+EBUILD rust-bin-1.61.0.ebuild 6636 BLAKE2B ec6cb60a496aa25093e64e1bbf8987dde73979cf450772962d5ea346dc338ded919acf3a75c273ac468240b248877c157f1f434490b89afffc1cb2c1e88764d9 SHA512 9b828c3d6873e315cf105c5a7d97a6185ebbe3889f2cd410aec3d47d80e4ff018600d970d4421321faddcf713bbc89bca8c110b16e4687b10a1fde89031560f3
 MISC metadata.xml 591 BLAKE2B 6f9d494e400400b8b957eaa3c242b5f096808cc8372360eac0d9ae4bffcd2aa75b35bad4acc7248543b08466d8616b0145ae8a9b1534db1ad5ee838f07f9dc51 SHA512 9f59ea60d8ec9b748eac0789fa6750f32e4867e1c2cbe106ce270acdb7306d40fe8754315f8c65a924af43d5b3e88f4f50dec6361299de80ef1a25665aa03182
diff --git a/dev-lang/rust-bin/rust-bin-1.61.0.ebuild b/dev-lang/rust-bin/rust-bin-1.61.0.ebuild
index a745ac2ec2f7..1e31f9b3af8b 100644
--- a/dev-lang/rust-bin/rust-bin-1.61.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.61.0.ebuild
@@ -8,16 +8,20 @@ inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minim
 MY_P="rust-${PV}"
 # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src"
 MY_SRC_URI="${RUST_TOOLCHAIN_BASEURL%/}/2022-05-19/rust-src-${PV}.tar.xz"
+GENTOO_BIN_BASEURI="https://dev.gentoo.org/~gyakovlev/distfiles/${CATEGORY}/${PN}" # omit leading slash
 
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="https://www.rust-lang.org/"
 SRC_URI="$(rust_all_arch_uris ${MY_P})
 	rust-src? ( ${MY_SRC_URI} )
+	sparc? (
+		${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz
+	)
 "
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rust-src rustfmt"
 
 DEPEND=""
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 845e3fb9ea46..a149e52f14d1 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -108,5 +108,5 @@ DIST rustc-1.61.0-src.tar.xz 136696780 BLAKE2B 604299aa5c8dd7dff9802236898ca5d4f
 DIST rustc-1.61.0-src.tar.xz.asc 801 BLAKE2B 46384fd77c72ecf5cd7c783655f9345e4d52718c737470548a9f3498af9cbb93c3bf618464507cd10185c39a5207fd6669c6c82841c8c82fa325001cbe659cb0 SHA512 5ea807254f0d7c207f10f1fb224101d9ae3a3c81aff16d2ba2ea4af1fe92345d1a25336b5cff0964aba9ed249e38ab9d3df41eb1217e048988093cdb46da8962
 EBUILD rust-1.59.0.ebuild 21153 BLAKE2B 0c8da01c7b944faf9bda62d5033421284c0e3c58fe04d55a2f815cd11bf820c8a72e201c9f49f0e373e94f2e406d31cfd83208b8bdc5f194605e53bb0e5f8eac SHA512 d0ef5b70612856a9b8eb4baccbb90cd242d8892b26133a680ff5a1d700fa1a352ac244e27224334fe597dfe2bd821a26d5143372f796e9a1a07460e9b8352729
 EBUILD rust-1.60.0.ebuild 21376 BLAKE2B 406bac0d9acf6ffe0666fa319d0cfd9238c0f09400853e88b8ce9ba609962ea48e2c3f93174886b1b03786db25d122edd488c0f898c9304e4e85acecf4d6674c SHA512 8e2dcbb727399e6298c007c0a31d636fb27c8afce01ee1e9191bb0ed7e29d73646eea3b6e7a994f71891fa4bae32c0d6b509bfba6dfb818f11697101d2dce21d
-EBUILD rust-1.61.0-r1.ebuild 21896 BLAKE2B 1b9433a62c6ed58553bf0a4c0bfe4639e7c53ade69d0946057ca82848e922717ba7b8c202eabaa25c9193f258474e7eda70586f38f96d2d443b0cba73f64431c SHA512 b784b9df774efd791b159f3e306fc83ae99ef6a59ec38f7da47cba1abeca2c77d4b1cfa6d8529eeaa6883f36af8ffa8f5355d71cf732fe45b645ed2bfbdb6cf8
+EBUILD rust-1.61.0-r1.ebuild 21903 BLAKE2B 1ccd10ef4ac32b47982e465dedb6d500129b45453aa2296533726cd9254419d0a128b268bde11e6b5ee472b334d6a66a2f269bc72292bf70769fce858ac420eb SHA512 47b61b51211f546838469eaf68fc84879d0bd6c29715bdc5799344c70d6942324baeaec71a6179fc97efbbeac706463144e556fc1931c4176b54f69296884134
 MISC metadata.xml 1586 BLAKE2B 4d9530ee760d64480e32f899a1e343bee6e7be7e079ec3ce6e36403793f3fac7a2d45ad7415bce59750b0ec8f986708b80cce0aee80b4b7192a078a7053bc461 SHA512 e79110cc72691757b137dd904291f734f877786c72e5da9f4dadc6f3d6fd12e7d60b4ffd2fb1400ce408e82733f5b5a5d7230d0dbdfb5634a031cd17f24446c7
diff --git a/dev-lang/rust/rust-1.61.0-r1.ebuild b/dev-lang/rust/rust-1.61.0-r1.ebuild
index 0d78a06e94e3..f2d87f021ce4 100644
--- a/dev-lang/rust/rust-1.61.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.61.0-r1.ebuild
@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b01e53d39d26..3e6cc8840847 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 9468fb714cac..fa6527b1d5cc 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -7,5 +7,5 @@ DIST elfutils-0.187.tar.bz2 9240221 BLAKE2B 00ba3efa689d137808f5f53ecda93fd006be
 DIST elfutils-0.187.tar.bz2.sig 310 BLAKE2B b23f656de269030cc3dd518a008e22e22726138a3bd619ad269166d3b9fac4b1064d98c81a02fcc6250ca1a996cc3e81322b50e7692fe23cbee92e2908f0300d SHA512 2619d8d537364386491d5e54f2add7ffa5bab21cd19c94a29249f2d9c5cc5dac53e2031a5515268ddeee4799b71115a5d98bdbcafd361aa75bcc13a1d9b70b14
 EBUILD elfutils-0.185.ebuild 2553 BLAKE2B 814831c9a53e59cf1029350ce9da041a8bc6d7890af8b24dd3f7c0b9257c9906edc90ed394bd88733504f1f7b8849d9962098017979929ae8f99bddec709fb37 SHA512 9fd9f9fef8b6d73c83bac2bec4b8b69d9cf9bcfd029b21ef409a1f4974656004dd1dd059514b250b13b8806d7038fde18961a41e28bcae3a841e995104d47c2a
 EBUILD elfutils-0.186.ebuild 2554 BLAKE2B bd9055bcc73d88d089ab7c002f421c8721b7c2af222d9f4dba8691d73221319f77250ff967e4d231ca5be99e48773142156cd3c34072258afab2f2f043141d3a SHA512 2c88af4389bc319f8de9430f71a1be4f426be0db2a1b66651579c55a6ec1bfd1701b522930360c3c4c29356e139a03dff59d659d4ffa06b4766b93b45b04da3b
-EBUILD elfutils-0.187.ebuild 3105 BLAKE2B f1934cc2173f7a3680215fb8e438df5c8da26e6780c43e99141c85668d01cd30821eba6d9f9524e24a918f08093e5f018a2d850bf92672594461b0db5fc6c55b SHA512 8fa8bb447e918f6a1fd0fcc9fcc7de62e8a3a61768ef614b79ba967aa02101f29695efbf6f652aa809f0f7bdd0fac9c1c5772f6bcd3a5ebf617f9cb8640242ba
+EBUILD elfutils-0.187.ebuild 3098 BLAKE2B 8a848936db7d036bbf1ddb34577f77dc3315cfdfa209f7413c037c20a1af81606d55eeff6a6ba3a78819ad530e0f5752d0c29a581c74262a3170b9b9a6236f79 SHA512 070a38667f8c29de404f325ee711bdb57696fc62a28a1c239355743e2aa8e3eb418400cfe438bb1e6025eba8fc2408a370db6812c1bcccb94bd4c07ebbee90e9
 MISC metadata.xml 730 BLAKE2B 94e9585a2d765ee2a7c85a823c389453bcdbc29b90a5542333eef1253d4ebafb7c26e383dfe5c5e0fcccf61f60321e7a46b0ae8c5edf467937485d6c9867712a SHA512 663cb6d587113d21fc0d3c703731f4dcaed55fc1bc7e75e1ac465e21b161ba5c4b4cefe0fd838d28b1f890cc33008878996e1d117fcab6435f8ed49f7eb0bc73
diff --git a/dev-libs/elfutils/elfutils-0.187.ebuild b/dev-libs/elfutils/elfutils-0.187.ebuild
index 8a7b8581db92..1db301f35330 100644
--- a/dev-libs/elfutils/elfutils-0.187.ebuild
+++ b/dev-libs/elfutils/elfutils-0.187.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest
index 3e88fb665627..3f84350425f1 100644
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@@ -2,5 +2,5 @@ AUX ffcall-2.4-vacall-riscv-pic.patch 16090 BLAKE2B db91cee446d8542d48b7bc33cc13
 DIST libffcall-2.1.tar.gz 943235 BLAKE2B ae82663174db084e830b6ff77ceedf8641b3edeb7800952ac4e2772d9033da3e45f46159e6fdae86615dc69fceba39f48d6c75e6cbd41be98f1986fa69d50b3b SHA512 da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e
 DIST libffcall-2.4.tar.gz 1253767 BLAKE2B 669bf556f082b533eb7d71ebc6fadeac464b1a6054ac8078c9315678929bcfb8ad4b7376b345bcfbb5d2caf9d45179012d4bb5a08ad675f475f58570ae96b7ae SHA512 c9451662764a888e3be21499c29673bfb0e1df4915814da3506db5d395a2b00ea2f0c08d1c9dffebf030179f9347794876ec6ec9e6710b4fc70fd760960335e6
 EBUILD ffcall-2.1.ebuild 1465 BLAKE2B 94c45c5e0c32ef02e7eeb1922466dabb4c5ad239e992403796e84a803fb2901384da0b029af539b8d71d960e207530de48bc49a72ecdd7143721d0982af76e13 SHA512 4b4fd2c30aaa9e7039e3797df97ad9947f960ba22d65fc5ae1a8d6c57c1cf6ad04ea6726249d3e2fcb34940ebf30b2c15f270f19b79dea9dd2e8b0fabdce062c
-EBUILD ffcall-2.4.ebuild 1589 BLAKE2B c918984a0d98ce6eca0170ffbdcfcdaecca7a9be9c7cebc7d0783824f8fa24565f02f44281c0fde515d5b6ee7506c12416a4871a6dd09f817402759700a510c4 SHA512 440554c776624b64291bcae003248cc7506bb52003bb5b267f413d4086b5790e26fef15463ff76d07f6acd55b132369becf6583f973ea229b2e78ab1a0be56d3
+EBUILD ffcall-2.4.ebuild 1594 BLAKE2B d5698aba91126067627ddb9a88f525e248bffecc7ef49288f8dff1f7c32746a4dd0d9f421bac6ede0f5d0130434a69771e7c38ef457eab46911361b374025e90 SHA512 27ff8105f30e2c1f3fe76e2c125cfb1b25870bb18471bacc642ca203ee6059f10f3292e2ed4f06ac40e128cbbe1619d3fc7e1985059d56d5d844da684c62b6dd
 MISC metadata.xml 859 BLAKE2B a3c2244f2545985f3000c06357c8494bda02e082d089a1b44793a944bdd2592eac8b6e567be29943d07a0eb2930dfda1eb20695f213ec469a1457fd3f8d4360f SHA512 49e8a58e4839ee6d15de7165fede7f8b5f1f200731f8d3a0c4ceee97b8ff1c6e03550ca6be6531d928d43000ec7ded5922f85ef8e3a97d1853be94c9c3d3afe0
diff --git a/dev-libs/ffcall/ffcall-2.4.ebuild b/dev-libs/ffcall/ffcall-2.4.ebuild
index 913305d7eaa8..286058bbcc34 100644
--- a/dev-libs/ffcall/ffcall-2.4.ebuild
+++ b/dev-libs/ffcall/ffcall-2.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PV}
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 PATCHES=(
 	# bug 842915, drop on next version bump
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 4366bedf75d3..ef771c1bb753 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -2,5 +2,5 @@ AUX gjs-1.64.5-gcc-11-support.patch 5254 BLAKE2B 77ca0c06f8214bc4a61d4e6df237177
 DIST gjs-1.64.5.tar.xz 422548 BLAKE2B dcc0b7327cbc6a1108be031c8807e61ebd3c8392916750078aaa0d82cb3bf9f7ff0e1876c250e5ddf6e9d7bb6a17d9d1fe34c1c77ff534b7ec1dd54fa05a2d1b SHA512 41a3c79888792674b2bccbf254507ed02497eb571c8ca7f47aab406d2ee29b73c98b1c7d59c33ed33bad90c6989df944d78b86d2f7e9824d598b62e29769b6dc
 DIST gjs-1.72.0.tar.xz 620296 BLAKE2B 33665e66d548c6017bdc9ddb7409e1a21b07c9257bfa23ef35b58131037eefcf8ec5c8ffddbb1968db374f22729a6da873b85a022a2f3ed00168cba00acc7923 SHA512 224934eed511052d013cc7c2a29ccf79b14e5ed8c01db8071f07858387d7794b9156abd43ac494a13294248d9b6f2956d21c4e9581a41f5161043dff374f72f9
 EBUILD gjs-1.64.5.ebuild 1182 BLAKE2B ba36f6e0485dc507cba57a163eb835d5857e00e6f9dc46e6659bdd4e3b35965f10d8808c3a0220e7369f29c3c0552351ebdff4d590932bf916a11b2ae26ab8bf SHA512 d2be5b242e3249e7a718f7ea595ab3b44a83645f553d7ad42cc5a2b766b96a335b86f182a718fc1544e0817ade4b2d6229a0b0a41f9c4ab5f5ab0af49fc96bde
-EBUILD gjs-1.72.0.ebuild 1189 BLAKE2B 044d0ee15047cd104c26605554c9295c89036a909b2fd48159dd1ff9d3c9c78d03e4624fa738e01d0ecfc7d978b40442dd5a7331b27d93c91ce35af6a43af0e4 SHA512 3a4821773f90d2be224ddc77f551a0b489aa349113ce1f1fec14e520f5a332e896776e019b1119686dba8069449378dc12b52d63e4ff86afedb9da34bd891807
+EBUILD gjs-1.72.0.ebuild 1885 BLAKE2B 472680725a8ac3fc8f95831135755ff14a111b4491ceada68851fe8754b5e380308524d5d1b5760581cafb2e827a2a74ea449f5d55526d4515ce8358b0e479ea SHA512 b30afd4b9b05e09b4e864f70accc355bfc0fde823cd4cc41decf88732c5a06679167187de2f55df4fbca958367f8c399e5689926c5bdf35e7edd645be6bb5d25
 MISC metadata.xml 389 BLAKE2B 68d318dc917f5072b08e83506e14d0f4b8f25bdb90b95701013466112f8fdd77c2cc193257eee82fbce517e41056eeff61cd20137b697f6d1d688d943bafb8cc SHA512 bc4b0c94d58f3f67cbe481c45fdedb5d601e3ca40b5dcc88ef8c7ad9b214e7cd0d5c47d94599f85c11cd1c21dfd57770fd64d442f4b3f960ebc70a8e16f8e8eb
diff --git a/dev-libs/gjs/gjs-1.72.0.ebuild b/dev-libs/gjs/gjs-1.72.0.ebuild
index 842e4de4da6a..6a6738cf344c 100644
--- a/dev-libs/gjs/gjs-1.72.0.ebuild
+++ b/dev-libs/gjs/gjs-1.72.0.ebuild
@@ -34,6 +34,20 @@ BDEPEND="
 src_configure() {
 	append-cppflags -DG_DISABLE_CAST_CHECKS
 
+	# On musl, it's required that either gjs, pixman or gnome-shell to be built
+	# with a larger stack otherwise librsvg fails to render a particular SVG, as
+	# a result we fail to get gdm or gnome-shell running (greeted with a fail
+	# whale screen). The bug has been reported to librsvg. This is ideally just
+	# a temporary workaround until we understand what exactly needs a larger
+	# stack size, as it's not sufficient to do just librsvg.
+	#
+	# Please refer to:
+	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/686
+	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/874
+	#
+	# TODO: Find an actual fix instead of increasing the stack
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
 	# FIXME: add systemtap/dtrace support, like in glib:2
 	local emesonargs=(
 		$(meson_feature cairo)
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index e2e91a7145a4..77e20277c393 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -2,5 +2,5 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923
 DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913
 DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69
 EBUILD glib-2.72.1.ebuild 10226 BLAKE2B 7d030db432ce12180a60984f45f115e528c7fbbbd31b045ecf9bacbe2a143c6ddc1631b106e10a3059695c3fe3428f438318670aa7e4ccdac7956baae4c98d10 SHA512 651000c70ed27d2649f2fe04aba63e104b851bd7915da1b3f7622d97d91eee4765831c70f3d47d0013f518cd3342d412312f1308eb8eddf54ff91fd75da52d85
-EBUILD glib-2.72.2.ebuild 10237 BLAKE2B 0ec427acc268ee0fd9fb184ba9168fe0e06ddb4bbb8596724a8c041b0f699f17768e16f85cb39bd45a3d5af7441d62f906749472f4ce05b5c87aa8ff4909c947 SHA512 d3f07fdb308a8374e8e34ea094efa0d7464d064252f419397942c7df08da037fe5aa27fed5bd42000df6958095ba707569ae8d0ba386a0b455ca10cdeb9a31e1
+EBUILD glib-2.72.2.ebuild 10236 BLAKE2B 78cdc4624b1c9ad6505e0d477a9a19720a9382eb6963b768c74ca7c00861780906f0424a0f5588f84ef600cab1499440133919c7900973597a113df566743f25 SHA512 085a40a832e93f18af8e0a09cd4f3e64102daae4c22402e49e97340b3be002deb7595267f8c415a36025f9d02b9570b54fea25e8432419a9249c801b31baf378
 MISC metadata.xml 1221 BLAKE2B 517c6f9ee14ccac7192d7c1189773ec6e034bc638a8acd28081a604f8516ee639f43c82ca3233d513dbfd06db714358e396f2c4cd906715bb0950f130974ab9e SHA512 0c4203b3c9d8b91eebe4ee54f34d1aae26e5efa4c791760559b18b58d90b508936ead62ee8df81e6777ad8e0cb0e9c68d504d0f24ecd5903d4e3df89c6cc0bdf
diff --git a/dev-libs/glib/glib-2.72.2.ebuild b/dev-libs/glib/glib-2.72.2.ebuild
index 269d854fb717..4068ee31d4ce 100644
--- a/dev-libs/glib/glib-2.72.2.ebuild
+++ b/dev-libs/glib/glib-2.72.2.ebuild
@@ -16,7 +16,7 @@ IUSE="dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap te
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # * elfutils (via libelf) does not build on Windows. gresources are not embedded
 # within ELF binaries on that platform anyway and inspecting ELF binaries from
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index 1a5899e8afd3..596b8bb98d6c 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,15 +1,11 @@
-DIST intel-compute-runtime-22.17.23034.tar.gz 5345890 BLAKE2B 0cd4b9c117978c9127ff1b9e985ab097e672b228a0bba39ad868881af94e821683afb45f394951776f0ecb725872a4624b35be50e2022fec06b1d77d58227fc9 SHA512 d34a63263f073c8fe6d61f105b753468d856de965b605c54ae4e8931bcb81293378f501b796cf84938857f7e08288f4650299cd76d56483f552846fc4b93b2b9
-DIST intel-compute-runtime-22.18.23063.tar.gz 5355944 BLAKE2B ee4d79370c10f2aa1fcd0209a1403a89da1ff5a21dd8b39fb40ac33416b1adaef08713382ee89ad88e64b74d5edcb02e3877898e2301b5454a14b8910ebde009 SHA512 a94a3a7c331ea8bb059740ffaec6e139c17216be23c86cc9e880d247ff12dcb93357ee90b9863b9ddcea59dc1a3d377b32600675a145c29f12c810c13a9e3a61
-DIST intel-compute-runtime-22.19.23136.tar.gz 5390779 BLAKE2B 376f355802d20ba76f485dcd174bb7dd0fa128495be37718b7eda3a3a2ef34086ef9060911f52866c1d1a4fd13f59115d511b5c6b327ce574ae494506085a91d SHA512 dc0c2f150b06c2a41a0d20c1ebcf38254d7ff976eef4340bcc3d47eab8e2ec0e36d8cc871b97ca4d8b304be53b0aced6b2a6fb66da7e58b0352297e7f28b81bf
 DIST intel-compute-runtime-22.20.23198.tar.gz 5453705 BLAKE2B 85e3ed926522db44c3464da23c6888effc9fbcfb51e9d644cf12e97335f7a14139040ae09ab99ab9e5b2ef27d4f9a9c23e68ee35378c85279b7c800426a2c829 SHA512 85bf87a6c4d387bea4cd75b6e59e7d47ccfee153a50059209644cecd912d2b52c62b398f004148e1dddc1bac069b19bdacafd355499d3b47c157d0a4a7b2d70b
 DIST intel-compute-runtime-22.21.23269.tar.gz 5475347 BLAKE2B dbac36c1720ee2a2475b64c3b61d144501fa4031ceb0eb69a3313cb78b5588926d029ad1916e2229fb8dea8d3450936da5b4e25b47814c854b05ec0bdb940943 SHA512 9ae38956dbff9764d85b5447cc03f7616319de463ddbf0dc5d4c8e8f8869f197b6045e446c81a902d8a5e7681e05cb5ac63e345b6bdcb74366b83619c52eb012
 DIST intel-compute-runtime-22.22.23355.tar.gz 5498680 BLAKE2B 81368ca9a5151305a5eb656ecca6a8d51129df2f567631d72fc5965c66b367e843bcf7b89a201702aa78e430d60e706079eba48a11cfd2b6a82e7a34d7ac5789 SHA512 72813ebd5de38d31f9ceb8087c38337d1bd0bb35256b86f3f3d7f3adc5ebe73b3cdc04bf653a522e25098b38c3b867f62fc3590eedf17e11d2fc03c2aa2b22e2
 DIST intel-compute-runtime-22.23.23405.tar.gz 5515173 BLAKE2B eafb5a4ed8a221bc5290576a137f371f2f9d3cebbe1e689f3d1ce41f9430a5242d82ae78799f523f29685c3a731570e4a6766f804faa0f6bb7bae365cb5d6573 SHA512 38ffadd9130717acb0e8d6492b2bb4d8d5c962b151784a92c85d6249cbab1014dcd418bf5110eccc1640334c1ab0d171b7028d2f0d95d606733b42a319bf2f0b
-EBUILD intel-compute-runtime-22.17.23034-r1.ebuild 1777 BLAKE2B 7491834ce3565a551b8faceea2922cc91f9e6a50b97630b5986c5e4b73393697113e045d346ec9b671642c0bef11c06c995b210eaeef46a14c9f3de07c22d2af SHA512 390dea8d71b90a6a178488a3814781b2c07bee656323099cfb4681c4ca0df666aea8a5fd4acc58da12bccfb0b5689578417f8d99d731d42158e416d2b38b6881
-EBUILD intel-compute-runtime-22.18.23063-r1.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
-EBUILD intel-compute-runtime-22.19.23136-r1.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
-EBUILD intel-compute-runtime-22.20.23198.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
+DIST intel-compute-runtime-22.24.23453.tar.gz 5521386 BLAKE2B c025539c0d2a0ac492ddc5893c0d077523bbc0c0e1dcdb3d086ff381b36f26d0a7b24aecb0ba04e915e443eafecbaf171ef54fc0c455e57b0ae622ef164f4056 SHA512 fb57348ef4cad48b7d09bf8db64a874a63bdbbd586323c25b7c9cf7461bfd62c1cd061c4b989c52466e5d364fde9dec2335bf7e244baadd573888ba904ba867c
+EBUILD intel-compute-runtime-22.20.23198.ebuild 1904 BLAKE2B 5ae9938b50ead43d244d4f3ea2bad42d595da7b8e60c4f817a80abb562bed48336ff7fc0135e82ad3e1eab3367234fc10782473de618e49a627bf771f80ccd1b SHA512 a885b8a43eae56cd9d980e9b576ba9f64c463ea71e87223d18c88721288623e8d35405b820c0f9bb15d539f03cf616fa01e3b33aa81605991f904079434c5d18
 EBUILD intel-compute-runtime-22.21.23269.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
 EBUILD intel-compute-runtime-22.22.23355.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
 EBUILD intel-compute-runtime-22.23.23405.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
+EBUILD intel-compute-runtime-22.24.23453.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.17.23034-r1.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.17.23034-r1.ebuild
deleted file mode 100644
index 94aedd784bb7..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.17.23034-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+l0 +vaapi"
-
-RDEPEND=">=media-libs/gmmlib-22.0.2:="
-
-DEPEND="
-	${DEPEND}
-	dev-libs/intel-metrics-library:=
-	dev-libs/libnl:3
-	dev-libs/libxml2:2
-	>=dev-util/intel-graphics-compiler-1.0.11061-r1
-	>=dev-util/intel-graphics-system-controller-0.2.4:=
-	media-libs/mesa
-	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.7.15 )
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		x11-libs/libva
-	)
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "README.md" "FAQ.md" )
-
-src_configure() {
-	# See https://github.com/intel/compute-runtime/issues/531
-	filter-flags -flto=* -flto
-
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
-		-DBUILD_WITH_L0="$(usex l0)"
-		-DDISABLE_LIBVA="$(usex !vaapi)"
-		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
-		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
-		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
-		-DSUPPORT_DG1="ON"
-		-Wno-dev
-
-		# See https://github.com/intel/intel-graphics-compiler/issues/204
-		# -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
-
-		# If enabled, tests are automatically run during
-		# the compile phase and we cannot run them because
-		# they require permissions to access the hardware.
-		-DSKIP_UNIT_TESTS="1"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.19.23136-r1.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.19.23136-r1.ebuild
deleted file mode 100644
index bdc8a84baf08..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.19.23136-r1.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
-
-CMAKE_BUILD_TYPE="Release"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+l0 +vaapi"
-
-RDEPEND=">=media-libs/gmmlib-22.0.2:="
-
-DEPEND="
-	${DEPEND}
-	dev-libs/intel-metrics-library:=
-	dev-libs/libnl:3
-	dev-libs/libxml2:2
-	>=dev-util/intel-graphics-compiler-1.0.11061-r1
-	>=dev-util/intel-graphics-system-controller-0.2.4:=
-	media-libs/mesa
-	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.7.15 )
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		x11-libs/libva
-	)
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "README.md" "FAQ.md" )
-
-src_prepare() {
-	default
-
-	# Remove '-Werror' from default
-	set -e '/Werror/d' -i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# See https://github.com/intel/compute-runtime/issues/531
-	filter-flags -flto=* -flto
-
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
-		-DBUILD_WITH_L0="$(usex l0)"
-		-DDISABLE_LIBVA="$(usex !vaapi)"
-		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
-		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
-		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
-		-DSUPPORT_DG1="ON"
-		-Wno-dev
-
-		# See https://github.com/intel/intel-graphics-compiler/issues/204
-		# -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
-
-		# If enabled, tests are automatically run during
-		# the compile phase and we cannot run them because
-		# they require permissions to access the hardware.
-		-DSKIP_UNIT_TESTS="1"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.20.23198.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.20.23198.ebuild
index bdc8a84baf08..0bbb025dbde7 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.20.23198.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.20.23198.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.0.2:="
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.18.23063-r1.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild
similarity index 100%
rename from dev-libs/intel-compute-runtime/intel-compute-runtime-22.18.23063-r1.ebuild
rename to dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild
diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest
index 0d23b0248b63..9c1897bde21a 100644
--- a/dev-libs/intel-metrics-library/Manifest
+++ b/dev-libs/intel-metrics-library/Manifest
@@ -1,5 +1,3 @@
-DIST intel-metrics-library-0_pre20211123.tar.gz 227022 BLAKE2B c718c5972ae1cb8d36c65f541832a36c7107af1299c2cd4101df1180325a97fca5ca2066574ee0bbc31eaac35286c27a00b2c292058453b5fcf41d745585a0ad SHA512 e54d68c5b31c59258086f89d56ea819ed4a680901d65862361dd17e172be7806cf21be9999d907a0f59fe8c3295cab541402dc0f7c41a944f4aee1481356c2a9
 DIST intel-metrics-library-0_pre20220512.tar.gz 252101 BLAKE2B 32078b86a878a2650a812bc5a0d75f423e7fc05505e5ef2f9fbe6676126a78a67af4abe27451df323ea2699d363bcb7a7666d8b642214f36ecbea81b18f5b611 SHA512 3b05f6ea17b50b8357a579e4cc39ca6b920aa47d0b6bb9ca86b773c5ecf1532fd630ee738ff2f0c263d8ced4084023f7696ce848b0ecdb5aff00e6d8f393fa4f
-EBUILD intel-metrics-library-0_pre20211123-r1.ebuild 619 BLAKE2B 20781a2adca8b83798084e7b99ede7ab7fc7b333a16011c107986745bd6b32a7121251db96f9d166709de2083452fb0e9c2586f56977e7a2edb6b3c6679ccf1c SHA512 46a077bd83f5c4985609afd3eafe26076150208efec41690d0485ea3077d882a8c386bc4d8763f05c885b7f9766d5e2f48e9d11d13710d904c946b7594be6ea6
-EBUILD intel-metrics-library-0_pre20220512.ebuild 620 BLAKE2B 898efa3dd26f56212e06dc5943c15b00d1d87dce26e51c904cf5d6e4787fc83134a59f46ff04b04a0d3ac1cf5aa03b0641e7e29fb63fb5030410700a97d77dca SHA512 8a8414d056aff424fca0468a135458b7360576deb326384ed77b72bb16dc8503acb4b709bc8db427fc724b38e4db53d77e95fe172123568e7198264bd51686ae
+EBUILD intel-metrics-library-0_pre20220512.ebuild 619 BLAKE2B 4abc1966e3c3119caf6064412611b464c0bd064492c34c682fe15f221b0f1a928adafe17d7ef11ebfdaa21349745467fc51e7cb8e2ca5eec44bc7add0cefa9ee SHA512 bf75afb6f98545980a1446a86bb511feb32a572cfef84292436dc145f11bd1261707c2910e7dd0c4e57e26499b258ec7bd4ad0675f05d67ec77383da823a9210
 MISC metadata.xml 904 BLAKE2B 9b29e523b88f3d4eef193b4ecd90f03bf74d4e8521d3691bcc3518fc4133e4a97142b2d0f9a1354d86ea913ca79fa74972e99fe63a21eee7bb0fee78dd414e25 SHA512 ea9cd435e8b72549945ca370d318a84d03d8330ea995f726aa29f6c6a8fb1f353c9b5c2eab2fc56a2e89ffa6beb019be2a291f3f64d7a8e5782efc0c3935cebd
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123-r1.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123-r1.ebuild
deleted file mode 100644
index e94b6050162d..000000000000
--- a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-EGIT_COMMIT="3fd6eb0544fadcec2ac762aedee7c2d5d6479feb"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake
-
-DESCRIPTION="A 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"
-KEYWORDS="amd64"
-
-DEPEND="x11-libs/libdrm"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220512.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220512.ebuild
index 552ed90f15d9..11cb3589d4fc 100644
--- a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220512.ebuild
+++ b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220512.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${EGIT_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="x11-libs/libdrm"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index 1e8ea898480b..c17fe029dcd8 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -3,5 +3,5 @@ DIST level-zero-1.8.0.tar.gz 418939 BLAKE2B c07cf99bed347458fe1680ed572575591eef
 DIST level-zero-1.8.1.tar.gz 419208 BLAKE2B 0957e1694db80f655dddfae06f13224ec21ed5ee349fe032e3c8fc643a72128c81f9a8dc9f040ad04eb91bc43491f7aa61d6c438276feb05c5e3099e8f18d66d SHA512 b108ed9a8be77924891b543c5b36c50ade7e7e17a9319c9e7b46526c6d4ee1d10397095a3e9ac4b95c14bfb224eb3b608a8e4b4e23740cec217326b203db4136
 EBUILD level-zero-1.7.15.ebuild 627 BLAKE2B aca47fb72cf707848e75b93925d2026623612743ef8516f7d813143423a3b1a0bc7487edd309a583135e30a2c5dcfbd0f5fd388f94489e1963caf86cc899f6a5 SHA512 a3ebecbe6443a186d1b32edae090b0f97ff442f2aae1f22df0f23846b6dc583c7b893a9e4499cb8da756c83af65c15c712f200d129b59856dcaf8ed62e6035ca
 EBUILD level-zero-1.8.0.ebuild 628 BLAKE2B 19db5e3da871d1eafc51d0cb941f4264bf2ae829720ccf185c6167d44aed4aa2f107c96c4009b48ca37c4516aeb77548886d6de8e06d140ebb1b309c73c6d640 SHA512 e61cb69efacfbd907551fcb62c3ebe4f0aeb5c1fbae007607d5af2bac778db2d40cbc3bbf9cb1d8d73cfd547fbf7fc6f2f82ece63f2bcf59a7a72591416cd899
-EBUILD level-zero-1.8.1.ebuild 628 BLAKE2B 19db5e3da871d1eafc51d0cb941f4264bf2ae829720ccf185c6167d44aed4aa2f107c96c4009b48ca37c4516aeb77548886d6de8e06d140ebb1b309c73c6d640 SHA512 e61cb69efacfbd907551fcb62c3ebe4f0aeb5c1fbae007607d5af2bac778db2d40cbc3bbf9cb1d8d73cfd547fbf7fc6f2f82ece63f2bcf59a7a72591416cd899
+EBUILD level-zero-1.8.1.ebuild 627 BLAKE2B aca47fb72cf707848e75b93925d2026623612743ef8516f7d813143423a3b1a0bc7487edd309a583135e30a2c5dcfbd0f5fd388f94489e1963caf86cc899f6a5 SHA512 a3ebecbe6443a186d1b32edae090b0f97ff442f2aae1f22df0f23846b6dc583c7b893a9e4499cb8da756c83af65c15c712f200d129b59856dcaf8ed62e6035ca
 MISC metadata.xml 586 BLAKE2B 44eca05640a9276ea9cbddccc0d199dc8c7297a3fbf5ad6b58693c406961efa2aabf99501faaace47ce6bb97736fe371533e89a5a700949b03db66359222b269 SHA512 da9b222b216ed217842f236eeb1991e31ec4f140d86c0a048e9e401a18018d90d6ad8d4f10edec8b71386687bc9481ebf9154a1190bf6969d4fab04bba20100e
diff --git a/dev-libs/level-zero/level-zero-1.8.1.ebuild b/dev-libs/level-zero/level-zero-1.8.1.ebuild
index 84d0079b1c54..af873cd942fa 100644
--- a/dev-libs/level-zero/level-zero-1.8.1.ebuild
+++ b/dev-libs/level-zero/level-zero-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 73f0f94235fe..6c2e43e644a9 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,9 +1,7 @@
 AUX libbytesize-2.4-no_Werror.patch 827 BLAKE2B a9192908e7ec0bad0cd4d1f853fd6f48a17977380d6f2e6a0c8255058d1e3ebecbfdaff68311f70f8d26291ed0c917dafb8f7d85fd5ad8f097ea929f4a200677 SHA512 6972e86cdc8de7f27b850742c4e0d8c492e354c1a526e103f4f4ec080cc6543db7ad4abd54a9674807521d083eb19fa811e351942330a73591e0a9700e876bd7
 AUX libbytesize-2.6-configure-bashism.patch 1239 BLAKE2B c579abd45db89e2c252be853edc2306b7c29ea4d74d9c1aeb5f6d937456fb1386f19f7dc114d49959a89ecff641eb63473447478851f60d4a3dd169274af5577 SHA512 50e3f5adde12a809d7356429b39e8746045a88587e21111dfc988e723ee59207d1c786d2405c1a8309b9a92b47512845d11767ed84fd849b2c2b4fe169e7a79e
-DIST libbytesize-2.5.tar.gz 439194 BLAKE2B 8d2cd82cea1e95f3368eed5855abfbc89b410fe1d627f7cbe69974f0d1fc89b600c93ad242816a37c3585b8318fcce77ef0fe6ab349d10f34a8be4c69303e343 SHA512 730d9c84bfc7199424fa34de5037dd9187d60c1f32d82cedc3e395167bf39a98a3b7f20b15f154206e797144c11de05ae0f606e0af6a2157ed946f138a346ad6
 DIST libbytesize-2.6.tar.gz 444795 BLAKE2B 5f89b2c614ebdd8efd3ac0841ad99c32309bdb33236373a0c9b007415a2f40ff30a0edcecb56947f2f41403cabb6a6bff68c2e4ce52e322df15d6daa3e10d2af SHA512 f6e72b763216c54c08318d090d604791c61cd5a3e683ffbe6e9d01de850661bd4e8a3adeb85c6fd0fb60244e2e128292cbae06c0aa2d1fe9f34104e64af8210e
 DIST libbytesize-2.7.tar.gz 445367 BLAKE2B de5e48b4e17364308c19bbf8e8d68f88ee9e79c9b99d77a81f9f7a1b65e09c2af0ca1ae28ac30ad1b1820335afc1aa4a2596cff487cfd770f04fda0fb38258cd SHA512 3f2bdebad1e145227d7c81b25b8832ab9f984513c35d81254f68c0cb50b1883f3b96fbb258d7c8223fb284d79dc4ec8b01beae3f7687cded629b269ef5b7210e
-EBUILD libbytesize-2.5.ebuild 1609 BLAKE2B 6508a1777cf4e28205e371a9bce0e669cb4a5db58af622f9ed1814e3036924ce60ae75aac6ad3ea16fb3bb3604e5f31180797947995e880d2c9a86791e36f794 SHA512 febcd1883b9cee736fb08632c77b10bdacb443e0c2177ecfcd305dbfd4437bcf3fba431081e822f2a33b7212faa3c63d31200f26ae7e074ea8e8e27ecb67e625
 EBUILD libbytesize-2.6.ebuild 1625 BLAKE2B 3eaf5e035ff1830a2c74b239e25e1d5b3ddd54db029f2485e3351cf128a282fd8da10bc6ccd41b96c1d530ddce019ba5dc22e019cdbbff4b6f21466e99e25cf4 SHA512 cefe63b638b9ed169a1b09d473e722181edc28b931360c00f739f1f0b3d317146081cf80f354f6473aa1ffa67b27b6e06db71f6f9b2b10c2928742835de56b8e
 EBUILD libbytesize-2.7.ebuild 1591 BLAKE2B ad716adb1ae6d61c33b5c2ca8c57396d617120725abcda34b0752445fe2330f009934025c9858dfc296a8b630ebd7a33ba1c92a665bb3e01b8a012440391c60b SHA512 ed7666f64c1f831fb82415f85a86a350535eea2b88609e627ce179acfb2f15aa65094877fb9f81b03c8277e4c9d74cba0ef186e7202bfb269119a91d9a7b3cea
 MISC metadata.xml 426 BLAKE2B 9476445b939bba3c8cc648a30455b653fb77660e010bb8238af7f7773617d28304986dccdb856bff949ca30c8296bda26ecd0cc2d085609b4bcd891c0ed4f110 SHA512 bdb43b7259039d6170cdae6af640bd8eb5e84277db1fb28f51f3eace267ad81ae0546c805ad929b78bab4c5b8603cea2dc9b5a610787a0b7413f32bcf30ab97a
diff --git a/dev-libs/libbytesize/libbytesize-2.5.ebuild b/dev-libs/libbytesize/libbytesize-2.5.ebuild
deleted file mode 100644
index 9afd519fb6c1..000000000000
--- a/dev-libs/libbytesize/libbytesize-2.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
-HOMEPAGE="https://github.com/storaged-project/libbytesize"
-SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="doc python test tools"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tools? ( python )
-"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/mpfr:=
-	dev-libs/libpcre2
-	python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )
-	test? (
-		dev-python/pocketlint[${PYTHON_USEDEP}]
-		dev-python/polib[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.md )
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4-no_Werror.patch"
-)
-
-python_do() {
-	if use python; then
-		python_foreach_impl run_in_build_dir "$@"
-	else
-		"$@"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with doc gtk-doc)
-		$(use_with python python3)
-		$(use_with tools)
-	)
-	local ECONF_SOURCE="${S}"
-	CONFIG_SHELL="${BROOT}/bin/bash" python_do econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	python_do emake
-}
-
-src_test() {
-	python_do emake check
-}
-
-install_helper() {
-	emake DESTDIR="${D}" install
-	use python && python_optimize
-}
-
-src_install() {
-	python_do install_helper
-	einstalldocs
-	find "${ED}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 2769c191c8f8..198892cc3cec 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,5 +1,7 @@
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
@@ -9,5 +11,6 @@ EBUILD libclc-14.0.1.ebuild 1454 BLAKE2B 6ab617ff1ac0ce7f190015bbd78a2116bc0d2c9
 EBUILD libclc-14.0.3.ebuild 1455 BLAKE2B a6a252b3c3d8df2bf45a8e37f9f6168663236b097fdf63f451c35557e4cb4167b3fa104a67b39bc83504e4eba82efd15033a0ef89f05be7d67b6686a67fd83d6 SHA512 22a58deaad2de4836ea9e4d5385597e9f4deb96b0285ee66064f46465a10067423490f9197d78b7d137aa65bc28d1f4c90e6ad2905d3be03e589f807cec89fc9
 EBUILD libclc-14.0.4.ebuild 1453 BLAKE2B 8d049f8f1d7b218f164ea21d289ead001d611c2c2f2432ad4661cece52a19ddcc36090d30d4b611e05403d9141c2a23a68df0d3f627ab2dc4f502b2314c4d2fa SHA512 9cfd836743a72ae4864d89464485b7b7c8e546b43db01b4b973dd50cbb90f0a3e5759e5fb348dbc8e4e73d576823dc6b273e27c9083d631a7fcaa45c6965fa0b
 EBUILD libclc-14.0.5.ebuild 1455 BLAKE2B a6a252b3c3d8df2bf45a8e37f9f6168663236b097fdf63f451c35557e4cb4167b3fa104a67b39bc83504e4eba82efd15033a0ef89f05be7d67b6686a67fd83d6 SHA512 22a58deaad2de4836ea9e4d5385597e9f4deb96b0285ee66064f46465a10067423490f9197d78b7d137aa65bc28d1f4c90e6ad2905d3be03e589f807cec89fc9
+EBUILD libclc-14.0.6.ebuild 1455 BLAKE2B a6a252b3c3d8df2bf45a8e37f9f6168663236b097fdf63f451c35557e4cb4167b3fa104a67b39bc83504e4eba82efd15033a0ef89f05be7d67b6686a67fd83d6 SHA512 22a58deaad2de4836ea9e4d5385597e9f4deb96b0285ee66064f46465a10067423490f9197d78b7d137aa65bc28d1f4c90e6ad2905d3be03e589f807cec89fc9
 EBUILD libclc-15.0.0.9999.ebuild 1465 BLAKE2B 9be755012d8d257f856890aab71593255289ef268cc448ea3de19393397702f0a59c9158ac4e4422333a07c9f224c6ec0e057d197cf6e3a60d84cb3ab5bd70ab SHA512 b9c034a32197ff5a434a8f130afa190f3afbaba5fef1ee3cd0de046815e8b783ab50fbef3c86d661b956fbece1de0da32f5a5db230c27829c3bc9151fd8fa563
 MISC metadata.xml 395 BLAKE2B fe71cab225f1879c7bfcb591a2bf96aaf7c2d454a3b83a8f4730e36c609d7064a9f0a3c9cd105eb11248a80e552a6ddddaaf69db0ec7c955356698a63042f9d9 SHA512 160750cbd7da115c3b9d070a73afac330c6841cb4a0d3102c65f4e9396c008d82431e14f66fae1c7ec83199a97d3749b662cb01d9d769ee20bd6d08666f5565c
diff --git a/dev-libs/libclc/libclc-14.0.6.ebuild b/dev-libs/libclc/libclc-14.0.6.ebuild
new file mode 100644
index 000000000000..340dfa3ea626
--- /dev/null
+++ b/dev-libs/libclc/libclc-14.0.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+IUSE="${IUSE_VIDEO_CARDS}"
+REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
+
+LLVM_MAX_SLOT=14
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		sys-devel/clang:14
+		sys-devel/clang:13
+		sys-devel/clang:12
+		sys-devel/clang:11
+		sys-devel/clang:10
+	)
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	# we do not need llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	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"
+	)
+	# TODO: spirv
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+		-DLLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index 581f97d67438..ad23c8ca841e 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -1,10 +1,7 @@
-AUX marisa-0.2.5-cpu_features_check.patch 4645 BLAKE2B 3ccd0b23d881d56d2341e1ed87f39acb0324440fd019b94fb7b846cedad756a9bd5c76fcbafac08ea7be294fb58334dfeda02d26ba575beb18df410dc921ca5d SHA512 5098491cddcd53451264d127373b29bed7e2260887494b1f562b94f1ab5d71962ee9fdc5d811d9ea0062c11c14d5cd4a81428da9f04d92ef2efe3a3810e844b2
 AUX marisa-0.2.6-loong_word_size.patch 565 BLAKE2B db3c245c896d265545a1b99202c60448b332384b3fd1edcc0c21fd517b3cb5e450ad8b6ed88308ac3c0c635ccf4e0abfdf4cb06dd4f76087ac38c54eea854f66 SHA512 16964170d1637c2ecb5fdd8cc93b890a72e80bde9991b5f52c979312bccc6b532416e1704047b8d8269698363c6622f825fbbc771844a7ece854af6c34dc6338
 AUX marisa-0.2.6-riscv_word_size.patch 486 BLAKE2B fef98bb16375bb482bfc5a219ecb61f9401e2bd560962f99e82c1725207c95a52c3ee9699d1fdc95bdfd972e15d6ca63e6c2e5c67938a385c592423205be8c08 SHA512 7da1120c5db4d8c902fd0bd16aa86f95cff09e8d81aa8d4140353eefbd2e3d7a100a9f38909193a5fd2333a652ce8b65198b0664792fe390790dd87883f6a7fa
 AUX marisa-0.2.6-sparc64_word_size.patch 783 BLAKE2B 339bbaecd8686e1af2f6bbcb9709020f2af0d13f9bef4fc49ffd2deb3096ab2ea556c0a32a8ae5b74555bf171c553a43c6bebb4ec05e9696d857c512525550d4 SHA512 d894d7a55cc9a617711a19c8be25a60eea9f808906be7f8ccca4d5cc970e9b5cb2b3e88fc111037e18f831e4c6a7b96c134eea5a2417edc89a402ef96e100689
-DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547
 DIST marisa-0.2.6.tar.gz 168332 BLAKE2B 3b8a89a9a0b344d9de96edb5bf17c50db07da373e75eba098f48c9064321d579ac104db622608119377084c79165bf558c804eaff591903b67330b13bc8acf55 SHA512 c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d
-EBUILD marisa-0.2.5.ebuild 2234 BLAKE2B 02ba56d816fab0c09264a98d4648060075504507028ff7e16da14c56b3863b5b9df3805ef1181d7330bf0bab94e182374444440e4c5f59e4bbd755b9c2c63a5d SHA512 a86361ab9bfe31aae2130a1e72498ca2096294442a27b2da8c81e68ab4f9e9a1c32d972f1f2b259ac5c3f4b141a473a0802fd6c70c0742695d51f73b4245430c
 EBUILD marisa-0.2.6.ebuild 2977 BLAKE2B fa21be068a686178008773bf7b86e366b129405588f841866d76354030b6ebf42724925eb9fd41a1dd86fe466e463be88fa787943129cd1ccce4c6ba18fdd07e SHA512 45840c1c0681830c3d020cc3db041acb406262c38999bf5f0b0612ec901637a8542196c1f828305fa3e43ac0acaa51c4227df24c5f24dd1f69eae062ab4000e1
 EBUILD marisa-9999.ebuild 2764 BLAKE2B d4c3df20f134dac32608de57e70c7a372cf21b6a153ae959eb764bbfe66880be164ea597b55a28d95a90d4e3f349c79c684c0340d01271549d5f8c75eee52e06 SHA512 71b497e8e551d5dee341a06c369fff566c7bdeb3cdd0fec282c7c2585be0e669575325374b00179f8a40267506675608c65810aaa7077025f209da438be20448
 MISC metadata.xml 466 BLAKE2B 52091b0a7fff43b807097f38ccc624057f7cc8becbbb8c4efd2a461d62fbf0bd1498497683ca3ed6b7730768d0fc94d461c983ab1deef8ac156ac3f1bd86c0e7 SHA512 b5914b5a81efb935857a7088421fe765d89a8101cd2a38568c8a9903957fa92482ec7882d4ce4e9555c467e14e2a1fca74b3966d71c541a42cbb0c2880331b12
diff --git a/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch b/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch
deleted file mode 100644
index dba677221a19..000000000000
--- a/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-https://github.com/s-yata/marisa-trie/commit/d93f1b67f3aaa2d56bf20089c0ce9ef216da6cb7
-
---- /configure.ac
-+++ /configure.ac
-@@ -13,6 +13,56 @@
- 
- AC_CONFIG_MACRO_DIR([m4])
- 
-+# Macros for SSE availability check.
-+AC_DEFUN([MARISA_ENABLE_SSE2],
-+          [AC_EGREP_CPP([yes], [
-+#ifdef __SSE2__
-+yes
-+#endif
-+          ], [enable_sse2="yes"], [enable_sse2="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSE3],
-+          [AC_EGREP_CPP([yes], [
-+#ifdef __SSE3__
-+yes
-+#endif
-+          ], [enable_sse3="yes"], [enable_sse3="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSSE3],
-+         [AC_EGREP_CPP([yes], [
-+#ifdef __SSSE3__
-+yes
-+#endif
-+         ], [enable_ssse3="yes"], [enable_ssse3="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSE4_1],
-+         [AC_EGREP_CPP([yes], [
-+#ifdef __SSE4_1__
-+yes
-+#endif
-+         ], [enable_sse4_1="yes"], [enable_sse4_1="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSE4_2],
-+         [AC_EGREP_CPP([yes], [
-+#ifdef __SSE4_2__
-+yes
-+#endif
-+         ], [enable_sse4_2="yes"], [enable_sse4_2="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSE4],
-+         [AC_EGREP_CPP([yes], [
-+#if defined(__POPCNT__) && defined(__SSE4_2__)
-+yes
-+#endif
-+         ], [enable_sse4="yes"], [enable_sse4="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSE4A],
-+         [AC_EGREP_CPP([yes], [
-+#ifdef __SSE4A__
-+yes
-+#endif
-+         ], [enable_sse4a="yes"], [enable_sse4a="no"])])
-+AC_DEFUN([MARISA_ENABLE_POPCNT],
-+         [AC_EGREP_CPP([yes], [
-+#ifdef __POPCNT__
-+yes
-+#endif
-+         ], [enable_popcnt="yes"], [enable_popcnt="no"])])
-+
- # Checks for SSE availability.
- AC_MSG_CHECKING([whether to use SSE2])
- AC_ARG_ENABLE([sse2],
-@@ -20,9 +70,7 @@
-                               [use SSE2 [default=no]])],
-               [],
-               [enable_sse2="no"])
--AS_IF([test "x${enable_sse2}" != "xno"], [
--  enable_sse2="yes"
--])
-+AS_IF([test "x${enable_sse2}" != "xno"], [MARISA_ENABLE_SSE2])
- AC_MSG_RESULT([${enable_sse2}])
- 
- AC_MSG_CHECKING([whether to use SSE3])
-@@ -31,9 +79,7 @@
-                               [use SSE3 [default=no]])],
-               [],
-               [enable_sse3="no"])
--AS_IF([test "x${enable_sse3}" != "xno"], [
--  enable_sse3="yes"
--])
-+AS_IF([test "x${enable_sse3}" != "xno"], [MARISA_ENABLE_SSE3])
- AC_MSG_RESULT([${enable_sse3}])
- 
- AC_MSG_CHECKING([whether to use SSSE3])
-@@ -42,9 +88,7 @@
-                               [use SSSE3 [default=no]])],
-               [],
-               [enable_ssse3="no"])
--AS_IF([test "x${enable_ssse3}" != "xno"], [
--  enable_ssse3="yes"
--])
-+AS_IF([test "x${enable_ssse3}" != "xno"], [MARISA_ENABLE_SSSE3])
- AC_MSG_RESULT([${enable_ssse3}])
- 
- AC_MSG_CHECKING([whether to use SSE4.1])
-@@ -53,9 +97,7 @@
-                               [use SSE4.1 [default=no]])],
-               [],
-               [enable_sse4_1="no"])
--AS_IF([test "x${enable_sse4_1}" != "xno"], [
--  enable_sse4_1="yes"
--])
-+AS_IF([test "x${enable_sse4_1}" != "xno"], [MARISA_ENABLE_SSE4_1])
- AC_MSG_RESULT([${enable_sse4_1}])
- 
- AC_MSG_CHECKING([whether to use SSE4.2])
-@@ -64,9 +106,7 @@
-                               [use SSE4.2 [default=no]])],
-               [],
-               [enable_sse4_2="no"])
--AS_IF([test "x${enable_sse4_2}" != "xno"], [
--  enable_sse4_2="yes"
--])
-+AS_IF([test "x${enable_sse4_2}" != "xno"], [MARISA_ENABLE_SSE4_2])
- AC_MSG_RESULT([${enable_sse4_2}])
- 
- AC_MSG_CHECKING([whether to use SSE4])
-@@ -75,9 +115,7 @@
-                               [use SSE4 [default=no]])],
-               [],
-               [enable_sse4="no"])
--AS_IF([test "x${enable_sse4}" != "xno"], [
--  enable_sse4="yes"
--])
-+AS_IF([test "x${enable_sse4}" != "xno"], [MARISA_ENABLE_SSE4])
- AC_MSG_RESULT([${enable_sse4}])
- 
- AC_MSG_CHECKING([whether to use SSE4a])
-@@ -86,9 +124,7 @@
-                               [use SSE4a [default=no]])],
-               [],
-               [enable_sse4a="no"])
--AS_IF([test "x${enable_sse4a}" != "xno"], [
--  enable_sse4a="yes"
--])
-+AS_IF([test "x${enable_sse4a}" != "xno"], [MARISA_ENABLE_SSE4A])
- AC_MSG_RESULT([${enable_sse4a}])
- 
- AC_MSG_CHECKING([whether to use popcnt])
-@@ -97,9 +133,7 @@
-                               [use POPCNT [default=no]])],
-               [],
-               [enable_popcnt="no"])
--AS_IF([test "x${enable_popcnt}" != "xno"], [
--  enable_popcnt="yes"
--])
-+AS_IF([test "x${enable_popcnt}" != "xno"], [MARISA_ENABLE_POPCNT])
- AC_MSG_RESULT([${enable_popcnt}])
- 
- AS_IF([test "x${enable_popcnt}" != "xno"], [
-@@ -170,6 +204,7 @@
- AS_ECHO(["  LDFLAGS:   ${LDFLAGS}"])
- AS_ECHO(["  PREFIX:    ${prefix}"])
- AS_ECHO([])
-+AS_ECHO(["  NATIVE:    ${enable_native_code}"])
- AS_ECHO(["  SSE2:      ${enable_sse2}"])
- AS_ECHO(["  SSE3:      ${enable_sse3}"])
- AS_ECHO(["  SSSE3:     ${enable_ssse3}"])
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
deleted file mode 100644
index af6c3b508d46..000000000000
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2014-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-DISTUTILS_OPTIONAL="1"
-
-inherit autotools distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/s-yata/marisa-trie"
-fi
-
-DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
-HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="|| ( BSD-2 LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 sparc x86"
-IUSE="python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="python? (
-		${PYTHON_DEPS}
-		dev-lang/swig
-	)"
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}"
-
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/marisa-trie-${PV}"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${P}-cpu_features_check.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	sed -e "s:^\([[:space:]]*\)libraries=:\1include_dirs=[\"../../include\"],\n\1library_dirs=[\"../../lib/marisa/.libs\"],\n&:" -i bindings/python/setup.py || die
-
-	if use python; then
-		pushd bindings/python > /dev/null || die
-		distutils-r1_src_prepare
-		popd > /dev/null || die
-	fi
-}
-
-src_configure() {
-	local -x CPPFLAGS="${CPPFLAGS} ${CXXFLAGS}"
-
-	local options=(
-		# Preprocessor macros dependent on CPPFLAGS are checked.
-		--enable-sse2
-		--enable-sse3
-		--enable-ssse3
-		--enable-sse4.1
-		--enable-sse4.2
-		--enable-sse4
-		--enable-sse4a
-		--enable-popcnt
-		$(use_enable static-libs static)
-	)
-
-	econf "${options[@]}"
-
-	if use python; then
-		pushd bindings/python > /dev/null || die
-		distutils-r1_src_configure
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		emake -C bindings swig-python
-		pushd bindings/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -type f -delete || die
-
-	(
-		docinto html
-		dodoc docs/*
-	)
-
-	if use python; then
-		pushd bindings/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-	fi
-}
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 101d15e5de65..030c7e4e10d7 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -9,5 +9,5 @@ AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc
 DIST nspr-4.33.tar.gz 1078948 BLAKE2B b46e1c02ab7e5c442288a2cba2868166adb9461950d35fcd76074e3340734057f2b1bbeb3c700f38edf3710323ffd34576dd644814c379033de2a380c54d4fe3 SHA512 8064f826c977f1302a341ca7a7aaf7977b5d10102062c030b1d42b856638e3408ab262447e8c7cfd5a98879b9b1043d17ceae66fbb1e5ed86d6bc3531f26667e
 DIST nspr-4.34.tar.gz 1096407 BLAKE2B 61199c1319578570f9569011a2fea8ec6b8c4e8337b03517d1b0e1a22749a7449feb2152c348f3a1d73fefa7aa5067be460f4cbc1728c479309f4a2592424fdf SHA512 4cfac886c14cf7df4c4b79fa1c3bc92e1b14260c9c3018fa2562060d62fecb4e66c0b4e8f7edf4f4823def784a919d99dde88a89674f0cd8a644310b0569ead4
 EBUILD nspr-4.33.ebuild 3959 BLAKE2B 963dea226892adbf2c4009fb4b940db2b3b6d20a0c2a72c5a671d6bbfcbb146ed1ebaf35417f816cb4d009e4f9fac5b17d1d0fce9fe0d61d9a14e964f521f992 SHA512 9ed8ed63e1b298d8efaccb9212cc4370bdd3d6d171c2b909cced7b10b601ca856b3a6f4f66b3a8c794788e34d75351a32f68916da48f8bd7ef226e19548d62a0
-EBUILD nspr-4.34.ebuild 4827 BLAKE2B 5631413f4683aae4aa56e5db89c5ef9fb39aca6bbd935199eba31e55ae5fbdee5245bedf3bd6ae696ea5558bc136b52bceeb834f0a8941eb019c0bd743b52a36 SHA512 0de309ed37487c244c743f9890901a0dbadd05fa111a54c4e25845828025726077f0c4c881b90a3ead46514f67980a177941ce7e31948d8558df33a8f5726779
+EBUILD nspr-4.34.ebuild 4863 BLAKE2B 0b7816891d541e20da7c948a8e45df0a395cebd55ccb584c7ab6ce00dcb17f350335808c4e61566bd54134460d750fed94b164584f8b813416c55d84c8f25c4f SHA512 d1a41e4ae067b9aa7f275fd9b230bb63abb7ce3b8863340a87dca93f4cd212dc089d9668ea7ec84c4fb729048dfd08a796253bceccaf91f980f2ef1d2c374a66
 MISC metadata.xml 350 BLAKE2B 0f4d7850a3ca725af4e01a47e4db4219d2465b6d4db8c44e12b8f57d2064fd3c6ddbeec16888a316627f96e1f9415777f3fedecbd7065e4d13516bbed473a6f6 SHA512 2cc7f3e6eefcb5ba16c4b2127e751c47ea7a6822eb71080c96c6850ef741acff8d424c520eb60288ca32ccdbe825568d7aced9f57148e304dddd0afb7f4a8883
diff --git a/dev-libs/nspr/nspr-4.34.ebuild b/dev-libs/nspr/nspr-4.34.ebuild
index d009166eea48..80f94f13df3f 100644
--- a/dev-libs/nspr/nspr-4.34.ebuild
+++ b/dev-libs/nspr/nspr-4.34.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 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 ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
@@ -31,6 +31,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.33-loong.patch
 )
 
+QA_CONFIGURE_OPTIONS="--disable-static"
+
 src_prepare() {
 	cd "${S}"/nspr || die
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index d58bc29b967b..ac36067ac07c 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -5,7 +5,9 @@ AUX nss-3.68-ld-fix.patch 1059 BLAKE2B ea449bf15d603e970468f1349a32804403036300c
 AUX nss-3.79-gcc-13.patch 1058 BLAKE2B d0249304f09fdea7e391732e7da63344c3e29c1856cb5ddb9e55a27305ab050077d138d9a8fdfbd6573bd7e7a345ed39f506e534464c3caaae925d1717b75edb SHA512 24dd41401b44ce86498a9b42f96068dbf58c6814ab18453db0615d49bdf327610a1ee2b0e32a2905a1c34364abd8d4c162a179f6b57cac19068babebbed229b4
 DIST nss-3.68.4.tar.gz 82409303 BLAKE2B a3cf572e82ce29dbc77e9356e0db425170f7294f1468755843746539663fe486089660e1c1b379d0184003d9ccf57db6cf0b2c161d7038301c1cb5028175b16d SHA512 f97b63a9f8218f8fbd7b5d48c084b8166366d02cd50aac69a22d56324d2fea01c49d074e51430bd128f510c733085f3f43c9739ce4073a07a5666675e0ef3b15
 DIST nss-3.79.tar.gz 84830113 BLAKE2B f558592bf0983d3c44f11e079512865d310b4f4c225bcc8e2058cb6a4a721d471c575965a1c2b5d0a130dcf27840da3d7b0ee8aa27fc63791414e22ef7804fa8 SHA512 d3311da3bd0e6907760390221c1307a63d84dd8ad9b85dbfdbf59fe4678341c9856b6f93235731999a1236c98dc0ac66d2dc023eb439cb696f73509dae70c41d
+DIST nss-3.80.tar.gz 84841312 BLAKE2B 6244193849a9277bc68c5225b4f836309bdf07bc415b23793d14c5343f5236b27bb7552fa7fb9975f410ea4732e9fc37185fee7bb950bf5d15b478f8bdec3ba7 SHA512 db05df17fea12bf3ec83882bf761663f8f10f3a8ce9a33519c7985d6003945068adb658250cf05d8b598c34ecb4ba7ea5cdc468d9cc7bc786aedb72d7be65923
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD nss-3.68.4.ebuild 9328 BLAKE2B 5883d294203e24b15b927cf60dd90b5a9b4666b26d5a8591ccbf248b99bf82da2866383de792c1bb5af794cb73fc7be73ead212cb3193ef98198509e061010d3 SHA512 0bb43a21931d5a3bd8ff9146ed4c63ad1d3d76075bb27eb25ed97fd3825dbd436576fc71387a6633961ad15bf03bfd37b315094cb2551073ca331187a55572c7
 EBUILD nss-3.79-r1.ebuild 10353 BLAKE2B da796c5bb3b7e73e87c3af0e2531d405070f87d251e6de360e5e63c81ce65e72001233d5f48650bf1a3c1fbe61261d221af6188213dc652e589774e2ad5ad3af SHA512 a047c3ac020ec3cabdc38662df9403d602b17eae4e414f274bb4df7d8790e27259455e94b13bd244a32a9a7a2b1dfa94ef025e0de9bcc108407ef1122f10388b
+EBUILD nss-3.80.ebuild 10480 BLAKE2B 9616ffe516291a9ecf933b11cf3019068fe5f29df9e03f7b56645fa750309de830710d07435c370726a20ded1f945c95f650cef66f05639896f43ee816e73987 SHA512 031ecf427ef2c1621650269be626ffad5027282ca7b788ded666426738dc78314df68ea2fc6c41728f4f3f666723ceb69b89368510919638cbe98b309bd8d21e
 MISC metadata.xml 517 BLAKE2B 85fba14d0b8a3539c57b8dca15a0f7789bb78a92891ff39271f804fa07b1620f5f3ece89269e3305b578064a53aeae7ab298bb97cdc019f41793888d42159727 SHA512 7b1fba5488498d5499134f1b58ecaa01cb8c51af3da666d55fba3884703d34efb57b449e76461fb6e13c37687bf5125c5dbab1934a950d4d13c0cff5a3b3318e
diff --git a/dev-libs/nss/nss-3.80.ebuild b/dev-libs/nss/nss-3.80.ebuild
new file mode 100644
index 000000000000..b273c86582a8
--- /dev/null
+++ b/dev-libs/nss/nss-3.80.ebuild
@@ -0,0 +1,389 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.34"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 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 ~x64-solaris ~x86-solaris"
+IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
+RESTRICT="!test? ( test )"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+	"${FILESDIR}/${PN}-3.79-gcc-13.patch"
+)
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	export NSS_DISABLE_GTESTS=$(usex !test 1 0)
+
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+multilib_src_test() {
+	einfo "Tests can take a *long* time, especially on a multilib system."
+	einfo "30-45+ minutes per lib configuration. Bug #852755"
+
+	# https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
+	# https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
+	# https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html (older)
+	export BUILD_OPT=1
+	export HOST="localhost"
+	export DOMSUF="localdomain"
+	export USE_IP=TRUE
+	export IP_ADDRESS="127.0.0.1"
+
+	NSINSTALL="${PWD}/$(find -type f -name nsinstall)"
+
+	cd "${BUILD_DIR}"/tests || die
+	# Hack to get current objdir (prefixed dir where built binaries are)
+	# Without this, at least multilib tests go wrong when building the amd64 variant
+	# after x86.
+	local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev | cut -d/ -f1 | rev)
+
+	# Can tweak to a subset of tests in future if we need to, but would prefer not
+	OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" ./all.sh || die
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index cfdf61fc6cc4..b7b75c00cb1c 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -2,5 +2,5 @@ AUX poco-1.10.1-iodbc-incdir.patch 369 BLAKE2B 345540ebd9c448a21e6c8adccba040a43
 DIST poco-1.10.1.tar.gz 10224204 BLAKE2B 644bb2134c571e10b63937ca15b3f5d7255767bcc99dd6b6107a13d64ed7ac83d499d74f04084c666bbf5ef6f033d57d2fb1de0b8b8487844e3aaf8cefe6fba8 SHA512 40aa8049c68651f461280937c1c733e13d1cedbec12bc44a7f3a6c131d31229c5445067052441427071f6102fd1965d238b2222c0689279dd156b4e261ac9e73
 DIST poco-1.11.2.tar.gz 10935312 BLAKE2B 66b4cdb6cb4b5dd4f5f0eee744e1d147d66e98561ec4286ed09693b638d565fbf084c3e40eff3f6a9a88cff167b1d774da08e8c8424986aefe13d029a540afe2 SHA512 3f9e46dbfb0a85f19389b269725cb6272172d993d8239f13da8110c0c6ce9ed2b6595708d5dba91a027292c74358c87da988e22587a74011e84707816a6a277c
 EBUILD poco-1.10.1.ebuild 3785 BLAKE2B ca9eeac5cedc288c23fef5400d2428704b09aa707fcdbe02d12d9905caf3d72beed144a1588e6a440c66f59751f7b7e3d9e81cbcc86acbfaee0dd27222e54028 SHA512 f67bb94b6b08ed7f5d17d3c3b6f7186d7d7bd834bb8eedf1db045e001d683ac8ddc3be94ef3e2e1e0a27c65ee5b88525e46208907dfda88c7b17fa5d4c1261d6
-EBUILD poco-1.11.2.ebuild 3881 BLAKE2B f3b8beb999657398871b46b7e8c8285a35dfd447fc063a26f2480ae713a915d5c8ebe86d4eedf460409251ac245016c0e7ecf05e9d03670e95b73d1ea2e7d43f SHA512 d890ce83447bb34b448fcb261e77036f5714e666d3e790e127abcdf2f38b90c7e98dd4cfc3feb4515429c1d27a91915e185de22c434a3c93a4c5332f123a578b
+EBUILD poco-1.11.2-r1.ebuild 3938 BLAKE2B d32cf63f1eb2b26789d3615a3f6908712b1af02ffeeac7fb9001893b6058e68b799ea3d3e0b54f95f3b932e8f8248378bc5e92e4365204009fb748f6e9557ee9 SHA512 c3084a698ce14b8f523e0582d314d2d9afabe588306c59c9acb22f09762d488df651f7443929d67355b1d01fe132ed17ae016ea9e40dbe7899a1251dd07fde44
 MISC metadata.xml 2644 BLAKE2B 397adfc4fd51bebcd784cea4e8cb99f7eef7013ccb5b391202d22816bd5831641ba7e22f2a5350fd8cf6103d810c1553e279ef37b23d99135fe9637c8ef46308 SHA512 2d6cfc831e51575aac6f6ad43bb70c7e71c39ea8623d05042afa34496213df2016977c962cfc65e215a3fc698e12cfdd60e9badeafdc2832bb30e830741a5efb
diff --git a/dev-libs/poco/poco-1.11.2.ebuild b/dev-libs/poco/poco-1.11.2-r1.ebuild
similarity index 95%
rename from dev-libs/poco/poco-1.11.2.ebuild
rename to dev-libs/poco/poco-1.11.2-r1.ebuild
index 260b3ec77580..40f8cc859b35 100644
--- a/dev-libs/poco/poco-1.11.2.ebuild
+++ b/dev-libs/poco/poco-1.11.2-r1.ebuild
@@ -34,9 +34,11 @@ RDEPEND="
 	>=dev-libs/libpcre-8.42
 	activerecord? ( !app-arch/arc )
 	mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= )
-		 mariadb? ( dev-db/mariadb-connector-c:0= ) )
-	odbc? ( iodbc? ( dev-db/libiodbc )
-		!iodbc? ( dev-db/unixODBC ) )
+	mariadb? ( dev-db/mariadb-connector-c:0= ) )
+	odbc? (
+		iodbc? ( dev-db/libiodbc )
+		!iodbc? ( dev-db/unixODBC )
+	)
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? (
 		dev-libs/openssl:0=
@@ -91,6 +93,7 @@ src_configure() {
 		-DPOCO_UNBUNDLED=ON
 		-DENABLE_APACHECONNECTOR=OFF
 		-DENABLE_ACTIVERECORD="$(usex activerecord)"
+		-DENABLE_ACTIVERECORD_COMPILER="$(usex activerecord)"
 		-DENABLE_CPPPARSER="$(usex cppparser)"
 		-DENABLE_CRYPTO="$(usex ssl)"
 		-DENABLE_DATA="$(usex data)"
diff --git a/dev-libs/qqwing/Manifest b/dev-libs/qqwing/Manifest
index 568548e58ba1..c8d549212400 100644
--- a/dev-libs/qqwing/Manifest
+++ b/dev-libs/qqwing/Manifest
@@ -1,3 +1,3 @@
 DIST qqwing-1.3.4.tar.gz 352060 BLAKE2B cf78a3d06c529ab1d47739ee0914e268fe8375d5dd7eb73a05ed91fcd7231b0f2103ae2490a8edf438ebce5ec77457f2686338edb61c38a804af34df78763c31 SHA512 6762b97d7595e7831edb80d9fac06ca784c6dfb6c5717e72adaac6973ec94bec417806f8ae4b80ed95b876388c8c1a00906b0fa8653a115998c5170db25aab0d
-EBUILD qqwing-1.3.4.ebuild 370 BLAKE2B 6ee3869e0d81de63a936e378dc800c8afa6ba73cc54bc35a320c03355ecae79f2746031deb724477fdb2ee1b3d90f86ec4ff13744e19d4b3850bdc741e382c3f SHA512 cccd1ca6200df6995b9c2e59e80f23700d652acee1168a5b3a867ae33cd05a7fe8a95234f42ab1162da3f9afae0f95cc6ca4b34d94140740cfc3b3741361c88f
+EBUILD qqwing-1.3.4-r1.ebuild 370 BLAKE2B 6ee3869e0d81de63a936e378dc800c8afa6ba73cc54bc35a320c03355ecae79f2746031deb724477fdb2ee1b3d90f86ec4ff13744e19d4b3850bdc741e382c3f SHA512 cccd1ca6200df6995b9c2e59e80f23700d652acee1168a5b3a867ae33cd05a7fe8a95234f42ab1162da3f9afae0f95cc6ca4b34d94140740cfc3b3741361c88f
 MISC metadata.xml 344 BLAKE2B 7ccab937a954c7bf6a62964af9cf5da988d468441feea89de8c82870e4d414b8d916e63db83e026886c636d5d204d4415581a84b408e8e453293285e94d3cd38 SHA512 d3bb75e12aee5f1d3126b583c178048d365f28bb219953e32d20b1b59e809d24e916ae81617b16f3e31a5ba9f9ddd87cac9fa20e38a65d757fa41184f8f51640
diff --git a/dev-libs/qqwing/qqwing-1.3.4.ebuild b/dev-libs/qqwing/qqwing-1.3.4-r1.ebuild
similarity index 100%
rename from dev-libs/qqwing/qqwing-1.3.4.ebuild
rename to dev-libs/qqwing/qqwing-1.3.4-r1.ebuild
diff --git a/dev-libs/sdformat/Manifest b/dev-libs/sdformat/Manifest
index 3440254fee57..6ec54ea0916d 100644
--- a/dev-libs/sdformat/Manifest
+++ b/dev-libs/sdformat/Manifest
@@ -1,3 +1,5 @@
 DIST sdformat-9.7.0.tar.bz2 699483 BLAKE2B a7f831fa42cc6371afaee47876bee5d2b8e9ef3b05a9fa8281e1746d0b038fb75b0f96d5e84b615b114a25424de65be08dbea052a53813d01b07ca8a1c0d08b9 SHA512 8b05dfaa47dea7cf55dafbed828b3c361f1c13f368fd4ac50cd35c1be859e401bdbd500a79286f7b8b0e6bac04f92a4c406e910a22aa1a9583aa8ffb660c1f89
+DIST sdformat-9.8.0.tar.bz2 706107 BLAKE2B d4880b8b26bc792f7932f92238fea9e583284fb95fd139da2755590f795bf8f00d2087b949ff44df7c04f7e3e81218f7a7f5643c65164e7805b76626ac13de4b SHA512 090e654f442c26d0a930960fa603ab5e58a28d8cef276ea75f4f63cad29c249c90045e76a2e081b2f90bc569b80abee086efe7598c138fd81b387535debf7e6c
 EBUILD sdformat-9.7.0.ebuild 808 BLAKE2B 00efeb0f8266d762d3d509d5d3b2257117dc7757e788218e30f8096fdcce3ff57da627e90e75b09d8f2bb41f51d236b147083cdf5149ff708e4680ab441a992a SHA512 fcbc2147f6b49eb76016029d7fff1ad1a6c77f16d31cd5592b46c18e143ff518027ac257dd8a3a7ec0813a32c137a438b6f5020d1a7d44680b0418fa1ced0330
+EBUILD sdformat-9.8.0.ebuild 808 BLAKE2B 00efeb0f8266d762d3d509d5d3b2257117dc7757e788218e30f8096fdcce3ff57da627e90e75b09d8f2bb41f51d236b147083cdf5149ff708e4680ab441a992a SHA512 fcbc2147f6b49eb76016029d7fff1ad1a6c77f16d31cd5592b46c18e143ff518027ac257dd8a3a7ec0813a32c137a438b6f5020d1a7d44680b0418fa1ced0330
 MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af
diff --git a/dev-libs/sdformat/sdformat-9.8.0.ebuild b/dev-libs/sdformat/sdformat-9.8.0.ebuild
new file mode 100644
index 000000000000..4a78444096c6
--- /dev/null
+++ b/dev-libs/sdformat/sdformat-9.8.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Simulation Description Format (SDF) parser"
+HOMEPAGE="http://sdformat.org/"
+SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# subslot = libsdformat major
+SLOT="0/9"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-libs/urdfdom-1:=
+	dev-libs/tinyxml
+	dev-libs/boost:=
+	sci-libs/ignition-math:6=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/ruby:*
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# get rid of default flags
+	sed -i -e '/_FLAGS_RELWITHDEBINFO/d' cmake/DefaultCFlags.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_INTERNAL_URDF=OFF
+		-DUSE_EXTERNAL_TINYXML=ON
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 146bcac45d51..cee6653c798a 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -1,3 +1,5 @@
 DIST skalibs-2.11.2.0.tar.gz 219085 BLAKE2B a8aeca79890465784cae5e958d73359544416b11ac3ca4fb412ba00e59db28ee041c745653efb9f1553944974579238b0d9e8e5b3696de9a07d4e2e11333d631 SHA512 174e92be03cfb8ee41d9dc78bfd183a435d01481ad9835b74b38e000012cf6fbadd30f97c27203dbc942102641349626f92000510636dc73f413a5aebd7f7942
+DIST skalibs-2.12.0.1.tar.gz 222717 BLAKE2B f094677bbe2efe4c4dcd4359bdfaafa07dc2d436691517a868870e88a360fed8fe81008ebb5ad6f2737d12764a8313b20c31fb52e0c424174744451eca991d9a SHA512 383961588eeb4934ef68e25764d3e258d7d9f19fdd14156490e8d9e2e111050c92b34b1786d007c269d09f82cd234bdcbecb13ef603c101e9439ce4b77a6e635
 EBUILD skalibs-2.11.2.0.ebuild 923 BLAKE2B 425d25ea8f525abbec4b6019c3ce2a234f7170a193d613f98752225876942a17bd2ee33a766286bd009ad99c8a5ef1e37d78c1463e1a2306f13b7224272edb42 SHA512 c57af30c867da127abc76165b0814704c5aa686e247f1d77a3a25c853834c2e249cf995a91c935fc8a6731c869edc80197e8a80b6267eff349814454576a8d31
+EBUILD skalibs-2.12.0.1.ebuild 878 BLAKE2B 9c85e378857d096e21211f71356ed3d8c5743e450bf12fac8a233806fa9905133bcc88df7b3f26cdc327985601a64b62000bec667e240be5c5faccf81a653a6a SHA512 82e0e95c0550f7a4080e4a3282e230f02b2cf9bf91c37eaa18b24d48bdfeecf86e73751cbbb7b46f7a4ec8e7e7ac1f329adbbb3a726bed6adde2baa5284c283e
 MISC metadata.xml 500 BLAKE2B a0a2130490a01139a57fa7cfe6fb63532250b5d26b3d94bce3cc5da02552f53b84c0f6e714604040026c95ef6031adcec3cfae5f002e2d4f830aab5c594c9d20 SHA512 401f71564f9d41c07bf1271789654f4a1ff6bb957ff03945dc62a501c1dd9f3f3a49c5f1a4177d6f79182283cd9ef62243a7083d0f0c3efd076935d304f0cdc9
diff --git a/dev-libs/skalibs/skalibs-2.12.0.1.ebuild b/dev-libs/skalibs/skalibs-2.12.0.1.ebuild
new file mode 100644
index 000000000000..748bda1854a2
--- /dev/null
+++ b/dev-libs/skalibs/skalibs-2.12.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="General-purpose libraries from skarnet.org"
+HOMEPAGE="https://www.skarnet.org/software/skalibs/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc ipv6"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--datadir=/etc
+		--dynlibdir=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--sysdepdir=/usr/$(get_libdir)/${PN}
+		--enable-clock
+		--enable-shared
+		$(use_enable ipv6)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/dev-libs/tlsh/Manifest b/dev-libs/tlsh/Manifest
index 2642ae21b79c..7918f6b640e7 100644
--- a/dev-libs/tlsh/Manifest
+++ b/dev-libs/tlsh/Manifest
@@ -1,5 +1,5 @@
 AUX tlsh-4.8.2-gnuinstalldirs.patch 1244 BLAKE2B 1369902e03db4837e02c01d63262545725b241a02f02462fd4fb41e7204dee9bae668bf16daf0990b083ced13d4234348ba3df220eab6d69fd77a1e3979b71f3 SHA512 68cf688a8587a301299efb5779ab47473a508e0f0cf6dc90e3ada21bda3cae25142da7d83b67098adef0f03cfbbea40952acffffcaf75c18842efeacb5bcfda8
 AUX tlsh-4.8.2-respect-flags.patch 820 BLAKE2B 9159f50d554168497ad9f416e4e002fd757a88543529fe6e2a180f6250399956bb6d967b06bc458e71b9dcf7f01cbb5d98d762ee65d9fd61392fd59b81dd25c4 SHA512 4b90021f2a01992d68d52f11b20a2ce9c4900216c8a6cd7c6fb95cfad20b44fbe37ab118ceee2811e65da7380e12960b5ddbf883198573491c2cf40f25b0fed1
 DIST tlsh-4.8.2.tar.gz 3345458 BLAKE2B 27d5eece16bb36225b9ae8b3d3a9d055a0f214fffae08a58c39211c3d918dd842497315a62237b291ee1055dfadad78826bbd24f7b9d88f510e9a31f74654039 SHA512 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
-EBUILD tlsh-4.8.2.ebuild 694 BLAKE2B 414ce9579dc2d43248930cc2a1d5d16dedc4897772ac95ef312a56d837707af0fcd925ac286f0de2ec719271150d99c779d153c0b68c19afde04906389b3a9f6 SHA512 93fd5250912ffdac7b19941cbe51fc844c8bc1eae9465796cb9f852e907a7b165aab07e99881892658f3fbc6fe12457f1e4e9a639756ba1481ba81e94ac24627
+EBUILD tlsh-4.8.2.ebuild 701 BLAKE2B f9a25d4319bedf551fb642076d9b9b653fd0dbfac41736c43992f2e84939f3f25838b5358dd2e392c9cbce8e4c97fd9fc5c938ec882d9e4eb03fda0506ab7bc1 SHA512 3b845f43b55529379b39beaf7d0522067dc040cc0e15450781c5a15486cc65530ef9ead96b87f8cacc8c22d607bad504332ffb5b33eaec409d189bf6e455437e
 MISC metadata.xml 471 BLAKE2B 2e17c59829f15d1439933fef59fd14a8525723aae1de1c640c8a83a9df612776ff33d24904a30ffcf27eddcd9c778af09d6d65c3b4e66542288810f416ca0ec4 SHA512 e8a8759d526e1d0b9607f84df503440a650f5835c864c0c5c89c5f978b58839620e2ed7e0bc39af51e38e1da1fe86fac1a398394069f4b3820219db40254a284
diff --git a/dev-libs/tlsh/tlsh-4.8.2.ebuild b/dev-libs/tlsh/tlsh-4.8.2.ebuild
index f6ae6017fb1b..e6fb73d50849 100644
--- a/dev-libs/tlsh/tlsh-4.8.2.ebuild
+++ b/dev-libs/tlsh/tlsh-4.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/trendmicro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gnuinstalldirs.patch
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index a49f5b38950f..5f9d4d077fac 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -2,6 +2,8 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f
 AUX weston-10.0.0-backend-default.patch 828 BLAKE2B 2c6712737bc6e2d1a37d89b5ba4ea93fb30d137b8d76b77496f82503892bc295d19e97d8de223377328f8aa32721544f7a67f904c22bd1f1483fa99bf6c5f15e SHA512 e3cf66567ed8878ceeb0cde40f3c3aac8d20a04ce501d4fba8429f9d7552dc53ef4eec0cf103bf7e1e93fc9bdf224b20c628c9dede3e545455735fd95ae5dfea
 AUX weston-10.0.0-test-deps.patch 1052 BLAKE2B eaa6d9950a7a932686d11d9b9efb9ebfc602ac82db14348d4c1701a0420a85469e05c5af76568a6189546f4d8b5f05bac85c64e7168522af4cc0a5a3d31a8050 SHA512 7f59b5da1ec7a885d53bf48c12a13cceed6e7306c018e9921d64ec1856b8d125421f7af0aa227785d794924c6f035bc79a681eb9331adb17fb790f82c28d0f10
 DIST weston-10.0.0.tar.xz 1774600 BLAKE2B b2b8fa4f7542aba03970ca8abf504f340f8f8da9f9581c16ceac5c702eac355f5d4244778393a8804017f39dff490431e26a48580746033158bd2d2b721437f8 SHA512 77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4
+DIST weston-10.0.1.tar.xz 1776740 BLAKE2B e672d3d7d87782162fd79778fb7dab1e81de688d33bc470bb3d151da991ac94e680903781a9d7d8130df6136931d0d2badacc6aede09c96094f9fc2698ea4545 SHA512 688d843096a95b463161b98e85ca3443b31ba2ee49fc8d456a2780cc96f576e9d097054e9f361997a66e9cc8373cf29e406a742dae3884b3b50b26acf1710c8c
 EBUILD weston-10.0.0.ebuild 3934 BLAKE2B fd140a51aeceac3251a2f5f0878cb5f4e37b630c4ad7807873ac041c863f490bb7845d29086dc17d169856dc8e9dd9a1e87c042b94c6e46ef2b5ae0810412ef1 SHA512 f48f41f7fdf96d2b1a9842150d57e1fd394b7e86725318aabb8bc472d7fab2483e1e4654c37271f13dc92efc92139e58c12bf8972d250028d9f7dc7dfd469921
-EBUILD weston-9999.ebuild 3815 BLAKE2B ffd80f511c1e14766f6a8f68ece3392aa1e0a1d2ac6e11732f98914656bd5075a09c55f73e8ff0a0453b481e4c067d9557335755c55ab2376302079372e6b7bc SHA512 b14628f84f9f71e6c0a26c94814bb4c22634a8f80c3bd12cca4916504d0f081eb2863a1f5843ff2456a52af24b5bae85fb3fb2bf0a62157e59202b30abe9c9ee
+EBUILD weston-10.0.1.ebuild 3872 BLAKE2B 1375a741be055b8d4a107a4e1d340053bfa2d8e792efecb0a40728bae205124e02bdd34d7a8db5d190b9d85022030f7117f068c225a8492f4328f5eaecee73da SHA512 9f948f3bc883290e058244149c9de0e0c11132fceb9f8c142003765d4d7a16f438994ca8423c2dd2c1f060b9dcdacc516b3672d9dbf9c790dca817850fc5eacd
+EBUILD weston-9999.ebuild 3736 BLAKE2B 9529febf4619e0464c7e479a2c064ea3811c18a2dbe750656efd4459f666bf6f81669c1f3e62b82a9d10fe6e04b3f424251ff063209aefa7408d81aa0e6a2948 SHA512 fea8d317c942d84333ffa7456f78eef654a0127c94fca386ca2402234d156a919f2223fc0daf2b2879f33c17c930f3f3e31c46df98d3a2c6f7a3cc8e5d20dbbe
 MISC metadata.xml 1520 BLAKE2B ac2338fd000b3549fa197f281e439a09974d1bfd13afa766f255727a58a793fc8b4a6bac2237afb59029d11b02fc7d1dfb69072d9db227dd6f7db783fd842fad SHA512 434b1fa93ce9e1b8329301333ea47b73def8377c068735ad12d57bd5fd2ebdb5fc9e778b8df04bc4ac7b71dc7cc004fd8750581a17624d3cb3d2ff6faf81218d
diff --git a/dev-libs/weston/weston-10.0.1.ebuild b/dev-libs/weston/weston-10.0.1.ebuild
new file mode 100644
index 000000000000..8e4f335e1688
--- /dev/null
+++ b/dev-libs/weston/weston-10.0.1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	colord? ( lcms )
+	drm? ( gles2 )
+	pipewire? ( drm )
+	remoting? ( drm gles2 )
+	screen-sharing? ( rdp )
+	test? ( desktop headless xwayland )
+	wayland-compositor? ( gles2 )
+	|| ( drm fbdev headless rdp wayland-compositor X )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-0.8.0
+	>=dev-libs/wayland-1.18.0
+	>=dev-libs/wayland-protocols-1.24
+	lcms? ( media-libs/lcms:2 )
+	media-libs/libpng:0=
+	webp? ( media-libs/libwebp:0= )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.95
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	fbdev? (
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	colord? ( >=x11-misc/colord-0.1.27 )
+	drm? (
+		>=media-libs/mesa-17.1[gbm(+)]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	examples? ( x11-libs/pango )
+	gles2? (
+		media-libs/mesa[gles2,wayland]
+	)
+	pipewire? ( >=media-video/pipewire-0.3:= )
+	rdp? ( >=net-misc/freerdp-2.2.0:= )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	seatd? ( sys-auth/seatd:= )
+	systemd? (
+		sys-auth/pambase[systemd]
+		>=sys-apps/dbus-1.6
+		>=sys-apps/systemd-209[pam]
+	)
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xwayland
+		x11-libs/cairo[X,xcb(+)]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use drm backend-drm)
+		-Dbackend-drm-screencast-vaapi=false
+		$(meson_use headless backend-headless)
+		$(meson_use rdp backend-rdp)
+		$(meson_use screen-sharing screenshare)
+		$(meson_use wayland-compositor backend-wayland)
+		$(meson_use X backend-x11)
+		$(meson_use fbdev deprecated-backend-fbdev)
+		-Dbackend-default=auto
+		$(meson_use gles2 renderer-gl)
+		$(meson_use xwayland)
+		$(meson_use seatd launcher-libseat)
+		$(meson_use systemd)
+		$(meson_use remoting)
+		$(meson_use pipewire)
+		$(meson_use desktop shell-desktop)
+		$(meson_use fullscreen shell-fullscreen)
+		$(meson_use ivi shell-ivi)
+		$(meson_use kiosk shell-kiosk)
+		$(meson_use lcms color-management-lcms)
+		$(meson_use colord color-management-colord)
+		$(meson_use systemd launcher-logind)
+		$(meson_use jpeg image-jpeg)
+		$(meson_use webp image-webp)
+		-Dtools=debug,info,terminal
+		$(meson_use examples demo-clients)
+		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		$(meson_use resize-optimization resize-pool)
+		-Dtest-junit-xml=false
+		-Dtest-gl-renderer=false
+		"${myconf[@]}"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	xdg_environment_reset
+
+	# devices test usually fails.
+	# xwayland test can fail if X11 socket already exists.
+	cd "${BUILD_DIR}" || die
+	meson test $(meson test --list | grep -Exv "devices|xwayland") || die
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 38b24ee38007..2056e5ec50fa 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
 
 DESCRIPTION="Wayland reference compositor"
@@ -18,14 +18,14 @@ HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/waylan
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland"
+IUSE="colord +desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -36,7 +36,7 @@ REQUIRED_USE="
 	screen-sharing? ( rdp )
 	test? ( desktop headless xwayland )
 	wayland-compositor? ( gles2 )
-	|| ( drm fbdev headless rdp wayland-compositor X )
+	|| ( drm headless rdp wayland-compositor X )
 "
 
 RDEPEND="
@@ -46,16 +46,12 @@ RDEPEND="
 	lcms? ( media-libs/lcms:2 )
 	media-libs/libpng:0=
 	webp? ( media-libs/libwebp:0= )
-	jpeg? ( virtual/jpeg:0= )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
 	>=x11-libs/cairo-1.11.3
 	>=x11-libs/libdrm-2.4.95
 	>=x11-libs/libxkbcommon-0.5.0
 	>=x11-libs/pixman-0.25.2
 	x11-misc/xkeyboard-config
-	fbdev? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
 	colord? ( >=x11-misc/colord-0.1.27 )
 	drm? (
 		>=media-libs/mesa-17.1[gbm(+)]
@@ -68,7 +64,7 @@ RDEPEND="
 		media-libs/mesa[gles2,wayland]
 	)
 	pipewire? ( >=media-video/pipewire-0.3:= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
+	rdp? ( >=net-misc/freerdp-2.3.0:=[server] )
 	remoting? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -105,7 +101,6 @@ src_configure() {
 		$(meson_use screen-sharing screenshare)
 		$(meson_use wayland-compositor backend-wayland)
 		$(meson_use X backend-x11)
-		$(meson_use fbdev deprecated-backend-fbdev)
 		-Dbackend-default=auto
 		$(meson_use gles2 renderer-gl)
 		$(meson_use xwayland)
@@ -127,7 +122,6 @@ src_configure() {
 		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
 		$(meson_use resize-optimization resize-pool)
 		-Dtest-junit-xml=false
-		-Dtest-gl-renderer=false
 		"${myconf[@]}"
 	)
 	meson_src_configure
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index ed41b7cb8aa7..53d8b01d319c 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/easy-format/Manifest b/dev-ml/easy-format/Manifest
index c9708aef6d9b..9242f9cbdfb2 100644
--- a/dev-ml/easy-format/Manifest
+++ b/dev-ml/easy-format/Manifest
@@ -1,3 +1,3 @@
 DIST easy-format-1.2.0.tar.gz 15632 BLAKE2B 0bf20b87050330e90f3ef5cbe47470049ddc470d22357240f6b0ddd75138d3297935306c071e4355f02ed2fdd01a3155461e90a91df1346fa33180833db77b57 SHA512 375849b1ecd2e37f4b32d1ee12197a95856b17a47e3eb06a7e7320a82234c241156c3c8bfb18ce17bbe73b93d31d755675478860505470aa7ab866277a99603f
-EBUILD easy-format-1.2.0.ebuild 663 BLAKE2B f1c4acb05ed87333ceccc0a89f00feb2167dfc9834d2ba4ebe6db3faf9ff0a58732144ea3484d616fee37e17d96e44be3ddd8055b5103dc495f483750e7f81fb SHA512 b09e2d80a2188a4333617fbcf0bce1afeb513d71bac326d2211658aecf336bba1d28b706fcc946c72649aa0af27ba4471cc3982ac84b7704ee48818595c07f74
-MISC metadata.xml 252 BLAKE2B b6e6fd523833335fb85192475a983dc60c9bdaa8575b7bfeedce64b0c3bb82478a75bc7561531e10739874d60bc3488e65a8d28a037fca522873a7d1d7f70e03 SHA512 a4bb780419d437bf2d184344d957430dd91dddfd666bd980e69fa35742b0cdf1dd4d33f66182422091869e4e977c76a2898fa79b85f6c3d90c9c864939454f86
+EBUILD easy-format-1.2.0.ebuild 679 BLAKE2B c45602b87317c1f9d91da2c231ddc30e6714cbcc172f79793d8ae3178852d754900c297a4ea9dd267f0fb0dae6b3d9f1c0a095e0029f60d4bca33f75e54be2aa SHA512 b130da938b479b5390e498bee7930fc3d54cb4e27339c58ae571aeab892d1b8a59cf2fc05945d634dca6aeb75d420b6a2f9b471e7996058ea955a2045ee23097
+MISC metadata.xml 260 BLAKE2B 698f1409f89c17dc9dc9bfee29a275a03fd79aea9841f5ce04501a54ca8c2ffc19ec2a78794a7184096799ac83b4661cdb1d1d32d54aae3ee749929df3315102 SHA512 1cb43f2ef1943307736c654698fce57892ed54069b1f244e4294ae5f6c6aaaf1c549da9620e9f5099aa62e9a1f30b2ce1f17ed1e892b67a107674ed7607d30ae
diff --git a/dev-ml/easy-format/easy-format-1.2.0.ebuild b/dev-ml/easy-format/easy-format-1.2.0.ebuild
index 8a98e21fa9ab..e52a4ab1772e 100644
--- a/dev-ml/easy-format/easy-format-1.2.0.ebuild
+++ b/dev-ml/easy-format/easy-format-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit findlib
 
 DESCRIPTION="Pretty-printing library for OCaml"
-HOMEPAGE="https://github.com/mjambon/easy-format"
-SRC_URI="https://github.com/mjambon/easy-format/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/ocaml-community/easy-format"
+SRC_URI="https://github.com/ocaml-community/easy-format/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0/${PV}"
 LICENSE="BSD"
diff --git a/dev-ml/easy-format/metadata.xml b/dev-ml/easy-format/metadata.xml
index 3e9b5df74698..1e91a54d3cde 100644
--- a/dev-ml/easy-format/metadata.xml
+++ b/dev-ml/easy-format/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="github">mjambon/easy-format</remote-id>
+		<remote-id type="github">ocaml-community/easy-format</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 0618c107b14a..b25aa04a913a 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,5 +1,7 @@
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
@@ -11,5 +13,6 @@ EBUILD llvm-ocaml-14.0.1.ebuild 2589 BLAKE2B 0c6950ca5cc99a140e53eb08d5de27bf482
 EBUILD llvm-ocaml-14.0.3.ebuild 2594 BLAKE2B 60511c8fbe6fb601e25db4cd2241c0539f829c7c13b55cc142348fa2ac7feff500ddaa00929e7c0152f114cc3dd257f20063290d40a725a5cf05fa51c3ef7072 SHA512 a323d719faa75764be7ae4e663beaf806836b8388521c3aec93ea07a2f3e001a130c7881a15137a7199660a3e0e7baf646391817b09921dab693adbe03c2d173
 EBUILD llvm-ocaml-14.0.4.ebuild 2594 BLAKE2B 60511c8fbe6fb601e25db4cd2241c0539f829c7c13b55cc142348fa2ac7feff500ddaa00929e7c0152f114cc3dd257f20063290d40a725a5cf05fa51c3ef7072 SHA512 a323d719faa75764be7ae4e663beaf806836b8388521c3aec93ea07a2f3e001a130c7881a15137a7199660a3e0e7baf646391817b09921dab693adbe03c2d173
 EBUILD llvm-ocaml-14.0.5.ebuild 2594 BLAKE2B 60511c8fbe6fb601e25db4cd2241c0539f829c7c13b55cc142348fa2ac7feff500ddaa00929e7c0152f114cc3dd257f20063290d40a725a5cf05fa51c3ef7072 SHA512 a323d719faa75764be7ae4e663beaf806836b8388521c3aec93ea07a2f3e001a130c7881a15137a7199660a3e0e7baf646391817b09921dab693adbe03c2d173
+EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 60511c8fbe6fb601e25db4cd2241c0539f829c7c13b55cc142348fa2ac7feff500ddaa00929e7c0152f114cc3dd257f20063290d40a725a5cf05fa51c3ef7072 SHA512 a323d719faa75764be7ae4e663beaf806836b8388521c3aec93ea07a2f3e001a130c7881a15137a7199660a3e0e7baf646391817b09921dab693adbe03c2d173
 EBUILD llvm-ocaml-15.0.0.9999.ebuild 2578 BLAKE2B 97a593be8139c38da4982fb71466961d2adb99abe6a8b9c84d5ad8f5d19baa2c20d4e614c73310ab5d14e76edb39afcda90ddf373bd4f124697815acc84c0625 SHA512 0f61326a23d3a283ca122398a6ddfa4c9f94c56838c0c7247772c1102eb115661c624d4b118ac5f572b2111ed529dc9756576ae5d042bc2a7516081be9b715bf
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-14.0.6.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.6.ebuild
new file mode 100644
index 000000000000..4dd3009c2bc4
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.6.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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=${PV%%.*} 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}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# 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-python/Manifest.gz b/dev-python/Manifest.gz
index 8a8e3877a7d3..70334b02d127 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/boolean-py/Manifest b/dev-python/boolean-py/Manifest
index 17ec89395d81..8f01c9997065 100644
--- a/dev-python/boolean-py/Manifest
+++ b/dev-python/boolean-py/Manifest
@@ -1,3 +1,3 @@
 DIST boolean.py-4.0.gh.tar.gz 33855 BLAKE2B 68e183c670684d2f92ad94f2b88616c932c2a85db40fa1a2552bc60c9bf03999bb456e0a91623afba2af4f2c89ef6cacf0c6f0267ac55aadcf02e67c8324c8f6 SHA512 2c92188645c4949478b40c2879f02a0eb6f3f92c0781a910862fcccebaa3476b9f2668ef40a5faec9d5c3a9c7361043a8e1b92ed98e282d6ce89c56b8ac0c2ad
-EBUILD boolean-py-4.0.ebuild 581 BLAKE2B 75a7455a773d6e9acfcb4f4b631a4c015b0ca51c2a3c33c6c08885b145f1b470be7af2acac8f8ef5eb2de0c7a6f72fa1fb585e93f68b642684bdfc2b061c31d9 SHA512 410f00285b2d07c4e507ba97fb318a7954268666de74522ab2bfcc3ec131f2838f4c257952a371d73e90d9291fb666fadda0dba99699dc7f3e402b0dfb5427b8
+EBUILD boolean-py-4.0.ebuild 588 BLAKE2B f5cc42824905f3d100c88a5398762477490c41f1fc69af2d20294596907a0c820fb32031842f35c48c408d04fd9327cc26a969f784a78dcee1cd3045cc07b12f SHA512 be70b422b05dd93aaa8a5f72a416ffb9202f51de6f608c862d79bbeba3e211052533edfbe28a7ef1dfabb5850b0dd6c4eb7ec7aa6ba2bc7a96b8ef9c6dbc0ece
 MISC metadata.xml 374 BLAKE2B 4dc485dc736f6d9e3e47ca111cb85e0770d8701bd7a10587f6aaa035723a66f225eecb633f2a127255051637c7f64d17f69d9f449a50f00b00cda766b88503c2 SHA512 940cc16f6dddb68c7154bab0be91f5c5639e4f3563a1efa2d56a4a17ec8dbe70f86f7e53be6cb082283d2c650edbfcddc406419a6acdfe2ebc8035a12b17c35f
diff --git a/dev-python/boolean-py/boolean-py-4.0.ebuild b/dev-python/boolean-py/boolean-py-4.0.ebuild
index 2e9a87f92887..5b08c43bc615 100644
--- a/dev-python/boolean-py/boolean-py-4.0.ebuild
+++ b/dev-python/boolean-py/boolean-py-4.0.ebuild
@@ -22,6 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index ec07899c4521..42a4ff430254 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,10 +1,16 @@
 DIST boto3-1.24.12.gh.tar.gz 509573 BLAKE2B 5c9978cac1cbce0521dee6f2164652c4fca82b0bf20276e3f4e75960e0877ec0545ca50884daedde115bba117bea424da2ad2fe63e845a32a6f832a3ab5a5841 SHA512 dec940a6e97c51089933a66994b14882f31f2ed7959f966e1f9cd2e6a4a1bb40cc2c01d509ce7346ac345df30d0f164213034c0de97daf3053ba4ea51e5f7495
 DIST boto3-1.24.13.gh.tar.gz 510032 BLAKE2B 4d204f4b4e1dbe970d45e65eb04061193d1b21236b59f33994d03138e5a1f31fce2d27f7323d1a4da8b5f88d143e1dc51cdc73e19689e79722ae696453d314e3 SHA512 e8962339b1e5c72ace2d9980d7268bd09725b11b30425c32d649703089b32324ca442e597756a14a3d4be222c3628a8ccac4da2d7739cc237dfc29a8ea722818
 DIST boto3-1.24.14.gh.tar.gz 510393 BLAKE2B c5a3f28abdeb3deaf33620ab7278b5d14dce55297e37c8d17e58994348f7459598ea96c3d44cfa7cf4bfa760aee2ab09aea0d905d514cc2365b0beb12424ea49 SHA512 d357cfd4e1098a8aa7e59aad36f27427dbc43fe39bfd3628928879058ee396774ebbc2c270fd5422a125f447a7b64fcb34da5008fcf44a8d74ed344b81f65666
+DIST boto3-1.24.15.gh.tar.gz 510710 BLAKE2B 9640c037d6bc95225b9dbb9fc8b33d65a4253057b9a534c1dc2f33a5040796b25fe069a1842aee61851b0b5a75c15770564c5348b8937cc38cc8b898a5d01106 SHA512 07b8758afa9454d435a8935e90e7bfbe91ba266fecfd8413f81cb000c86101a8ad14cd9dd7e5ba620dd807da9501409896c36b532d243d68f26b4d0aa8574fbb
+DIST boto3-1.24.16.gh.tar.gz 511182 BLAKE2B 00180c2cee9499efb3093c517f776536a85972014c622ec87d327c0e1a628b1440a85ddb239431d7c647a459f8c55422136f61254cd192cd3ca8f68eb03270d9 SHA512 cc2d179ba3975fdfc1127565d352077529159cd97d120831629650af881600d022f8a55f4ccfb3c732be5814b58739178063042ca7a0e26f0163f47ba8dddb36
+DIST boto3-1.24.17.gh.tar.gz 511281 BLAKE2B 577efc0ebfb39957e55bcaf7aa678cdf072eed885ab1055b15fc8ca2295fedd6d56fd2fb919913beedcdd335ff26e452bc5434283c9ca9d8f0135080e2aa1312 SHA512 a843146951eb2a5ad7dd31159d833806ae403014abf3e9a617f6457e3ecec1a0dc4c6ce6a87079c9112513cbd6a2ccd26542e5736eeea6c5723c7e39c660befa
 DIST boto3-1.24.7.gh.tar.gz 508670 BLAKE2B d526f6a4dc4c6126c61ca7c9074b4341c742f84a6e95b38cd8a450fb74df379cee44513e1be6bc7cd0c8f728598d0ecfc06240120a8da71f75f86371498f5233 SHA512 4d57e38c18138b950f93a234132ac1d31c9a29ad00ca5e1298517d6b16ff2849802ce6cfeb8de390c2eb25086043d45e0276a7a563707595649ca1905367be52
 EBUILD boto3-1.24.12.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.13.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.14.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.15.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.16.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.17.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.7.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.15.ebuild b/dev-python/boto3/boto3-1.24.15.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.15.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..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_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+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/boto3/boto3-1.24.16.ebuild b/dev-python/boto3/boto3-1.24.16.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.16.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..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_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+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/boto3/boto3-1.24.17.ebuild b/dev-python/boto3/boto3-1.24.17.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.17.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..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_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+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 7b3a42d1e446..ec08e5f67b9a 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,10 +2,16 @@ AUX botocore-1.26.0-py311.patch 2164 BLAKE2B bbe6b3db1a2369293894e8d7ef610301223
 DIST botocore-1.27.12.tar.gz 9132872 BLAKE2B 74b74b5a5745cfacac066d5e087974fb58be5a600c7cfb2077d243044b8c429b1396d19e6790c0f754e42931085b115f74039b8c93da39593512d28021d6314a SHA512 767defae44ffb3b54b55625fd0f8a20c22a4a5f209a1397b1a27cfc2e36ac9e03cfdd25bc77bebc944613c5744dd7651e1b574674e8a992f219e172eee9210f5
 DIST botocore-1.27.13.tar.gz 9134638 BLAKE2B 471a46a4c4f14082ceb7030495a121ea90a6f67b6f802cbeb1394624513ff86deb7b90e3aa3e568dff42cd3280ea038565752eff69577231250b6542e6586e1f SHA512 6becb7cd6d2ea3b09012f7b168dcf7fd3386c19ee6003a4e8f4059e3b1ad2b281f5fdaab7abaafe6c34bccd547c8f8ef1bc253f5190d3e91127b1239ec8e307a
 DIST botocore-1.27.14.tar.gz 9134503 BLAKE2B ca29a33c5363457053f8ac042279726a15d3dc5f72546558d11bbacd79e7641d94b1137b76e201ad00203ecff53274fd41abd9178e7abbc1c5a51fe388f7fa5e SHA512 3995918212559eab009f141f94e6e6496fc77f12438e1dd62ce3ee232009b90de3882d342d20e83eb11de5f35b7878f53eea884016874caacb9d2e3d167b4f1a
+DIST botocore-1.27.15.tar.gz 9134585 BLAKE2B 33fcf026334e0be28b7f20b78e072d4eed85e857438319dfe6a1aefb2aeb287aa7a4d6b5f40cd47b9ca5e904263bd7716e58fe2962a75fa64ffea8da383fd527 SHA512 15a65137b131220863fc7fb4c085d83b858a673ee49370bc8d5ce8433f2ee3c99dffd102830da10ed1c4fa4a6f5fdc5f543be4e88646f981409fb855ea100932
+DIST botocore-1.27.16.tar.gz 9138117 BLAKE2B ed636cd031445b14f57282326836616dca626c27ff912b5a2014df83c5574264f773d9ab8aae2f01b55bb810d00233f1a4cceb0f746767247b5954bb8739b7be SHA512 c4b1debe648cd3027fe409f4ec095a4b454050ec427e8a11e04bc1f82d452566d2168dd539d5dc687e46e612f3d47e218d99de9510156e19eac477ea3c0259d2
+DIST botocore-1.27.17.tar.gz 9130505 BLAKE2B 04c6b37f3b42a0f9fb696b5213338b004418a68c754f5027ad447119fb20556dc49bd53f40fd9560ea3f5bdcf2afbe151dba68e901079baec770f9f223b1a894 SHA512 b1a145d3c97adfd4df40639da99e1c34087508be189d5818ee7176f20454f2897a6f518a14b4bfbf41cb169a17188bec467337c10d0ad511e223f0c1ff5b64ee
 DIST botocore-1.27.7.tar.gz 9102259 BLAKE2B 094ec463531f1dfd54ff32d0f44ebc39cdc0a6d4c3e19b49a25e25d9d13acdcd26c782c1d4819ea4f1cb8954a858aa6e997411785678700b7ca03cd8844527b5 SHA512 d4a1327f4314279548af00fbc6da2f9fc5f25f704da3f6ddfa90773878f28ac9f03556b00fa4c0207ec2e952eb716aa98c1c22abffbd51d82dc55d9e4ceeca5c
 EBUILD botocore-1.27.12.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 EBUILD botocore-1.27.13.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 EBUILD botocore-1.27.14.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.15.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.16.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.17.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
 EBUILD botocore-1.27.7.ebuild 1628 BLAKE2B d42a7b3e64fa2a66eb055490c1525faedaf9178fcfbb8aec42fa09841ddca13b276a8872699d7e5b2cea725fd2e835570a59c2eb9783a63bb728266499185321 SHA512 cacfaeb4cee9165055b59b287a2bcf73759c4d1291b3fd0831ca309ef6937347655be22c715328e212264c62e41bd03b024eed020826b07165f5518e52f4729a
 EBUILD botocore-9999.ebuild 1635 BLAKE2B fa5b1fc2a47df0e4f5932aa89a5f84d50b25e36b186cc87f8acd3069bae7eda9ba405a99fd38633480cc5bcefebdfac8456aa49a855d7a221c05d329b211b18a SHA512 1dc2cd74fc9d7d205abba35e494f2189e7ba4dfdd2ded0e7fdbfc44c6aaad840074c5b676bbe2aadc84b738e1223d26d8c9e4ed57489503482879a49b0da1305
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.15.ebuild b/dev-python/botocore/botocore-1.27.15.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.15.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..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="mirror://pypi/${PN:0:1}/${PN}/${P}.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_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+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
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-1.27.16.ebuild b/dev-python/botocore/botocore-1.27.16.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.16.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..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="mirror://pypi/${PN:0:1}/${PN}/${P}.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_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+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
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-1.27.17.ebuild b/dev-python/botocore/botocore-1.27.17.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.17.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..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="mirror://pypi/${PN:0:1}/${PN}/${P}.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_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+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
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/calver/Manifest b/dev-python/calver/Manifest
new file mode 100644
index 000000000000..8044325f2a57
--- /dev/null
+++ b/dev-python/calver/Manifest
@@ -0,0 +1,3 @@
+DIST calver-2021.7.30.gh.tar.gz 7058 BLAKE2B 90cb8568bce2afcf3e086e038dc237440c5d20c05cc19b7d6966d16b55854810a627120dc870d77975676ca166eac0922443d19b85aeffdb51f3cf435848ef5d SHA512 17c10b0f60ec4c8c582de660bd715d054c3478d8fdec88a6830396bad1d6147ce375a34c5ff57d244c8c2e337a6b382b6ee10673182a40bc14ad16a97405f181
+EBUILD calver-2021.7.30.ebuild 757 BLAKE2B 6b8835d4fa15e47d7619b673788c91c6fa505a4f4c7795253405043a88fe9bc41841109a62d65bef39ab44431ec859774c2b6d4654f258a55f655f9896eda755 SHA512 c9fee97043203f8c6d619aeb7e2397bae529878085e97cc757921963abfe92be45ab85e00f481388ee59922a48d239a8b6fa6b5cd909e5c16eb28f1f542a1fe3
+MISC metadata.xml 337 BLAKE2B d1215a2b0ec479b37caa4b8474201c18ad555e344d49ce25ff7c2cab6f117ec3b2b3d14320e8d91706be93f6dfd09f87df4794a729512ac5f88cf70b4f158fd9 SHA512 d37ecb1686abb7257053e2ec74b26f00d9640c63f590776a3c43c440d7ec7ecf9733506f95ce096439f44030f172307d3624d5e9c825a776ee6d8d04c455a4c3
diff --git a/dev-python/calver/calver-2021.7.30.ebuild b/dev-python/calver/calver-2021.7.30.ebuild
new file mode 100644
index 000000000000..ee5748e2277a
--- /dev/null
+++ b/dev-python/calver/calver-2021.7.30.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Setuptools extension for CalVer package versions"
+HOMEPAGE="
+	https://github.com/di/calver/
+	https://pypi.org/project/calver/
+"
+SRC_URI="
+	https://github.com/di/calver/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# bootstrap workaround, until https://github.com/di/calver/pull/8
+	# is merged
+	cat > setup.cfg <<-EOF
+		[metadata]
+		version = ${PV}
+	EOF
+}
diff --git a/dev-python/sphinxcontrib-openapi/metadata.xml b/dev-python/calver/metadata.xml
similarity index 59%
rename from dev-python/sphinxcontrib-openapi/metadata.xml
rename to dev-python/calver/metadata.xml
index a019e89fd495..2acd1a33af2c 100644
--- a/dev-python/sphinxcontrib-openapi/metadata.xml
+++ b/dev-python/calver/metadata.xml
@@ -3,11 +3,9 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
-		<name>Python</name>
 	</maintainer>
-	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">sphinxcontrib-openapi</remote-id>
-		<remote-id type="github">sphinx-contrib/openapi</remote-id>
+		<remote-id type="github">di/calver</remote-id>
+		<remote-id type="pypi">calver</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cerberus/Manifest b/dev-python/cerberus/Manifest
index ebfd1fb65d12..70ab147fcbce 100644
--- a/dev-python/cerberus/Manifest
+++ b/dev-python/cerberus/Manifest
@@ -3,5 +3,5 @@ AUX cerberus-1.3.4-raw_docstrings.patch 695 BLAKE2B af53c17d8b683e1d88e744330ff9
 DIST cerberus-1.3.2.tar.gz 149344 BLAKE2B ce65f3c4c612f87562c28f913cac95c1c7af9b2dfa72955bce3f0e0459e4ff9024a126ceea4587e2c72cf606be2a249046a090a2e2d5e908bfe4b700ba5e9b92 SHA512 e9cfef5a936783eb0576afd3d23397dab38d8c88b6b43f98de0ad7e20739e5ff983eaf4ac769206adb7fe9692c651583f6a5f2bab263b81b8de96f45707c84fb
 DIST cerberus-1.3.4.tar.gz 926258 BLAKE2B 6fabfcf32e26ee7f4881b64ce9c3098a27949d95fd0998e09b7adcc3b834033f904a07b6e9b2cadea218b952142f6c2bc6051d8c208a14d6e8172a0c3823c38b SHA512 c816b426ed1b32367d1e8f1c26d6ddd4b49c6578540e688baf693e3094a05800f645cfe879be6378c1e9be9899cad7bc2ad1ed9844d6762d2ef6e0cc54a7476a
 EBUILD cerberus-1.3.2.ebuild 555 BLAKE2B a2daf7c5987368b3c9c85ac67137f263200fa99819c204ecd89f7175a91a39a7415d9b567a944be7dc4e71d4adf0efb0c0faa97040eafde1772931c0f684b8fa SHA512 7be0b457e94d62f49d6b24c448ec98c07394a31c8f9f773aa0f8d0090664a23ac7d0b232d26a3b9546bf0d48ef8b7da9078b160026282388c3e8aefa5000afb1
-EBUILD cerberus-1.3.4-r1.ebuild 822 BLAKE2B e4514c42b3565c336ca3ab646cb0f6d0c93c1ff37431701ee5c067e57af04e024b671604b472ebf964e31aa9b794e0901c2184c09925fad8d3035f32b1269622 SHA512 1de9372782161f02b011e85805a0cb2cff04d3c72e2c1c2c6f0703f70c6b9b4ebfee4d36dada763458af0262e39d7ce2b49389e2e80a4e8d8916e03352046ecc
+EBUILD cerberus-1.3.4-r1.ebuild 829 BLAKE2B 2b999e11e120ead67f5ec33eedd71355eb6e5c56964135019ee2cada8af8b4792d437f1f5b0749ca9ebb46a5cb9b797a7987575535589a8bae2a281fa5812c48 SHA512 20cb0196ad4c661c1986f235fbcc05a8a71d070a4c81a2cb33812ac0e4c74dfb93d9e1a71f95caf459e0f788dcdc9635a1b19804d76e65264c7e6a8906755433
 MISC metadata.xml 395 BLAKE2B c9dc795ac8b1daba3bb10e3aef517b28be2e88b26f5e1192c380bca300ef929608e2b2bcef23adc710e01d41fcbc640c97429d6d8ee61fe4a78014aa181b528d SHA512 c1abc73709d977c4f7a3e989c335f0d1312d07dc843dd88faadc633e2dbfa3371c1cee566a481ebfaabdba60e0a8f00068ce8a83ce9b05ab091c35917b8c146a
diff --git a/dev-python/cerberus/cerberus-1.3.4-r1.ebuild b/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
index 21c3a141c938..58798d203a59 100644
--- a/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
+++ b/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.2_no-pytest-runner.patch
diff --git a/dev-python/cheetah3/Manifest b/dev-python/cheetah3/Manifest
index 3c1161982bb9..20b2b03f21e4 100644
--- a/dev-python/cheetah3/Manifest
+++ b/dev-python/cheetah3/Manifest
@@ -1,6 +1,3 @@
-AUX cheetah3-3.2.6-fix-py3.10-tests.patch 1082 BLAKE2B 5e418f22d9067208c038ddcbd35ef5942c09bc92a14a9a28c7ed996496c419b41b772d1fafd3ac01b524aea0dd70706ea69815db0f6fbb3de26abd95b416c3c4 SHA512 1adcc664bfd580fcd62156591b52375e3f01a5107a995ad6a8c01baf8e604c2114451be7cd13775bdf2bcc2d16998d86fd5d0db38c85d4ff6e52bd314fb3c264
 DIST cheetah3-3.2.6.post2.tar.gz 316291 BLAKE2B d5dfaa958bc0cc41097d4a75abfe092d51379efd644daa01caac6ba1b789c21334a662904166b6069a0204e302c1d9e7bea74aa9f11082b9c8fce1c1c509f888 SHA512 b10d2569ce92181029b8f95d23602ec7b002400c8fdf4f6bb095ff40201154b97418fec19c9920f2f212f545633571aa32dc50a16a9ba81a9427303ca7938f29
-DIST cheetah3-3.2.6.tar.gz 2481158 BLAKE2B cb8ad192ae9caf0d1284294b323cf4a918cd2fc951bae25867d69a3dd7933728056b76fbf52a22d34f290056a96cce7d9ccbeb2404f2f0bb782f8db8b7453e47 SHA512 abf74def695018a79cb1364f60e402e7e0095a4d2f069decfbddf42501d865b70451ebc7b52abc67aa23e57276d7a3b8c2894a9571876e15db43cd1358f74d31
-EBUILD cheetah3-3.2.6.ebuild 1139 BLAKE2B 4bf5c4cc0f85b4f7b4e46287055cd3b0e33f4fd69e162b514ff8bb96a8337f8b95ae81964f31e4332a93a214cbc4333530bb5c8c20d756a7b927ee4d0601d55b SHA512 1534d89a0e31a31f6b1027425bbaedcc8e14e1af91e319418ac6be6eccd001a364cdad0f103be82aeb8b018c41f603a70caeaae660776f2b6edf81e2b0d5e2f5
 EBUILD cheetah3-3.2.6_p2.ebuild 913 BLAKE2B 0b94462a6c57cf619d16e412aacc42f1da89e8444b8a53b4dc7384b5637cb6f359606e6bfd82b58c8759057d945a28104b56b09377d264f0a927d29bbc73f270 SHA512 1e823f237aaa564d3d7f96ea5d3dd5a33d62690719bc433d9efd7f80d35c7a8cffb828af54cb5eb3273a7bd26ba700c2936a7b03036d5eab15ebf307655593bd
 MISC metadata.xml 728 BLAKE2B eed475bf99f19abf5f934cc9e9f0ed10c3a29536767133a628dc3f23e95a37a0feaa82e4f080ac8f6d541cc6d802a084d670e64049149937b061e5f20bac317b SHA512 52b5eb46efb8d6e750823775ef459eec200e617e9232867cdfa229e2d7b6a41feee15441ac1a7c1ad2871f0fd19fb91fd6c36719eee2592c41e27ad8ec5fd162
diff --git a/dev-python/cheetah3/cheetah3-3.2.6.ebuild b/dev-python/cheetah3/cheetah3-3.2.6.ebuild
deleted file mode 100644
index 77379adab8a1..000000000000
--- a/dev-python/cheetah3/cheetah3-3.2.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python-powered template engine and code generator"
-HOMEPAGE="https://cheetahtemplate.org/ https://pypi.org/project/Cheetah3/"
-SRC_URI="https://github.com/CheetahTemplate3/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-SLOT="0"
-
-RDEPEND="
-	dev-python/markdown[${PYTHON_USEDEP}]
-	!dev-python/cheetah
-"
-BDEPEND="${RDEPEND}"
-
-DOCS=( ANNOUNCE.rst README.rst TODO )
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10-tests.patch"
-)
-
-python_prepare_all() {
-	# Disable broken tests.
-	sed \
-		-e "/Unicode/d" \
-		-e "s/if not sys.platform.startswith('java'):/if False:/" \
-		-e "/results =/a\\    sys.exit(not results.wasSuccessful())" \
-		-i Cheetah/Tests/Test.py || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp -r "${S}/Cheetah/Tests/ImportHooksTemplates" \
-		"${BUILD_DIR}/lib/Cheetah/Tests/ImportHooksTemplates" || die
-
-	"${EPYTHON}" Cheetah/Tests/Test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch b/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch
deleted file mode 100644
index 845520fb02ad..000000000000
--- a/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 112dddd8fa5fb9c285fb8ef2818abfef99365070 Mon Sep 17 00:00:00 2001
-From: Victor Stinner <vstinner@python.org>
-Date: Tue, 19 Jan 2021 11:19:15 +0100
-Subject: [PATCH] Skip test_import_bootlocale() on Python 3.10
-
-The _bootlocale module has been removed from Python 3.10:
-https://github.com/python/cpython/commit/b62bdf71ea0cd52041d49691d8ae3dc645bd48e1
-https://bugs.python.org/issue42208
----
- Cheetah/Tests/ImportHooks.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Cheetah/Tests/ImportHooks.py b/Cheetah/Tests/ImportHooks.py
-index d7b5f5d..bc0239c 100644
---- a/Cheetah/Tests/ImportHooks.py
-+++ b/Cheetah/Tests/ImportHooks.py
-@@ -87,7 +87,9 @@ def test_import_builtin(self):
-                 return
-         raise self.fail("All builtin modules are imported")
- 
--    if not PY2:
-+    # _bootlocale was removed in Python 3.10:
-+    # https://bugs.python.org/issue42208
-+    if not PY2 and sys.version_info < (3, 10):
-         def test_import_bootlocale(self):
-             if '_bootlocale' in sys.modules:
-                 del sys.modules['_bootlocale']
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index c110c2db9303..51e15c29ff20 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -2,5 +2,4 @@ AUX cherrypy-18.6.1-close-files.patch 15776 BLAKE2B 8205e3db173706e749d9adc83d47
 AUX cherrypy-18.6.1-py311.patch 1078 BLAKE2B 7518be839f56493dc3960472bdf0fad663490382ebce956c3cf8f2917c93e6b6672bdd654afe162f447f4ce907b1d122d5fdd90b30a9c130564fae7419246cc6 SHA512 31d00c5bc29491f57d4e663211bcc6c2292ca1eaff41c7be6ee5b6af0802875cb82fcc110c16c852989acec40c4c5bbc6ae0bddecc5afbfde2e8c571a767846e
 DIST CherryPy-18.6.1.tar.gz 692730 BLAKE2B 44cef7ed54a090df396691001b794bf13be2c61003bf80b63223e3a42914ce50fcfe43c06626fb881105e3ed6fbf587df7024bbf7cfde00a8263c432f4cc7ae4 SHA512 186a0992a443e1ffc1a2924b3351dcb0e6cc6c88b39ac32330d6365fe1b0a35c2008a3a18e1a57f61ffd1901ea6134333bb6288024d8ffbb1fd8e8dcd3145007
 EBUILD cherrypy-18.6.1-r1.ebuild 1950 BLAKE2B 1d40c7f6d31c9641ae503df5705e5465941befa8f6ce24adf0e976778dd023d73218902ab35d0c271e7cd9ee52cd5bfa57dbefaaa0b982623f6e2d74ec460ba3 SHA512 d6b60880219efb9eec875a01f4c8549c225edfb1c789a1fb2927b1d3d285a216f67400dfd4dd929ee9b9de52277dd1c5e08ef6eccbeb72f6207388812042bcb5
-EBUILD cherrypy-18.6.1.ebuild 1519 BLAKE2B 2bf70272fdca85f50497b07d796b03b3f9c3589ddf646f4426c6438efc1b0a06b188bf9cff5170df004ba49e5ebf883ae211a372caeb6e00e89f1d325949c062 SHA512 050e6e2c769a83d105dd4a79952f75f44bf3ccbb9a90c4b8bbab4b7dcf6f6f80d73027000b6c2a8ac7a51c89a012c4c587588e32474ffda603e912c54afa90f9
 MISC metadata.xml 347 BLAKE2B 7694118d09caebdeac890ee40fd8a79906637bb695f9ec44dc25e67378c8c7f06901e5c52e6f79dd498921ffa01b18b9762b102baeea34792a2ff730a1303c40 SHA512 29cbadf45008c3c422c47ca232634bd15efbd4bcdc6065d18cf1adcbc0c3bbb155a2b122eb4ce7180839fcdaf4acb5515486f191ebbfa63eaec8a14abbb1e3eb
diff --git a/dev-python/cherrypy/cherrypy-18.6.1.ebuild b/dev-python/cherrypy/cherrypy-18.6.1.ebuild
deleted file mode 100644
index d1177e6159ad..000000000000
--- a/dev-python/cherrypy/cherrypy-18.6.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_P="CherryPy-${PV}"
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
-HOMEPAGE="https://cherrypy.dev https://pypi.org/project/CherryPy/"
-SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
-IUSE="ssl test"
-
-RDEPEND="
-	>=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
-	>=dev-python/portend-2.1.1[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/zc-lockfile[${PYTHON_USEDEP}]
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/routes[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/objgraph[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
-		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-		dev-python/pytest-services[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		# https://github.com/cherrypy/cherrypy/pull/1946
-		"${FILESDIR}"/${P}-close-files.patch
-	)
-
-	sed -r -e '/(pytest-sugar|pytest-cov)/ d' \
-		-i setup.py || die
-
-	sed -r -e 's:--cov-report[[:space:]]+[[:graph:]]+::g' \
-		-e 's:--cov[[:graph:]]+::g' \
-		-e 's:--doctest[[:graph:]]+::g' \
-		-i pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cjkwrap/Manifest b/dev-python/cjkwrap/Manifest
index bfe97bfc86d9..3389fb31d5b7 100644
--- a/dev-python/cjkwrap/Manifest
+++ b/dev-python/cjkwrap/Manifest
@@ -1,4 +1,3 @@
 DIST cjkwrap-2.2.tar.gz 20995 BLAKE2B 35604e2d1aa24a75e1de0f0b17ba592e7588aade42d43e98864f5d83fe598eaa0ca566682cb7c7af566e66f79c9696ba2ae86b1579681688d6cd31469c07a3ff SHA512 c72ce67b10af46018f7aa5d65af030373e8889a28f533a59d55668e5c90a759ad7cb31708dd6ff35561f9e62115edef5bc0facc74b6a6e122d7399d9dc950624
-EBUILD cjkwrap-2.2-r1.ebuild 447 BLAKE2B e3d2939a7dc60a57fd4a08aaf8978d08aadd41f10f918da34b333b93f44552cbfb8b6597f7f9414c60ad5b93ceeff291141b170745958502a1e600065bd0d427 SHA512 ff085e30a422a4fb7af547f76f2c3b2f6da94beca4236b93a0ea5edef735ce80ca547c2beca205a2375a6482d027da3330cfc98b2007b567da08a7f2cd6108e5
-EBUILD cjkwrap-2.2-r2.ebuild 481 BLAKE2B 4b89479b88b043e7806f42679311098cf7ef841cd38d1dc87fc1c647d1372fcc4bc356f9cafc855f45b88742572a126cd3f5ccff92d4eab00b77355a50b2b6a1 SHA512 19fa681cf46ac6ae2d4b23f25a4cdb7a2eb607df545dd3364b93ad38b3aa3f2d5dbf6e9dbd95b113e6c98a0d8f04f1c457ab1cbd3811b934465a937238e767e7
+EBUILD cjkwrap-2.2-r2.ebuild 478 BLAKE2B 24f52b57db2c84e0d436cca30a5eb3ecb78bea43d5b7f5804f18b9debacdf852fc237dcc0c027c5772a3bfa2a550c12457f048abcf4cb8fc24e413bec05616d8 SHA512 cdfd62fdcc5e4c90bfc7f45c2bcd9b5c423ca06ddcbb514f75ba7fb871bdb0fa601319b6e8d8bcc5ca49e7ac3fe6d5c4ba3c03ec43645e575fda314d1dcc63fe
 MISC metadata.xml 413 BLAKE2B 6ba9b74fece1e3cc8080bb2c7839338623e42f7eb642c2c8af87adc54b6f183e6bc7d5fad8e489759e06b1c6c65891d9202e04f60bd15cc1842c10273d5be978 SHA512 87750744c4564723a681ea6a66c9b2e1b54df404efd4d062ecb168c0475f59e42fd2d964fb8dc8f7961219de397e2acea74284838d1544b668b684ba697ad0f7
diff --git a/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild b/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild
deleted file mode 100644
index 8673743ef0dc..000000000000
--- a/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="A library for wrapping and filling UTF-8 CJK text"
-HOMEPAGE="https://f.gallai.re/cjkwrap https://gitlab.com/fgallaire/cjkwrap"
-SRC_URI="https://github.com/fgallaire/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
diff --git a/dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild b/dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild
index efd377e64ada..31706393b115 100644
--- a/dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild
+++ b/dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild
@@ -13,4 +13,4 @@ SRC_URI="https://github.com/fgallaire/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 6040c63997c8..91d277e5f739 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,5 +1,7 @@
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
@@ -11,5 +13,6 @@ EBUILD clang-python-14.0.1.ebuild 927 BLAKE2B 2c35566372b28bb772b497e0b11728e6fa
 EBUILD clang-python-14.0.3.ebuild 958 BLAKE2B 1fd62aa82c0b224e068d043830ad4a0fd44b62161df1e912f53ea0e6ae2a923d4d7f5d2d897d6a74ba1b8fc9a4a8c632072daf9cb50927d73f055a9ffbdd2a00 SHA512 2cf161f95be1521e2e5b6e50c881f90918eefc501059e0d0ab9d376ac56be5dee590d40a79936be021889a8fcb4b98d730316b4dca67e5ee314ff97ef48d1fce
 EBUILD clang-python-14.0.4.ebuild 956 BLAKE2B 491c8335c64484034663fd84ca2397e13afdd8cab6d3b4adfcc9317379e7a3620372ffe5996d4a0029a7d412f11a0d598f741a6893803ebadba85d330e49682a SHA512 4ef0d1ab2cbc3d277d4cced33fa87de7c3d43295a60a3b418ad4a95399e8de8c2e1e5c594681bf7ce1bfc465732d34b2db3a9e8636c0ed124ddf79c8ed7a5750
 EBUILD clang-python-14.0.5.ebuild 958 BLAKE2B 1fd62aa82c0b224e068d043830ad4a0fd44b62161df1e912f53ea0e6ae2a923d4d7f5d2d897d6a74ba1b8fc9a4a8c632072daf9cb50927d73f055a9ffbdd2a00 SHA512 2cf161f95be1521e2e5b6e50c881f90918eefc501059e0d0ab9d376ac56be5dee590d40a79936be021889a8fcb4b98d730316b4dca67e5ee314ff97ef48d1fce
+EBUILD clang-python-14.0.6.ebuild 958 BLAKE2B 1fd62aa82c0b224e068d043830ad4a0fd44b62161df1e912f53ea0e6ae2a923d4d7f5d2d897d6a74ba1b8fc9a4a8c632072daf9cb50927d73f055a9ffbdd2a00 SHA512 2cf161f95be1521e2e5b6e50c881f90918eefc501059e0d0ab9d376ac56be5dee590d40a79936be021889a8fcb4b98d730316b4dca67e5ee314ff97ef48d1fce
 EBUILD clang-python-15.0.0.9999.ebuild 935 BLAKE2B 259d469221df0c360735c5c033f89523161f2bf19db811f390973b52229a50b82cb06f96c05230a9862986a77d42466d1b3bc95b5bd30578c96715b28831212a SHA512 a26fbbadeff6657cca7ef915d263bc9a1a4543116bb1f14282b889c5463a662d280ce8d7e7f674753c43b186fb0531062ea86462221adfb4a8b76a50c214aa1d
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-python/clang-python/clang-python-14.0.6.ebuild b/dev-python/clang-python/clang-python-14.0.6.ebuild
new file mode 100644
index 000000000000..0b7cef715981
--- /dev/null
+++ b/dev-python/clang-python/clang-python-14.0.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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}
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	"${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/configupdater/Manifest b/dev-python/configupdater/Manifest
new file mode 100644
index 000000000000..8df1ae21edd8
--- /dev/null
+++ b/dev-python/configupdater/Manifest
@@ -0,0 +1,3 @@
+DIST configupdater-3.1.gh.tar.gz 138671 BLAKE2B 48e349780e11ca26b4b15b44aa298058840cfcea47fc7b2e555f3ca743de1956a15255bfea2c5f96624e02e399bed99ae45f3422ab1660b8ae83087ddf6117e1 SHA512 89685a93f3bec907184d818b5adea4f87967df313fe4e4216aeef2c227fdf0b0f98757ec27da7f43adff6e2ee37020dd57b98569d5811c9dc7c3201852b27432
+EBUILD configupdater-3.1.ebuild 693 BLAKE2B fd1c8b10619c7b2ff849c59a467687e53b653188b2395aadf47e4731eedb967fa93d203cecb8d1bbd00b309f977ad242a21658cdd371affbafe79b44e03d5cf9 SHA512 23745443f9fa98695eac44e41559300c0948ebfe099aa7ae41450239040685acaa10c97c600c48fefc046ec2fd3cb934c400c45819ddb191fc636c0206132b71
+MISC metadata.xml 359 BLAKE2B 59eca20050b8eb4620813ab2bc61abec0d905dba4c38d35806f135cc3f165634cf6f1df124d77e294dbcb3d196b521bbfaa005979e0c63164004d4942afe4717 SHA512 8ce147cc56b7c207125e40d9ce54f692f62f2ecff1944e74d661b2656e5d479e8072e41fbec7451e58976d3453c5dd0e4eff0726ff9f2b502b505926fd2d851f
diff --git a/dev-python/configupdater/configupdater-3.1.ebuild b/dev-python/configupdater/configupdater-3.1.ebuild
new file mode 100644
index 000000000000..bb6d09e8a58f
--- /dev/null
+++ b/dev-python/configupdater/configupdater-3.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Parser like ConfigParser but for updating configuration files"
+HOMEPAGE="
+	https://github.com/pyscaffold/configupdater/
+	https://pypi.org/project/ConfigUpdater/
+"
+SRC_URI="
+	https://github.com/pyscaffold/configupdater/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT PSF-2 PYTHON"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/--cov/d' setup.cfg || die
+}
diff --git a/dev-python/pyfeyn/metadata.xml b/dev-python/configupdater/metadata.xml
similarity index 58%
rename from dev-python/pyfeyn/metadata.xml
rename to dev-python/configupdater/metadata.xml
index de0ba66c8d44..9fbb7c1b9718 100644
--- a/dev-python/pyfeyn/metadata.xml
+++ b/dev-python/configupdater/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>grozin@gentoo.org</email>
-		<name>Andrey Grozin</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
-		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">pyfeyn</remote-id>
+		<remote-id type="github">pyscaffold/configupdater</remote-id>
+		<remote-id type="pypi">ConfigUpdater</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/csscompressor/Manifest b/dev-python/csscompressor/Manifest
index 96563924e80f..0bb354e06659 100644
--- a/dev-python/csscompressor/Manifest
+++ b/dev-python/csscompressor/Manifest
@@ -1,4 +1,3 @@
 DIST csscompressor-0.9.5.tar.gz 237808 BLAKE2B 26d9e433513577a2b76660eef2ee0fc0fd3b95d28bcfb06ccc38dfd6f524d63414ba9bda297c8e4622cbd663e4752051717af506064509bdee14f0360ffdc481 SHA512 aee16b5af8b1b780a0fef10d359864a5a21a90b7196740c8b7efef25d1ba4d8197e9fce03483d0e2331abc736290cc6b862e43ee65d1b76260310aea65fc6eb6
-EBUILD csscompressor-0.9.5-r1.ebuild 453 BLAKE2B 29151958210e374cca4d2d1d07b484d8cf0d3b76ea2c7cdfe7df14810392d524340b161d171d3b02f19503bc87187b4f8f6be99d84be9e12d2153cc0e3b2b786 SHA512 1d927116239417ba200c0610565eb14edcd6bccc175fb335a163dddc9edce80b78e33210622334b5445956a374259d9ed5c2a36a8cd3f162ea06e4cd2f20ee2f
-EBUILD csscompressor-0.9.5.ebuild 451 BLAKE2B da6170daa0ab8092758b06bd0837b64ad5be58b9d09fc7675ff67e72af744b4e0bb170c61c0b2b581273c754179b1f787e588adba4a06954ff7f6c65b41c039f SHA512 7150c9b5b14b6779ab4b3357895735619d46c47aabe149d3e6d1771f3f8037764c93ac9b87075dd585823883c0974fc0a80aafe05e15d1bd9d66d5c6ccea0b78
+EBUILD csscompressor-0.9.5-r1.ebuild 451 BLAKE2B 563319f0eb51a78ed5e0b47e4b0565d7823d9e2001380a4b30c34316c152ff8e0a1aa874281154e4679111f4f5978d44ce3737a04b28597972ddfead04e64877 SHA512 7d2603a369639423aca73bccb4d3ad9447e0a513146ca3fb94c849dbe9fcaa82758489980de00acf6af567addbae0c0729987a29b441bbcc252dfef87ec780be
 MISC metadata.xml 402 BLAKE2B f1cc451a52cade36de3a7311417e31831d67ff14d9ab770dee735fbe12ac58d7431446a1c19ad93866732992257acc4737eb0a633f13b511b3595a7c6a3baa1e SHA512 04ecdec5f3d281f51faf5c4d399c21929947fb6eda5f0ba568f23c1690b6e146c5000ef9bdabbb06c2c7c0b464d3cb17164c768e18dab3ad68eb59ac0a3514a4
diff --git a/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild b/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild
index abcd3b7bcb15..2258ba579ed7 100644
--- a/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild
+++ b/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild
@@ -16,6 +16,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/csscompressor/csscompressor-0.9.5.ebuild b/dev-python/csscompressor/csscompressor-0.9.5.ebuild
deleted file mode 100644
index f9312fcde96f..000000000000
--- a/dev-python/csscompressor/csscompressor-0.9.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python port of YUI CSS Compressor"
-HOMEPAGE="
-	https://github.com/sprymix/csscompressor
-	https://pypi.org/project/csscompressor/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 0d0614b7e657..ce738972618c 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,7 +1,9 @@
 DIST dask-2022.05.0.gh.tar.gz 8658529 BLAKE2B 0b09ef38137d9c395384549fd8a3b0218ad1761ccb1816f8fc4f4af7328215716603e3f41b8cc3bf7044ff42b72eee277147b3bd03da48467cccc88f239bb2bd SHA512 15605321143f354ffb9c890823f5751131d942cc16c523b2d00bdcc752ddc5243525f7cda138091604c8f2f9c5b4a309b1efc95f483b753673df98cc8a81ce81
 DIST dask-2022.05.2.gh.tar.gz 8721528 BLAKE2B 42b83ca6fe58b014d3aa90cc99dc4b9b631d6b5bb3243a2a2bd1bcfc6f9ffe5d545b7bcc43edfd3299273e105f7355fbaa9490043a12a8c303773d0e08e63d8c SHA512 1d6ce8db1c83ac22f081beec8667f35acda48578263c637ee294934c729d16a7aca4259e0dde6fed6f2dc9924490589610fc3fc4225dfe07552b15b6af20d8d5
 DIST dask-2022.6.0.gh.tar.gz 8727952 BLAKE2B 060595de52ec64db83bf56d5b4c975ac22009fbe4efadd903ddafa80400e8b5706d60a47445b70f513a73cc915dc696b7ee17831f6c4aed4f55ca11bd8c4fcce SHA512 92619558dc8ed4808842cf45bad703443bfc38f2206fe15e65e5dc457040042eeefc9cd0fb16a8322c4a8972dd10b0b7250451d1883a148e2238f5bcb3f0555e
+DIST dask-2022.6.1.gh.tar.gz 8729249 BLAKE2B 211beeb3960569aa1cb68a4fd9b261a417297de5dc406d50bc54342239227ea01e2158b618bd889862a7eff8bb01bb43d098937bb3911f088250957caa672d04 SHA512 6e06b63dd5c7f1d7c6c7dce867ffa42b956023b313b25245a339f698b06bea17a03cc4ead9bd5aef8ddf081750cad4df4b6b2972038315c89585221382c9e95c
 EBUILD dask-2022.05.0.ebuild 1525 BLAKE2B e3a0a84144604df9d5a12ecfb37026b255e588c1b3a22d668338074f0af832ad66043aafd77576a962f69249624d318ea8372a0cfec55ed342bbd7a3651bed6f SHA512 546b309ee34fbdcd72eec139df6be0d87fd98a99f70e8a12dbebeeef844bf81084e3d38889f1f0109c20ad473ec785f42b6d5eb22f2f38b4080f98554092cc6d
 EBUILD dask-2022.05.2.ebuild 1526 BLAKE2B 4f46069ebe97edccd7c0384ebc75300e2cb19f2eb506f9ec5ece4a752c961c7568ca5326ef3b35513d15b3a3e8c315e96c1a8b50fee71e129897bf609226b8b4 SHA512 70a136b384844ade3c2307135604dd4e6c100cf0b7b5751ee3d91c86df00f058524c39e051af00cd64cb90fe5eeeac7bc81530def38173154c112d09e1d8a822
 EBUILD dask-2022.6.0.ebuild 1530 BLAKE2B 891e358cd393bc2c162f180f340d3d1e235135d5d81c1332ef2eb47499d394c384536ce049f82cbd93930cba66306282c61f0240cdc08e64395be7c57bd077c1 SHA512 f2ffde23fdc7e4e95936fe135d13c305c321cf7794b6fc81bb238d5cae3b02d6735f14a1ccf315c0b627d779dd6fcc2efe41cd904701f183040a9d113da901f1
+EBUILD dask-2022.6.1.ebuild 1530 BLAKE2B 891e358cd393bc2c162f180f340d3d1e235135d5d81c1332ef2eb47499d394c384536ce049f82cbd93930cba66306282c61f0240cdc08e64395be7c57bd077c1 SHA512 f2ffde23fdc7e4e95936fe135d13c305c321cf7794b6fc81bb238d5cae3b02d6735f14a1ccf315c0b627d779dd6fcc2efe41cd904701f183040a9d113da901f1
 MISC metadata.xml 722 BLAKE2B f5ef083408180a71a3f997ab61bba6770b08018e3d0737a17a99827edd486c2d10fc8bf17c70c8d5a431bc40bdd685d2a6ce6e8e1784a2c1d89152b167f51648 SHA512 1e1a79bf0d919a2a7a0840e77f239b3aa3bcd57666a06f18113c39c9b075d03e380b37c2e9c96dfe8ba864a94e98fe52fc0b6b16e69009364374020729b261ef
diff --git a/dev-python/dask/dask-2022.6.1.ebuild b/dev-python/dask/dask-2022.6.1.ebuild
new file mode 100644
index 000000000000..ce906c8679d6
--- /dev/null
+++ b/dev-python/dask/dask-2022.6.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="
+	https://www.dask.org/
+	https://github.com/dask/dask/
+	https://pypi.org/project/dask/
+"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+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/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# another test relying on -Werror
+	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
+	# TODO
+	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
+	dask/tests/test_config.py::test__get_paths
+)
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index 005acfc92270..640cac82d92a 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,5 +1,3 @@
-DIST ddt-1.4.4.tar.gz 18527 BLAKE2B d83df38dc54197063418eacad242269bbc130a8dbac61a9b0dcf473ca1e9fe0f4101f8f96839d81acd1e16d9386870c108dc4aa2c3e206670360fee6066e9e59 SHA512 a7cb4565254d47aeaccaa98cc1bf5a605d5dc323b7f15130d16f6322af3d084e5fae34da5e793be1d197b1ca6213306ab1a907277982766ba38bdfd20f53ea59
 DIST ddt-1.5.0.tar.gz 19609 BLAKE2B 8986a7e3df8212dbd5ec6fd15e5cc73c5da65db56cf9234acd83649fc5fb988eccb9605a7fa09188ff9499e759c84ff076d86fbba2e3eeda054224acc8382626 SHA512 91faba2bed66df5cf366011343886e3f0059d4e0f44ca46ffcfed7288068ba43a94a426bd692717b3ea735437ee6c0339d42b5c15f75221386153c035597ae5c
-EBUILD ddt-1.4.4.ebuild 637 BLAKE2B f2b1135e2c15acf408911a0ac472a26b24182cdd852a2e029dbb80b8af6f1724d8712afcd503005e5c0c03e06716eb40aa3d003c0706f33599c95a6c1bc9f23a SHA512 6280df3e7d2848e6c239fdd22cb13b2497608c5f9189b4300ab693d7f9652496323ea701acf485d6548b264d587799813c560baebcb50057ac847fc12afe1465
-EBUILD ddt-1.5.0.ebuild 676 BLAKE2B 9a7ee92535cf71dfca2f6d4037f158f7bac5d39fd26d2be4d345e17446cb759f3f19a01c789c40337f5b9042c8e03f2a74357c41955d5a699a94578b6f4f1b74 SHA512 f3771d6d8bbdc1561b840eea989e92725b05df313394209422d82c970c35822c945a39103225fee352dc7b029dd3c93389023b7506992f34e25b9b2ab9510aaa
+EBUILD ddt-1.5.0.ebuild 668 BLAKE2B 92a0a26887ff2edd73b0a22b61352ea017085e193775839a94a4b720bfc9edab45322a61cf2e1296d93cb35aa849672b8bdaab71e9ed4f0c92170f80836e5ff9 SHA512 6896314ece65c22752c586aee741f7ba8da3c781b26b206a233a479570931c0e746a8cce263224c0aa4c33dc23149fc047841d0ffeac8bd6e704fa7934800e45
 MISC metadata.xml 637 BLAKE2B d7aca1ac2fde8171ceb8fab19b6be2f32125d3ceb411adb504e66a024bbaebb3be0234f17ea0c07073c647d4e613cac889cb241c49ade87f168218056fb8afee SHA512 7416856917a9b619b7884f9a8fde9fb30ee03223e9c8dd45920c43f296a469ee70d79ba999bf495d97ac41d310d17949674f87c0d365ac940eae37aca2ef8d94
diff --git a/dev-python/ddt/ddt-1.4.4.ebuild b/dev-python/ddt/ddt-1.4.4.ebuild
deleted file mode 100644
index a18d168f4781..000000000000
--- a/dev-python/ddt/ddt-1.4.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A library to multiply test cases"
-HOMEPAGE="
-	https://pypi.org/project/ddt/
-	https://github.com/datadriventests/ddt/"
-SRC_URI="
-	https://github.com/datadriventests/ddt/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ddt/ddt-1.5.0.ebuild b/dev-python/ddt/ddt-1.5.0.ebuild
index 20b91ee5bf78..e14ca98aa422 100644
--- a/dev-python/ddt/ddt-1.5.0.ebuild
+++ b/dev-python/ddt/ddt-1.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/dirty-equals/Manifest b/dev-python/dirty-equals/Manifest
index 91c842642d8d..d33db6ea556e 100644
--- a/dev-python/dirty-equals/Manifest
+++ b/dev-python/dirty-equals/Manifest
@@ -1,3 +1,3 @@
 DIST dirty-equals-0.4.gh.tar.gz 41864 BLAKE2B 0b916d37b323e9f587a977b46415432bc11367a6d0c95ac49e47fe604b3ee16c26eaecbbe74464076834c6186f5f0eecc049b211699a3f515ef7fdadc492537a SHA512 f98fa8c9850f26efc44dc2c5cc0ea6d687c07b49980c3eeaa71eaae78930e418c03bb35cb88aab065905443fa354b9b05d44a588458ed37d140d376b943c9da9
-EBUILD dirty-equals-0.4.ebuild 788 BLAKE2B 704181f19ae29b9951c8fabe92697253a5e86da9f35ca6d19a818108038aea19e0140a061c91ab1c2da9d5c12672423d688e5ce896c56d2fc24f42b7361758ea SHA512 e0effe3900f75fa3ff494a4a94c5aac7f163cfe4851fddf8d45421e59b404496afa59a8e2e5a18ddb1b59e9bcb74325de1263a27e6d601a90a4f92db872f01e4
+EBUILD dirty-equals-0.4-r1.ebuild 888 BLAKE2B 71159fbda98b69938194f4e65467c6d3966160e4c5c1b97eb024fa53ec843ab93825ae23c201f4d7bdacf9ba474cfb46eee765d401c798681010484c5acc59c2 SHA512 28542bb7f97023905dd62d03eb320d2a6e04d32da7847795215e145a55374e22f5ed583fe62505177cd8758b44dc96d4b8df91969f978073bb6dc9c57962b76f
 MISC metadata.xml 359 BLAKE2B 120f82faf2460b2528927b708a41b2d105248a57af2f3f11966b102237731f9dab87962069728dd78327757c190790f01646c94c228d0e79bf60fbab82e1ca39 SHA512 fb17ee5e8483cd6c5ce840c2f070601c4506b0d62a8c6a80338e8748e57bfb49ee412faf7b95f21c16e5c5730efb9879d8d66fd4fd1c134ca459af3657994f98
diff --git a/dev-python/dirty-equals/dirty-equals-0.4.ebuild b/dev-python/dirty-equals/dirty-equals-0.4-r1.ebuild
similarity index 88%
rename from dev-python/dirty-equals/dirty-equals-0.4.ebuild
rename to dev-python/dirty-equals/dirty-equals-0.4-r1.ebuild
index 59aabadc9e4a..a3764d74a643 100644
--- a/dev-python/dirty-equals/dirty-equals-0.4.ebuild
+++ b/dev-python/dirty-equals/dirty-equals-0.4-r1.ebuild
@@ -34,6 +34,11 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	sed -i -e "/version/s:0:${PV}:" pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	local -x TZ=UTC
 	epytest
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index 8dbf3e9c97c0..169c707f3105 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,3 +1,3 @@
 DIST distro-1.7.0.tar.gz 58164 BLAKE2B 22bbd2daf9cac589530eac9a58767db6b9e389b77719516f7386a9377b49ba4c9b696165701acc42366b760b9a632c70a2243a58c12a367fef2a0a770a4aea44 SHA512 14516ecab33ee8c57c35a8279eb515fd699031fabac7d8886092ea98696797d55503179870aeb513a85e1a66c7e69f2f60bb6ea9fc935be975cb5135e1917ecc
-EBUILD distro-1.7.0.ebuild 605 BLAKE2B 2617a0b87048966a38f028e42d60769de92c326eddd01b5417e5b345591c1ac3333a8792f1d3a24e5499ff2dab0051524fab7f3fe6bb9877ed7aa4e582a0a084 SHA512 2a1e89e9bbc66abc0cb566b27361796730a774ab1cca64dd3b2a632ed07cbcf0cfe78d783950bcae096eb4810c4d7126723376a07d5e70b0600c25c88eac037e
+EBUILD distro-1.7.0.ebuild 604 BLAKE2B f6ea7544bbe89b785b12d3d5bd7ad1d753724fb9c3ecf8fe0838351cdb567a024424a1c6df11f563f55806ab87886e4615066308763f9a6e40d5921dbd56beda SHA512 735d94041569023a02fd97fd002cef38f647bd66e14f5a5f95f6e59db09aed82c34154c63774438e6a8bb85da5334d7b00a30c46b312b707ee66f18a43b0dc56
 MISC metadata.xml 847 BLAKE2B 62f2559f30efb777b18c61efdd9c957ca1855ed90bd35c93d492225369f1b293120a3c765412b00c2efde0d2a96b6e924ffb8f5d5a2a0bf305f142d29f88a6a0 SHA512 af4a1c5373c4d2b324859e736632349214c33a6f256e2e69be4ad6a8bedf3c8adb670c187dbe16fd9a546d347639e61ac117bcf2918438f290dc8c5cdb13f89c
diff --git a/dev-python/distro/distro-1.7.0.ebuild b/dev-python/distro/distro-1.7.0.ebuild
index e8782ec7484c..74b41304a0fb 100644
--- a/dev-python/distro/distro-1.7.0.ebuild
+++ b/dev-python/distro/distro-1.7.0.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index b963a4649a59..a54a0e7f5ae6 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,5 +1,4 @@
 AUX docopt-0.6.2-pytest_node_from_parent.patch 958 BLAKE2B 0fc4437f92f9410a47823a28b1b26057bfbc1687923ee56b0c69b4d921128b7b868fd793098b8399349906a4353aed9e2801ced0d458cf121af31b209df118e3 SHA512 74a384b1e62128df781c5c24bfa6a0f01de63610fadb51349f8f094375b84ab090209d86cde1a65116c735bb90eca61cabcef60e608297bb6976da2f5b510529
 DIST docopt-0.6.2.gh.tar.gz 26345 BLAKE2B e2a4b2030239387b6e7985c7e4ca15b001ec86f0d7a8c8f316c2321ccb18ed8cc94060a6c8eee4e84916d5f42e4a304551fae69b47abe2e173fa5e2409e9835d SHA512 228661924329682786b143f414c9df911016963cdc91ae6eba833285144e71744df507321a476b51f779e3ea270af6dc4e50edb8b0ee99674c19acccaab57a03
-EBUILD docopt-0.6.2-r4.ebuild 620 BLAKE2B 3f8f07a1a6ba5885a904109b48c6a35e7ae74034260ee9f7ce179f7c558ed5237ef5bf1399d507acf41d6558202034a728c75a98e40a8ba27bf2994e96542706 SHA512 9b5da48ccb62f8b1d858db8ae286e318144388a4fae37a0656a2af5abff7adee677d6dd148ad954dda46009a0abc563082bd3e6daff6f531fd55e21be9db9f36
 EBUILD docopt-0.6.2-r5.ebuild 662 BLAKE2B 4c1dd63324c9de804f7284fdb97174101be5debc95a8af4c57c3cd1a5d82378273be308037e13e68030aec20a196d794db870e32574b18748467d8142b6b3d6e SHA512 11081c57afd660907d4be6e6238c8df0ec03f1fa510b5625590dd480d75fbdc7a26e543dc9812df183c08097c1e53afa0b9031f3e25876d25c9feeb4b4f63712
 MISC metadata.xml 387 BLAKE2B c190df1ef516cca0d259568bb7c371b007f0bdb34dfaeda4c9cf6fca58773ce5db43eeb526e4046797d8b7c367a8aab060c29ab042b51f0f3f7df4e0fc896345 SHA512 c65933341a2f83c779ec8c9557aa35676a04ee748aa007da93294154c8df2471194c2c03cd88a10edbfbc1255c9732ef1a3aad4208a917c095fd1a8ed8ef7843
diff --git a/dev-python/docopt/docopt-0.6.2-r4.ebuild b/dev-python/docopt/docopt-0.6.2-r4.ebuild
deleted file mode 100644
index 5a9806a1b324..000000000000
--- a/dev-python/docopt/docopt-0.6.2-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pythonic argument parser, that will make you smile"
-HOMEPAGE="https://pypi.org/project/docopt/ https://github.com/docopt/docopt"
-SRC_URI="https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.2-pytest_node_from_parent.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/exceptiongroup/Manifest b/dev-python/exceptiongroup/Manifest
index 726245f5d37a..4ab0818bb9e7 100644
--- a/dev-python/exceptiongroup/Manifest
+++ b/dev-python/exceptiongroup/Manifest
@@ -1,3 +1,3 @@
 DIST exceptiongroup-1.0.0rc8.gh.tar.gz 17562 BLAKE2B 617e174e32f4c062f576b12c9dfe96e5495003097dc0da82e383019a65b2a043546d4b73181081defb641d453127e056be52e55e76fdf0ec0247513f5eb211ff SHA512 f7f1700403f345755a1e32c77eb43744b366b1f55446e1898dd960988d23396ad8334bef072ecc7ec5ac7075300f0f3e8e9a0d454d9dd80677ae55b4166fc6e4
-EBUILD exceptiongroup-1.0.0_rc8.ebuild 737 BLAKE2B db971c49f7aa84c1fb8972dc4fef2db767eddaf1ffc978b30373983bfbcb3e09c6ff1c4fa79b0d6a7c770bcef3d0ef8748032c3ed0afb344e7451e27c042a019 SHA512 796238ddaed9f94cdee42e07f0601023ca518e2379de4ba795f772411b52ba3b7fd5f4a2995698b14dba4570518635c7a58e5bd304114b734b0fa18221e65531
+EBUILD exceptiongroup-1.0.0_rc8.ebuild 743 BLAKE2B 040f9b52408be52f1359ac271c66adb03880a816ff472a18b5be243b86cfe37c6583b633f0bf12237183a05440f4b18e1cc5bd2cfe4fe6d69809996b7a4439c5 SHA512 10f17c8be5d5121bb2dd2ff558ce944fe34b5655a1c135fe00bdb10beede131017d9a8a4d46b51af7204587d97dd94f6c204264440ddecdc20eff95d417d0e5e
 MISC metadata.xml 360 BLAKE2B accdc2d9dc39a31238555b937189f135482f2094a570396a741ba6202a1243ad46c99003e829e59e4e5fd0db0a01b050cc0e385bf28b44892e3e3c5615351028 SHA512 d740125cf760309a4dc5de1981b5ad704e880c37588e8a0e17816709065d80ad2ffecb3b5e50725b5665a38594a53f9659c17b35eb34bffbb06d11b830d740cd
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
index 142baa8d033f..e502a65b3f0d 100644
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
+++ b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT PSF-2.4"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/extras/Manifest b/dev-python/extras/Manifest
index 8ec06c79db97..3d2262ad941c 100644
--- a/dev-python/extras/Manifest
+++ b/dev-python/extras/Manifest
@@ -1,4 +1,3 @@
 DIST extras-1.0.0.tar.gz 6759 BLAKE2B 341bce7f172afeb9e2a5179ab392d396920dc8ec2b9a6e734daf8668c7f329d9a64de6f3f90b70f8e42d5e111ef196315341c0bb0f347f13ba4974d970695fac SHA512 510c796628f28db90bb96c7c9ba5fc9b2b950d2968e219efe67f3899bbe7ef68fe5de1494f8fd640f13a1ccd329e7dac9cd38aa965ab1e07c4cd287c04da50fb
-EBUILD extras-1.0.0-r1.ebuild 687 BLAKE2B 610943f7c9fb5db2d6b6746070ac1aa0dd41b3e39ce8b1486df707aa1aa9fd15186f469b3e4d187869301e081b3071fbcfa9813f2fd60e5faf62e48701fa431e SHA512 7527e149d684d43a7c0657a659ced29fb9bd4076363cec34866b0efd36d3a908205f8316e4d6f62403060afc01e5b657afd4cff07bc54ae691abb55171eebae7
 EBUILD extras-1.0.0-r2.ebuild 655 BLAKE2B 639ec36d795421a3c89d7da04e8ccf61488a6f9ab60c13ecf65f0e8630988c484452601271925a7f32d2fe105e2d973bd61f93686ecd73ebc60fdfd18a7f9eef SHA512 8664621f4840b5772933e5dc4755f7f55a92670fac8aad5667084476160c506c7f5d94613f0892267c74d8a2dfbc74d3be97f75187979c3fbebde84842a2c173
 MISC metadata.xml 407 BLAKE2B 3b3fe284e5cc05732c66efe8c759025b3d5b1965e87316cbf33ed9533b41e6ac461ce428be7db25a4246b99bf0ec35de1f3d5a458617b6efdf16e95368fb246d SHA512 874b16dde8e0c9b4dadb7bd7bce6f6a1e0d6bf5b11063c7c1d61f9eaadeae3c2e792b4a57947f31d387e8d4ede79499884dc81657dc8bd041f19911d3acf7605
diff --git a/dev-python/extras/extras-1.0.0-r1.ebuild b/dev-python/extras/extras-1.0.0-r1.ebuild
deleted file mode 100644
index f259b61cb5d6..000000000000
--- a/dev-python/extras/extras-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Useful extra bits for Python that should be in the standard library"
-HOMEPAGE="https://github.com/testing-cabal/extras/ https://pypi.org/project/extras/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? ( dev-python/testtools[${PYTHON_USEDEP}] )"
-
-python_test() {
-	"${EPYTHON}" ${PN}/tests/test_extras.py || die
-}
diff --git a/dev-python/flit_scm/Manifest b/dev-python/flit_scm/Manifest
index b9b2ba3038ce..d93442a3777e 100644
--- a/dev-python/flit_scm/Manifest
+++ b/dev-python/flit_scm/Manifest
@@ -1,3 +1,3 @@
 DIST flit_scm-1.6.2.tar.bz2 3230 BLAKE2B 3977f1be820f2f590f4f781f065661adfc4a05427a87882093acad81f87eee2ba20d910ba3662b5b19997735f0356d262a4f150ba940310166b62a019b68ba05 SHA512 32690af4d24eb704338c78fdb0080d9f910a0741066d282e79eb88c473ada8d9a3daeba1a9aecfe830b2a6d0cea8da471bf6ef904b105fd8036994e4a0e12d12
-EBUILD flit_scm-1.6.2.ebuild 884 BLAKE2B 571f515cd8f9a7ae651ba65d2763bf75887c0a5d554fea5f3a54ac98944e27cf23e1ca67041894775392ea0e6498509ccd0b890facedfeec8fbf2bd588cdcd0f SHA512 ecc67f8dbbb5c22ab5bc0a2391a187d075c98e90d25d94863d6455990d42adf5bb17c95dd58cd7645c245f8d523b5c8ec1c15aac8de97f7b81d53c70c27b27e0
+EBUILD flit_scm-1.6.2.ebuild 890 BLAKE2B 419a00f906a0945acbacac70ce93a23a49747f43396f155b94de56de4f52e3441da266c25602041c75f5ccecb904fd79a3f9ab09d4d6c96badfb58ef56a134df SHA512 3bd9a6de3488cbc62fc702b0a8d40c0e1c21a1a0e42514af0e7a957f600b872e4f8578225c90597aae6b135c5f046f432cfc00c1bada5674db077a4b83525a03
 MISC metadata.xml 290 BLAKE2B 555156b5f21d6d87b8077755a5e7ce59b7341380e29c073535e55fe44aa668db2837e42416f88d8802ef879be0dcc1ce85e27545db479add9b4273de348083c3 SHA512 7c3f74c83b9e928eac698099602db5e75cb9878354bd465c063f0e050fdc16ebcfa0e7ead8e26e5c82cd54684e9eea9b2657376c26330bb8c77bfee42116b889
diff --git a/dev-python/flit_scm/flit_scm-1.6.2.ebuild b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
index 837f02416634..fd6c051ef32c 100644
--- a/dev-python/flit_scm/flit_scm-1.6.2.ebuild
+++ b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/flit_core-3.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/git-review/Manifest b/dev-python/git-review/Manifest
index 136561d91733..839e69268fde 100644
--- a/dev-python/git-review/Manifest
+++ b/dev-python/git-review/Manifest
@@ -1,4 +1,6 @@
 DIST git-review-2.3.0.tar.gz 66005 BLAKE2B b074811614093058525ec817770d9d1d0d0adc4f154ec7a8882406c1954672063e3cd58df28d0ce17735b5a135f0a6be97657207e16dbe8b7719e9b6f77aea28 SHA512 841ea039e73e2571ee01ba08781d82c5ee0c136be092d2f7ff44e59284f2e77d57537ef5aef3eaf24a0f93f63106fd2404e1ec89745a723386944b5e0b32faf0
+DIST git-review-2.3.1.tar.gz 66400 BLAKE2B 67b2bf60e91a127144995231b94a48eaa03cfe8cb8e27513183f21b4cae1fbe2eeaa00a23d21da2dd7258aa794ce4cb0ee06e91510d707116699da1702bbebac SHA512 b3fe0ab40c473c80da20c42b4104e82115c9ea02bda01580aedb69622e117d733160eb42027432eec12379250186ea7b6f9eb4cb86b128a591816243a0c0fadc
 EBUILD git-review-2.3.0.ebuild 782 BLAKE2B ff9255a07fcdcc81c3f17f4f9067ae19d7e717e1dd3fafb087e96066ca621350142027eda30cace90561a6d63dcdf9a09c4a5643cb71b30598f20c28675c72ab SHA512 d6314d81c5fe52d91684c2c313cf2969ad57001f6ad5f00d001d12fbbf70a8144bf9de9869579c150f558c1c359a4ee727a05c1628a9186374bb2d0445c29c7b
+EBUILD git-review-2.3.1.ebuild 784 BLAKE2B c2d971221d2bb7a6d07c4d961505d2cf7cc03785ee94eacb7496fad6fd999ee2fa21971e302a0a25de533a9153d36f92405bfe575dabead70afff8afa11e9ca4 SHA512 7267baf2963f6338b961241af52af728af0b8c2d8430c99e139f8f7e1f20800380781abb90cf9cb3fbe44f2e43955321953bdad5d14ec0cd28799e9b63eee875
 EBUILD git-review-9999.ebuild 784 BLAKE2B c2d971221d2bb7a6d07c4d961505d2cf7cc03785ee94eacb7496fad6fd999ee2fa21971e302a0a25de533a9153d36f92405bfe575dabead70afff8afa11e9ca4 SHA512 7267baf2963f6338b961241af52af728af0b8c2d8430c99e139f8f7e1f20800380781abb90cf9cb3fbe44f2e43955321953bdad5d14ec0cd28799e9b63eee875
 MISC metadata.xml 338 BLAKE2B b891e2436716d179293d3a1844dc671cb2c4270887260921b04fa3674d999805d4845337b73d3e45a34b2105b900209c7630f85962ea59fa8b472946981b4b6d SHA512 b8e512c07502ddba83bd5012ca036fb364ecf433408e70f036290b4209f0f06bf085de7a7519f47f46f1e68df9e9c97349cc55454b48ccf9dbf57dddc1ec28fd
diff --git a/dev-python/git-review/git-review-2.3.1.ebuild b/dev-python/git-review/git-review-2.3.1.ebuild
new file mode 100644
index 000000000000..16e5454edee8
--- /dev/null
+++ b/dev-python/git-review/git-review-2.3.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool to submit code to Gerrit"
+HOMEPAGE="https://git.openstack.org/cgit/openstack-infra/git-review"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/opendev/${PN}.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND="
+	>=dev-python/pbr-4.1.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i -e '/manpages/,+1d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index f09cec229109..7154f590e7e7 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1,3 +1,5 @@
 DIST gsd-v2.5.2.tar.gz 105448 BLAKE2B 408e66a91ea056e8c863e23dae439009e5f802f38d5e2a3b89bbb07c574ad61827fa9c2767729c37dcc8fa7ecb1fc3be922755da0ac0dc922ead2a365ce66a10 SHA512 2a2afb56b9f836608523b2946a0d2ca94511457506d02038d496b374ccb96dc0daad6435f9ee63b0937837b725d6288325c066d75d2ac0b0c6d9da4beb9eb082
+DIST gsd-v2.5.3.tar.gz 106104 BLAKE2B 39cadcca6a6660c736be8ce576b45d86a82a499bd21b6c818dcc6d307750940a8be85fdd63883d7aac9a416f5eddc55793ca2ab0da0b2373901c394d63ebe3f7 SHA512 3e3d5f8dece5553a4bc68b23aff8320b99169da5b995d1655da85c37e84a9e69d30f73ed3925e2e49b1c97dc875c594258dd15f3669337ca4c91914cab90d49c
 EBUILD gsd-2.5.2.ebuild 702 BLAKE2B d584680489300ed071995b1ddb30cc7db06943f17d62dfdfbf1d8e44915e8e4a8039b3148e454785c2f545e167db13f5b23982059be6b3ae9160729a60d85a14 SHA512 29c60485cc12a9f177581a4a0f0a238989025941ed9b93515fa927d129a9f1dfa900fbbf11a3f0e4c91a45ecd0e98168f4dc9efbd81a49294f36a50e0df98bd8
+EBUILD gsd-2.5.3.ebuild 750 BLAKE2B 7d862925dd039ef481f4105760f926a2f574411acde6710b1873770994eeaddc88fca7da26aca10c128d1221740903a0d2b6846bedfb6160a9d5a8a8cbb3c32a SHA512 261c3ceac73ef2fe4818fc838c1f3774e42670adc65490a04a78c713f7a6dc0519bea324a04c72e3a4b6246e9f38aeeb90532da7d05882d5f8df4521d42aaef2
 MISC metadata.xml 416 BLAKE2B ff2192a940eb2d265ce71841163a524658a8e59f8fe6f2d81fd01fcb0c45b8cb6da92fb178574f61838e22064a096084faafbd77f971753f480ab5d216dcf412 SHA512 81bcc244ebf91346602c1d0de769678fd1f359ca04178613a0473d18da884f210b8e873717db3605c1d74713240d6b1203e9dd1e3f4643bfe702a4015b5cbfd7
diff --git a/dev-python/gsd/gsd-2.5.3.ebuild b/dev-python/gsd/gsd-2.5.3.ebuild
new file mode 100644
index 000000000000..30df9f182655
--- /dev/null
+++ b/dev-python/gsd/gsd-2.5.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/-/-v}
+DESCRIPTION="GSD - file format specification and a library to read and write it"
+HOMEPAGE="
+	https://github.com/glotzerlab/gsd/
+	https://pypi.org/project/gsd/
+"
+SRC_URI="
+	https://github.com/glotzerlab/gsd/releases/download/v${PV}/${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+	epytest --pyargs gsd
+}
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 36a809bff5b8..97eeb3811f97 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,5 +1,3 @@
-DIST h5py-3.6.0.tar.gz 384160 BLAKE2B 354764bb002cd342623aa962de88a24ee45156c0a2d61088508017980e407e90f85e65da9d3e29a6745dbca754ba1708700fbea4f4123a10a620bc758cbaa3ae SHA512 f3a108d16578ced552fcac4fceb7f3180ee71a3c8f6caa8702fd9989728d8284afb9d85f1239648e10d14f3532c772f46d05f8306bb8b305d98b162d7604683b
 DIST h5py-3.7.0.tar.gz 392355 BLAKE2B efc974ff14457ef00329c6b2adf5b926e2dff33bbb4b9e9d60773760a973214c5279bfafca87c6fcab02bbffb85b780c708d26fb55a1e7a401d8d676f20acc15 SHA512 c10a9a623c88dbc965238cb2057b8924492c762c29610cfdb24f26f878a7322e414d3e5c90d750c2f5cfe1b4949f884bc17f09a126b01a4721ad6e14761174a2
-EBUILD h5py-3.6.0.ebuild 1464 BLAKE2B e8cbf89396ce6be874c723ced64c1d08ed21c11c875e5fb7e2a84225915eb3c784b3a41693c54960f967c23108c8668b1e7c2019c6874ec4df6628a287d7c176 SHA512 95adbd8b245149d692d8e8712f4ac2e0dc6dd11b96b4424dc5bf12563735708db85a16ffe18d477e151a0d4c5bbce136fa1efbe6a8721f30dc3132464aeaf5e7
-EBUILD h5py-3.7.0.ebuild 1466 BLAKE2B 6f6433f0726a575b606d004d83b575508acb5feb3dcb9e7b4b6280a8bf7581fb9427517e3003cd73f4a34a2a5597a4f5b54be1bbb9f84a5144a092f36f3e6dc9 SHA512 7380ab2f8cca1c9c8b691b1f71c3ac9373c5aff45a9426cac7b3b47981d90c34a9ce8191af7340df1181b011f15513cf949f1fb2d2717b557fd4b432358463fe
+EBUILD h5py-3.7.0.ebuild 1464 BLAKE2B e8cbf89396ce6be874c723ced64c1d08ed21c11c875e5fb7e2a84225915eb3c784b3a41693c54960f967c23108c8668b1e7c2019c6874ec4df6628a287d7c176 SHA512 95adbd8b245149d692d8e8712f4ac2e0dc6dd11b96b4424dc5bf12563735708db85a16ffe18d477e151a0d4c5bbce136fa1efbe6a8721f30dc3132464aeaf5e7
 MISC metadata.xml 1016 BLAKE2B ab015a188dadacae6ad496f541bb6d4df97631d5d1601e21396509675f03da4060dbce67588e77cbffea5a7b763344e95b61a7ab482d6b64a16b90b0f1484d0c SHA512 fc4debeec5b4fb1b22f1c1f23d9dc2bf090e88451f2e456b5c7c82d11abbce789ecc79993dff9520a4a407c94299a10e1eddce796a6d44e216fbc7702dc23dc9
diff --git a/dev-python/h5py/h5py-3.6.0.ebuild b/dev-python/h5py/h5py-3.6.0.ebuild
deleted file mode 100644
index bbfbfbcd2ca0..000000000000
--- a/dev-python/h5py/h5py-3.6.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="
-	https://www.h5py.org/
-	https://github.com/h5py/h5py/
-	https://pypi.org/project/h5py/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-# disable mpi until mpi4py gets python3_8
-#IUSE="examples mpi"
-IUSE="examples"
-
-#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
-DEPEND="
-	sci-libs/hdf5:=[hl(+)]
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	test? (
-		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-	)
-"
-#	mpi? ( virtual/mpi )
-#	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-#pkg_setup() {
-#	use mpi && export CC=mpicc
-#}
-
-python_prepare_all() {
-	# avoid pytest-mpi dep, we do not use mpi anyway
-	sed -i -e 's:pytest-mpi::' pytest.ini || die
-	distutils-r1_python_prepare_all
-
-	export H5PY_SETUP_REQUIRES=0
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	epytest -m "not mpi"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/h5py-3.7.0.ebuild b/dev-python/h5py/h5py-3.7.0.ebuild
index c6245c6d9fd4..bbfbfbcd2ca0 100644
--- a/dev-python/h5py/h5py-3.7.0.ebuild
+++ b/dev-python/h5py/h5py-3.7.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 # disable mpi until mpi4py gets python3_8
 #IUSE="examples mpi"
 IUSE="examples"
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index e4f5d4389ad8..a79de314ab23 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,5 +1,3 @@
-DIST httpcore-0.14.7.gh.tar.gz 75844 BLAKE2B 50d5fac7f44996cc5a08b4f994c2109b173e5b9fea080c8740309b799421d012a70280a84fffe93e290bf425e5ee6eb1bfcb74aff81fa7e737c21f25019e6664 SHA512 6865e97f9b84846bb4e9304ea358b0a28d66fd2d1e244e8a2a439ee446a294ecbc68ac07d5a718fd1c3eceaa44a391d7a8f7f2ca659f1674eb17a90f39987d48
 DIST httpcore-0.15.0.gh.tar.gz 76220 BLAKE2B e9a346d4f77cde82be5a3eb468123ae453753e57b54382f0b2c60b16afd3433cba173d9a796df20d76edbd8b5bcf2d61c32302bdd30c8d587036b3ac6f0425fd SHA512 3c25630d582448e3c7d46176c8862e4d92c6c4aac954bfe46b06e26297b32f996db2e002a87c7187accb5bf4ef86e82d7f9051404bee651ce5254119571d0c95
-EBUILD httpcore-0.14.7-r1.ebuild 1250 BLAKE2B 6e8288fd2c293ef122f41cd3fcec0e4e9ea5272068e04bbe3d311c8e9b4a3ec192a9d1080ead3ed00905a5c7cfe106843d5ebab55807659c70926fc0d7185351 SHA512 ce793f5a045286e0293adcc919c088cca1998450522878acd7a6c841196441995a8d9864d6bb70624c8770902659d9208a105fc735e6c9deaa86ab18486209c5
 EBUILD httpcore-0.15.0.ebuild 1251 BLAKE2B c00e6bc3e7650f8c485de280b612590cc141e91f732229d9657560780340bede351a7efde15121f179c206ef560e24e76b706ef1406fc7b2236c42621c8c63d0 SHA512 a4a7468d09059fa610d1617c779defc01a70aaf37f81295917c68904763fb2ec0cfb13d3efcc2dcead3c3366b047b748ade6a167bb23bb98a5939415cbea08d8
 MISC metadata.xml 454 BLAKE2B f8a48d9ab81e5f74623dd0c8490e5de5cc711fda7f4614932e7ac6caa80bd23436037ddf9327d6bddc3d39c8b601b4ee74a85c0a10bacb20514cbf8278e34d1f SHA512 af962141bd55f51b27e0d4b61bcf7d5426e816df4f8c65be257d8fddd597664afe04e78ebe7e11caaebf06ae4fe17b88f568dc440403865ba6b8e3b47d796aa6
diff --git a/dev-python/httpcore/httpcore-0.14.7-r1.ebuild b/dev-python/httpcore/httpcore-0.14.7-r1.ebuild
deleted file mode 100644
index 58fcda4426da..000000000000
--- a/dev-python/httpcore/httpcore-0.14.7-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="
-	https://www.encode.io/httpcore/
-	https://github.com/encode/httpcore/
-	https://pypi.org/project/httpcore/
-"
-SRC_URI="
-	https://github.com/encode/httpcore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.14[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/h11/s:,<0.13::' setup.py || die
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	optfeature "SOCKS support" dev-python/socksio
-}
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index bfd856ac10a4..b6650a0114b8 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,5 +1,3 @@
-DIST httpx-0.22.0.gh.tar.gz 2157682 BLAKE2B bb08a7c4b72478d24264c0dca5630205ff386af73294dca66dcd12b646de602ad64e308feedaabd58742cb7a9d799fa23cd2f922e685e74f8181e1b5e9f1c4ee SHA512 a7360f5355f75f07425b42d49697e480319f3fe606d4601bb6d64b870c8a8fce6fad8bd857ef422fc48e6141201307ee94876d5bc54a68557c7dc32ce8f1451b
 DIST httpx-0.23.0.gh.tar.gz 2160686 BLAKE2B 036c66b2c3f743cd069716297f331f0d75043a98180b9db3e156c5692ae8bf9c68d1db87169953a7f44aaf7ee8554d0166f70b508f77b7ff4b0ebc0500bc02ad SHA512 3cfdf2b3b2f15967a1eec0be05ed947c5e18a46576b68a9cbfd5147dfd4736cb7c389f5431732b93f3a11f3ec6c6f25f7cbb3d96d845f00b58e2b8dae047c1d5
-EBUILD httpx-0.22.0-r3.ebuild 2434 BLAKE2B bf81591ad04db1c38a2a3d22c95edb23013022114a0a60eac8d62970a5da06bfe36d8be2de3c5326c9f5d35d2cdfb3edba72c37518786a696cbbd7c7991dacfd SHA512 c4b4d75947bb2a80caa95f24d7431eb587dee457950ae679a1caf3d191f95a7901e6956d947168f08fb6b82b041d1c01f12d5830a4b60be8f83b6f6f7cbc3890
 EBUILD httpx-0.23.0.ebuild 2188 BLAKE2B c7ec73ae670465bdeac0d1b81543aca3d7652f54bd92fe80be7a158bec35a817764c3cee406fa8aab50f98869ff59f8321a19c1141f1eff0512b3579fede6e87 SHA512 9d400fe37329144efee52f6ad9f23317e5290ce0a0489a9cbb8573a88decc9aaf5a1f30233a7f0ffb0d122c59d764070c0b19951ace5473a3bba1b3da9ba666a
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/httpx-0.22.0-r3.ebuild b/dev-python/httpx/httpx-0.22.0-r3.ebuild
deleted file mode 100644
index fff6839ac6c5..000000000000
--- a/dev-python/httpx/httpx-0.22.0-r3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Docs builder mkdocs not keyworded on all these arches yet
-# DOCS_BUILDER="mkdocs"
-# DOCS_DEPEND="dev-python/mkdocs-material"
-# DOCS_AUTODOC=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1 optfeature # docs
-
-DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
-HOMEPAGE="
-	https://www.python-httpx.org/
-	https://github.com/encode/httpx/
-	https://pypi.org/project/httpx/
-"
-SRC_URI="
-	https://github.com/encode/httpx/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/charset_normalizer[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	=dev-python/httpcore-0.14*[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
-	cli? (
-		=dev-python/click-8*[${PYTHON_USEDEP}]
-		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		<dev-python/rich-13[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/h2[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e 's:==[0-9.*]\+::' -e 's:,<[0-9.]\+::' setup.py || die
-	if ! use cli; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/client/test_proxies.py::test_async_proxy_close
-		tests/client/test_proxies.py::test_sync_proxy_close
-
-		# Result change in charset-normalizer-2.0.7+
-		'tests/test_decoders.py::test_text_decoder[data3-iso-8859-1]'
-		'tests/models/test_responses.py::test_response_no_charset_with_iso_8859_1_content'
-	)
-	local EPYTEST_IGNORE=()
-
-	use cli || EPYTEST_IGNORE+=(
-		tests/test_main.py
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "HTTP/2 support" dev-python/h2
-	optfeature "SOCKS proxy support" dev-python/socksio
-	optfeature "Decoding for brotli compressed responses" dev-python/brotlicffi
-}
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 15bc3813fa38..43bea1b26b11 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,5 +1,7 @@
 DIST humanize-4.1.0.tar.gz 73777 BLAKE2B fcbde90977ae9fcd706e423767b1d5617fd118ae8903283f4b307ee05a5adffb3bb68305e5d758b1860d37a37d22766127d84479d331a7ed05c83cd53e5b0829 SHA512 7e2d92ed44e773bd8a53d4b151e80949fda057d8f4a52003826efa9ec2a569360b76663d44c3d1239fd2ecdd5365357d3fac72a395d1c10d5207b4a27f248878
 DIST humanize-4.2.0.tar.gz 75169 BLAKE2B dc590d296362be20f607282686e18df73e1bb07aa37459431d7ec1f74ff6611497811da974b7eb62cd791536268018460d9171eb65ed958af6f12f668b3ae2a8 SHA512 ac0a067320d4dc236d97a69a3019cf01ce87efe2cb98e758f516f90986352fe87d03bfa497d66a2a75e61152a35fd8fac827bafd926d6bd84c8f0d2366e5beb7
+DIST humanize-4.2.1.tar.gz 75327 BLAKE2B 1c36002a2a5d103bc1dae444d9d8a70c3983c778674d5c6aa3a76aa82dc9bd3bf39faefd1c3dcf8d0726b151dfb4f8d8247bb88fdc9af765f703edfb08226b8a SHA512 c84f797b01bb8bcc2e036496f0b727f9c21fe88148a6d90f73ddacd25f73059a46bbc60ef8c3bb81554db0c75f1ab9aa1e551d8473aecb40761e51b59580092a
 EBUILD humanize-4.1.0.ebuild 586 BLAKE2B f89d881fd19e60a8eb9c2ffd5d53e8b0e6ac16672c16f441b2bf8e776b81b7a20218af77eb61fb4a1d9ae744906e361fd953da37b7e94542fd5e2e0c3bd329e7 SHA512 3f7f0f0239a899ab1445277b7944da5763d5585e287ccad072a0aa6b86d8bc2c5e0557c255f7d8e29d630ce681b2c95985dfdbbb72127a886df1a6cd79a85e1c
 EBUILD humanize-4.2.0.ebuild 588 BLAKE2B 7ccbcefd9b985a2eb85773993629bec0fdab43f09a9f092c67a520b123639a8272f01296153b0ef38a9ae498032807af089e4536b2482adbc033a5a4468f6a97 SHA512 53444dd98c6898caf5158cc5e5a55355ba7269cf7e1d130a5788ae246c7f0e1af06e53d2c99b094985583e2f472d28027d724a47bfb0c57f18ee1e2daa0fb5f7
+EBUILD humanize-4.2.1.ebuild 588 BLAKE2B 7ccbcefd9b985a2eb85773993629bec0fdab43f09a9f092c67a520b123639a8272f01296153b0ef38a9ae498032807af089e4536b2482adbc033a5a4468f6a97 SHA512 53444dd98c6898caf5158cc5e5a55355ba7269cf7e1d130a5788ae246c7f0e1af06e53d2c99b094985583e2f472d28027d724a47bfb0c57f18ee1e2daa0fb5f7
 MISC metadata.xml 506 BLAKE2B c00c304481f8bd5d2309a1fa72a19bd8405d2f8d55e68a9e688435dec5410db728537362d6fc090f448738fa462ad62d03cfdb82fda8702b91aced4ecd6c05d5 SHA512 71905cfb331f60723b2b3dc02b1a5cbc2712ea9a411692d8ce12e62ea90a4ebef41bb4806b90f9bc0706d8dfb6a3ebb69d23ef16f0177eaddcfbdf07612d8614
diff --git a/dev-python/humanize/humanize-4.2.1.ebuild b/dev-python/humanize/humanize-4.2.1.ebuild
new file mode 100644
index 000000000000..b471878fc311
--- /dev/null
+++ b/dev-python/humanize/humanize-4.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="
+	https://github.com/python-humanize/humanize/
+	https://pypi.org/project/humanize/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 413df0f26a60..9e4b4b3dad57 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,10 +2,12 @@ DIST hypothesis-hypothesis-python-6.46.11.gh.tar.gz 9312248 BLAKE2B 78b5ca5bd38b
 DIST hypothesis-hypothesis-python-6.47.1.gh.tar.gz 9314265 BLAKE2B c2ad0120ab2cbd565f73d472f0a5a87e4b51ff9cf7c08d75dbc54223ad9fe60ed475577ca7dced64ab02d4cc1ee5d30525677c4acfe720af8251f804e72a3b00 SHA512 1aea9f949242d3a273584cd92e1829654d6ce385efcd631b412374f1f9252d3b759b8e216aaa9a49e26e0c3b12673348eac79d0189881f6a811f11daf14b0873
 DIST hypothesis-hypothesis-python-6.47.2.gh.tar.gz 9314053 BLAKE2B df607e7d81a280d916cc3946c71f6b2a6c7004263069e83d2647222730d11276b6c246fedbb07c5a4f3c526df38d6ea5c7999bdb416f0c86b0877d0231418c73 SHA512 b58835fac221353ea9beff227dda81f7776e2b50f6a765e536c83bea129d5c5a862551423d9df5abbc0cf294b358c6c537c62add69b3d5a1f38b22e179d2f83c
 DIST hypothesis-hypothesis-python-6.47.3.gh.tar.gz 9314739 BLAKE2B 282b012e020fc6494b628ba629c576f604db831c219878ab92539fbd1d980f3363e490ef35f888b68902661dd82e682393641d13a882c1177d8570ec232b217a SHA512 c7231ff06ae5846f718e76c48ed4bb8a1fc0f9aff80c7ddd1ff0ead219eb93dcc7f9d5c5e591390661e81a33bcac79773ea620cfe3f246210114635f0c089144
+DIST hypothesis-hypothesis-python-6.47.4.gh.tar.gz 9314838 BLAKE2B 183048d7d784f8e64bcac1f5bb53b6b9f945b38d555aebd84d0966bcf64178e952f767dcf63122d9b3e8d41d79034b4b11074335e5dbb7575b5f78e152d05c25 SHA512 17a7388ac03ea9029bc5a90f24aa85c3f825bd04ceee963ff7f144ff675b0465afdd22edc5608931f1fd60e83c59d10be24dd74ed64015f942c3f09956b652d7
 DIST hypothesis-python-6.46.9.tar.gz 9311955 BLAKE2B f8cf7e216650401ea8a9b427311d10bc65a21b79eb231864c4ff429baea4600f8d84b05e4b94120551ebe17f1b4b99a65e76157efe9d0a133ad68c22b1c46452 SHA512 e4fed5210ba11977958d4d14f9fb32427b812ea7903f391bbf977ade7ae268770e846b0cd2193585f519a02681e4fabfead23eea5bcededaccc0e7a9857e98cf
 EBUILD hypothesis-6.46.11.ebuild 2013 BLAKE2B 942c16f7b0978033b8fcf199b3a57091deb236729cce7c7ed5178e0857ec96089788af2ac5f4ad500b1eac5b269c3d4e9f4aec65ed569b473dacd18b2d02b4b5 SHA512 cf708baf47e35232f06f322e81e1292a4b48640a81a27521d1adec845b76515670397f1059d3a922634569831e254b3a54cc975905aae6653dfe4e12b8bb244c
 EBUILD hypothesis-6.46.9.ebuild 1942 BLAKE2B ce72baf06bedc78ce59e88b096996d01ea2eb5a3260d4b83797d0f26e1b667953b3fc4851d640137936d3b57d925d0e5e134d6ab2f4ca04cf116e232b0e515bf SHA512 0d922094e0ab799714de0378b55efb39e7e3af54f94ace4b3ef391730bff5d9823ff5477adec0ec6d4eb85969fcbfdf7e8dd86e5b9afec2f1781b22ecf728c71
 EBUILD hypothesis-6.47.1.ebuild 2013 BLAKE2B 942c16f7b0978033b8fcf199b3a57091deb236729cce7c7ed5178e0857ec96089788af2ac5f4ad500b1eac5b269c3d4e9f4aec65ed569b473dacd18b2d02b4b5 SHA512 cf708baf47e35232f06f322e81e1292a4b48640a81a27521d1adec845b76515670397f1059d3a922634569831e254b3a54cc975905aae6653dfe4e12b8bb244c
 EBUILD hypothesis-6.47.2.ebuild 2057 BLAKE2B 7def57b017aa81010a65b6fc7fc59db242d8277d72e1d0154caf10c1919a91463b8f899133c03d7ad0af21d45b274951d71ad378829eae3ab09a1298caa018ec SHA512 124270b45b0890964bcc4976b9d1e6ea2244e64bd8b7bd836cf9ab89fa85b2349fcbd0645b1de7cd5124d95bfc9a3b52bb01ec04da4d0d7099194a30277b0dcf
 EBUILD hypothesis-6.47.3.ebuild 2064 BLAKE2B 4e8a250a6353438d405124afe04499bee07c0a3e3169452c62b857369c2cfa0742fee6138f76d171aa6190c1c2d4c069cdb338e7654366f67a9a010efcce0058 SHA512 b6864899029f0b84778085a8d891a5ecacdf6570bfc6fa3960ea00043a4dc6568c8d6529f5920617c620b99feb1826865d1583393df33c1cb54f92ea6aad5b98
+EBUILD hypothesis-6.47.4.ebuild 2070 BLAKE2B 16d0140abad3a4a6c2d7f37c4110a4e596830e240de0199b08187d6fe96803dd26a9f65df3592b2c29e2a23186ad844e4cec6fe033bb3b07f7b84daad8173ba3 SHA512 f4842d5d84cb15749f6a951399629633a60932367389ecb6e14c94cc70524d83ea556c2690091efe55819568d609b5a6d292bd2c119ee284c6d0801ec6a314d4
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.47.4.ebuild b/dev-python/hypothesis/hypothesis-6.47.4.ebuild
new file mode 100644
index 000000000000..96342100a7e2
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.47.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..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
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~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}]
+	)
+"
+
+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/immutables/Manifest b/dev-python/immutables/Manifest
index 41fa3539b30c..e487fb8c6d33 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,5 +1,3 @@
-DIST immutables-0.17.gh.tar.gz 84660 BLAKE2B 475042d6342e3ffe5b4aa68e2e8c27a438658214ec2aa6439e077d59d2e2257313f644f535ebfbdb171b0e7dac33cde590f8a84a8da9da717b249e5b2e11ca92 SHA512 d5853de6b7c6064c93b6dbf66819873c982dd2e155ddcbf6b5dd321475374e9f52eb683c853a6944c71ca15fb194ac9480ad2d444407c885ee574c244c4f081a
 DIST immutables-0.18.gh.tar.gz 84891 BLAKE2B 2e800e1b7b354781ef221315b80877e57ef446753c4a42e411196379e2bc921f71918c5ecd5cc693ca54cb7c401bef31161e9d249407b705626fe95d0e4e9fcc SHA512 1477ff6d9a6c02c3619b209352096abefb913cf53d392748e0940160067ecdcf2b89ad9ce807161ededaa5062105a2e5c5a3303bd02752a5f07b5f68f1c1044c
-EBUILD immutables-0.17.ebuild 792 BLAKE2B 4deb8e5419c4e8081a2e3ab677de91fef44c8af851ecc1a80faa7e9b69cf6949295c9c43057146bde55583d5bef869a1ab056f85519b0ccb8cccaff4a66424e6 SHA512 1ac6698c67b44ee25b28ff373432bc4f212bb3c8fc6ce799f31f2eb3d9923f9299f810c03f5db99d7ae265eb74950c784a9ae9b9b156a49a3e83162299bf34e9
-EBUILD immutables-0.18.ebuild 813 BLAKE2B bd5c93ba9ce3960636ae8fbab48aa21de0a1c873118075924b7d81c5a39a613355aa19730ad8ecca9528a560aec6816e8f8e5ded368e8c63435f83fd8bab25fa SHA512 0c8698d76923071fb1440beef0169a23a701695252a386e23de81684fb4fb49d38d9aac392e88e2e0f27f03417d14fdbffa357ca03038f24c3d05548eec9d5f8
+EBUILD immutables-0.18.ebuild 811 BLAKE2B 4fa65ad7440492d0113f3801a968af96840cfba36f24f45780c1ac3265184c82b0c3de2948b63886cdb9f63fe87ce18109bdd2eb6011c49a25984334393980af SHA512 d4156d40e6b4fa634d16781aad141b18bb3de8cc85bfcee0537369c76086024dc51dc6004f6dda9b6af0f8ec069c1db17784ff892eba87b997e78dd61787703b
 MISC metadata.xml 353 BLAKE2B 5ba3a63b6d65aa989535ec78a5e097fb15e6bcb392e846471fb01efd4a4b546a3ba861cc3829d13e71f1f5c31b582a99e1f5e4adf6b60c2b6fb17bdfb9265c99 SHA512 ede81f3aec8f6ee374c8d39d60f4193cfb701f2561858f2ddfadbe68d531849cec13fb8c13cc671e14d8ab1f18b08759d030c562cc496f959517c6ce67ac9781
diff --git a/dev-python/immutables/immutables-0.17.ebuild b/dev-python/immutables/immutables-0.17.ebuild
deleted file mode 100644
index 1a30c2e5aa9b..000000000000
--- a/dev-python/immutables/immutables-0.17.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A high-performance immutable mapping type for Python"
-HOMEPAGE="
-	https://github.com/MagicStack/immutables/
-	https://pypi.org/project/immutables/
-"
-SRC_URI="
-	https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/mypy/d' tests/conftest.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cd "${T}" || die
-	epytest "${S}"/tests --ignore "${S}"/tests/test_mypy.py
-}
diff --git a/dev-python/immutables/immutables-0.18.ebuild b/dev-python/immutables/immutables-0.18.ebuild
index 057054dfaffa..e34f68e5dd8a 100644
--- a/dev-python/immutables/immutables-0.18.ebuild
+++ b/dev-python/immutables/immutables-0.18.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 4ee3a4255193..9bbad7706737 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,3 @@
-DIST importlib_metadata-4.11.3.tar.gz 43607 BLAKE2B 661f8ce68869540995dbee39c6be07d7b88e8339267d4d49744691f2347ab2bcc9ac33c4cafd6caed5fa9ce3d4a3640a816e4659eee9a59b5ccc1df2edd2f6aa SHA512 d33efa2abba5f6f770615f133c940a61948ce5091d59526ee2c7e3866aebd74d79ac464f72602404c2b56fe284a93a9cd1b0cac251ceea53666019485bdddf23
 DIST importlib_metadata-4.11.4.tar.gz 44160 BLAKE2B 83b39ac858c5d3b63becc19be1a62ce253ce873afba16e5dad085fed531c5dcefa173e1644de10bef6318965aa132331b5d037dd7c0c8a0908880d97764b645e SHA512 2b5a6b0788103f7f0245f172832576852f56316e1c05b32f194a56b5fbaccd987c0315971f7d32d1b225ab74c12dc9f1aa96eb2a9ed2ebfd7613a9b816398560
-EBUILD importlib_metadata-4.11.3.ebuild 1488 BLAKE2B 51e64a198aa51b008e84f9ac8ff2c0b8e98eba7ddc44adfaa44ff14c239d2cc4325efe7c3666bf607eb5e12a08cf9bbe12a6959d2e64a3b4aae2cae0b927c358 SHA512 74cfa4f99e76b36d751a0620538e1f7ed64c8d7f564c6b1e22b2464c77fe1470cb416cb6ee790dfa93d7a7a9b56d01c606eeed6f0e6abb2a0aa02c6fd8962ce4
-EBUILD importlib_metadata-4.11.4.ebuild 1496 BLAKE2B 35ade448491fca4a82f483e4c6953f1faf17ec2c35f0d8822f4c66886a14f51a5e5a9022dc826e977c51130e9b86778f24e4fc9dc69b30b3b31c53a029b61d4b SHA512 c61a2badbbdf71dd60a7a66a7a89d55f356a19b4cba4bfcb77c02b831e7540715aba9c05a118faf5b9c20cff1d2f001b86d6ab189df03add5213ea46968e4155
+EBUILD importlib_metadata-4.11.4.ebuild 1488 BLAKE2B 16a21675ed83d39af765d032a32c2761b64e6e0f83282b8fa957e9ca4dfb4e51428ecb1b9ac0c2fd3470546b853b120bd7f5fa69908a5670845eb2a559b3731d SHA512 a0a9b7a61ca7c9002531562c1c783f4ac41774b14e5c91ae251a59b06ca3fa5de23fa6de42f6cff6c8c99aad3953dff7eaea304ad1c639caa6e6e98665bd7540
 MISC metadata.xml 646 BLAKE2B c3f9ff98b5090d22a37a5a5b36b6c8523b4d1ee804c05c880bffe6a45ee482023d4c037b49332bfa93cb60cc5892d1178b486cf1d2e0d4c44d7da8d292e406d5 SHA512 e558c5ae62e98685a43bfafbff6fc5d5339965a9bf8c6bf0bd8cd5b542c94ae6ecaf0a04e5210b211a32abb65b37c5db6af64dc7d74ae79ec31075fcc659c9f4
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
deleted file mode 100644
index 1002eac6d55d..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-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_metadata/importlib_metadata-4.11.4.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.11.4.ebuild
index 2441731aed0b..49339f2d9da7 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.11.4.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.11.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 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"
+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}]
diff --git a/dev-python/ini2toml/Manifest b/dev-python/ini2toml/Manifest
index 754860c13432..18a601d6e8c3 100644
--- a/dev-python/ini2toml/Manifest
+++ b/dev-python/ini2toml/Manifest
@@ -1,4 +1,7 @@
 AUX ini2toml-0.10-test.patch 1883 BLAKE2B 88402feed5aa7e51587f7297b8c3afa058d04e0f878acf1a6af5dfab77cb50d0c5708cfe9e1a45d704f7fbaca068cf9f3d0838bdcb6e1aa3145129f6239180c9 SHA512 1df613aa1e793716e4b0e7a83b3f15bb69f7abd5c43831e0d09dd4ec42ee8ed617586188bfb9bfc6863f93f4cdeb0114226e9da44c8b3a73b04705f7c9139c87
 DIST ini2toml-0.10.gh.tar.gz 93535 BLAKE2B 8d8a5b31c53b9194e578b473dfd562b1b569d701b36b267ec4f59ea75ec03abd6e1df5541327b9414a2f1c04b1cb41ec57c6f900007f69a3c51a172143d2eacd SHA512 3d88f97c50a13fe3878e3fa35d70c9051874bec99d278411dcc7098d86898deb0e490be26f293e9a304d4c9a2842274e68126a2d20dac77b526161fde682dd75
+DIST ini2toml-0.11.gh.tar.gz 93696 BLAKE2B 0fb52b346065421049fd377a62de4189a6d261ad12c00679c97568a0e7b7f8fc7bf1aae2196b8fc70489d547c0ce9be1347336d25769c7fb383f9fec4d4aa205 SHA512 7329fd3ba31567638fffce22f2370c2055503bd4abc3d7dab30b1828eb54204d31036753efddfab52e79703ce7583f6070e1207c95345096c0751c2d429fd6ea
 EBUILD ini2toml-0.10.ebuild 1755 BLAKE2B 4c7a421ba090d291b492c5284c77ab8d606d720e377f94e8b7da7a15188fea23694be7d1bae37f5d3c05fbe2e9a29a6111dde08c389456204faeb8446c4ab23f SHA512 0e1aae211ad3a54bfb2964b0a0e08572a5832ee351f40fc92019ce9c5f9ae3e36091f62ea94478076f97a381aa049fbc568df3ba190ba13224e7aa19500e617b
+EBUILD ini2toml-0.11-r1.ebuild 1132 BLAKE2B 66ff865c1eadc8c03713a42efdc4aab5aea87ce6d08896ed0856ea4335e8365b25850610a28102f0e2a6f3cfa142f30d430aad2e2636925cf62623a19966d465 SHA512 2689cb972d214a56501033ef7570af6a92aa9581f147640d323f2d893097763ad321be1c19d47c869536f24664fb4f29b6f14a4480fdd62c49d505882cc5df84
+EBUILD ini2toml-0.11.ebuild 1719 BLAKE2B 2e1c03d2c44d196372584a151063b5ad10ffacc89c6dba1ea9216c5bdce21799de25bb9d508362a255df0b8293e710edd33ec38a184f2a5ef1298b433fa4c2dd SHA512 470d4a9675fe624a7a15d7674a380ea514df4b5dbcc26b6d5f287450713018d5813213af3a23b9f2f23ac7970719a826efae3398f0c8a48b68f925ac494809cd
 MISC metadata.xml 374 BLAKE2B d1d096c2db4d1975e07553486be8e1ef66a63338b6a6617f71131565b80f612b9d50ca7c039d0b37b02eec56421231f52833390eb8536de44d4edd7c90d307f2 SHA512 21a272e9c3a7eb3e0950358f8ffb90b961ff0e39073519ed0b36660dfae91b24f8e09e3b89a20dbeadba45d995eea4bb89d484acc04a7251dfb9f33603bef998
diff --git a/dev-python/ini2toml/ini2toml-0.11-r1.ebuild b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
new file mode 100644
index 000000000000..71e549fccc36
--- /dev/null
+++ b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically conversion of .ini/.cfg files to TOML equivalents"
+HOMEPAGE="
+	https://pypi.org/project/ini2toml/
+	https://github.com/abravalheri/ini2toml/
+"
+SRC_URI="
+	https://github.com/abravalheri/ini2toml/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
+	>=dev-python/tomli-w-0.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/configupdater[${PYTHON_USEDEP}]
+		dev-python/pyproject-fmt[${PYTHON_USEDEP}]
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/tomlkit[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_IGNORE=(
+	# validate_pyproject is not packaged
+	tests/test_examples.py
+)
+
+src_prepare() {
+	sed -i -e 's:--cov ini2toml --cov-report term-missing::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/ini2toml/ini2toml-0.11.ebuild b/dev-python/ini2toml/ini2toml-0.11.ebuild
new file mode 100644
index 000000000000..de5aad955494
--- /dev/null
+++ b/dev-python/ini2toml/ini2toml-0.11.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically conversion of .ini/.cfg files to TOML equivalents"
+HOMEPAGE="
+	https://pypi.org/project/ini2toml/
+	https://github.com/abravalheri/ini2toml/
+"
+SRC_URI="
+	https://github.com/abravalheri/ini2toml/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
+	>=dev-python/tomli-w-0.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/tomlkit[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# pyproject_fmt is not packaged
+	tests/test_cli.py::test_auto_formatting
+
+	# fails on whitespace/comments/formatting
+	tests/test_translator.py::test_simple_example
+	tests/test_translator.py::test_parser_opts
+	tests/plugins/test_setuptools_pep621.py::test_move_entry_points_and_apply_value_processing
+	tests/plugins/test_setuptools_pep621.py::test_split_subtables
+	tests/plugins/test_setuptools_pep621.py::test_entrypoints_and_split_subtables
+	tests/plugins/test_setuptools_pep621.py::test_handle_dynamic
+)
+
+EPYTEST_IGNORE=(
+	# configupdater is not packaged
+	tests/test_examples.py
+	tests/test_transformations.py
+	tests/drivers/test_configupdater.py
+)
+
+src_prepare() {
+	sed -i -e 's:--cov ini2toml --cov-report term-missing::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index eb7630898a0d..8f601da64954 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,3 +1,5 @@
 DIST ipywidgets-7.7.0.tar.gz 4074763 BLAKE2B cff338dd635c57943161c78708e6a69abccaa46878e0bedb11ead76590b858ba57ce4dcfa8052533a4849da0dc9d5472987a7918fd2043462a21a908105d7910 SHA512 038da040912e6701762fb66fb3b6996ce0a59706afb05405b5932c02d34733842b227426f0b29eea115196bab384617425b0553c5db13a9dc832bddef63dfb92
+DIST ipywidgets-7.7.1.tar.gz 4075672 BLAKE2B 1e52d3b3b9380f42f67ad658f6e8579a61220e7160c10b1569437c1fd74ce962fbe746f3a6a3e302b5417812f69807deddc0ae3fe255b8e2f213d65103d55362 SHA512 ed6bf1a59a511714a3af96cc66e7665b9b264f56862ca4ea02d943137fcc6018da8fcb8dff4a8f9157bfb46cc19b7d58ceaff028e84f2f8d18ee16e57ce7fb96
 EBUILD ipywidgets-7.7.0.ebuild 990 BLAKE2B db29723bd37454ce6bb52d34ba08d00f1098970651fd53fc892532cecbce6591704130047860230e67e66f2c0dab785383f4b8de1387582f8065d2d71db7962e SHA512 23d1814f143bf6c54be421bb4a53fc38046dff9f0ea48332d4587d8942bc655b7d1fbf706ea51c115e0379c7a9802f42c6cbe6cb2a504ee301ed4539da3609f3
+EBUILD ipywidgets-7.7.1.ebuild 1040 BLAKE2B b6d51cb14e0ed73120ad2a327e19dfb41d9b45ab281cf69a1761379da9dd2073a144a8ac7842f6089808404967313313fda47f8f9cf33a0c8a2c87ac64f80083 SHA512 b35f317acc83fd88e62c6a00b21bbd254578b9b6da0a050869a17a9d2a8a00accec8cf001425eb6d70df3ee958e2b0c73c56596e516592e4e2fe06ec6e551494
 MISC metadata.xml 537 BLAKE2B 1f3b91be328b958870a72b5ce438c3e5bf67efd072b59dcb5ae77a9b89334e726af4fe8771221a7b728905cef4175cf7e0a49b11c651a7c0520b5cb032085985 SHA512 cb8092ea7a06e309a26abb78f5ddfd4a91f416e15374d2b59fb5086a64cc13f3dd408e18caa6719d12b1f18f762469a72a1027b2a047db626c51d22a5f304e54
diff --git a/dev-python/ipywidgets/ipywidgets-7.7.1.ebuild b/dev-python/ipywidgets/ipywidgets-7.7.1.ebuild
new file mode 100644
index 000000000000..8f080eed2ecd
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-7.7.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="
+	https://ipywidgets.readthedocs.io/
+	https://github.com/jupyter-widgets/ipywidgets/
+	https://pypi.org/project/ipywidgets/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-3.6.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# upstream hack to autoconfigure ipywidgets in jupyter
+	# we don't have jupyterlab_widgets packaged
+	sed -i -e '/jupyterlab_widgets/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index 5e237522efb1..a7cdca7fe754 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -1,5 +1,7 @@
 DIST jupyter_server-1.17.0.tar.gz 445648 BLAKE2B d7e19804b6b4cccb72c0a24febe8702829c2a32768e916a9da09ee9f55a08e360cf2a81c3c4bc535ff342c916155bc0b7933a9b5b49645db2b5f9a58ec02ab3a SHA512 d99d4036698d6f8d5e1258de214e3cbc6239b978314af4af7e722789c950edb1f261b98e666cffb46efdfe97a23c001784cfd29d7bf75c02dae53c2c07476b7f
 DIST jupyter_server-1.17.1.tar.gz 449682 BLAKE2B ca7a8b57c50a552c20e3c2a6a1318357df87027770bb0f37ee5c6c8db1a99116429ace7f7a28fca9f62728ba8469ce9875dc6f3a4cdf0a447ea8df616dff936f SHA512 bf37188a796e590340589414361e04c8e0f5f81d0e03cf55ad12ef7b59f35708996664da27727824424dadc038b44259a66e55f99c2da4270e727eae615f4e26
+DIST jupyter_server-1.18.0.tar.gz 450132 BLAKE2B a378ba3bfdc629d05478c33365b2d6df893b9ce1dc3ce26c78efcbd69b42441ff730ca58a83fb87446d073f849ce5a6c725784a15953fe9bdae119e529fe30c8 SHA512 5a194a9811162774990b125020d75c134ca32ab916c046cf0345a3959868ab7b293c0659bd54c2da91ef5e8bbb9b433f9a6c16d829277d0f34e924c6332fa6c0
 EBUILD jupyter_server-1.17.0.ebuild 2278 BLAKE2B eaeeac1afbee14c94ea5449af306a73c1b66f2e6d2fef2da8715063ca56763699d6a2a5a0870bac069c9a297fdeb79ab425973c1d2a494b7d8c3ab695f3461e2 SHA512 2fab27241cb236e6ee15e26b94010eedf3c27388216f928d21a80656523ff99a5bbab3cce75f2943be15b2b696ef0ed4b74e7415b4fe2368ef59e8f6d391d6dc
 EBUILD jupyter_server-1.17.1.ebuild 2284 BLAKE2B bc12a7e86bcc8c5cb2e3da9ce7a4446b4fefb396f6f269bbd58bf7b7c860baf9076d2de92f30165c6dcd5b63735269f6b6f5122a2242d77529ae596de82241cb SHA512 c4f9b09bb07f2ce436144a48fb6aace74a922f0eb50310facc328efc399d4d385227779e8c0a039103043bc6d6f86a33e0e14b97157c5a7ffa80866c71a37cac
+EBUILD jupyter_server-1.18.0.ebuild 2284 BLAKE2B bc12a7e86bcc8c5cb2e3da9ce7a4446b4fefb396f6f269bbd58bf7b7c860baf9076d2de92f30165c6dcd5b63735269f6b6f5122a2242d77529ae596de82241cb SHA512 c4f9b09bb07f2ce436144a48fb6aace74a922f0eb50310facc328efc399d4d385227779e8c0a039103043bc6d6f86a33e0e14b97157c5a7ffa80866c71a37cac
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter_server/jupyter_server-1.18.0.ebuild b/dev-python/jupyter_server/jupyter_server-1.18.0.ebuild
new file mode 100644
index 000000000000..7d41175712ea
--- /dev/null
+++ b/dev-python/jupyter_server/jupyter_server-1.18.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=jupyter
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
+	<dev-python/anyio-4[${PYTHON_USEDEP}]
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.2.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/pydata-sphinx-theme \
+	dev-python/myst_parser \
+	dev-python/ipython \
+	dev-python/sphinxemoji \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/sphinxcontrib-openapi
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# This fails if your terminal is zsh (and maybe other non-bash as well?)
+	tests/test_terminal.py::test_culling
+	tests/test_terminal.py::test_terminal_create_with_cwd
+	tests/test_terminal.py::test_terminal_create_with_relative_cwd
+)
+
+src_prepare() {
+	# disable npm use
+	sed -i -e '/\[tool\.jupyter-packaging\.builder\]/,+1d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest \
+		-p pytest_tornasync.plugin \
+		-p jupyter_server.pytest_plugin \
+		-p pytest_console_scripts \
+		-p pytest_timeout
+}
diff --git a/dev-python/kaptan/Manifest b/dev-python/kaptan/Manifest
index b30b33b8bf5e..126b74470c70 100644
--- a/dev-python/kaptan/Manifest
+++ b/dev-python/kaptan/Manifest
@@ -1,4 +1,3 @@
 DIST kaptan-0.5.12.tar.gz 10539 BLAKE2B 678e1aae6053a7075218a0fd9ef928685e7ce9ebf385c6953275b06d1bbf67d4c8434838a7a8f0b0ec8b02e7bef434d7f68698060bea2b4232cd5ef7fa83f0b3 SHA512 fccf767749e9473947bd7cb493ddb30f7dc1b2e10ce932ca327ae3423bc023fa9c76910ac249269ee546eb9162e4ce151e2ad0b9685d888854a7185c855ae143
-EBUILD kaptan-0.5.12-r1.ebuild 469 BLAKE2B 996fc72346d5d71aaf2c02b797e8e72e44123cf509e469fa9b31138ad24b5a8ada13fb636899065bb31918bd594bde482deabcda4ec1e29aee0928950345f873 SHA512 8e5ef52e6f096918e6e00eb0270dc064a321ac139ed54731019cb81c25c78ee9c5a3fc680fb55ca90aa6eaea70c355ea6d31c52b31a1ed20970894c14732c4bd
-EBUILD kaptan-0.5.12-r2.ebuild 471 BLAKE2B 14fe5eeb72c9b35ab3013a69c0567fcc640766a412a97d80efaafaaeb7ec4125b903de5aee165094e01f14924c3a9326a49332c94b02fb34b8ae1f2aa046ce23 SHA512 56b1d1a735f8e858e873ec2c6579bd50c17bb8bc9f4a359032567d0545f1266eeb6ee20ccf6fec3a7adaa96f486e8fa2aa0b4a76b0a9007ad2725966f03ab4a8
+EBUILD kaptan-0.5.12-r2.ebuild 469 BLAKE2B 4ba2fe7ccf5814f151ae5d15bd07cebb23dba6cd0d27720ff80d712356040a0b66e1fe50e2fb24659a5d6307bb8a98baa8bc43c822cfdb7ec5c1c52a090137c3 SHA512 a6bc09d4e59d5d2b2d5d3fd9abd57a4c4d635ba305374a746d1339e164f93c805fae60de1699dbe233a185371e55feb7debc5e2ec1094f5a7af0f5ac88e13541
 MISC metadata.xml 420 BLAKE2B c948340212ccafdf7b04e6d524e9775c5cf8bc937e51358e6d04353bc7b97ec6e68a2ddd3662fb185969ba2bfc234ca657602a0bb59059a2e2d2cace54f6fd84 SHA512 73b63cd4d2eea4c615052cfb5385383db2a85ce9cf1722bac5e5459e2ba1f7e777d1162c27a531ecc0bd41a187c2ea121e1fd9c1eb9534bae2f1f05c82296b9a
diff --git a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild b/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
deleted file mode 100644
index 03d94f339712..000000000000
--- a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Configuration manager in your pocket"
-HOMEPAGE="https://github.com/emre/kaptan"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND=">=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/kaptan/kaptan-0.5.12-r2.ebuild b/dev-python/kaptan/kaptan-0.5.12-r2.ebuild
index 4b17486d37ef..58d0a031e890 100644
--- a/dev-python/kaptan/kaptan-0.5.12-r2.ebuild
+++ b/dev-python/kaptan/kaptan-0.5.12-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND=">=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 8b1ed69286c8..5c77a972cee1 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,7 +1,3 @@
-DIST keyring-23.5.0.tar.gz 44586 BLAKE2B 70179f8353147679f03c888b1af00d2461264e7a7062eb7b1372615ae883f43352999ce57e24f3378ac66d5e74a81df66702bf380eb32d6d3554777e9ca63dfe SHA512 639d1cdece5dac854053818f3a4751b30fb9f13a2b3abb0090ba0cb519b50604858673678fe6205c2ec10be863e5f3d63cc7891424beabe2482d35b820a60da1
-DIST keyring-23.5.1.gh.tar.gz 44938 BLAKE2B 65c03e58ae8de844c1ed58486fd6348a1c7063025d92f9857c972cb3b2f29f4726dd03d25ff04329170719478ec5334f922556ef8598416d0ee07af6fb23c167 SHA512 521dd393221287840a5e9d22e94714d88ebb3ac26e87a72dae4958b7d63900cc445bdd087c2192353cdcd72b380d17838e93c4d9e1012f13e026ea27def11f38
 DIST keyring-23.6.0.gh.tar.gz 45236 BLAKE2B 98ea183760da39512fcebd93b182b10f031853ee88d4e93add119a760851d9552d830fe599c57937d84a23df67b6a6ca9e33a5623a034da2fc8b28c0216a6aaf SHA512 dc196914389ad12f89652614ea00b2ca17cf22471f1bd41ed3cb58519b1ca9b8ad7f497707d77c31d1354c12d73b9881d4f5511c61a6dc562ec358f3009a0c70
-EBUILD keyring-23.5.0.ebuild 1376 BLAKE2B d6c9379a6f646e17f423f52e275ba816c866779ab177b29abc2882612c556c5a4f0eb4326e14300ff57d6811c62bd4111a2513be399afa6026e668a65f8deb8e SHA512 b8482785ac275c565d4fc709cf6c8de94d7449823b9f3251ead415ac5a62db16f6723ddae17f18707899d1ebe46f80550d4e5367930840c522cf341fc8107805
-EBUILD keyring-23.5.1.ebuild 1357 BLAKE2B b04a0f9e70a26237449341d73be8c4379536194677d5b5e628987456499ebe6fdada720287b1d7c351fd921cc1690d901732003d57954bb71ea114535f7f448d SHA512 89a0592aa4ba555cc0a4b6d47b63bb46f5b5de9482e55fb835436c3877c9d9fd0151d8add61c9a9489907e5f78bf90121c54ee707289c0966b4ff6e8ec3f7690
-EBUILD keyring-23.6.0.ebuild 1229 BLAKE2B 28f4c86bdec43394a9f080780810e6b9727d59dfd3e5117f6ff1a079bd7f88fc0a7d47afb73accf62f5bf72ade9833681e6ff0be4e033731f169fea902039048 SHA512 874f4a414150b4388fceeca15472ed5a2c1d161ebb6b842413d055b4fdaa1027a4e8f244c1c1f804c09dff4f8283fa7b976e4d3e31f04060ebb9642c84776e91
+EBUILD keyring-23.6.0.ebuild 1221 BLAKE2B a3596ec3f62fc95ecdc6cfe5b2d6a30d272e38c3c53f9825018c35b5383254d49f94d3156ec3efb84fed037f4591fefb528aee14ae3f98acdbb325fd57e923f0 SHA512 c9f9531593f9c9be4a881aa2849c135017a26bdab441fa9fe69b566edf511677c8b6a50b0f19dcc007bf6305c4b1d8e39d20ff1a811c7c7848b58577b52c55b1
 MISC metadata.xml 611 BLAKE2B 7f938075d992467e01da200f0c859e9bc6a6128296151b3529b2168b68364605bd7dbadf69f7820d459d5db6950908e0b0acb09a636f1fc45862093df6d08334 SHA512 a0ad1729c53b18fedf227053648b04541f5adcf56bfaa73218e214f8c2409ebe2574a5917442c5218084b38da34691b6566f2c65390ef6487985a123f62f9efb
diff --git a/dev-python/keyring/keyring-23.5.0.ebuild b/dev-python/keyring/keyring-23.5.0.ebuild
deleted file mode 100644
index a4719564f632..000000000000
--- a/dev-python/keyring/keyring-23.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/jaraco-packaging \
-	dev-python/rst-linker
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# this test fails if importlib-metadata returns more than one
-	# entry, i.e. when keyring is installed already
-	tests/test_packaging.py::test_entry_point
-)
-
-EPYTEST_IGNORE=(
-	# apparently does not unlock the keyring properly
-	tests/backends/test_libsecret.py
-	# hangs
-	tests/backends/test_kwallet.py
-)
-
-src_prepare() {
-	# remove jaraco.tidelift dependency from docs, quite useless
-	sed -e '/tidelift/d' -i docs/conf.py docs/index.rst || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/keyring/keyring-23.5.1.ebuild b/dev-python/keyring/keyring-23.5.1.ebuild
deleted file mode 100644
index b0b2427e6483..000000000000
--- a/dev-python/keyring/keyring-23.5.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="
-	https://github.com/jaraco/keyring/
-	https://pypi.org/project/keyring/
-"
-SRC_URI="
-	https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# this test fails if importlib-metadata returns more than one
-	# entry, i.e. when keyring is installed already
-	tests/test_packaging.py::test_entry_point
-)
-
-EPYTEST_IGNORE=(
-	# apparently does not unlock the keyring properly
-	tests/backends/test_libsecret.py
-	# hangs
-	tests/backends/test_kwallet.py
-)
-
-src_prepare() {
-	# remove jaraco.tidelift dependency from docs, quite useless
-	sed -e '/tidelift/d' -i docs/conf.py docs/index.rst || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/keyring/keyring-23.6.0.ebuild b/dev-python/keyring/keyring-23.6.0.ebuild
index f5b8e85e5cc3..fd91c4904577 100644
--- a/dev-python/keyring/keyring-23.6.0.ebuild
+++ b/dev-python/keyring/keyring-23.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/kgb/Manifest b/dev-python/kgb/Manifest
index 7c8591a0b558..08e7903e6517 100644
--- a/dev-python/kgb/Manifest
+++ b/dev-python/kgb/Manifest
@@ -1,3 +1,3 @@
 DIST kgb-release-7.0.tar.gz 54742 BLAKE2B 22193a573c797221382f5f6117f67dd5fbc00322e43d67079882a251fd3fd361672fbbadb523bcb14e8671b274789cc39dd591ee0b20f3b28649c8f39b58711c SHA512 571f077b4c4be10044d05ab1f88d75315afe4ebf7661851daff68e2782fd408dcf994c6db2bd620f38a56ffd89c1f52f41139defc30f05ec792663ae5f351364
-EBUILD kgb-7.0-r1.ebuild 682 BLAKE2B 1b6af8c62ba87876961b467a32f3a89b905f3b3cd25220392b173880d649c21c1367c5bcd483abf029a3ab11576d94016cea8c2eefd271636c9f27174b4f2765 SHA512 2e6c2be6bceb3b0b045b122f0b32f51fbba71eb8734f6d98580ef2ff246bc084cefcce04afe9a193c2308d99c14c20ba8adc8db08034027a98162512dddd15e5
+EBUILD kgb-7.0-r1.ebuild 687 BLAKE2B a055e3a10ec4bc41a2b2fb3dd00e21932d57cf98a5456b2e121cfacbc2442a8608b9727cf6cf9fc81e4b78a918d22fea3f7203539534a6836164a72c00c03bf3 SHA512 7d1e603b1248753a1db47187c0b314779925a3b5219864729c208e3409b3a4550e8f2b9c7c1bc34a665a018ac9be32efa2cd20d573b7201e8443b925a13eb10f
 MISC metadata.xml 385 BLAKE2B a36cb8262ed3d2fd3114e8c84bdd732dbbb661b8fea7a9705ff329f56659c020e5b9e00756a9e9dbbf073b894ddf5f811367b8c4d9b11dddd7c866588987e96e SHA512 5ee33147dec8e3fee8dc4856ca8a363674cd1854f36e9a01559751ec6799d8f8c995c8d0f82dcf794161b1f91acec387d7a18d7cdee2638fddbc177f0a069c81
diff --git a/dev-python/kgb/kgb-7.0-r1.ebuild b/dev-python/kgb/kgb-7.0-r1.ebuild
index 1dfcbc9ec48f..843408951a14 100644
--- a/dev-python/kgb/kgb-7.0-r1.ebuild
+++ b/dev-python/kgb/kgb-7.0-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/license-expression/Manifest b/dev-python/license-expression/Manifest
index c7bf44251b56..0eb81aab947d 100644
--- a/dev-python/license-expression/Manifest
+++ b/dev-python/license-expression/Manifest
@@ -1,3 +1,3 @@
 DIST license-expression-30.0.0.gh.tar.gz 153630 BLAKE2B 4231bf14e69705fbf40cc4af5f17a1070c780d595db5ab0098b318eeb7289740b86319c683e61aaf844a1cc5b8598d832f14e4eeac354aff37f7b82e5437df1d SHA512 ce6e3a48c1e035e98c3831180bdafb1d70afe94b1d0148c47941129a8223b8b39e11af9407b255ed7a3d1247873c18848f8236c0a805e9b2333c6d59506aad12
-EBUILD license-expression-30.0.0.ebuild 729 BLAKE2B cd2a6f8edf0ac609b61eb1b6a1168e577d92bdab887feaf32ae4eb30688ed43773738376fd6ffbee9f869f0cd0d2271860551d06625f2372f14e46c427bccf82 SHA512 97e9da4419e4bfde1c30cec32e9caa388a48fc25fba5b58e790f7913666099b8c216ea0b2b0e2dfd8b0dab11b89eb575f6ad8be7dc7e5a53f87031322cef53b5
+EBUILD license-expression-30.0.0.ebuild 736 BLAKE2B 6934b19bc7c9ed647ed3c5c79a47b5e0d57b86801e7f1e5acdd551d6fcc48d908c716177fb8e580024b1eebd34e99fc3e9e359876682f9d246be5630ac2c36fd SHA512 0268fec1067f44144c2b645c6faa968fbfc0d0c7cd47c3422b8d8fe9f322e0e0042e5bded79a4d0d963ded804c1e3a8e74470168cdab6ed4c56705b686e41105
 MISC metadata.xml 387 BLAKE2B 52d862f7ede77b8ab90dbd9ed2949f1c4a2b289458cff0f2e7042bf43be07b7d7e63ff94f0a10aa1db41027b3441be721656def8d59ba54155d3226e4bd30b57 SHA512 7ba89c3d94ef921fad190a85655d032a7e3a0c5794d0957c3a30ff73c75b717e87517f5f2547408426479d646ac3d157f7e659d66a18d4081689b6b41136b268
diff --git a/dev-python/license-expression/license-expression-30.0.0.ebuild b/dev-python/license-expression/license-expression-30.0.0.ebuild
index 72ee1259ffbb..ecfd97d0a33e 100644
--- a/dev-python/license-expression/license-expression-30.0.0.ebuild
+++ b/dev-python/license-expression/license-expression-30.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 9d96ad594bcf..0c268c6d72b5 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,5 +1,7 @@
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
@@ -11,5 +13,6 @@ EBUILD lit-14.0.1.ebuild 919 BLAKE2B c579f3fca21b5f18b4a286c3ad73fc3120f3548c8bc
 EBUILD lit-14.0.3.ebuild 920 BLAKE2B 97bfc25ead78c898e41321f68e8667b4dd3ccd7927e2a80e8de7eb992ccb6c9b34a54a5e43ccf3962ea19b0a01cbbbe3a8529c5e5c3222eb9303a7ba1ec86102 SHA512 8868c596fa94a532725f2806c4e14b2d9bbf4615f5c13a376e2ee8627ebc8a499d3febff129077b89199567b6ed9313f11a211f891d2aa2d81ba573607f4dbe1
 EBUILD lit-14.0.4.ebuild 916 BLAKE2B 27b024b5199193c6401411fe1b437678599a8f4b2870a0d2e25e2bd9936fb1907d94e99dc1c5329a483390808bdbc14fa62be432b4279caf08c5001fd2b6bd2e SHA512 001afdab1e0f3c3f52dbbe5f4204d92be4f09ad8fee4c4b727f9e2a198fb3e7265e3864e9defe9011ffaa79d28eac75e1ffc9f923a2b18e4e7796af798ec08d3
 EBUILD lit-14.0.5.ebuild 920 BLAKE2B 97bfc25ead78c898e41321f68e8667b4dd3ccd7927e2a80e8de7eb992ccb6c9b34a54a5e43ccf3962ea19b0a01cbbbe3a8529c5e5c3222eb9303a7ba1ec86102 SHA512 8868c596fa94a532725f2806c4e14b2d9bbf4615f5c13a376e2ee8627ebc8a499d3febff129077b89199567b6ed9313f11a211f891d2aa2d81ba573607f4dbe1
+EBUILD lit-14.0.6.ebuild 920 BLAKE2B 97bfc25ead78c898e41321f68e8667b4dd3ccd7927e2a80e8de7eb992ccb6c9b34a54a5e43ccf3962ea19b0a01cbbbe3a8529c5e5c3222eb9303a7ba1ec86102 SHA512 8868c596fa94a532725f2806c4e14b2d9bbf4615f5c13a376e2ee8627ebc8a499d3febff129077b89199567b6ed9313f11a211f891d2aa2d81ba573607f4dbe1
 EBUILD lit-15.0.0.9999.ebuild 871 BLAKE2B 7637fa92b7d8e5b7c87bd1cc7e8941357b48064795ca297050fcbd83f0e2a9a2a36bc1916d2cff19e95fff353250c5cfc82d2eb052c36b8bb9cb9398df19e3c0 SHA512 d049fceece84c0a07332d664a7f9b98b3c5ef81e69f24394f3e81e733977b64a523eb9b15a149e82bacd54c9a262f988ea777ee7af7c3ad48007be62f529c103
 MISC metadata.xml 283 BLAKE2B 7636ccca14947f04df1e43d5ab56b0486ea2a3c500077c6dacadce13f2eb46d7729bd2766ed9e4bcc1748dc72d9c21b61b8c04c83fb78d4341f286e04b5d33ea SHA512 8816317f9fe5bc2df7b2e5bb9a9582f042e5fdd634b897e1fcc6a256d41e45d1215399b0a4bea8b1d47bf10ee122796eb723f3e4c654d4cc6d7772927aae790b
diff --git a/dev-python/lit/lit-14.0.6.ebuild b/dev-python/lit/lit-14.0.6.ebuild
new file mode 100644
index 000000000000..638a94fc8e55
--- /dev/null
+++ b/dev-python/lit/lit-14.0.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 ~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/lz4/Manifest b/dev-python/lz4/Manifest
index 50d5c0474219..339484b2d922 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -1,5 +1,3 @@
-DIST lz4-4.0.0.tar.gz 163729 BLAKE2B ce617f2aea3f45cf9fb0bf642599a1d872d9532ab465d32602b63987081a7e78ab4ac4373a41c6a97ec50eb6f2debc078288554966390651325ba166faa79c0d SHA512 885d215dd4caadc84d1e2a9575be9972a33a43af089f0788192c9f4f53382c0937f9d67aac412e2860c9ba393ee3bb15dfe273865acb6a3cf8aecdce8292ecc9
 DIST lz4-4.0.1.tar.gz 164309 BLAKE2B 6338c2d74dedf1dc92f455378ef87c691291fdd16faebff8992aa927bf95c707b346af6bb35c512d8095b60a1878615d1081ba64f99c083e580eeacfb5cf11a5 SHA512 caa08a8a531ca2887ce7e596b7a3d9d8f8f2b93c6ea48c3fb0f8bbe6e6f2a18fb6b3c055e57841f8ce74f70367738a28dbb5fb1f07cbf785434642e6034b558e
-EBUILD lz4-4.0.0.ebuild 838 BLAKE2B 07baa1b0680bee036885ec11c7316ce7556a0e90e88ea1fd5542d2f908e151c8f87b74c8596ef5f14739f76e1cbbf6e40e827d2b1ce42dd3cff0b4f46760fc99 SHA512 5f54a5694057fa88202b67f193703ff37bce72b335d3b02eb11d2e694d0696caa3335880087b1fcd10c8d25dea3f5485aa285dd23a69f200a83982aef108b35d
-EBUILD lz4-4.0.1.ebuild 846 BLAKE2B 2c270e0caef0bac8607871f95cc19b46ba58fe24edd7d67af622609fec2cbf419c1db195977e66f76ecfc4723ad53f29d4bb1795bc88bc675de518c92f826744 SHA512 5b3ac74eba66e09892d7d6dd54b412ec7f7a1ac4bbc5581738872dd8f70bc8b1337e20b25db2a9d486d8955db56751d9a2beac4ffb98d95324b45164adcf625c
+EBUILD lz4-4.0.1.ebuild 845 BLAKE2B 29d2fb2769362cfabf157882f7c75e790f0ad390a9d1b6c1d51ea7e6421aebe73419a366bc20f717e364d86e4c0854029c31c619e3947f8afcee673c78e9df9c SHA512 e5574d41eae03b184952862dff8cc36b14684358b5ce4a6d30c45449ddd6e499f45e536625b1f04c5ea105b522df87187c37132e29e3561f32fbe2e7330f2a60
 MISC metadata.xml 454 BLAKE2B b02d4acc9eb7d4fb35bf36371cb660d099c77f807fc08fc351b7e0e1d2e0199fdab82d83bb6bc31a56bfdb9a5b020b2f57aa9b89b59a7e5c22fcce554b6b0859 SHA512 a1b61eb4d3ce636b10abcff25ee3315bf5ecb3bdee58e1c45ff99f0b40717b13e3a8ec33c9abcb926bd716990a31749b1bf6729d8137b7859857318c386a8ec7
diff --git a/dev-python/lz4/lz4-4.0.0.ebuild b/dev-python/lz4/lz4-4.0.0.ebuild
deleted file mode 100644
index 601952c145b8..000000000000
--- a/dev-python/lz4/lz4-4.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="LZ4 Bindings for Python"
-HOMEPAGE="https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="app-arch/lz4:="
-DEPEND=${RDEPEND}
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# lz4.stream is not officially supported and not installed by default
-	# (we do not support installing it at the moment)
-	tests/stream
-)
diff --git a/dev-python/lz4/lz4-4.0.1.ebuild b/dev-python/lz4/lz4-4.0.1.ebuild
index 962aaba6cd95..10c11eec6203 100644
--- a/dev-python/lz4/lz4-4.0.1.ebuild
+++ b/dev-python/lz4/lz4-4.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	app-arch/lz4:=
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
deleted file mode 100644
index 741ca2c88895..000000000000
--- a/dev-python/m2r/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX m2r-0.2.1-tests-network.patch 1019 BLAKE2B ef091cd10f528e2f592490749517d88c9e7375bba7d37fa9415ec30a6ae33e4163388823b3cf810fadb3578f6ecda564157360bf6d7e96b7e549472de0ac62f4 SHA512 fce454ce19d6a97d03fc8c5ecce235665bf5bf165a87dbc02389d2a899ea758aa710d47c9dfe405238953fa27eafb5c2da016dfa36e989d562db8382f43263d4
-AUX m2r-0.2.1-tests.patch 2190 BLAKE2B 8e98fff491b0b18800386e42d05959b89f4312c28b2b4193eb41e73d2d7b30e9ef92ed9cb25ddee522534b5830cc870762b4fab9bcd2f957c2538054957465cf SHA512 54cbe2539d3a7c774fb71ae3c36eddabe41b341be185a11478a0dd5bb94b23d35c690a0bbc9b7517ef5d4cc4af56d695bc40cc7c313fad6cf871f667229c5697
-AUX m2r-0.2.1-upstream-fix.patch 641 BLAKE2B 4d75137a8bc0e5ba9363d72b611b83933c714b62265198e6c2183e5c74de1297bc090f110641cb58734b3b1ba7520687efb01d440704fc5acd24a45797263900 SHA512 9722565d577329f1afac4331bbc2114f562f208f2b36472d9b9bf9d83274731c8efdd466a3e2a8a87a61ffa781b5bdeda7d4144f37323eed8c8413582963729f
-AUX m2r.1 9244 BLAKE2B d7ac673d0750695f8b21b6e9d0c5328ab8934dd20eb88835c655affab45d4b86adbe4306d39a705509f7c4597d9f0ef37cd61af035d59871e04596f6cbdc10c5 SHA512 bb085477c363a0384a5aea0f5cac3e64ece957048f5a610b3063a5d96a31e8b78167dd847bd42d0f267b506595b55cffdf7647a5c819c9755b054e34d2ee3a99
-AUX test.md 34 BLAKE2B 88eac9a501f3fd54ac3c9555612c7d3860d5c692170fcfeca3d75b665611b75e627443e8a54d8dbba4c820b2f793c5b933a76493381d295aefdd5ef55b7fc1d5 SHA512 c4b98b3256e14d46187d4c5cf5d3b26e4e4e0b1c6f2f61618987c234f49ea5a9bf31a94b9d2c4907bbd0685fb30138a5916b5dd3c8f92cd80bf0c7c2e657ae26
-AUX test.rst 45 BLAKE2B 1bdb710270f83f8a5177fe457f3ea40bd0bd8ddd36e5acabb4d6fcbdd1cded336a736978a79efff42c7cebcd1a420d8bc4485593d675b3a66e3f427434147c9a SHA512 a2d44de89e17b5a023928fa695c8dd61163a2b59968a514b9a976f92923881ce53625930f0e05f7f257250e46f25747928f71e8f25fcb9c05445b221688077d7
-DIST m2r-0.2.1.tar.gz 24455 BLAKE2B 42ec5a919301b6dee2b345a5eca9e62a1bd44186fb61dbd8cc9de6cacc34821e912f242355cc7368b755f923a433353cfa567afc480e9b8c63bf209ff9d3c624 SHA512 847f04538ee52f0b0a88cee9474ed889e8114a3a7b1fb221cdaa867ab70ca52f517250f2c8bbf795ae598c7b6614e6d03d9f6f05b7e3d56fb8087d63eb52f1bc
-EBUILD m2r-0.2.1.ebuild 1585 BLAKE2B df95e2457f9ae097bd580fb8bcc13dcacb6392a77d18c5522f1207a92284b5f2740a3958db7c31ca8ea4b85905cf5b6bd7a1d98b94ced1ea99677b05ad97aafc SHA512 91d1f777e54fbdc0235d6456803f5f90a060507618298401b64363e80dde32cd0ec844b8b0d0c223e2bedc83cd4ceff664869756768ef7defff323f827a8e015
-MISC metadata.xml 485 BLAKE2B f68c3b410c1f07f3f844a95c2e7b749f124a8ace55a492ac7536b3a62753aef023e591030e0c6913d6a9e8d2685c304d5541d041602e4be36dc12d716c51d97d SHA512 1ea5e8481e9a089dcb8b907f72a9c3810d509ed671fd2ec746543b913e4a8b85c1ec75a5d6ee1b69919fcb575eb133e1d4a1d21a3a06e597bd63a969690365c9
diff --git a/dev-python/m2r/files/m2r-0.2.1-tests-network.patch b/dev-python/m2r/files/m2r-0.2.1-tests-network.patch
deleted file mode 100644
index 74f3a0ca7a6a..000000000000
--- a/dev-python/m2r/files/m2r-0.2.1-tests-network.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/tests/test_cli.py b/tests/test_cli.py
-index e53e209..4dff652 100644
---- a/tests/test_cli.py
-+++ b/tests/test_cli.py
-@@ -5,6 +5,7 @@ from __future__ import print_function, unicode_literals
- 
- import sys
- import os
-+import unittest
- from os import path
- from copy import copy
- from unittest import TestCase
-@@ -127,6 +128,7 @@ class TestConvert(TestCase):
-         self.assertIn('__content__', m.call_args[0][0])
-         self.assertNotIn('**content**', m.call_args[0][0])
- 
-+    @unittest.skip("needs internet access")
-     def test_anonymous_reference_option(self):
-         sys.argv = [
-             sys.argv[0], '--anonymous-references', '--dry-run', test_md]
-@@ -135,6 +137,7 @@ class TestConvert(TestCase):
-         self.assertIn("`A link to GitHub <http://github.com/>`__",
-                       m.call_args[0][0])
- 
-+    @unittest.skip("test seems to be broken")
-     def test_disable_inline_math(self):
-         sys.argv = [
-             sys.argv[0], '--disable-inline-math', '--dry-run', test_md]
diff --git a/dev-python/m2r/files/m2r-0.2.1-tests.patch b/dev-python/m2r/files/m2r-0.2.1-tests.patch
deleted file mode 100644
index 9c70bbc5b49d..000000000000
--- a/dev-python/m2r/files/m2r-0.2.1-tests.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 77968c4574cb121737a2017b936870603664be39 Mon Sep 17 00:00:00 2001
-From: miyakogi <miyako.dev@gmail.com>
-Date: Tue, 4 Jun 2019 19:13:26 +0900
-Subject: [PATCH] Fix test
-
----
- tests/test_renderer.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/tests/test_renderer.py b/tests/test_renderer.py
-index 5c6f915..4c7ebba 100644
---- a/tests/test_renderer.py
-+++ b/tests/test_renderer.py
-@@ -43,6 +43,7 @@ def check_rst(self, rst):
- class TestBasic(RendererTestBase):
-     def test_fail_rst(self):
-         with self.assertRaises(AssertionError):
-+            # This check should be failed and report warning
-             self.check_rst('```')
- 
-     def test_simple_paragraph(self):
-@@ -709,7 +710,6 @@ def test_footnote(self):
-             '',
-             '.. [#a] note rst',  # one empty line inserted...
-             '',
--            '',
-             '.. [#fn-1] note 1',
-             '.. [#fn-2] note 2',
-             '.. [#fn-ref] note ref',
-@@ -719,22 +719,22 @@ def test_footnote(self):
-     def test_sphinx_ref(self):
-         src = 'This is a sphinx [ref]_ global ref.\n\n.. [ref] ref text'
-         out = self.conv(src)
--        self.assertEqual(out, '\n' + src + '\n')
-+        self.assertEqual(out, '\n' + src)
- 
- 
- class TestDirective(RendererTestBase):
-     def test_comment_oneline(self):
-         src = '.. a'
-         out = self.conv(src)
--        self.assertEqual(out, '\n.. a\n')
-+        self.assertEqual(out, '\n.. a')
- 
-     def test_comment_indented(self):
-         src = '    .. a'
-         out = self.conv(src)
--        self.assertEqual(out, '\n    .. a\n')
-+        self.assertEqual(out, '\n    .. a')
- 
-     def test_comment_newline(self):
--        src = '..\n\n   comment\nnewline'
-+        src = '..\n\n   comment\n\nnewline'
-         out = self.conv(src)
-         self.assertEqual(out, '\n..\n\n   comment\n\nnewline\n')
- 
-@@ -748,7 +748,7 @@ def test_comment_multiline(self):
-             '\n\n')
-         src = comment + '`eoc`'
-         out = self.conv(src)
--        self.assertEqual(out, '\n' + comment + '\n``eoc``\n')
-+        self.assertEqual(out, '\n' + comment + '``eoc``\n')
- 
- 
- class TestRestCode(RendererTestBase):
diff --git a/dev-python/m2r/files/m2r-0.2.1-upstream-fix.patch b/dev-python/m2r/files/m2r-0.2.1-upstream-fix.patch
deleted file mode 100644
index 7060c33e78dd..000000000000
--- a/dev-python/m2r/files/m2r-0.2.1-upstream-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c78db2aa91787df6973ad6400208707c7ecf4b12 Mon Sep 17 00:00:00 2001
-From: "Ethan \"Soron\" Kaminski" <ethan.kaminski@gmail.com>
-Date: Thu, 25 Apr 2019 12:56:14 +0800
-Subject: [PATCH] Remove a trailing newline after `.rst` directives (fix issue
- #35)
-
----
- m2r.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/m2r.py b/m2r.py
-index 897338d..74c8c98 100644
---- a/m2r.py
-+++ b/m2r.py
-@@ -507,7 +507,7 @@ def eol_literal_marker(self, marker):
-         return marker
- 
-     def directive(self, text):
--        return '\n' + text + '\n'
-+        return '\n' + text
- 
-     def rest_code_block(self):
-         return '\n\n'
diff --git a/dev-python/m2r/files/m2r.1 b/dev-python/m2r/files/m2r.1
deleted file mode 100644
index 1a6c10b48a90..000000000000
--- a/dev-python/m2r/files/m2r.1
+++ /dev/null
@@ -1,515 +0,0 @@
-.\" Man page generated from reStructuredText.
-.
-.TH "M2R" "1" "Mar 30, 2017" "0.1.5" "M2R"
-.SH NAME
-m2r \- M2R Documentation
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
--
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
-\fI\%PyPI\fP\fI\%PyPI version\fP\fI\%Build Status\fP\fI\%codecov\fP
-.sp
-.ce
-----
-
-.ce 0
-.sp
-.sp
-M2R converts a markdown file including reST markups to a valid reST format.
-.SH WHY ANOTHER CONVERTER?
-.sp
-I wanted to write sphinx document in markdown, since it\(aqs widely used now and
-easy to write code blocks and lists. However, converters using pandoc or
-recommonmark do not support many reST markups and sphinx extensions. For
-example, reST\(aqs reference link like \fBsee \(garef\(ga_\fP (this is very convenient in
-long document in which same link appears multiple times) will be converted to
-a code block in HTML like \fBsee <code>ref</code>_\fP, which is not expected.
-.SH FEATURES
-.INDENT 0.0
-.IP \(bu 2
-Basic markdown and some extensions (see below)
-.INDENT 2.0
-.IP \(bu 2
-inline/block\-level raw html
-.IP \(bu 2
-fenced\-code block
-.IP \(bu 2
-tables
-.IP \(bu 2
-footnotes (\fB[^1]\fP)
-.UNINDENT
-.IP \(bu 2
-Inline\- and Block\-level reST markups
-.INDENT 2.0
-.IP \(bu 2
-single\- and multi\-line directives (\fB\&.. directive::\fP)
-.IP \(bu 2
-inline\-roles (\fB:code:\(gaprint(1)\(ga ...\fP)
-.IP \(bu 2
-ref\-link (\fBsee \(garef\(ga_\fP)
-.IP \(bu 2
-footnotes (\fB[#fn]_\fP)
-.IP \(bu 2
-math extension inspired by \fI\%recommonmark\fP
-.UNINDENT
-.IP \(bu 2
-Sphinx extension
-.INDENT 2.0
-.IP \(bu 2
-add markdown support for sphinx
-.IP \(bu 2
-\fBmdinclude\fP directive to include markdown from md or reST files
-.UNINDENT
-.UNINDENT
-.SH INSTALLATION
-.sp
-Python 2.7 or Python 3.3+ is required.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-pip install m2r
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.SH USAGE
-.SS Command Line
-.sp
-\fBm2r\fP command converts markdown file to reST format.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-m2r your_document.md [your_document2.md ...]
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Then you will find \fByour_document.rst\fP in the same directory.
-.SS Programmatic Use
-.sp
-Instantiate \fBM2R\fP class and call with markdown text. Then it will return converted text.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-from m2r import M2R
-m2r = M2R()
-rest = m2r(\(aq# Title\en\enSentence.\(aq)
-print(rest)
-# Title
-# =====
-#
-# Sentence.
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Or, use \fBparse_from_file\fP function to load markdown file and obtain converted text.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-from m2r import parse_from_file
-output = parse_from_file(\(aqmarkdown_file.md\(aq)
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-This is an example of setup.py to write README in markdown, and publish it to PyPI as reST format.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-readme_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), \(aqREADME.md\(aq)
-try:
-    from m2r import parse_from_file
-    readme = parse_from_file(readme_file)
-except ImportError:
-    # m2r may not be installed in user environment
-    with open(readme_file) as f:
-        readme = f.read()
-setup(
-    ...,
-    long_description=readme,
-    ...,
-)
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.SS Sphinx Integration
-.sp
-In your conf.py, add the following lines.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-extensions = [
-    ...,
-    \(aqm2r\(aq,
-]
-
-# source_suffix = \(aq.rst\(aq
-source_suffix = [\(aq.rst\(aq, \(aq.md\(aq]
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Write index.md and run \fBmake html\fP\&.
-.sp
-When \fBm2r\fP extension is enabled on sphinx and \fB\&.md\fP file is loaded, m2r
-converts to reST and pass to sphinx, not making new \fB\&.rst\fP file.
-.SS mdinclude directive
-.sp
-Like \fB\&.. include:: file\fP directive, \fB\&.. mdinclude:: file\fP directive inserts
-markdown file at the line.
-.sp
-Note: do not use \fB\&.. include:: file\fP directive to include markdown file even if
-in the markdown file, please use \fB\&.. mdinclude:: file\fP instead.
-.SH RESTRICTIONS
-.INDENT 0.0
-.IP \(bu 2
-In the reST\(aqs directives, markdown is not available. Please write in reST.
-.IP \(bu 2
-Column alignment of tables is not supported. (reST does not support this feature)
-.IP \(bu 2
-Heading with overline\-and\-underline is not supported.
-.INDENT 2.0
-.IP \(bu 2
-Heading with underline is OK
-.UNINDENT
-.UNINDENT
-.sp
-If you find any bug or unexpected behaviour, please report it to
-\fI\%Issues\fP\&.
-.SH EXAMPLE
-.sp
-See \fI\%example document\fP and \fI\%its
-source code\fP\&.
-.sp
-I\(aqm using m2r for writing user guide of \fI\%WDOM\fP\&.
-So you can see it as another example. Its \fI\%HTML is
-here\fP, and \fI\%its
-source code is here\fP\&.
-.SH ACKNOWLEDGEMENT
-.sp
-m2r is written as an extension of
-\fI\%mistune\fP, which is highly extensible
-pure\-python markdown parser.
-Without the mistune, I couldn\(aqt write this. Thank you!
-.SH LICENCE
-.sp
-\fI\%MIT\fP
-.SH CONTENTS
-.SS Example
-.sp
-This page is written in mixed markdown and reST.
-Source code is \fI\%here\fP\&.
-.SS Basic Markups (inline)
-.sp
-A \fBstrong\fP, \fIemphasis\fP, , \fBcode with single\-backtick\fP,
-\fBcode with two\-backticks\fP, ,
-\fBreST\(aqs code role\fP, and delete.
-.SS Link
-.sp
-Auto link to \fI\%http://example.com/\fP\&.
-.sp
-Link to \fI\%example.com\fP in markdown.
-.sp
-Link to \fI\%example.com\fP in reST.
-.sp
-Link to \fI\%example\fP in reST_ref.
-.SS Basic Markups (block)
-.sp
-This is a simple sentence.
-.nf
-sentence with
-newlines
-(reST)
-.fi
-.sp
-.sp
-Sentence with
-hard\-wrap (markdown, trailing two spaces)
-.INDENT 0.0
-.INDENT 3.5
-block quote
-second line
-.INDENT 0.0
-.INDENT 3.5
-nested quote
-.UNINDENT
-.UNINDENT
-.UNINDENT
-.UNINDENT
-
-.sp
-.ce
-----
-
-.ce 0
-.sp
-.INDENT 0.0
-.INDENT 3.5
-Block quote after raw\-html directive
-.UNINDENT
-.UNINDENT
-.SS List
-.SS Unordered list
-.INDENT 0.0
-.IP \(bu 2
-unordered list
-new line
-.IP \(bu 2
-next item
-.INDENT 2.0
-.IP \(bu 2
-nested list
-with new line
-.IP \(bu 2
-nested list item 2
-.UNINDENT
-.IP \(bu 2
-original depth
-.INDENT 2.0
-.IP 1. 3
-ordered list item
-.IP 2. 3
-second
-with new line
-.UNINDENT
-.IP \(bu 2
-original depth again
-.UNINDENT
-.SS Ordered list
-.INDENT 0.0
-.IP 1. 3
-ordered list
-in new line
-.IP 2. 3
-second item
-.INDENT 3.0
-.IP \(bu 2
-nested unordered list
-.IP \(bu 2
-second item
-with new line
-.UNINDENT
-.IP 3. 3
-original depth
-.INDENT 3.0
-.IP 1. 3
-nested ordered list
-with new line
-.IP 2. 3
-again
-.UNINDENT
-.IP 4. 3
-original depth again
-.UNINDENT
-.SS Code Block
-.sp
-Simple, indented code block
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-pip install sphinx
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Code block with triple backticks and language.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-def a(n: int) \-> None:
-    for i in range(n):
-        print(i)
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Triple\-tildes (\fB~~~\fP) are also available.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-def a(n: int) \-> None:
-    for i in range(n):
-        print(i)
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Here is reST style code block.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-if True:
-    print(\(aq\en\(aq)
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.SS Extensions
-.SS Table (Markdown\-Style)
-.sp
-(cell\-alignment is not supported currently)
-.TS
-center;
-|l|l|l|.
-_
-T{
-Table Header 1
-T}	T{
-Table Header 2
-T}	T{
-Table Header 3
-T}
-_
-T{
-normal
-T}	T{
-\fIitalic\fP
-T}	T{
-\fBbold\fP
-T}
-_
-T{
-\fBcode\fP
-T}	T{
-T}	T{
-T}
-_
-.TE
-.SS Math
-.sp
-This is E = mc^2 inline math.
-.sp
-The below is math\-block (markdown\-style).
-.sp
-.ce
-
-.ce 0
-.sp
-The below is reST\-style math\-block.
-.sp
-.ce
-
-.ce 0
-.SS Footnote
-.sp
-Footnote[2] and footnote[3] with markdown.
-.sp
-Footnote with reST[1]\&.
-.sp
-
-.IP [1] 5
-reST footnote
-.IP [2] 5
-footnote 1
-.IP [3] 5
-footnote key
-.SS Change Log
-.SS Version 0.2
-.sp
-(next version)
-.SS Version 0.1.5 (2016\-06\-21)
-.INDENT 0.0
-.IP \(bu 2
-Support multiple backticks in inline code, like: 
-.UNINDENT
-.SS Version 0.1.4 (2016\-06\-08)
-.INDENT 0.0
-.IP \(bu 2
-Support indented directives/reST\-comments
-.IP \(bu 2
-Support role\-name after backticks (\fB\(gatext\(ga:role: style\fP)
-.UNINDENT
-.SS Version 0.1.3 (2016\-06\-02)
-.INDENT 0.0
-.IP \(bu 2
-Remove extra escaped\-spaces (\(aq\(aq)
-.INDENT 2.0
-.IP \(bu 2
-before and after normal spaces
-.IP \(bu 2
-at the beginning of lines
-.IP \(bu 2
-before dots
-.UNINDENT
-.UNINDENT
-.SS Version 0.1.2 (2016\-06\-01)
-.INDENT 0.0
-.IP \(bu 2
-Add reST\(aqs \fB::\fP marker support
-.IP \(bu 2
-Add options to disable emphasis by underscore (\fB_\fP or \fB__\fP)
-.UNINDENT
-.SS Version 0.1.1 (2016\-05\-30)
-.INDENT 0.0
-.IP \(bu 2
-Fix Bug: when code or link is placed at the end of line, spaces to the next word is disappeared
-.UNINDENT
-.SS Version 0.1 (2016\-05\-30)
-.sp
-First public release.
-.INDENT 0.0
-.IP \(bu 2
-genindex
-.IP \(bu 2
-modindex
-.IP \(bu 2
-search
-.UNINDENT
-.SH AUTHOR
-Hiroyuki Takagi
-.SH COPYRIGHT
-2016, Hiroyuki Takagi
-.\" Generated by docutils manpage writer.
-.
diff --git a/dev-python/m2r/files/test.md b/dev-python/m2r/files/test.md
deleted file mode 100644
index e54ac950e527..000000000000
--- a/dev-python/m2r/files/test.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Title
-
-## SubTitle
-
-__content__
diff --git a/dev-python/m2r/files/test.rst b/dev-python/m2r/files/test.rst
deleted file mode 100644
index f45558879567..000000000000
--- a/dev-python/m2r/files/test.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Title
-=====
-
-SubTitle
---------
-
-**content**
diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
deleted file mode 100644
index cd8709ae16d6..000000000000
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Markdown to reStructuredText converter"
-HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r/"
-SRC_URI="https://github.com/miyakogi/m2r/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<dev-python/mistune-2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)
-	${RDEPEND}
-"
-
-PATCHES=(
-	# pulled from upstream git
-	"${FILESDIR}/m2r-0.2.1-upstream-fix.patch"
-	"${FILESDIR}/m2r-0.2.1-tests.patch"
-	# skip tests that need internet
-	"${FILESDIR}/m2r-0.2.1-tests-network.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# fix a Q/A violation, trying to install the tests as an independant package
-	sed -e "s/packages=\['tests'\],/packages=[],/" -i setup.py
-	# add missing test files
-	cp "${FILESDIR}/"test.md tests/ || die
-	cp "${FILESDIR}/"test.rst tests/ || die
-	cp "${FILESDIR}/"m2r.1 "${S}" || die
-
-	# in python 3.10, the text changed from "optional arguments" to "options".
-	# the test matches on the concrete string, make it match on the part that is shared
-	# by both versions
-	sed -e 's/optional arguments:/option/' -i tests/test_cli.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman m2r.1
-}
diff --git a/dev-python/mamba/Manifest b/dev-python/mamba/Manifest
index 29c431b5389b..4055ec9a0fba 100644
--- a/dev-python/mamba/Manifest
+++ b/dev-python/mamba/Manifest
@@ -1,3 +1,3 @@
 DIST mamba-0.11.2.tar.gz 37370 BLAKE2B 90228aa9668c5c79161aee79d92a9409e5df5d9d71b94f2ae8401ec5eea32ed45cf1b1a72eb596b6e24f140bf053bca4cec848830ae83c24b108ddb4a2bcd148 SHA512 8ca6207c9df7b3388db8ecabd13456e54d8811c24f695ccc638c90bb2c975268f9e803533808f9b099651ee4744376fad3b58eaa84a6c97605631368f979915c
-EBUILD mamba-0.11.2.ebuild 856 BLAKE2B c7214adfb14f1fedfe04889db43f32c84ac69a1b6177db004b173e6977008adefb6427adffaa33e61a4b72037e6c26b48e3d28c1b6abd6c8e11523c62731c685 SHA512 9f7d40724d80dab83bcb74a705c85d96ef8d0301f5c17a66ebdadbd51e8d128791738f7c7306c949f537c3aa36552d1c96d44cb235a5e50997ed428597db6041
+EBUILD mamba-0.11.2.ebuild 851 BLAKE2B cfa1c2a3e1e009ec6bf16f0b27f01c75e2e42e9dc83dc0dfecd538e1ced8af8802dab2ec570088a4ac2fc88431e87f88a52ad52121aba743fa7b1062e3e3cdb4 SHA512 6a41d6a2d2c995d60283cf01cd525b08744f8a7061c863e8ab9a7836986dd22782422fb93cf574c50540dcb9ad3539fa237c87771c458869490527365accc677
 MISC metadata.xml 300 BLAKE2B 890c49024db1a2ad04de3245e808924edce1e5007108c80523a1518318d92c5043945fb65324016853b583faff3a8cb03ab64a4d1aa421d3034ef54dd4f71a33 SHA512 0e1dc6cfd109165e1061f7156ddb366ec19a75e0bf5859970bb29eb3ed6dca659e9105975f27f086ce644bcf6342d7e53ef704545312c93f5de5af8fc45867e1
diff --git a/dev-python/mamba/mamba-0.11.2.ebuild b/dev-python/mamba/mamba-0.11.2.ebuild
index 890b56f6e002..07a9ac4016a6 100644
--- a/dev-python/mamba/mamba-0.11.2.ebuild
+++ b/dev-python/mamba/mamba-0.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python test runner born under the banner of Behavior Driven Development"
-HOMEPAGE="https://nestorsalceda.github.io/mamba"
+HOMEPAGE="https://nestorsalceda.com/mamba/"
 SRC_URI="https://github.com/nestorsalceda/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest
index 833bc685c9a3..c7eb8faeaa00 100644
--- a/dev-python/manuel/Manifest
+++ b/dev-python/manuel/Manifest
@@ -1,3 +1,5 @@
 DIST manuel-1.11.2.tar.gz 51846 BLAKE2B 0650c9db757a7e8bd0ba12dcdfda8ff071107d460fab7d24715796e477960ebe41375a10cd83a1c7881c76e6fa1e7cdd5cda383be75adffeea7e1cd6d763df13 SHA512 bbfd3ca58ccb0fb40ecbf54a5be0e73989e93ec026b8c686a7ef4e746c650ffed6f2fc5f119fe58e7c13a4a13cacb8c568384a69b1068413ab6bd6f01664a72f
+DIST manuel-1.12.4.tar.gz 45369 BLAKE2B e15f9261854fbad8ee1e1dc8645ec286a212c460a78fff1576b6886d8bf462ffe9a5484338fd9efc2bf053a7689e16b08de55f763ae319e66a363c5c28cf2a60 SHA512 cd65307f2ca94e66d88bc0c7c75702d49f505b358ebb812fd20906036ba10f2d1d11d2d69404b88c5f10b584dea05a988b5dc8ba07210b9d20ebd8a11b701633
 EBUILD manuel-1.11.2.ebuild 752 BLAKE2B 44a49f6ec888b5fe8ed11a5c566310f2fd3336e92453cf4422958a2e17b929221ede214bca9bbc7b931bd7a7fcc730c4e31abc21f1dda1faf91b317f0a016ec3 SHA512 3e47afbe1e22476e9119fa2e045c76630976feea3e4217922460602ed55ff42d645a7602c355ee520721eb73db45880d0eb02132abf3b704455f861b0c8d42ac
+EBUILD manuel-1.12.4.ebuild 755 BLAKE2B 4d9ae0e77ec12519e44d3c22392d6aeeda9650a14ddb581fb16b660b231fb214506c2cbf6d4bdd7e7b0807ddf45bc75fe6d47debf35ea898dfcaf8d7b1e57ca5 SHA512 9b6f63427b60d972fefbf0cba68d82e32a1275e05cc08556d5a6185b2b2749c280918a669639ac23af1ae6d08c9941b2091149fed95fd71df843e58df151ace2
 MISC metadata.xml 391 BLAKE2B 6b95f9d29d8df2b9f0cfd85012a7d751f443c3bc67f6254c376f8cd3c1c66e2972bc165edc8db6b5ef2851edf3e870cc2ca76d3f6f3c06daeb247ee349407f45 SHA512 ace493867fc08487876a55331b619a62b01e269d7b5307b2ae9e016d75ee9058f2e1354bd2e3243ef1b0cfff30cc3f8f661675e03c1ac07fb805f443b31c64ad
diff --git a/dev-python/manuel/manuel-1.12.4.ebuild b/dev-python/manuel/manuel-1.12.4.ebuild
new file mode 100644
index 000000000000..735e15d14dfe
--- /dev/null
+++ b/dev-python/manuel/manuel-1.12.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Lets you mix and match traditional doctests with custom test syntax"
+HOMEPAGE="
+	https://github.com/benji-york/manuel/
+	https://pypi.org/project/manuel/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	# unused rdep
+	sed -e "/'setuptools'/d" -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/markdown-it-py/Manifest b/dev-python/markdown-it-py/Manifest
index 31c54a845297..9e70ba01aa63 100644
--- a/dev-python/markdown-it-py/Manifest
+++ b/dev-python/markdown-it-py/Manifest
@@ -1,3 +1,3 @@
 DIST markdown-it-py-2.1.0.gh.tar.gz 265858 BLAKE2B 0d1bb789ed9a8d08b16c753f7ecc7cc6a6b1fd59fc39d303a0de15276a0a0f93dc8c8bc952de60450741f26770dd3955ae0e6aaa358bacf1003e5eb9124d3a54 SHA512 04e90538c8693f795aed2ed0a5bef4eaf0c12fac32cc0c2049c563e974b229940b9ceaea849ce86fa9804ccdd7be93145f3b6fc8d0774e96fafa0484368d0a88
-EBUILD markdown-it-py-2.1.0.ebuild 963 BLAKE2B fdb3e58c37eabf241a3731bc9bb65db782adfb05e4bfd70d88ddc4a4f76ed7a7647b6cb861b87c200b6655df5c33fe4e2c1d7919d90af1dece7d3e3959b31115 SHA512 2856c1b039a45bd4dfd16c63e75a1d9f0b09a5322e1f9addf2551dae328dff6806b1f3766bc66316e3fc18fa2ee091f43cdb895c657bce4093f27a67f8797670
+EBUILD markdown-it-py-2.1.0.ebuild 974 BLAKE2B 1f04950da848baf028195f185d8edc0b6a9208901c46048a8ba8d061789aa06471693007a1bfe2cb6d229a72fc7b4c522fa57506ae00fdcb73a4f39cbd2aac30 SHA512 fc4f27ac9c6e77a963e4db2bfffc9d46ea4a32f58463b73a7b87c9440f81a5e62b732b15d43ed1fd19ecc40011849222d65ded7ea91efd94312a8e255bd6561c
 MISC metadata.xml 412 BLAKE2B bffaf51dbd0a94b09d07650e49e9bee76015ab4358c36db207713d82387a1d729e7f6576d824b02ccfd786353762e623e3dd657fb3d7c42f8467c8165da61ed3 SHA512 88b86fad883100895db6feee193102cc93ead665e1283d02f9f57a4bb228acfc738cef11af2ba02cab9b02fdfe8ba35861347a19e5b0de22f546e8e0a297e173
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
index d87d24a6cf40..91f1413b7a38 100644
--- a/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
+++ b/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
@@ -3,13 +3,16 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Python port of markdown-it, Markdown parser"
-HOMEPAGE="https://pypi.org/project/markdown-it-py/
-	https://github.com/executablebooks/markdown-it-py"
+HOMEPAGE="
+	https://pypi.org/project/markdown-it-py/
+	https://github.com/executablebooks/markdown-it-py/
+"
 SRC_URI="
 	https://github.com/executablebooks/markdown-it-py/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
diff --git a/dev-python/mdit-py-plugins/Manifest b/dev-python/mdit-py-plugins/Manifest
index 2b7ede09e539..ccd2cfdf1a43 100644
--- a/dev-python/mdit-py-plugins/Manifest
+++ b/dev-python/mdit-py-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST mdit-py-plugins-0.3.0.gh.tar.gz 50654 BLAKE2B e84842e7cada1d9239f1d449c1a21ed654ab13017ea92f82190053b37371bc7e06d7afb65f6f56f7fa935666d24d05dca99628121bd4092a1143c289588ddfa4 SHA512 dd6aa738c6d93e45437326b1be52e0a9fc411aa3beacb61690919c272979c97ac1b38116b1ebb01c7d8fe724d4af9621c81ccd45131a690df8a2c0c325eef0e8
-EBUILD mdit-py-plugins-0.3.0.ebuild 720 BLAKE2B 838cdc7bfa6d39707ae0ead81eca2bc1f57c990d4a1019af803d3eb0225c64c05f6354af979ff0abd831c87e92afa2a4b0443331a517b7eefea3f0e11cfa372f SHA512 06f05c73ce61a1585dfb22ef0ee99a5dda683769cbb14c858e4ba9d5f1f903cb1a1039084261ce71015e26e4521404f9136993c9fc14e9bfd3e2b9117ee2bff8
+EBUILD mdit-py-plugins-0.3.0.ebuild 731 BLAKE2B 1650367f723e7c13deec9ed6d6a0ef34ee689d304a3e9dae1969f482662565ea9feb71c2fcdd7eaf1d0ac6fc71fde10088c7af9c5072cbe0d42b498c6734728f SHA512 74e0b635b52c2f0ec31aca0c2154866affd25a1b2dbbee5b9ae8ee87bb8724b45b21f185e05189e6ed4ff62bd62c11061514a3b23f5e269e9b786e2f43174eaa
 MISC metadata.xml 414 BLAKE2B b7b6cfc3dff5ca097543d0541b066c466669ea3d9193e10530e97f6992053bedb67badf78023b14893d779a1580eb3bb385d51affc5a0927d76f89ddeed1be24 SHA512 564918fba45aa79a7a05d532691fe15aaa61a0e16e6004d57875720a26fc13548d37793fbab83479d0fc8c70764b3f919430a9bd698c03c85bf9103b56355166
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
index d3bbb79c4893..7a658489c7a5 100644
--- a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
+++ b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
@@ -3,13 +3,16 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Collection of plugins for markdown-it-py"
-HOMEPAGE="https://pypi.org/project/mdit-py-plugins/
-	https://github.com/executablebooks/mdit-py-plugins"
+HOMEPAGE="
+	https://pypi.org/project/mdit-py-plugins/
+	https://github.com/executablebooks/mdit-py-plugins/
+"
 SRC_URI="
 	https://github.com/executablebooks/mdit-py-plugins/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
diff --git a/dev-python/mdurl/Manifest b/dev-python/mdurl/Manifest
index 4ca6687037a7..06ecd8aa39c2 100644
--- a/dev-python/mdurl/Manifest
+++ b/dev-python/mdurl/Manifest
@@ -1,3 +1,3 @@
 DIST mdurl-0.1.1.gh.tar.gz 15265 BLAKE2B 1a0126c674c69f43df08be248e88bc65529ea25703f6d43f1cd5917181b547b55541a4dae953a4e20e1f18bdc3eac17e54e6347d9e90fe2957c6935bee3edaf2 SHA512 ae7ee5672f59595d96fa3fd8b45154d3175881432dea60c72ef6dbd0b22124a20183539c83552bb9a8dfa1fc1c4ac3132201ce389a6678853c55c0224aa04622
-EBUILD mdurl-0.1.1.ebuild 529 BLAKE2B 97f8c8c6895d49ceff86c5e5064c9528a371e42d82cf48ad525ef0ef08dc215dfad8f4a6952c39b8735d2d2c9c8ae6c776a640e6cc0dfbd01ead705568faa1d1 SHA512 cfee4e468e2b43939c2fc9e1e49dbce4d96536fb00e038ffddd5fd67d4a23b5ace43a25457177d03af8451d4d944e3da8620fac08907aec91066bd5bcc99e4f4
+EBUILD mdurl-0.1.1.ebuild 535 BLAKE2B 7798b12faf4069e882c64b4dae5680832554751e98804753b9d19f0e9f1438b481f07e09e470e459d7a7dbade33721790370947d069197a92cdcd1291676e5b4 SHA512 25a24f7d7c3b0c6052c455c94339d6f6f691734a04afeeae05c4892ef4baf5756b433fe35b7387d1a1adbade08c80b766a80fa4d962bec526c2f9a94ed1a84fb
 MISC metadata.xml 394 BLAKE2B aa057d7c7bada96d6c55c84bc2e93265bba07098d21f7c2732ab0faaf7a3bb5e995387188bce5e573d1e14a73c89784ef4f7d85dd430eeedee0104689cff8baf SHA512 f2d4709202646808a878dded8372edaf0b9098ee86f157ad073a469c8adbae8a16497b9c4e18a8e76869cc0ef0dc0481779658078be7935d1a7fece921211dea
diff --git a/dev-python/mdurl/mdurl-0.1.1.ebuild b/dev-python/mdurl/mdurl-0.1.1.ebuild
index f72f764ba088..6389d45c94db 100644
--- a/dev-python/mdurl/mdurl-0.1.1.ebuild
+++ b/dev-python/mdurl/mdurl-0.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mdx_gh_links/Manifest b/dev-python/mdx_gh_links/Manifest
index a74dd5ccb6cc..e057c708a27b 100644
--- a/dev-python/mdx_gh_links/Manifest
+++ b/dev-python/mdx_gh_links/Manifest
@@ -1,4 +1,3 @@
 DIST mdx_gh_links-0.2.tar.gz 4961 BLAKE2B 02a391d3a0dde532cecbd4f025a7624a90aea698815ddb797cc4f74e2be80f5b55013b9cb3d358f92dcdb43fa9a160880c881ed3ac2a4f2c306f16dad06e1f3b SHA512 0a6be387e4b3d5f31601a365679733647f9669d61537ef3b630321d61f1d645f633098b92cf2fbd61faeb8469094bd89a5df8a561d15b8908645314ded4dd42a
-EBUILD mdx_gh_links-0.2-r1.ebuild 512 BLAKE2B 86e9bedba2778f9b12fa7c112906e2fd74ed1e710fbe143b0b61b37ed8b2a6ccd99c85d207f974b8882fdef365c488dd42bcc8c3d4fe7166582608cea80c0219 SHA512 472e7dfb3f4fcc9fa2a346d3219d2006cf7dcc4ba24fe2c532d1fdebe91e384f0b396d2c953fadb70ca8d3b36bc75fcb07ab629169238da986997ba2e328bd28
-EBUILD mdx_gh_links-0.2.ebuild 479 BLAKE2B ca339365cf16294d3c809ea8067d75ee201e8482a0002bb3caefbb367fd9203ac856e6fb9f3c943d5287187c714dfaf929d4b122fc63885bc7cb27c37010fe1e SHA512 259cb54733f2555b6121f5b6b05232a9665ae70de902bc7ee629d304c98a9b3d77cba2266500cc6ceed2556a07e9d46046f202334e37436cc26b30c460ca99a2
+EBUILD mdx_gh_links-0.2-r1.ebuild 510 BLAKE2B bfdc30f7d2cec5cffa912f1c8d2b959403192e1964f5c005ee51fdb949eb0573a26aaf5f8c167cd7dfcc29dfda78d941e96a87a1ddecfa61c3128338300ccd1f SHA512 2aaad6dbc060672ada382da070ad8d8bb7a7d7040cce970debd0b61f6f7341830b13bb5c06f0f9bd7fb8546acceb50deaae671dd0be5f5e5b84599d823e9539e
 MISC metadata.xml 358 BLAKE2B afd0d531616d5dccb789fbf6122ef55817334d1d038084c9717da41d65fc576f176063abc0cab5535bf6a2bf01e6fe89ea0ac7b376047fb535cd770a67c5cafe SHA512 7d7aa45569fdcf361df845792a9df05a7b5aa3460be70e0b26d1de5f5039e5abac0fe149ba2f7e1dae4cd794866521bff7076e4aaf15766e06d97a52a7ef33e5
diff --git a/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild b/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild
index 804f0cb29cea..b64e20480cfe 100644
--- a/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild
+++ b/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/markdown[${PYTHON_USEDEP}]
diff --git a/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild b/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
deleted file mode 100644
index a53a419b7794..000000000000
--- a/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An extension which adds links to GitHub users, repositories, issues and commits"
-HOMEPAGE="https://github.com/Python-Markdown/github-links"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	dev-python/markdown[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index 0e35af8e4c1a..bd630373f75a 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -3,5 +3,5 @@ AUX meson-python-0.5.0-pyproject-metadata.patch 4094 BLAKE2B fa9a654d90fd8e7cc9a
 DIST meson-python-0.5.0.gh.tar.gz 30525 BLAKE2B f9afcb0edfdb06ce001b5185bf8c09de18a35d0f2d12f8fd69ed35cf17cc5e987c73724403fe1d6c44c80f1fad41b4b66b07b26e050b551673b3860a3d453a29 SHA512 e3941d258c5d16d0355752aff2f6458705a6af7d83850f679c5304d61699c393e186b9da2fe1a6405cb616a319250351e02ad81ddc8abf042f64c6b42b0be1cf
 DIST meson-python-0.6.0.gh.tar.gz 26783 BLAKE2B d5c5b95d5d609487a0efee1ce05b133794705cdb16f2d05d6e08b9201541e31f61a832c7770b4b5ad675f8dd91860c30c67769ce8fc0af2c48e65b0aad187ddb SHA512 25042ea030d2ad323c67daa0a520db936a4a4efa0de1c9f631c47fac22d797e01d1f1707ed407e2931164a35b3916e19a774ee16ab1d45fc91e41c75add57fa1
 EBUILD meson-python-0.5.0-r1.ebuild 981 BLAKE2B 2b8f82ed85cd4e9e08221596cf0d74e8177d42d6184338461cf2c15aa77060aa16f0082935b78a2ec1dbc37bf765d4b394c05fe9e3967b3004283789e8e255e7 SHA512 35d06bb9f0f3facaa3294010978efb5db56c374ed5a7d5f25f60ce334e2c7d96bd94eb3fdc76fbd44b27c6b19f141f3c4d592d661b89a7fa2e4483ec876ec2c7
-EBUILD meson-python-0.6.0.ebuild 1049 BLAKE2B c0c9831477c0206e47cfe9aa29c46d3be9039e6c8bcbdd68b0f6f3e4dd61fa8bb97af7b5460762b9274da549e29c830ffd5d834c09b7b0105d00509101a54a41 SHA512 a088810f71470740ed9d34266f9cc5eada37b08ee05c57e4a4d9a1046a349e2c2ffe6cd61639304dce711b81c9348e57411d74f50bb526c325e0121bb1fac2dd
+EBUILD meson-python-0.6.0-r1.ebuild 1048 BLAKE2B 2c6fa715c72007b7ef19ecc532cc740387da9d05241fc7acd14b094b65086eb863b64470da496c938d945ebc6359f1123cc68ca52a064ca91c01e617ef3740aa SHA512 6c1d80399018626a7bc4b68f6a5dac46a8a5e8f8119603938da653d4793aa1856c62e3089d0960022b1784fd66079f680575486f5e6f8d4bfcfb180d66926764
 MISC metadata.xml 352 BLAKE2B 581fd656bf2da3af0cb7a9f50ef99effc9c2fc54c5012a363a3aaf4cb5cb1715c8626aed86ea176ebbbc22ece33e8b0f76d5c818b4533f99b3bac5b92f75fff1 SHA512 7e57debaea115565ade7e8ab87af065c4580506225df1a203c92fea877a9b918ebfce6fd172412bf318be07a8a4548be492318e5626b31688ed2714f00594d54
diff --git a/dev-python/meson-python/meson-python-0.6.0.ebuild b/dev-python/meson-python/meson-python-0.6.0-r1.ebuild
similarity index 98%
rename from dev-python/meson-python/meson-python-0.6.0.ebuild
rename to dev-python/meson-python/meson-python-0.6.0-r1.ebuild
index c11826509066..9ff05d7701f0 100644
--- a/dev-python/meson-python/meson-python-0.6.0.ebuild
+++ b/dev-python/meson-python/meson-python-0.6.0-r1.ebuild
@@ -26,12 +26,12 @@ RDEPEND="
 	>=dev-python/pyproject-metadata-0.5.0[${PYTHON_USEDEP}]
 	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
 	>=dev-util/meson-0.60.0[${PYTHON_USEDEP}]
+	dev-util/patchelf
 "
 BDEPEND="
 	test? (
 		dev-python/GitPython[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-util/patchelf
 	)
 "
 
diff --git a/dev-python/minimock/Manifest b/dev-python/minimock/Manifest
index 54f75ef3b48f..bdaa13093343 100644
--- a/dev-python/minimock/Manifest
+++ b/dev-python/minimock/Manifest
@@ -1,3 +1,5 @@
+DIST minimock-1.3.0.gh.tar.gz 13828 BLAKE2B ed60d9725ada7173f88cdd64d76e3674fbeff352f4ead919f2a3a94ec871189051da29da5ee285b4d663eee143da847c95e35286cf33a587abb7fe95e02a4824 SHA512 de7feef7fee044ba45a52d7c83905d082ad2ed2c3d12b294a6995086b377a22317730326946d048b19063758f158a9bee7bbb6a79c9ae0b4ba7a93e4a21ea196
 DIST minimock-1.3.0.tar.gz 13828 BLAKE2B ed60d9725ada7173f88cdd64d76e3674fbeff352f4ead919f2a3a94ec871189051da29da5ee285b4d663eee143da847c95e35286cf33a587abb7fe95e02a4824 SHA512 de7feef7fee044ba45a52d7c83905d082ad2ed2c3d12b294a6995086b377a22317730326946d048b19063758f158a9bee7bbb6a79c9ae0b4ba7a93e4a21ea196
+EBUILD minimock-1.3.0-r1.ebuild 623 BLAKE2B 51e4314a1dc20b16a4e1aa4ea314b097112f02b78424ad8387063649ccd2190c4c7efa480cb53532cf486e0eae77cf938c9f3516d6938ea4ec2b8cfbed6e953c SHA512 a3769955bec456eacdaa521ae5bd1b83c34e6a58ddf1039321efb66cf7b0882ae78ece94dacdefd47f28c2f9cb66e9b0bf85a778aa5fe1e811b844d406c92287
 EBUILD minimock-1.3.0.ebuild 558 BLAKE2B 7916e6d42927acd97a9bd488f22a5dd320651819638808b59acd7f19edecff6c80a7cf90edb78cc67bf850c4ba06ed281c234008d818a15f163dfd58a882e3ea SHA512 755ecccabea68142268eb5ad43ba1e42f29ee0ba92524e2be33f23ac63a15797b603354ddce7d12f1b581f5188f9b3b3fe94ef948599a75eb3bfdf76eb6b6e83
 MISC metadata.xml 390 BLAKE2B 9e75c471275dd555065f040f21dc122c7517752b5e8c1944b6c9b70959786f701f9a6e73cb38d2a6707307b5293ddd82da1f84a5407566f516a6a744fa9caf63 SHA512 3506164492e1dd9b17e387f3bc2e57d8663cc899b0dd40bca73e8b4bdd9c62d845465d7fe91ffb5d22711e08a66da984f97d7d56374ef39cdf3cc62354dd2ffe
diff --git a/dev-python/minimock/minimock-1.3.0-r1.ebuild b/dev-python/minimock/minimock-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..ff4cbf3dee73
--- /dev/null
+++ b/dev-python/minimock/minimock-1.3.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P="MiniMock-${PV}"
+DESCRIPTION="The simplest possible mock library"
+HOMEPAGE="
+	https://github.com/lowks/minimock/
+	https://pypi.org/project/MiniMock/
+"
+SRC_URI="
+	https://github.com/lowks/minimock/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+DOCS=( CHANGELOG.txt README.rst )
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest --doctest-modules
+}
diff --git a/dev-python/mkdocs-bootstrap/Manifest b/dev-python/mkdocs-bootstrap/Manifest
index 526954d441ed..5c43d0e900ac 100644
--- a/dev-python/mkdocs-bootstrap/Manifest
+++ b/dev-python/mkdocs-bootstrap/Manifest
@@ -1,4 +1,3 @@
 DIST mkdocs-bootstrap-1.1.tar.gz 233231 BLAKE2B 64470a4e5ca6d44976944c16244daaefa99702fa68d68fb14e31201fcfd5f927dc2b962fd0b1967a6fd7eec8719389a78dd13cbfcdc387fa6de5f21c9c1a4960 SHA512 a494afa614f96771fbc640862b5cb5674d4eb5c978a56e86e2f523137fed315808067f20cfadca463cbeb5384de062c91001b6eaf5f3ebdce329f167b461d2b5
-EBUILD mkdocs-bootstrap-1.1-r1.ebuild 468 BLAKE2B 60d5dc716d6f919adb1d899b319462655ab8b11b1f226da2f725d60fb7de66d2fa87de877f35943f26f9b81ea7fa2bee4ca5dd04c766dca341b476bcebc778dd SHA512 2a213df10aa9cbfa4a4cfb6ddad1c1ac907a322682197f9cb49013c73f69f21103aef7809f3c6406babe9eebe5eee8c2ac73857be66307fa5fe8910acb24460a
-EBUILD mkdocs-bootstrap-1.1-r2.ebuild 501 BLAKE2B 344392b2a994570980893c075dec6fe16dbd1a6834553cb1fd3bbd8b145bf1eb8b0e7727ad700826b6faa4fc07c67220021f067ad5d0a204dac859bd59fe4a5d SHA512 c4b79dbad061c48baf7b0ae1c52abb10ff76a4cfb95f22bdcf213c4f0b9c031e2e1cba98cc77054a570f87cf0dd618d16827bf0dcfd5ca1a500134db42e387f2
+EBUILD mkdocs-bootstrap-1.1-r2.ebuild 499 BLAKE2B 88d01fb0376e2d475981639ca581b6afd283d5088e8acac00e59b0b3523d863dcb082c5fbfb31ce9030783695b8d80d9940ccdb9573d70be134be47bbbc1cb01 SHA512 823de587b3544daaaab017d9d3c84029b3d59cb979f3530049b86a294599b32b03df2db2480192952cbf6f8f6f3104ea283e79fb3e2f70af41674a9bcc880f6a
 MISC metadata.xml 449 BLAKE2B 991a60ba78b90e5b405993269c325a7724fe2c8977836ad2fb15e5c4b429236e7e03be4f6f91dc81a954403036e39cb30ea419a1a79589b1b33e63b3220630ea SHA512 ce0378db70f5c4d524ae77bdc4b40c99ede5741c49d59669d63ad026ad85dfc57e11880fd9476021f2d1d080ff8e4540a07bfb2f50fe34afecfaa77bec78a1b7
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
deleted file mode 100644
index 417d22e6ad23..000000000000
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Bootstrap theme for MkDocs"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootstrap"
-SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild
index 14ceaecbdf92..1bcbb3dc774b 100644
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild
@@ -15,6 +15,6 @@ SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-bootswatch/Manifest b/dev-python/mkdocs-bootswatch/Manifest
index e636b825818b..290a8d253b10 100644
--- a/dev-python/mkdocs-bootswatch/Manifest
+++ b/dev-python/mkdocs-bootswatch/Manifest
@@ -1,4 +1,3 @@
 DIST mkdocs-bootswatch-1.1.tar.gz 1514738 BLAKE2B 0ee80c7816a1a8d6c8e09494f3e07d94cfa8fd1fe8d4dfdd44c55974edf9811be20c22a6aa0424b07f21ca89764e1c15617cc43aaa1a6503365b237905f010e6 SHA512 1a3305434a11aa5dbb79b6a9e7162ddb458f987f44f2e48bcf74776e6ef33d172b2f38e6b46c288401af344386f62d9c814d015be70d38f66b7635ff87bdbdb3
-EBUILD mkdocs-bootswatch-1.1-r1.ebuild 471 BLAKE2B 2aa2d4716aab9fa72295e6296f297b79632a0ee75f9a7550802e5fc550c08a6e453926f62c1bab715ea20b813b0d5689a54d63941cd1509435a837f1f0b9e5a5 SHA512 4dad4556c4672b33ed97d51912269a4e7154cbebd92af457bb45d9ff3126f6be4a0688da1851540747af285f5548fcbcb0a4efa6c70df0253896bf5581ae216c
-EBUILD mkdocs-bootswatch-1.1-r2.ebuild 504 BLAKE2B a05bfcef1b2590105a146f16930da079107adbada86f41f758795ffafc30ccc9951c0e45d800e98f23dc7ff245e045921af1857a49ce11549c33e473f14c36dc SHA512 4cab7b978e8ac4ef399a4fc00747bbce1bc8ba88419b70b68f591c8e8a44d92848ebf6acd96043d69acff33cca0b01c688413a8c5fcbc30ffaa33654f5a95cf7
+EBUILD mkdocs-bootswatch-1.1-r2.ebuild 502 BLAKE2B 849be6572aff6dcd26eb11fe1d7722ce06632eb23c898165f83be219347a8aec8e93e0109f42dca8e53d5d6e52fcb54d039a650427653d99b0481cd1fdf122a7 SHA512 9ec10c6d7b1abb7767431f3fc03cd6acd36292eb53ab33bd15f2877463d818ff06c357c23ebf0000a9b645a107b1572dfa46be2706cc2f0a7d92cf6f7f4bc2fe
 MISC metadata.xml 451 BLAKE2B 6604531dcf8e275e499aec87bcb7ec7de57ea73912e4178b40d342a4958832952f8f2c5ad5c3b45fc2aa71f9afbdfac0fa997c8fd2a49adec7a20937781617d6 SHA512 2edffa466941d9b6c5cf6572d785e829bb41dabc6d55ade2cc4752cee2ef4fb232a1731d81e173b40c89453a04cfd061b59d6a9bf99a9e21296bbf89a1628fba
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
deleted file mode 100644
index 23d161cb9901..000000000000
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Bootswatch themes for MkDocs"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootswatch"
-SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild
index 85569d8bdb3e..8976a0763c55 100644
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild
@@ -15,6 +15,6 @@ SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-git-authors-plugin/Manifest b/dev-python/mkdocs-git-authors-plugin/Manifest
index 069577c89414..56f48f83e0e1 100644
--- a/dev-python/mkdocs-git-authors-plugin/Manifest
+++ b/dev-python/mkdocs-git-authors-plugin/Manifest
@@ -1,7 +1,5 @@
-DIST mkdocs-git-authors-plugin-0.6.2.tar.gz 27623 BLAKE2B 7b0dd3b865b067b63e467fa75018a92cea8cfeabdeb66791664ea143ebecbb072110698f1366f917f390dd29c33794c7d2cc03e03bb84f8913b572d667e77b9d SHA512 75e4a4e6f3ca443257b5f61f5f0d9784cb4bb28a5a03412cde5c226da697117a29c2f4a3d1cac2aa362421f244fd56ea8580a923414a8e096bedc4502afcb5b0
 DIST mkdocs-git-authors-plugin-0.6.3.tar.gz 27644 BLAKE2B a8778baeb504db5d0571aa20603e8d60e04d8c315c096b5b3f89bb6a3b433a11b04a510d7f80ae86a9bb54259c6a2b0f2e1cb5cdade4220d4dfa1f06612e4aea SHA512 ab1f6984da002b72af2a53131222a3ff7b6b50a7a57f5d1986bca9e7d34365eaa5bfdf7d920e4dbc555e332587607480eef4134d847faf866a3b4750db3747eb
 DIST mkdocs-git-authors-plugin-0.6.4.tar.gz 27799 BLAKE2B 02456df969fac72fc29906ed6faa34ead8d04dcd005fdc39bf72393e5252934c398995cb07133107af99672328d03b96e9a19625a7a83ee438278cf4f8587f50 SHA512 948b59bed123acc4b02a01248b831ac27fd98a24653fbae315424a1da33573d109667ff8b836be454e7c9b56a6f68f45200effe8649fd4fe6d5551d1b93a6cd5
-EBUILD mkdocs-git-authors-plugin-0.6.2.ebuild 1235 BLAKE2B 5c8422d30f2b4e0d2a89ea8cef665b718ffc69fff1c40547efab146b9869a6c933df00b9791f3c7e8e2c03e39e85593ff73cca13a047c3a92fba7450851503b8 SHA512 3c19312212180a4074d5ff8a20ac80525caaad6300f903db1ae02f79d8ec9f24fc60ce0c2d91fbdd9c1c608a52e98090ee8bbe67756602d046c585d19d72eb76
 EBUILD mkdocs-git-authors-plugin-0.6.3.ebuild 1233 BLAKE2B 89fe7ee0e50bdd73b247adf81943b4c48271d48ca24c5e0bb911f4b4d6980bd1c3f866fae432773b18ce4f253d9202cf8a0f0e618d7234f41f2e36e10ff95c6a SHA512 e3d7b905f6929aecabd899a369ff62f4ba0646b499e43aa26573b104222d7b4d7c6c6e1b098c8379c677ee47a8df221d7248dfee22050c4d104e542114dcd380
 EBUILD mkdocs-git-authors-plugin-0.6.4.ebuild 1259 BLAKE2B 0068f2359374ce6f4540c8534e528ed60809165e8df55d26c5c5578b6b2c6f87cfc7684b2bbdb48498c198b62e9632c663eb5ad33b223554c9e382b340d1b9d2 SHA512 be9b53722fce8f2569ee7741dbc2d4e8520a45baa6b5f559e01f183e071910e1fe483ecb1dca7e2660b679369c65080ab7e7522077dfe6e15f14b1ae1b733469
 MISC metadata.xml 564 BLAKE2B cee03d6742cb66a51c92f8999483f6c04c2b3fc7e8b88f5882bbabc577a54e922bdccf8a1a467e601c43511a372ac90ff8aa4500bd95715cffa83214ee2e64e9 SHA512 2b5539fff2990ebd293715b659e7b9bdeb63117c35933f49a21b873b45188476d3d44f6ac5b1656ee598f028e80f648b91b36ef4dae3f900705dbe2a7355356e
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.2.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.2.ebuild
deleted file mode 100644
index 5e3f4cc0b40d..000000000000
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="dev-python/mkdocs-material"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Mkdocs plugin to display git authors of a page"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-authors-plugin/
-	https://pypi.org/project/mkdocs-git-authors-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-python/mkdocs-git-revision-date-localized-plugin[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-	doc? ( dev-vcs/git )
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# mkdocs-git-authors tests need git repo
-	if use test || use doc; then
-		git init -q || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -qm 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 7ec37d791af7..cfa3feb908f9 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,15 +1,13 @@
-DIST mkdocs-material-8.2.15.gh.tar.gz 8337955 BLAKE2B 542871c9be9c67c83a0b62d3bb61c10628bf0fb4bd380b75e8263d566ff3cedb97e208993f3e8141d4a641f3afbf6d0db7b1962d407ab6162bfdb87065406db9 SHA512 fdc57e173678a7910d48fad94779864bbf65ce817700ca325eec9121c18f7cf2bf8e29ca64bc6f9a62f5bcd60a15cbe815edd320d2771f1a8d247099ed5d5ce3
 DIST mkdocs-material-8.2.16.gh.tar.gz 8358163 BLAKE2B f3102be342d697e462c798fe8227febd7f3ec99fcd9791dde96103ec39f9ec86c68c8682170b48e1bf56e03d4be45fa6cd372b1b4391ef4ecbd1bef2866d3e90 SHA512 4ebc03e2b9954e3d64c1837b20df7c85d610ffa63303ba07e5f42ae680777fd577b1aa4744732352da6bfab4f70e2ca17afeb092d3a494f3e0a7c5f7b2149fb7
-DIST mkdocs-material-8.2.8.gh.tar.gz 8304608 BLAKE2B ff44912e812a32c7bc99fb7a07178864a952ecfbe953fe8e4d06188e2cf79f87276a881aeba1b2e5b5c290b4e12afa72761b35988290b7039163c643ec51c154 SHA512 fd2308f78c2dfff81d917f958903fee44fdd214a209464c4279d399812a686a26084e40367b0809889f682adfe5d1fe3b4707dc206621f3aa216be59e13d5d0a
 DIST mkdocs-material-8.3.3.gh.tar.gz 8283580 BLAKE2B aa6dc9e07b0a7fcb6fd598f4bef37a2c3b00ee4260bf6b2fe088dfc9e8c1468f8ec50767d41ddebad0c32a193669e560bbeb835684e5c8451d5985637038a1f9 SHA512 ed3bf417b8c9f2da9f198fd7079ffca3c1bf9f6f455c1c03fb4b3b566ffdc95be6b39d4f47590eca74610b2a0efb34dacf50ad2c2c4f9cca4e18079d584a7128
 DIST mkdocs-material-8.3.4.gh.tar.gz 8311720 BLAKE2B df2b01fa36b49e33be95d67935b24361f1d87394f118b51c51e4b822b8975dc41530d3e1cb87c7ebeb21dafb6494664730cdf96608af5dd5b83fc8715971dd92 SHA512 453e866c1dac643c9347573b3412642a1eadbb5e1087170bcd8ada57506d53d59bc52072ab8a6ac034feabacd09a47f3d32b5f7f3b0535e98d7ab3bf29733af0
 DIST mkdocs-material-8.3.6.gh.tar.gz 8312956 BLAKE2B c4a6603a23adb882c404356234b10f9a41159424534f1eed4d407381ae8bad0c50adc2d92670e33a52e0e946fdcf0a5a02ae74b25e6ef7439cdb57f178eab313 SHA512 94ec949c133d09b166326490ee8da4c539ded266aeabdd46970596df7da5607dc06866e618cdbe1694a8e1cd1ba0202a3fbb9da90cc5862f4324551c3a4e4154
 DIST mkdocs-material-8.3.7.gh.tar.gz 8202111 BLAKE2B 1a30a3d4de788adb3b0129458d9c3ad14f16f40c8109f8b31cf15cb285cd5ad58e8eea529a8bc74ba8ef9342589ae2e22a561e01e1d0940ac77e673232557caf SHA512 766bb25d4f6a0332bd7ebb473b846b45a006e44335cf0b5b57024ef1f77f5ca173ad3fea5041ce9bfb777d2da2249907f3c4b921d41686fe430ed43c158e8780
-EBUILD mkdocs-material-8.2.15.ebuild 1046 BLAKE2B a1354ffb639fa1d967358867a01440e15f966ad4884c761e48ba14eb08a874ba1ec3bf1df1eeb1d214d16aae5b089cfc5254dbb4817b32a34b432d03a2eeebe8 SHA512 e3d4630057818c974fee925e51e8f38bc39cf5d86aa989158f97d024ac4e0c0cd4daeaa57242edf20429d9a6bea02a0019fcfa68b60c36d85f461c781fe3a54a
-EBUILD mkdocs-material-8.2.16.ebuild 1046 BLAKE2B a1354ffb639fa1d967358867a01440e15f966ad4884c761e48ba14eb08a874ba1ec3bf1df1eeb1d214d16aae5b089cfc5254dbb4817b32a34b432d03a2eeebe8 SHA512 e3d4630057818c974fee925e51e8f38bc39cf5d86aa989158f97d024ac4e0c0cd4daeaa57242edf20429d9a6bea02a0019fcfa68b60c36d85f461c781fe3a54a
-EBUILD mkdocs-material-8.2.8.ebuild 1044 BLAKE2B 62e53b29887db5f6862f2cd991a512af4359eb5453ff56096d21f1bf1e0b68e76dd4de0baff612f7eeabf5abbc74929629f2e151b21e02d896ba2e401efd6c9b SHA512 cf145810cbf84c10611b75e989f7ecf7ce7334bece51dcdaf119c61b6f2b6f4398f3a8d7ef3954e21595de2b7975b522b616791a0732a2b8a6d0d989e7c4940d
+DIST mkdocs-material-8.3.8.gh.tar.gz 8318363 BLAKE2B 5b97026e96e28058e7d7081db9da92bc4457e8e7e022e4201c558c1193c5ff293f85ec576cb46db40de24c301f73a614217062a6bee2835fedab71c362e89a96 SHA512 216ae887463e67251285b788ff298db504ce65043337707a2f54dc3ce31f3461c90126a86c506c709592b3e3876934685a97e68a9c58ac0a4b6be480bb3b65b8
+EBUILD mkdocs-material-8.2.16.ebuild 1044 BLAKE2B bae6282cd8a771c6c6d9f11205442841ba82f970b1a0ce8490902931670a45fa0ff1b8ba08d2d4c9b819ab43a668b9acbbc4f84aa7c35f854519cd609b2472f8 SHA512 7aaf4b2f7e3f75e579300424d9d8c2418c96a96ca61c085b53ae15f152abbe142dbf13924b24d36eddf1321f6de1dc6d3d5a018e19612b2245cd860eb03818c6
 EBUILD mkdocs-material-8.3.3.ebuild 1046 BLAKE2B a1354ffb639fa1d967358867a01440e15f966ad4884c761e48ba14eb08a874ba1ec3bf1df1eeb1d214d16aae5b089cfc5254dbb4817b32a34b432d03a2eeebe8 SHA512 e3d4630057818c974fee925e51e8f38bc39cf5d86aa989158f97d024ac4e0c0cd4daeaa57242edf20429d9a6bea02a0019fcfa68b60c36d85f461c781fe3a54a
 EBUILD mkdocs-material-8.3.4.ebuild 1046 BLAKE2B a1354ffb639fa1d967358867a01440e15f966ad4884c761e48ba14eb08a874ba1ec3bf1df1eeb1d214d16aae5b089cfc5254dbb4817b32a34b432d03a2eeebe8 SHA512 e3d4630057818c974fee925e51e8f38bc39cf5d86aa989158f97d024ac4e0c0cd4daeaa57242edf20429d9a6bea02a0019fcfa68b60c36d85f461c781fe3a54a
 EBUILD mkdocs-material-8.3.6.ebuild 1046 BLAKE2B a1354ffb639fa1d967358867a01440e15f966ad4884c761e48ba14eb08a874ba1ec3bf1df1eeb1d214d16aae5b089cfc5254dbb4817b32a34b432d03a2eeebe8 SHA512 e3d4630057818c974fee925e51e8f38bc39cf5d86aa989158f97d024ac4e0c0cd4daeaa57242edf20429d9a6bea02a0019fcfa68b60c36d85f461c781fe3a54a
 EBUILD mkdocs-material-8.3.7.ebuild 1046 BLAKE2B a1354ffb639fa1d967358867a01440e15f966ad4884c761e48ba14eb08a874ba1ec3bf1df1eeb1d214d16aae5b089cfc5254dbb4817b32a34b432d03a2eeebe8 SHA512 e3d4630057818c974fee925e51e8f38bc39cf5d86aa989158f97d024ac4e0c0cd4daeaa57242edf20429d9a6bea02a0019fcfa68b60c36d85f461c781fe3a54a
+EBUILD mkdocs-material-8.3.8.ebuild 1046 BLAKE2B a1354ffb639fa1d967358867a01440e15f966ad4884c761e48ba14eb08a874ba1ec3bf1df1eeb1d214d16aae5b089cfc5254dbb4817b32a34b432d03a2eeebe8 SHA512 e3d4630057818c974fee925e51e8f38bc39cf5d86aa989158f97d024ac4e0c0cd4daeaa57242edf20429d9a6bea02a0019fcfa68b60c36d85f461c781fe3a54a
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.16.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.16.ebuild
index 71839dd0e93b..65c7c88b4dd1 100644
--- a/dev-python/mkdocs-material/mkdocs-material-8.2.16.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-8.2.16.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.8.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.8.ebuild
deleted file mode 100644
index 7cb07d3578a8..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-8.2.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
-"
-
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.15.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.3.8.ebuild
similarity index 100%
rename from dev-python/mkdocs-material/mkdocs-material-8.2.15.ebuild
rename to dev-python/mkdocs-material/mkdocs-material-8.3.8.ebuild
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index 07263b934c6a..f6612f8dc228 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -1,5 +1,3 @@
 DIST mkdocs-minify-plugin-0.5.0.tar.gz 3387 BLAKE2B bce05582eab831976b430d5c331c0e51cecf790f4db6f3bd089ff6f0f5421c0b824c9bf6637a6b00555eee203b23cbd5fc3a0e81fcb5a8697ab7c06e94a9d2e0 SHA512 a31770c9de39439ba5eb4e35acd088aa7df2d7fa39f7942819c0b25429abb7b2b0626765f26f4d4fc77fd11e48dfdf90f9eb93e999cf7b641bb630c852eec50a
-EBUILD mkdocs-minify-plugin-0.5.0-r1.ebuild 678 BLAKE2B fd79b3e8ade11bb28094095654d382a9100ae35caa30fc045abeeb093a8f0ef4e23645e67ba1d8d66a8fc22f167f523f32fe99927ba048a28a2727defed36728 SHA512 5f0f373b01bae7f3e41324b2674a239d253266dd17704657d1bde049158c25063c7dd47d4787177ee38026029fbb0461b68203035b5ddc8bf840bf88d666b7ec
-EBUILD mkdocs-minify-plugin-0.5.0-r2.ebuild 711 BLAKE2B 6b7847cd307cda108e60ca7671d836b38a191860f5fcd0c797f6c259fff07e52cc4ea441c0c83502531e459137aa01b23761a891a9403ddb5b29d8814c8ce9c1 SHA512 d479062fe21e462f9e40676754adb0ed1f893e28545bebd078f975e86fef8c9568fa02db8d3e6bffcbff2f478e1583c54831016edf6ddf86e4966c6f1a1d7dff
-EBUILD mkdocs-minify-plugin-0.5.0.ebuild 626 BLAKE2B c90a113faaa46b981c15434d254abd513ffda1a3a7409de9de339ec9d793827f51baa1a6626c42267b3e5e78572870f31acd55d18f702249a3361a2fff3de627 SHA512 d5c05d9804e84241f707e2ce47091e684e95316e07799ca0ce1984406330a6f07029bb1abb556112f923b3d591ee27a21383f746306024568d9fd60427d91548
+EBUILD mkdocs-minify-plugin-0.5.0-r2.ebuild 709 BLAKE2B 0fe20ea91a73c81c4a6fc218fc04fe1306bc56d640e5d238638aa2b84ed5605d31db6f100b808f61d8acb37bf31839f3b7f3997c8228d5e8df94f97bcf138cca SHA512 6f39651d52c31858271aeb4478c201ac6fa16a4de6ea78170fb83b23cffcb606c06571bb3e34abe5a265dbf7b42b36ab5699476e22062be93ab9ba3d28c00989
 MISC metadata.xml 437 BLAKE2B 0b089b896a3b9458b03573a6f2870ee98c194a76969cb730508582aaae75cd5ae3fc46739ba12850a2388cf588aa68c6a45e31a59a8f1894e7eb02fe78d74992 SHA512 f238ac7d118776d582d880a4355d0786dc5d9b3f82e9139d5668fa9be009eeb7228a0bc0b2d5254e76b167ec30457241b808917a910b8d2037c781e46a871946
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r1.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r1.ebuild
deleted file mode 100644
index 55540167844a..000000000000
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
-HOMEPAGE="
-	https://github.com/byrnereese/mkdocs-minify-plugin
-	https://pypi.org/project/mkdocs-minify-plugin/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
-	>=app-text/htmlmin-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/jsmin-2.2.2[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild
index 7d2e5d4f0dd6..a0d8ee6df7a4 100644
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild
deleted file mode 100644
index cdd329da5633..000000000000
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
-HOMEPAGE="
-	https://github.com/byrnereese/mkdocs-minify-plugin
-	https://pypi.org/project/mkdocs-minify-plugin/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
-	>=app-text/htmlmin-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/jsmin-2.2.2[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index db2eae442a3c..1bf6fb6ac044 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,4 +1,3 @@
 DIST mkdocs-1.3.0.tar.gz 4085674 BLAKE2B e34605c2d1122ff86ed5cfb6134cdda67450e8f32d7628626ff4ac8c36c45b127312ad693efe35237b714adb9efd244f12f90cf8ecacf6009b75786db30ebb1b SHA512 d33d728eaff4e39106c1187cf04f579706ce28af364852c67706ab85f6b9ccdcd26ae84cd4d5ea7572e52fde1d1137eb3e424679dd4c8ef043c9637aac062270
-EBUILD mkdocs-1.3.0-r1.ebuild 2290 BLAKE2B c9f346965b74027dc34a3a884811b5bac08d8c8f9f46b3f8e5508936064c45e83c5ef0ef047b4790d30fa177903d01004248ffd19ec980c8caef295027b2c427 SHA512 fdc311994b3ef5e0a84e95ac9529f48b253bfff69fe0281c79ddb3fe7f290602d13e7f24cb9cddd95f40a79ce3f0d9e1afeca5ecf84b652be6c5a783f7fabada
-EBUILD mkdocs-1.3.0.ebuild 2243 BLAKE2B 46ea225d6b41d485e2bce065e084fe951e31ea52639dbb2ea1488142cd677524f64ba4aa31d9a24121cc22f6ec4fa335389cdba40b62229fff749f6d5bdeef84 SHA512 f9e684ecb8377e2271c316ba9c7db28d19ccf96e5fd6b91e58ba2ffbc0a2e652f719e745847bd231c3775d18678ddac0aa34493d2e6c23f1e755cec3c5d3c57b
+EBUILD mkdocs-1.3.0-r1.ebuild 2288 BLAKE2B 8a7422e0e7ee24f4af1a3a789cbb07c6d69b396d568d803efe932098af4bd74315e5701b1c8347d60fa050362bd580509f3c21d6861c735ca31b87c281de382f SHA512 82903c70c5aba1a350deebde695dbe48a2e8bbd3eeb12cb53ca30508edb412e899e34d07e82b1d38fe898384a009b3a7eb0ee963d5b4b6435b0768c4a082aa2a
 MISC metadata.xml 405 BLAKE2B de9dd789fea13afc3622c6961674d046806db1025e9d0475c0ff8bfe1c6d91a741b6112ccaafb46cb19b9dac971c50095ac89b13353c7c0e1571961a19a90387 SHA512 7a19785dbacb67aa5679d6e7c9617b52b25f724430fa3471b645e31df04157efc4060dbd4fccbfc37b5709138164d8ec89c2e94cddfd727b3ee4c705ddd38dcf
diff --git a/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild b/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
index 07d01f86a1a2..41fd1b9bcc69 100644
--- a/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 IUSE="doc"
 
diff --git a/dev-python/mkdocs/mkdocs-1.3.0.ebuild b/dev-python/mkdocs/mkdocs-1.3.0.ebuild
deleted file mode 100644
index 46541abdf194..000000000000
--- a/dev-python/mkdocs/mkdocs-1.3.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Project documentation with Markdown"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-IUSE="doc"
-
-BDEPEND="
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
-			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-RDEPEND="
-	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/click-3.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.2[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=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-3.10[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
-	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# Tests fails if additional themes are installed
-	sed -i -e 's:test_get_themes:_&:' \
-		mkdocs/tests/utils/utils_tests.py || die
-
-	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
-	sed -i -e 's/test_IP_normalization/_&/' \
-		mkdocs/tests/config/config_options_tests.py || die
-
-	# livereload has been dropped in this release, this test is a remnant
-	rm mkdocs/tests/livereload_tests.py || die
-
-	# fix apparent typo in test (importing wrong thing)
-	sed -i -e 's/from localization import/from mkdocs.localization import/g' \
-		mkdocs/tests/theme_tests.py || die
-
-	# Does not work in emerge env
-	sed -i -e 's/test_paths_localized_to_config/_&/' \
-		mkdocs/tests/config/config_options_tests.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	default
-	if use doc; then
-		# cannot just do mkdocs build, because that fails if
-		# the package isn't already installed
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 025a8e25bd0d..b36262725b3c 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,13 +1,7 @@
-DIST moto-3.1.10.tar.gz 2314423 BLAKE2B ad09f8cb70a1541dce640c870355c349f9a932beec1c98d3d4739bda89e773670fb0209b9ec7aca3a250472d425048d444b08edf2f1555c6777251de14c5a80a SHA512 138e5be59fffcfe4579b6cb292f4f8ec21c5d05723bcd66cae85bcc0f60991ac84310206d5a0fe8361135ff04573173f41b276021981d6f7844a726f18b54f83
-DIST moto-3.1.11.tar.gz 2320905 BLAKE2B 14cd572defd974e428a77f75be32f576d7cb222fa80a37b5f72bdb8f10fd36be3b456d7d660fe7943862824393b48b4d70687dde191ffc49a49db7ee05772994 SHA512 2e1a84beef161442f74dee95b1e5dc7b23c77d9b001c27b0d8ee3c429c5da13be9a6d0074bc26bacad72f5ea82b0eb85e88dd2adb585f7dfd688bd1e3d9cc5e9
 DIST moto-3.1.12.tar.gz 2323555 BLAKE2B f2ecefc5dbbc3f4ce66a799ec255cad40ce466f62fe3bfb0885866c7d0125884a0fef299b58fdcf1cb5da7ef58ac513d844b2fbae6d6545dcb38f2a3bbb2cda4 SHA512 29b8d0d71f3227784eddd05959434451ad88c9c0346b3684360e57bd3df8b9734f781d263bf992ac946749c88b433f6c86c1fc71d71a2dc565633c812579c297
 DIST moto-3.1.13.tar.gz 2330638 BLAKE2B ded004bcd783f623edd5b198c39b0245bc847233be46e101b8556adf71c8a7495a175957b3c5c475ca66c392df0999f53c8cedbb439cbb39cd5566e610887cc2 SHA512 95708e6638ab9a8d68b1acaf3af14fc381584e2d978d7f03ee500c50cd2b3409d99633f0e211bfb86c40335e67581f9e6ff3dc7934f8e91fc9f8be8311de8b5b
 DIST moto-3.1.14.tar.gz 2340613 BLAKE2B 8bdd9131449c2f3aeb1e4b4fcf40fe2d7ffac86777a73bcdff1d04a3450ec71030e5611c1d3d7429fd57e7ebc0791aecca4c57b8fb12456d18f2256693387fa0 SHA512 3a07e4f15a70ec422f81ba8cf5e2f38624981ff809e7ec51a3e23e26f3dff1755aa11d236daac097da0961948a46cc93e549e36102fbd8d5036f419d5fc96312
-DIST moto-3.1.9.tar.gz 2308059 BLAKE2B 85f5c084fc81d74e8297ab0a78e3823bb6e98b1d4fdb70b802dabfa3ba11475670c3bfda27f48069e5298691a8ca71c98acf156c3b15ab79ff85555545c7596e SHA512 600ec2042e5e6df5e3bbc9fafcaa32255568c35a2a127e4f093ecc9332a799b568002cb414e5c086f24795c4f8f510517bf00c29a9b6a38dd667807d04a18954
-EBUILD moto-3.1.10.ebuild 3854 BLAKE2B ef6d32957a4b1a5525f14ca4dce0ee923a0c0b0e695cebd1fa072b18b00c7f2f1580b5437bc06f98591dcaa087fcd32d0dfae8b305a9b8edbcdb64b855e076b7 SHA512 bcaaeebff6dffe3ed42489f70bec9fcab13ed65658f0d66b05fe4c2c87664c3bb13dfe759bf6ad315c993198598bce50962ffd67a77a17f328a730683591d2b2
-EBUILD moto-3.1.11.ebuild 3954 BLAKE2B 75a068f77e5a8328fca12cc29ef15d02b3fe2371fb15862e7f2385d4094caff3a7c1a84fbc3fce0c31899aa53df14a23be8f92c5a2a0973d4377f5ca6708fa98 SHA512 b1fd624f48745859c4b867d7548a40e10039c8e78e262c2fb528eb72c4ff42b35de276cbed81e461f4d820710db5dc0e7af4e14b4a7793dc7adfc4dd26fe6e8b
-EBUILD moto-3.1.12.ebuild 3954 BLAKE2B 75a068f77e5a8328fca12cc29ef15d02b3fe2371fb15862e7f2385d4094caff3a7c1a84fbc3fce0c31899aa53df14a23be8f92c5a2a0973d4377f5ca6708fa98 SHA512 b1fd624f48745859c4b867d7548a40e10039c8e78e262c2fb528eb72c4ff42b35de276cbed81e461f4d820710db5dc0e7af4e14b4a7793dc7adfc4dd26fe6e8b
+EBUILD moto-3.1.12.ebuild 3952 BLAKE2B c973165d7405a0ae7574cabe74b162e802e8b73ffb47777f6f815bb27f6c6677c56a1ac20166e99382854549798c55db798a6bcb3484e534f58a068c2ecc2f22 SHA512 9edfbfd062bae8d80a36eea36f53f9b255c370e5b34bcc3649a8bdc25efa32fe1aad8ac0be91a99ced0f6142825146a7a7b63455457a8bebeb1a9f36019248d5
 EBUILD moto-3.1.13.ebuild 3954 BLAKE2B 75a068f77e5a8328fca12cc29ef15d02b3fe2371fb15862e7f2385d4094caff3a7c1a84fbc3fce0c31899aa53df14a23be8f92c5a2a0973d4377f5ca6708fa98 SHA512 b1fd624f48745859c4b867d7548a40e10039c8e78e262c2fb528eb72c4ff42b35de276cbed81e461f4d820710db5dc0e7af4e14b4a7793dc7adfc4dd26fe6e8b
 EBUILD moto-3.1.14.ebuild 3954 BLAKE2B 75a068f77e5a8328fca12cc29ef15d02b3fe2371fb15862e7f2385d4094caff3a7c1a84fbc3fce0c31899aa53df14a23be8f92c5a2a0973d4377f5ca6708fa98 SHA512 b1fd624f48745859c4b867d7548a40e10039c8e78e262c2fb528eb72c4ff42b35de276cbed81e461f4d820710db5dc0e7af4e14b4a7793dc7adfc4dd26fe6e8b
-EBUILD moto-3.1.9.ebuild 3783 BLAKE2B 2a10964580092a2fa6b56972a30bd04b4150a1902af028b600ad3ec4a098be88064cf5c14c4293b35ca87fd5b4a8e583f22a0d1e9820b0462af7b049255bc16a SHA512 0c4986fe5dae3ecb5183ab6fb60b7445a6bb7046f94fffd3c7e2f87e42efb3ca4c0d4f1e37033f0c72682a3fb6b35dbe3499334f203f3b2cf98da233a7a8f946
 MISC metadata.xml 552 BLAKE2B c0162cc80007c1fda211c105b3e7391e3596ef11deb9257bab489f4b112f79ed115ca3f250bdf1b87aee0af258aa59056c8d062acebca7dec631acf3ec9eb2bb SHA512 3f7b3c5709bca51588e58f9eeb9bb363e2657a7e6483519ec7782eb047a5311d434e2459ccd3b495340f85f72a92da2f7cc6eb3de617e979bade7b8fc7b3c01d
diff --git a/dev-python/moto/moto-3.1.10.ebuild b/dev-python/moto/moto-3.1.10.ebuild
deleted file mode 100644
index 9c059040c841..000000000000
--- a/dev-python/moto/moto-3.1.10.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.1.11.ebuild b/dev-python/moto/moto-3.1.11.ebuild
deleted file mode 100644
index d32692d1217f..000000000000
--- a/dev-python/moto/moto-3.1.11.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.1.12.ebuild b/dev-python/moto/moto-3.1.12.ebuild
index d32692d1217f..83bce6f57fce 100644
--- a/dev-python/moto/moto-3.1.12.ebuild
+++ b/dev-python/moto/moto-3.1.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-3.1.9.ebuild b/dev-python/moto/moto-3.1.9.ebuild
deleted file mode 100644
index 9069529dd086..000000000000
--- a/dev-python/moto/moto-3.1.9.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index 07bd402dd8e6..83308af279d8 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,5 +1,3 @@
-AUX munch-2.5.0-revert-pbr.patch 1301 BLAKE2B ab22d6d9e73444d5e5240a5bd64662acce9816363f824d1e5361bdb08a762812c0c9286b4c4210f17c67f3ae1c7cdbe56343d3206c47c31c96756d4c139dd26e SHA512 d7e896112db30357a279433b6d6a334ec0495fb1a4d40cedefd3e0e1eabdbfaff09d484472a72d88eb2bbab72142261e9e6f1ad134cede92fdb4f68feb7eb27c
 DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
-EBUILD munch-2.5.0-r1.ebuild 758 BLAKE2B 15c4dd76fbfba10beda19505d251ab15fc1bea8915162c056a68a958357d2e3dfbc18c73c947f44b5789a70d532c12f537a9978dbedf6cf5e5546ea6a7c18140 SHA512 1bcc5c6b3d04e1a9fbc66e8e0ad2ca40758240798ed98f3e31c18e6892563f5b0fd7752bfd0301889658557a9c0e79d03bd8417ccfebceb07b2a58b895c57ed2
-EBUILD munch-2.5.0-r2.ebuild 719 BLAKE2B ca389fb3619323708b4770dce3a628a46fd2962dda6ceb82d8ea53a71e4f108838bb58a506bdbcab2ec06380c79178831d2ef3ee4889a160de77a632a2e89625 SHA512 48ce16f17f7bed77388ce340d74a1a1b0008c732b47b4e7e47787b073dda30b74547deb60b4d27784cd45c868b81da1757601fd155b3463bcb7ec077409bff6f
+EBUILD munch-2.5.0-r2.ebuild 711 BLAKE2B 990f6b1beee089fcebe9bc38e679bc51ec3bfde962816b674d6690229da9b5d8dbe30678ad30b352465da9660444eaebf9b82e8f2e62d986d96a601acd899d38 SHA512 ba7695251df9d134d1ea340ed7fc332674bfc0cb34f58073ae3d15434a4f80f0933971791a4a69eeee0f1379c0082430682e20b763f89d9354301805f1d2cc54
 MISC metadata.xml 401 BLAKE2B ab900d598b463036c2f6d7cb6a5b1abcc25e5739d3fb953741abae620ee8ac845077870dacf433211c5a4d14972114f8d16b94a86514be5de7667a2ab32b1f45 SHA512 f3334ff207272f39f44dad54f2d173218b2192675e04dd076cc16b461a656e146f3ba5b73e53ef8c115c5c3f32f40664f6191c31aa20fec5bcedb61186fed4bf
diff --git a/dev-python/munch/files/munch-2.5.0-revert-pbr.patch b/dev-python/munch/files/munch-2.5.0-revert-pbr.patch
deleted file mode 100644
index 450020cc2c19..000000000000
--- a/dev-python/munch/files/munch-2.5.0-revert-pbr.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 31f229c..9046e38 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,9 +1,29 @@
--from setuptools import setup
--
-+from setuptools import setup, find_packages
- 
- setup(
--    setup_requires=['pbr>=3.0', 'setuptools>=17.1'],
--    pbr=True,
--    long_description_content_type='text/markdown; charset=UTF-8',
-+    name="munch",
-+    version=__version__,
-+    description="A dot-accessible dictionary (a la JavaScript objects).",
-+    url="http://github.com/Infinidat/munch",
-+    author="Rotem Yaari",
-+    author_email="vmalloc@gmail.com",
-+    install_requires=[
-+        'six',
-+    ],
-+    packages=find_packages(exclude=["tests"]),
-     keywords=['munch', 'dict', 'mapping', 'container', 'collection'],
-+    classifiers=[
-+        'Development Status :: 5 - Production/Stable',
-+        'Intended Audience :: Developers',
-+        'Operating System :: OS Independent',
-+        'Programming Language :: Python',
-+        "Programming Language :: Python :: 2.7",
-+        "Programming Language :: Python :: 3.5",
-+        "Programming Language :: Python :: 3.6",
-+        'Topic :: Software Development',
-+        'Topic :: Software Development :: Libraries',
-+        'Topic :: Utilities',
-+        'License :: OSI Approved :: MIT License',
-+    ],
-+    license='MIT',
- )
diff --git a/dev-python/munch/munch-2.5.0-r1.ebuild b/dev-python/munch/munch-2.5.0-r1.ebuild
deleted file mode 100644
index ef1adba8f2dc..000000000000
--- a/dev-python/munch/munch-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A dot-accessible dictionary (a la JavaScript objects)"
-HOMEPAGE="https://github.com/Infinidat/munch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-SLOT="0"
-
-BDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/munch-2.5.0-revert-pbr.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -i "s:__version__:'${PV}':" setup.py || die
-}
diff --git a/dev-python/munch/munch-2.5.0-r2.ebuild b/dev-python/munch/munch-2.5.0-r2.ebuild
index 03a165bd5447..43f92bae1c42 100644
--- a/dev-python/munch/munch-2.5.0-r2.ebuild
+++ b/dev-python/munch/munch-2.5.0-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/mygpoclient/Manifest b/dev-python/mygpoclient/Manifest
index dd72dbb040da..b8fe94eb6096 100644
--- a/dev-python/mygpoclient/Manifest
+++ b/dev-python/mygpoclient/Manifest
@@ -1,5 +1,7 @@
 AUX mygpoclient-1.8-fix-literal.patch 1376 BLAKE2B e538cd673ae420e86cc68a8e8a93a20ab5714e2e44f864b62dfa2b2944fc5ba2c4df780079fac1db1ec531fc819b6c005bb727cd7ec95163f82d82ed6e6d256d SHA512 80409bb7419561e35f6200d0788e4e82c67b29114a5822c18f8559a280c5aab4bdfd3a263c1eeb3ab67ef17e95430e19723a8a8fc890644427811be6cc6ef9c2
 AUX mygpoclient-1.8-tests.patch 1635 BLAKE2B fb92cd995755013dbb2b35424de88d5c949485e818be45e00c89192bb60b9506690b971fd586c08d7be31e7680c54586a015cd8dee299320fbbccf87c9ea70ab SHA512 9036f3328ed4980858db07f57661300e429c15ca8159118067d1385f8cf0ed5fcbcb7ef498dd12336c9fe2b8e5d22c944b8cd1f4043d418c5ce2b706a47aa239
 DIST mygpoclient-1.8.tar.gz 43671 BLAKE2B 0a1c10c00a9ee034acc17bb5e28d1ebab50a14f3eea534f4a4277172251ce567a26e7ab66859a66d89d4adc06f44dfe5899edb0aeec45e90e461a4a8cb3ff337 SHA512 1edecd5ccb116c7f4017ebe6572439d87ff76501ed0628934e548dc0c9c041127a11ec9f4def4a54a6f7fabe46a461c863ec2ff2f8c14c3c67b5d1fd9285bb9f
+DIST mygpoclient-1.9.gh.tar.gz 44998 BLAKE2B 5feb17fbcdd02c632a11d9ae685b099addd2fed056e72d532e6391b707cfc46e694182ea4e5d7334be10796b5bb19b2d8cbceafe0b69798206f5ec41ca337913 SHA512 57502295725d3a1351e877998442141dd596927215d3746786c12db061ebe3bdf8282e8b2d554997515a558f608c0815e4caad311ad3f1ea9f5b62321e8d6635
 EBUILD mygpoclient-1.8.ebuild 836 BLAKE2B fda0a3569b1d605497bf10d6499806acdaf57bbbf70c783e2b35fcc1617535c6ec224ebb3c335d5e11a8b7f03f2bf26b86c3f3aef595ec601f25d8764c2d87d1 SHA512 d694c61cf3b353fc86b00367fd4a8d3d3e8b49b829d1447ffe7b571e567fa9996effa71dc46408d8a4e3e2731e13f99677f74f4972f7a5a553fb53ca020d3563
+EBUILD mygpoclient-1.9.ebuild 623 BLAKE2B 2f5cf8fe3dcab475051249c193dd46b620664759a4c350b987223294b82a02fd5d311178b9e5b6fff1dc3fd7bfcac2fd6369d679fee7d94703571a314f22d83b SHA512 e2754955aa22b4aad4e486f10571a27846a486054c308fe621ef139576fb3fc404cc4f118214f29ccf9168bf4c092c4462a96e6f6f41fe088050c94591dbf5fb
 MISC metadata.xml 512 BLAKE2B 2ff1435acc5efe1b4390e91957781baa2d555f127de82ceeefb7349f5c4b553a56924e0ecfe698e8a570da8a6d5ef462240a4c5b2f00c65918f2a175596fa9d5 SHA512 c89fef8499773f751d23d33d7c4407be85286ccf88f93f5fdc630a86602de024e2f3cb014837877f7b70012a3dac8625263fa8898aaf5c0675f0fa3afac31b20
diff --git a/dev-python/mygpoclient/mygpoclient-1.9.ebuild b/dev-python/mygpoclient/mygpoclient-1.9.ebuild
new file mode 100644
index 000000000000..1286362967e3
--- /dev/null
+++ b/dev-python/mygpoclient/mygpoclient-1.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A gpodder.net client library"
+HOMEPAGE="
+	https://github.com/gpodder/mygpoclient/
+	https://pypi.org/project/mygpoclient/
+	https://mygpoclient.readthedocs.io/en/latest/
+"
+SRC_URI="
+	https://github.com/gpodder/mygpoclient/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/minimock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 24b9dfb652fc..b0740430693d 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,3 +1,5 @@
 DIST mysqlclient-2.1.0.tar.gz 87635 BLAKE2B b92e138f6128873912e951087bc4f12b3c00a400521c7ee64da177c6f5a2dfb3a649d92f7a12f45c8716fd8b6b9682a0eff6d9bc111cffac38a27676f67d396a SHA512 a0b2645af225fd6f1f551cfd34c09309a859410e66287c32637901e15beb88632f9a3e87cf2b08a94867a9b2d4a048c56d63d55f523eafc82f1b1b93ce1c843c
+DIST mysqlclient-2.1.1.tar.gz 88138 BLAKE2B fdd044f2703af874dc0ca67b2fe07fcac3ceed5a4543aa15a0daa852ddf5ad6940a43675c0f104d9aa173e96da946e33054e1cc4c1b9812487558af64cc8fd43 SHA512 d8aed044b651aabb8d28d2df085f84e4d824ef0f147216d111425a9c8024f55634236ec131debf46660084c5a8fd67c944db60ffbf89e1d712cdca80c0726a06
 EBUILD mysqlclient-2.1.0.ebuild 2060 BLAKE2B 6f01c9b7ac4e37d4ad1670cf7e392f4bf420e2ac0c1688df8c9df099476519f92c18bee9ef1145b9d350f335f39f84907e4d51da50c3e4842348d64b6f9de76d SHA512 c2cb94c40114c5fafe4effaa92ba7b49f9281bdbeb46c6cb502ea48b117b63e0a50c25c03e714d48e0d557d44b6236f227fd911951f14425ee0f95385360c231
+EBUILD mysqlclient-2.1.1.ebuild 1920 BLAKE2B 60ba3343ef92ae4963610a24c679e56ae77dddfbd078f354f2aa0a60582c9d1a4eaf294aa6c4c8df639532b7fd5d7879e74fda48879b151b9564c695f4c8e279 SHA512 d9cf6b656baed93b80178f81cecd7b4910bd05326cb5a4d12b5cd62b1f440fc399804d42252c32d37f14c479220a2ede3244cef6acfd65ff18e8ff4c106c8e7c
 MISC metadata.xml 507 BLAKE2B 3c274117dde5aed93bb78488b1c106ea9b18243725d88867e6b568a09229d97bc35a1116d8a529c5c72cabcb9feb33de8157448cf3d339dbf1861d8a9ff2c1d6 SHA512 4304ae4addf93365b2acfd493a27a0144bfe0dd2d559a3fce73f52d0d1683c84b1597c9d11f36b332b6428523fd8082297ab39ce000d961ccdf39d92833828ac
diff --git a/dev-python/mysqlclient/mysqlclient-2.1.1.ebuild b/dev-python/mysqlclient/mysqlclient-2.1.1.ebuild
new file mode 100644
index 000000000000..e1988244df9f
--- /dev/null
+++ b/dev-python/mysqlclient/mysqlclient-2.1.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to MySQL"
+HOMEPAGE="
+	https://pypi.org/project/mysqlclient/
+	https://github.com/PyMySQL/mysqlclient/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	dev-db/mysql-connector-c:0=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		dev-db/mariadb[server]
+	)
+"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+src_test() {
+	local datadir="${T}/mysql" \
+		install_log="${T}/mysqld_install.log" \
+		pidfile="${T}/mysqld.pid" \
+		socket="${T}/mysqld.sock" \
+		log="${T}/mysqld.log"
+	einfo "Creating test MySQL instance ..."
+	if ! mysql_install_db \
+		--no-defaults \
+		--auth-root-authentication-method=normal \
+		--basedir="${EPREFIX}/usr" \
+		--datadir="${datadir}" >& "${install_log}"
+	then
+		cat "${install_log}"
+		die "Failed to create database"
+	fi
+
+	einfo "Starting test MySQL instance ..."
+	mysqld \
+		--no-defaults \
+		--character-set-server=utf8 \
+		--pid-file="${pidfile}" \
+		--socket="${socket}" \
+		--skip-networking \
+		--datadir="${datadir}" >& "${log}" &
+
+	local i timeout=10
+	einfo "Waiting for MySQL to start for up to ${timeout} seconds ..."
+	for i in seq 1 ${timeout}; do
+		[[ -S "${socket}" ]] && break
+		sleep 1
+	done
+	if [[ ! -S "${socket}" ]]; then
+		cat "${log}"
+		die "MySQL failed to start in ${timeout} seconds"
+	fi
+
+	cat > "${T}/mysql.cnf" <<- EOF
+		[MySQLdb-tests]
+		socket = ${socket}
+		user = root
+		database = test
+	EOF
+
+	distutils-r1_src_test
+
+	einfo "Stopping test MySQL instance ..."
+	pkill -F "${pidfile}" &>/dev/null
+}
+
+python_test() {
+	local -x TESTDB="${T}/mysql.cnf"
+	rm -rf MySQLdb || die
+	epytest
+}
diff --git a/dev-python/myst_parser/Manifest b/dev-python/myst_parser/Manifest
index 8dd65ea2ce8d..d264e5a9532b 100644
--- a/dev-python/myst_parser/Manifest
+++ b/dev-python/myst_parser/Manifest
@@ -1,5 +1,5 @@
 DIST MyST-Parser-0.17.2.gh.tar.gz 878600 BLAKE2B 0c5b9dd5aa1e1e54706c1a04770fac33f8b2233164f2462a27dccdd405592dde4d41ab986632a2903aa26a6e7ae942e0ad54103c48f0829d410b080facb061a8 SHA512 625894686093266af03ef2cf01cd3dc2fea80c933479d6df3a4b99a103f17e8afd7120fe7a56ef21bdc8aa33569741a675caf4a7e1ed6ddbe3facae19b3c222a
 DIST MyST-Parser-0.18.0.gh.tar.gz 768448 BLAKE2B efb5d1907b5779b1816f1cc4fd5ede9543cf246e4029f4bf6d763a8aacdf54b5c8c5efa2fea61de4bf257f5979871409ee907b3349cdb4f099ac689131d0805a SHA512 919494467de3f0cd97c9c8062626b88c22fd0596e120b7ca117b8bce18d9fad9faf06a36e4c5bd8a4dad838c888524c780beceaf3e7acb42232bd3c903fabc3f
 EBUILD myst_parser-0.17.2.ebuild 1307 BLAKE2B 0b16429855acefc1bca9c867c20f5f03b6125d2df0083d25c30fac7e503daa08cd9a7aab1fa4da0eb70441d4b9be4580a273a3c54f2618ad1d46aa379ed44c16 SHA512 d6c780e2078bef21d367bbfbec9c544ab0c9bb853018dc7e560f99b95e32642373cf0f78a9ad95220dc9355f55ddb13dafeb138024f8c431a2491ae279468ed4
-EBUILD myst_parser-0.18.0.ebuild 1382 BLAKE2B 71fdc1c78e4bfbfce4557f06eaf5b612ecb0b5e8b0bdbd66857cd4bb2e5aa83ae33de72a26b960d6c5cbfa8259dfb6ca580e68c0b7778e02a7930862af78e67f SHA512 d23531d015c38deea49636e7932e089c582ac2294ad66a10d7f072cb3c7361d9e0fb9c3fbe9846e3c80b5aeebbbe647b8e427db2ba179fea4c32478ee7c4902b
+EBUILD myst_parser-0.18.0.ebuild 1616 BLAKE2B a2e6ff6626783b5a66073d583a82422fb9ee144ef44eb198b105cb73177b219dca5c7999741cfea896950b6ab9ac0e43b022e05b7e0e8b74dfc529536a88f352 SHA512 10b8b6f5db8630ba6b4abf59c7df8799dcf1686da483c86970d581ed9884218b3a205b0272b2420addafe74fbc128d4fe73436b956e4fb060b83d8923e25bbb8
 MISC metadata.xml 406 BLAKE2B d8a974be3dd4fef4800958dcb1eef3124dc8e3ec49e6678d0db7d6096ef290019aa025796c4f7c38bc11b750d1667ba97d4429b64e7271009da707cd945e113f SHA512 acdc27a39e068c487306002342b9c0c5910d61ed34a7b62878272054ea458d5aad46fe24095a52666ed77ffcb6e703687cc83de0c9e2cef395a1decf9003d918
diff --git a/dev-python/myst_parser/myst_parser-0.18.0.ebuild b/dev-python/myst_parser/myst_parser-0.18.0.ebuild
index 607aca9eec4a..bc0af0f8d333 100644
--- a/dev-python/myst_parser/myst_parser-0.18.0.ebuild
+++ b/dev-python/myst_parser/myst_parser-0.18.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -43,10 +43,19 @@ BDEPEND="
 	)
 "
 
-EPYTEST_DESELECT=(
-	# Unimportant tests needing a new dep linkify
-	tests/test_renderers/test_myst_config.py::test_cmdline
-	tests/test_sphinx/test_sphinx_builds.py::test_extended_syntaxes
-)
-
 distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Unimportant tests needing a new dep linkify
+		tests/test_renderers/test_myst_config.py::test_cmdline
+		tests/test_sphinx/test_sphinx_builds.py::test_extended_syntaxes
+	)
+
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		# bad test relying on exact exception messages
+		"tests/test_renderers/test_include_directive.py::test_errors[9-Non-existent path:]"
+	)
+
+	epytest
+}
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 62437f5c83ce..f673381d7f69 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,3 +1,5 @@
 DIST Nuitka-0.8.4.tar.gz 3828278 BLAKE2B dbd6abb945f66ab6a5a359b8370fd3d5d36fbdc2c232b5002356f59ffbfa531180b96467b67a2edbb7a779c75ebe58789e9ae0ff806b5649eea4a5b7d9c0934c SHA512 683918e60f2f65d22911f894c2e4fedeafd9d0ef0cacd48bb66422fa2077f225c7c861186b83b9c0fd50eb965b956a1b26342249b3db2af599250c16fe84a152
+DIST Nuitka-0.9.tar.gz 3855240 BLAKE2B 59a508aabb04af0b841879a4de23fe9f9f8ea2588125127834319da21ef22ab530d8e39a2baba1b49043e9997dff9a20004fc548af5b09456b5eb3cd8f1d30a8 SHA512 ae2903e89233b7944e1ee1aa846897d30c352302bb8b064a31ab69237dc15ed0e451bba63db5530968e10f60b8da745bf7d7f1f130ff039d9aac2329f628f32f
 EBUILD nuitka-0.8.4.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
+EBUILD nuitka-0.9.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-0.9.ebuild b/dev-python/nuitka/nuitka-0.9.ebuild
new file mode 100644
index 000000000000..5b987e13729d
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.9.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 278802068f4f..603f706dd427 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,4 +1,5 @@
+AUX numexpr-2.8.1-numpy-1.23.0.patch 883 BLAKE2B ec2ebce730e72d2813892a152a18ab791565da18c2133d380a06d43c0508120d06d6b7be1e303897f9abb59811a42985c9f315468de09d0e2a79e176780b5d8f SHA512 1a00adc9c9ede86e982368a434a90b297c4907dda351fec6557b42ca02f766633d17346aadadfc6cbb4044dc599d3c67caf5dd7ce4f1c0c52f1914623f46a6e3
 DIST numexpr-2.8.1.tar.gz 111984 BLAKE2B b5d0b5bd5507c8c513db6404917b6256d9c8d232ea5d2f027f42cdac4a5e5c5f8c2db3d2283734f80d0ae7df2551314d088ccd2ed8e2c7401cc04a15ad61751d SHA512 243cddcb1fece9410e35c87a4c3f794ac0963ddfcc054b9a9c9842a2bb4e782d6c939f532d00d724d4b447d915764c3c8bbb87a99c71a22951798329aa7494bd
-EBUILD numexpr-2.8.1-r1.ebuild 952 BLAKE2B 39de25ed884c9fb42b0a4005e072852fcfd9ee53ff85decd663034963cb44d57a58e110f6e04ce42b61b3659548592e2a69097adaabd343a6edf98f3adacb873 SHA512 67f95dbb08d9d05560fd6c34e7a6fc695f2e56c52f6d42d75f1042299bbde40f8fb8a4dac0f87c62382e8e3d28bf8c9272ac63928cfa4d2afe4d170270802cd0
+EBUILD numexpr-2.8.1-r1.ebuild 1004 BLAKE2B dce2c039e02112a06e1bb2b209e3bd7055ed17579efed26ce411016f6e985a7f82940ccd4085eed19aaecd0734ef0ebf75d73a1f36c8b74bc372ffae0aaac45d SHA512 f8d30d44a473ce1b80556bc2422ffbf1ecb247cd88a82aa51f22d31bb404fc59a47f13efbb6ebe7379ae3c058b33d58bc553b27b58897b577de866bb17f5e74c
 EBUILD numexpr-2.8.1.ebuild 877 BLAKE2B fcb53d1172529a31edcf3a161b12ffffe3ddb938ec797f247f97bc62f57fd43a6fd82c5c5323b010528d81022785ff24810e5db06b10eced877d24ec4a2b4165 SHA512 cf79f29d797eef24877beba01d5273bdbcdfdbe664de076d927fb182252cfdce5d7d09ab17df52eff1f252e69d2b72b7a0661578ac5c70ec5cdedbbabe980d19
 MISC metadata.xml 961 BLAKE2B e94e9d69b1a1f5c1dca1e9d0d791b215c7a7ef8f8b42a00bd32e16ee9ba3379a1f5049a1539c8bfcfc7adb110b8179928c5a8273429550000b1a5e6f5cf4c897 SHA512 4e59af51f1f4a44de1289ae47dea1bb2461bc3ab860191e6ed8bc0c244e43cef766d571a903cbdf4e23b3b06bbd0d240b77d1234f30362fb26d1f7a43619dd57
diff --git a/dev-python/numexpr/files/numexpr-2.8.1-numpy-1.23.0.patch b/dev-python/numexpr/files/numexpr-2.8.1-numpy-1.23.0.patch
new file mode 100644
index 000000000000..b0e841077620
--- /dev/null
+++ b/dev-python/numexpr/files/numexpr-2.8.1-numpy-1.23.0.patch
@@ -0,0 +1,22 @@
+https://github.com/pydata/numexpr/commit/1c6a024947c3aa1bf926ecb9828036b306d7c6d7
+https://bugs.gentoo.org/853955
+
+From 1c6a024947c3aa1bf926ecb9828036b306d7c6d7 Mon Sep 17 00:00:00 2001
+From: Robert McLeod <robbmcleod@gmail.com>
+Date: Mon, 24 Jan 2022 10:54:34 -0800
+Subject: [PATCH] Fix for #397, use of NPY_ARRAY_UPDATEIFCOPY flag
+
+ Changes from 2.8.0 to 2.8.1
+ ---------------------------
+--- a/numexpr/interpreter.cpp
++++ b/numexpr/interpreter.cpp
+@@ -1269,7 +1269,7 @@ NumExpr_run(NumExprObject *self, PyObject *args, PyObject *kwds)
+             }
+             Py_INCREF(dtypes[0]);
+             a = (PyArrayObject *)PyArray_FromArray(operands[0], dtypes[0],
+-                                        NPY_ARRAY_ALIGNED|NPY_ARRAY_UPDATEIFCOPY);
++                                        NPY_ARRAY_ALIGNED);
+             if (a == NULL) {
+                 goto fail;
+             }
+
diff --git a/dev-python/numexpr/numexpr-2.8.1-r1.ebuild b/dev-python/numexpr/numexpr-2.8.1-r1.ebuild
index 494235d35671..55c558ac78d4 100644
--- a/dev-python/numexpr/numexpr-2.8.1-r1.ebuild
+++ b/dev-python/numexpr/numexpr-2.8.1-r1.ebuild
@@ -24,6 +24,10 @@ RDEPEND="${DEPEND}
 	dev-python/packaging[${PYTHON_USEDEP}]
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-numpy-1.23.0.patch
+)
+
 python_test() {
 	pushd "${BUILD_DIR}/install/usr/lib/${EPYTHON}/site-packages" >/dev/null || die
 	"${EPYTHON}" - <<-EOF || die "Tests failed with ${EPYTHON}"
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 16d0b7c06c68..7a8a7529078d 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -9,28 +9,33 @@ DIST numpy-1.22.1.zip 11443674 BLAKE2B 3f2e5fbd449c078fd97670be14e87fd9bccc8418d
 DIST numpy-1.22.2.zip 11447735 BLAKE2B 43dee4d06139822b1eec8280591ddbf6629bc8b92c5c279bf2c5e2f5b0afb4c30c2af2e783002a836280dc6affb60f51a49a37821dcf647563aa19b77aa489c8 SHA512 4ad584527d4395404c2d5d8fe5eb1aae1defac39361a987bdaa4d1f133c03fdc32c3d554c0edb544b55946f46fb3121c98526ebc1ee06e174087c727bf9b88d7
 DIST numpy-1.22.3.zip 11451867 BLAKE2B 0212cf2882410f9d9083fe40b3630733d0e407cab32c7aa10affc138e6305fdcba119a7a2d1b6c3dd5b99765d9204afa5ac8e389369ca933e779e5a647271605 SHA512 fdeefd0ffad798a078376fe16ad840551309d3bbf551eca09d92a35048ee75c3739ab0becedb23448d82999da148827e69ded8842201c3dda72b46b4eb9be93f
 DIST numpy-1.22.4.zip 11458830 BLAKE2B c999a42119e8d71942e4df4802ea22eef6c1ab65e11ad1f8364dd811c3df0eae1c7499055e76b523dc011bc9574f4060e17ecc3ea8bd35f5247fa17e3e188364 SHA512 bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48
+DIST numpy-1.23.0.tar.gz 10714532 BLAKE2B 8b7784adfe4aba8a21a50b460b908cd20eede912f46cc6840a65c03f4f128123ead64e61768ff839a6a79797680a5189ff39284be5819bacb6eb7e1902a09656 SHA512 899d0ca062b676b64de0da204339694dcb7e52f257625e971f9a8ad7267206a6ad2924353e4dd1e153b4a64ae318380899c9e1ee7a6f53fdeba4c19b34917583
 DIST numpy-html-1.21.0.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.21.5.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-html-1.22.1.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
 DIST numpy-html-1.22.2.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
 DIST numpy-html-1.22.3.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
 DIST numpy-html-1.22.4.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
+DIST numpy-html-1.23.0.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-ref-1.21.0.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.21.5.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-ref-1.22.1.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
 DIST numpy-ref-1.22.2.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
 DIST numpy-ref-1.22.3.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
 DIST numpy-ref-1.22.4.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
+DIST numpy-ref-1.23.0.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-user-1.21.0.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.21.5.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 DIST numpy-user-1.22.1.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
 DIST numpy-user-1.22.2.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
 DIST numpy-user-1.22.3.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
 DIST numpy-user-1.22.4.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
+DIST numpy-user-1.23.0.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 EBUILD numpy-1.21.5.ebuild 4250 BLAKE2B 566a16851c2b64a2960c578dd462380573c861ce31aae4ae04f298caa7be278a1d81bb315ae45d6d616d9169ce8c83c4e8308e979149b069f7aee909ef114fa5 SHA512 73185b6fb426e2c0851796ec9487992dfc5655f7b2e862ee881e9af2b9e8121beab5b81f315c91faf287f8aa50215956f5ae9298c8a16e7ad0ba8f5fd675bc50
 EBUILD numpy-1.22.0-r1.ebuild 4230 BLAKE2B 25c3b4283ea4a58cbcd8c1ef2ea539fa0d378c00a873a633bb81a40d146eb43bda016d98689e9306e4050cab65a265ad5908e8a8a3bbc755d82e42c99a68aa77 SHA512 9aeda8408565e61c7f1b18b909fac304f13b3ab59606a5f5957cc19905803b62656d3035cb7c4588ac37ca150b3d6d2fa1c06c5c882fc02b65d15b418778a750
 EBUILD numpy-1.22.1.ebuild 4475 BLAKE2B ee6d48a454d685da1ee4715391c0ca9dbe4072980c09bfa9c21e217a6a94509c3172828f76f0c408ce8c6c3655842a184c1636bf3d923a2bdfb35b6f0667345a SHA512 9f2898c9ab8bb3b2a7007ebd0f7094b844c74b05f64e62418a6ac9ba27f96f7eb7bfaeb480b267f615b4406040e651f16d254afd9db4a2f3e8381e545d341f89
 EBUILD numpy-1.22.2.ebuild 4522 BLAKE2B f3dbd009337631f3f72590d4ed8e1dfd910a624ce7980ec5d20edc7673ddf887e5e18eacb9ac5c33b128beaed1901ba13fddf3ac484d11c791c8e1af3ce7baae SHA512 e32115bf9f08bb1cbe0312ad34bb2a16c98e2b5973f33ae380e7e8ede7f4e0c4943d899fa60addaceb2d563309ea6bcb73000b46291ccf5b4cf33982f8c31d10
 EBUILD numpy-1.22.3.ebuild 4809 BLAKE2B 591d29cf3f8786179f8c883d185357db303bb90da5b577d4fc8c0d548bfe2296d247d10901ae931e276db68e2ef197c38a34740767afe9f091b5bd266ae50442 SHA512 a2973b01c557c5956ba9aebb8f9a15c56fabc321a672f61b06e19fc0f83c03e04856128eea37453b57797ee5f45572952dd67f51436a493ecfdc7434cfb6688d
 EBUILD numpy-1.22.4.ebuild 5025 BLAKE2B 3d338b40070c780e77bf4465835f8335edd771a119fa9a44b52db33b6951a224051ec44faccb9817df893f4ea11202538284a21c199127bae31eb200e17ad9fb SHA512 fb389e0de7d0275f548b86b2ed414ee974cae6456021f63c1696b7d5d7a0f523dc1a6e4f7db18db6af7a61d5113203c504d857fac809c96beb9bef68f5ea503a
+EBUILD numpy-1.23.0.ebuild 5073 BLAKE2B 32f377be0893beec58c4074d5514ae8bfefaf0a458f398bd481222c5f06045580c3cb21d963d06b8af8203f2d666f630e26ed313e8a1792e05ef5cd4b93af2e2 SHA512 b31aae22b0569df0e9871bf32c80fb7d273c90e05f04d2645c873a5fdc3a5d00150623b49e49a06d18dbe52859ec559d72dec07cf6215a4d6cad639400a05ab6
 MISC metadata.xml 930 BLAKE2B 8731116ae6d997dc77539b6ff9a8aff2466986888e3fc2c2a77499522360ba5ba11ec61e4eb6756b7cdbb9d7dafe05a862708dcc0735260e8af038a42dea3419 SHA512 1db89ba1a99457bef29a9501e2d14c11904251163172604fe58001048beb477eba5b1e4784c8636d0eb6767614b80a7341823a9d264a5663cc055a5a2c437390
diff --git a/dev-python/numpy/numpy-1.23.0.ebuild b/dev-python/numpy/numpy-1.23.0.ebuild
new file mode 100644
index 000000000000..5ffe8b0b6d7e
--- /dev/null
+++ b/dev-python/numpy/numpy-1.23.0.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 toolchain-funcs
+
+DOC_PV=${PV}
+# For when docs aren't ready yet, set to last version
+#DOC_PV=1.23.0
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="
+	https://numpy.org/
+	https://github.com/numpy/numpy/
+	https://pypi.org/project/numpy/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
+	)
+"
+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 ~x64-solaris ~x86-solaris"
+IUSE="doc lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
+	lapack? (
+		virtual/pkgconfig
+	)
+	doc? (
+		app-arch/unzip
+	)
+	test? (
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_prepare_all() {
+	# Allow use with setuptools 60.x
+	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if use lapack; then
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = ${incdir}
+			library_dirs = ${libdir}
+			blas_libs = cblas,blas
+			[lapack]
+			library_dirs = ${libdir}
+			lapack_libs = lapack
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# very disk- and memory-hungry
+		numpy/lib/tests/test_io.py::test_large_zip
+
+		# precision problems
+		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
+
+		# runs the whole test suite recursively, that's just crazy
+		numpy/core/tests/test_mem_policy.py::test_new_policy
+
+		# very slow, unlikely to be practically useful
+		numpy/typing/tests/test_typing.py
+	)
+
+	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
+		# Degenerate case. arm32 chroot on arm64.
+		# bug #774108
+		EPYTEST_DESELECT+=(
+			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
+		)
+	fi
+
+	if use x86 ; then
+		EPYTEST_DESELECT+=(
+			# https://github.com/numpy/numpy/issues/18388
+			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
+			# https://github.com/numpy/numpy/issues/18387
+			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
+			# more precision problems
+			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
+		)
+	fi
+	if use arm || use x86 ; then
+		EPYTEST_DESELECT+=(
+			# too large for 32-bit platforms
+			numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
+		)
+	fi
+
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# known problem
+		'numpy/typing/tests/test_generic_alias.py::TestGenericAlias::test_pass[__dir__-<lambda>]'
+	)
+
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TEST_DIR}/lib" || die
+	epytest -k "not _fuzz"
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/openapi-schema-validator/Manifest b/dev-python/openapi-schema-validator/Manifest
index ebc2f1ada210..1a85d8aa4ae5 100644
--- a/dev-python/openapi-schema-validator/Manifest
+++ b/dev-python/openapi-schema-validator/Manifest
@@ -1,3 +1,5 @@
 DIST openapi-schema-validator-0.2.3.gh.tar.gz 25501 BLAKE2B d961cabca647f59d4d4188f1941ce5b2475e02520bcc10e7cd29817c8ea8ebaaac5af1ffb0e3d5079ed2d1493414cdaf55336744b142385754585e748af8ac98 SHA512 e6dfe3d6cc99fa9723102ced42040203157639be68b0438d7bfae4499e51cdb6257a36dca10425a5d5e692cebb958468ebeee722116b99d800a6fcf972400c66
+DIST openapi-schema-validator-0.3.0.gh.tar.gz 27083 BLAKE2B 288f5d18874625c69eccf9be6442258ff8af735795eac0ee0449e5976584b1af22c1ea771bb79b4fa68623e60d417b140737e0d1ee85791027393650f0c1f747 SHA512 003ea97a1cac598eb3728d96291d8be56c6ba9e2d3cd4f77c1258962f67b460a887f4473fed39587870583e13a83403623c3b2f96fa8d02345583cd3bdaf008b
 EBUILD openapi-schema-validator-0.2.3.ebuild 857 BLAKE2B eb473e375f925dc889aafd6ffbae05880a663acb1b4a929795f9ef555e6dd92591aedc9f092e593fd3b8f8500b62f36d3e7101a791baf24296639fab7c39dfb3 SHA512 98c81c69daffc9d3f19a686e9b343ac0fd5bd74a966a129259d953895066c5216c6d6398372fe053c08b92b3da2915b204b3a5df5f183d51a5c91fc3b5b6f8ed
+EBUILD openapi-schema-validator-0.3.0.ebuild 900 BLAKE2B 12a9c332ed2c45205ce5bd62b138fcaea9cbcf2a032593123ecd0d86f026316f3c4a404480fa74c10b8e5a160622e8ff47309ed17490fe1437b260a7bbaaa26b SHA512 2e0722818e1a038e3a399a1936b358f1f71245eeb773e5bd696245727b35996f6136bcc661907786e0a841ddb3e3e19e87b4ad4d0ffa479ef7ce64db7a63bdb8
 MISC metadata.xml 376 BLAKE2B 6812229fbb8f1d8d5b21b7717bc6494f9c07cacfbb0b7b5510206557d295d91fbe942f5c2a24c8841447f2e6e0077f949d81720061b6f8cbe56f4772d9dcb6bb SHA512 8fa107a7a073629d9115e7d42aa532f5b4f1d955a522076ff8c515e98fe69192474e40eec08952d4287d8299afe36ea811c709e1b502c0489cb3511ebf748c53
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.0.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.0.ebuild
new file mode 100644
index 000000000000..b25ebd5a26c8
--- /dev/null
+++ b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenAPI schema validation for Python"
+HOMEPAGE="
+	https://github.com/p1c2u/openapi-schema-validator/
+	https://pypi.org/project/openapi-schema-validator/
+"
+SRC_URI="
+	https://github.com/p1c2u/openapi-schema-validator/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/isodate[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/openapi-spec-validator/Manifest b/dev-python/openapi-spec-validator/Manifest
index 7c56a7308eac..000f3647e540 100644
--- a/dev-python/openapi-spec-validator/Manifest
+++ b/dev-python/openapi-spec-validator/Manifest
@@ -1,3 +1,3 @@
 DIST openapi-spec-validator-0.4.0.gh.tar.gz 46051 BLAKE2B 43a1458ab1801700261f750e49d45b0cb4d02f1c17a16943b5232836061e0e1466fc973343bbd4bf7a8669b682bd6761cb905fdfb3b80c0b9720253cc2d5a926 SHA512 d2eaf22c75e72eb5061a916eb37b13179a5ba65eb8a00ec42e81c6b4168239bc8613388f2d77ce35113d260385b175280d8863a3deedf18ea5aa93a79f058419
-EBUILD openapi-spec-validator-0.4.0.ebuild 1505 BLAKE2B 8d6761dd381d64c27028f377c2321334b80b9adbac92da0d87924fbed17e11a107986754775b856936bb92072440847abacb703c6bbbc134abd5e3ffb9db2b4e SHA512 316f4a76a53ebee0edb7f18ec4188a1e414abffcf55c301c87b4b8daa91fcdf9ebbf4bd6406dd1d41d34d8a8ee39a01545956cdcbbffd0f5742a8d61416f33da
+EBUILD openapi-spec-validator-0.4.0.ebuild 1503 BLAKE2B 9630f20e77d363c1dbc99ab2a3cc6a5732fb1a9931fb39a7070e8822b24f4d45310b53287ca0c6fe3c09bd6f4a0f7acf01233b60b79c040954fd42fa36efddf2 SHA512 0c8f2cfbc74d2235fc83f579a33f781972b6756a632074ccea4a41f87014286b9edefb23d14fa3e311b81350372387ddd463a758d3f69c5c705ddb8a64db25af
 MISC metadata.xml 372 BLAKE2B 6b08d5f1a63e2ddf4c0f1ab8479a18109231211c82a2a1178a9e1d0775ad0fd5811580c3b2175137ec135b6c8d8ad0e0d728d79da98c092fd87fc604c7cc8a4f SHA512 4fe628abc1481b9dd5874dd5efaaefa5f1adf24e2e58183d2ca75677680077a443702887bb21c67049df998052dc6afae590ac9197b6edb87cc10c126ae22345
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild
index 26749263e281..c86f945de79b 100644
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild
+++ b/dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 32c745fc16df..223a163fde51 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,7 @@
 DIST oslo.utils-4.13.0.tar.gz 101834 BLAKE2B 9d3457ee9ce1746869120bf66d83495b4e1f2b4ca005285fa121ff4c176e85148662cd1de52bdaf93dc18d85478f2cbfde9b310e748b895f01c77ef82019dc0e SHA512 1d97fdaab79cc6c4cc34efdafca7263a2679e60d446aadc46fe31d7fdda2051b37f9df79d149644d914c7274e7fa2d9ef6a1c1aeafad8a1333221dcbe65f4723
 DIST oslo.utils-5.0.0.tar.gz 101823 BLAKE2B be62ddc2fb9130e3f678366b6181f1f334f95846a09ede4a08917cd88427492978e53039a482a7158f234caf96c9e520026ab6009f1df5de588a9fe68aa0664f SHA512 8941caf086354c9066ef51e64dcab5854b8d99c2b51807cb2d8b75fac0983f5787e499b0727423b624791ead2b5c9b55b463d5ff47f7586f3e302dccec1f5408
+DIST oslo.utils-6.0.0.tar.gz 101261 BLAKE2B 8a659b4bedf49e40c85ee40fe026205964d2f4a919170e4700c85e754f4bbffdf5bb9305aea00f7b36233feec93e42bf5e0c72591eeedc02709a7fcdba64d9b6 SHA512 9f9dcd585419372711af69917daf717d7c694cc604aed4db242e508ca6bdea3db9a52a29c354dbb5c80473a819c80dec9eccad7e6f6ca297c3469bcd2db5c7d5
 EBUILD oslo-utils-4.13.0-r1.ebuild 1669 BLAKE2B 7bada81a49796f1b4cb9cc7ad4feb1e9832149624076dd26fe8c8e610c394127f031d367c14abe46c22212b9882f9c82ff896aab1f984a8f762f40f721d7659d SHA512 b86f2f59fcd2f18bde993c47862462ba1becc45c2b99f27db40c32caf6fcc6b0c2f5c1ffb82547500cd2372f5b381efcfcc5c935a230d3e98b703e8eb5162dff
 EBUILD oslo-utils-5.0.0.ebuild 1672 BLAKE2B 5c9840e3cda6c0548860f3896dd2915e6f816990ad0ccd9e7f90656d52e8b199aa8063db0fdb6b6c0a0e2e6e908ac25b212256699c2ec52a5eb5c51a2c2fa42b SHA512 4f6dec1e7153b2858c7594b528c9b6552a710296a4b79fe77866514813e0a1d8b6f96a30823defcc0b53de45f7153ffb70693738d72b2eb78a23eb249a6790b5
+EBUILD oslo-utils-6.0.0.ebuild 1672 BLAKE2B 5c9840e3cda6c0548860f3896dd2915e6f816990ad0ccd9e7f90656d52e8b199aa8063db0fdb6b6c0a0e2e6e908ac25b212256699c2ec52a5eb5c51a2c2fa42b SHA512 4f6dec1e7153b2858c7594b528c9b6552a710296a4b79fe77866514813e0a1d8b6f96a30823defcc0b53de45f7153ffb70693738d72b2eb78a23eb249a6790b5
 MISC metadata.xml 607 BLAKE2B 4bbcd1e819a4bd7ce0fd4f13d70dfa686c1731f4e7b73d49dbe9dad97d91d6d3bf8c323d0aa167a8ae94b037ef7ef70150debb5a45fc8ba0121e94b02bc688ca SHA512 2a1d9a822c4b6ee4a1cedd2e11970e04ac7ed0639fe6163196874784867a7b2796b840a46338ef53a748b9b6e2dbc6526798124f576a0017c0fe65ec5d46aca8
diff --git a/dev-python/oslo-utils/oslo-utils-6.0.0.ebuild b/dev-python/oslo-utils/oslo-utils-6.0.0.ebuild
new file mode 100644
index 000000000000..a0bf0d0fa37e
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-6.0.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+		' python3_{8..9})
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# spurious rdep
+	sed -i -e '/pbr/d' requirements.txt || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	if ! has "${EPYTHON}" python3.{8..9}; then
+		find "${BUILD_DIR}"/install -name '*eventletutils*.py' -delete || die
+	fi
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	eunittest
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 47ec46317ab3..129a870d4258 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,4 +1,6 @@
 AUX pandas-1.4.0-distutils-hack-assertion.patch 439 BLAKE2B 6753d2a86071109b586a0ea957acb2db1d394bed2a6ad0ede53d7ae4bce81e034ba8e929611aae701cc51ab8d9ef95c8c2d608ad3f9def16aed6fc5ae237fb68 SHA512 04a3644dbc5d07859fea162877a528124b8b0af8288464dc86c394675006710f73653af58ad188d3d628c356c66c201190dbc6d3e77c9d9d0a3b2f4c758e014b
 DIST pandas-1.4.2.tar.gz 4940242 BLAKE2B b44c9e46458b4e2919b2d215c8678601ef0976118197172ddc74fa712cf07b02cdb09b79940e90bf6907a45e7e3c63615292f7141a4fb8ed4ae22a36decd1e39 SHA512 6406241e30e9ed386610dd90bbb7407cfe3e94ff20c8fd1241aa75288894666f06e59f7c74b5f916080a3745254ba22ec9dad1195f040b613639b5712aced571
+DIST pandas-1.4.3.tar.gz 4941520 BLAKE2B b134f7c04c2478b7105214ed62e9adcaed98ffb4179a785f7887850d66702bf0f185d60a3da6de6226742529008bac614b494453dca929e477960ff3b43ef93d SHA512 d8d7575ce2b813361641d4e438844e03ed79179f5dcc56f2e4923bfeceab6f825a9bcc419e9492ee5e0272ea7c9bb9eeab6a0e242a880a87999df2a492436d8e
 EBUILD pandas-1.4.2.ebuild 6549 BLAKE2B 06dc9e22e7147b81d555cc60a7bd7d8d0d7ed2895ecf951a9fc433a35013a48c7ff4808739656ed3ad57414f8f3525e6e1b13a334132cccec836a3522673218d SHA512 6378a9d969373d46e215459ae300cfd5d9d394177ae76dfc350ed2006892c470854175b0eff4d7a694c09a4b605de6040c3eeb08ba7592e147dfbc7e58d66478
+EBUILD pandas-1.4.3.ebuild 6421 BLAKE2B 475c95e4af32fd45c9502840b0375c2f6fd96a17f819301e1d125d1701d00b84fdc011fd997a3aea4b50c3aafb06550c35ff3b3281651260a75bc08fed9f6af2 SHA512 e993eafcbe4dee5ab0b7e8b241d887a6e0c81b65d1b0ecefeaa3f348115b72f4d0b9bea774f00cf72dcff3ffe250d0743dd140d8b960b021d95fb6379cfe0c2e
 MISC metadata.xml 918 BLAKE2B 09b6ef472cbceaade61bfec8780ba3659838cd73f0a19b277d731db75655ac7e65d396f9fa74c19a2d5e03269c541dfe2af59296c048e77744f00bdb55295d4d SHA512 0b1fd089b0ce35a4e3408cd7224a249d427571a638961a8d63dee73b386d03b5a22e4ff085e2e548749f9fc03e9beb18317010d0b67f608dafe305bb4a87ddb2
diff --git a/dev-python/pandas/pandas-1.4.3.ebuild b/dev-python/pandas/pandas-1.4.3.ebuild
new file mode 100644
index 000000000000..6c9f4d057959
--- /dev/null
+++ b/dev-python/pandas/pandas-1.4.3.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 multiprocessing optfeature virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="https://pandas.pydata.org/
+	https://github.com/pandas-dev/pandas/"
+SRC_URI="
+	https://github.com/pandas-dev/pandas/releases/download/v${PV}/${P}.tar.gz
+"
+S="${WORKDIR}/${P/_/}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc full-support minimal test X"
+RESTRICT="!test? ( test )"
+
+RECOMMENDED_DEPEND="
+	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.7.0[${PYTHON_USEDEP}]
+"
+
+# TODO: add pandas-gbq to the tree
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	|| (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| (
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	)
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/xarray-0.12.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/xlwt-1.3.0[${PYTHON_USEDEP}]
+	!hppa? (
+		dev-python/statsmodels[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
+	)
+	X? (
+		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+COMMON_DEPEND="
+	>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1-r3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		app-text/pandoc
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5.5.3[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.31[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)
+"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="
+	${COMMON_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e '/extra_compile_args =/s:"-Werror"::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile -j1
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
+		# https://github.com/pandas-dev/pandas/issues/38921
+		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
+
+		# TODO
+		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated
+		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated_direct
+
+		# TODO: these require a running db server
+		pandas/tests/io/test_sql.py::TestMySQLAlchemy
+		pandas/tests/io/test_sql.py::TestMySQLAlchemyConn
+		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemy
+		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemyConn
+	)
+
+	local -x LC_ALL=C.UTF-8
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	epytest pandas --skip-slow --skip-network -m "not single" \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.0" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-1.3.0"
+	optfeature "miscellaneous statistical functions" dev-python/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
index d9b6e0c4e0d0..da2b01f40e68 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -1,3 +1,3 @@
 DIST pdm-pep517-0.12.7.gh.tar.gz 304959 BLAKE2B 0571a77803b999f88f38da843c5fcf126eeb538c6812c3e245be2fc14d6cd19929559985efba2d245bbf0efb00e412b2133fca6bbe9e63317e6b7311867e0072 SHA512 45da8ab31071a57062fac5b89abe7d912d787d647eda1b45fe3941c43687fe0fe5c8d11e539290035375e17eef808489000513e3128708fcefd851e792757b8f
-EBUILD pdm-pep517-0.12.7.ebuild 1284 BLAKE2B 5780dda53ba7991febf9fa1e7b21d61cf9efbddd7e063feb1c8c0d6d2c1f10da45f0b196c2f8cdb7231614f1c5be32b9e7658060a36f8d60e095456fc40980f6 SHA512 a719bc1f4099c93aa45a64028c9afeb27bd58ead0449ca1292dfca2c923198ed453d2f91f055f4bbe7cdcbefdc8390605056287cdc7fca9687ece465c675dc6d
+EBUILD pdm-pep517-0.12.7.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
 MISC metadata.xml 400 BLAKE2B 0882adff4040585d2881a8712b035a5204909639f80f637526b793fd9e31e9d6cda6119cc069d8ff2e768b9d5807eab16bc27bfd35beb5a613722afead2d8b0c SHA512 484e17561642cf1d26d61a1d95554614b9e77b1ee985cba61ad35dad9c9470d0f64e99385200b8eb7e2cdd5e1427cf7835d6e39c10dece1fb90dd6e81cd15d91
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.12.7.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.12.7.ebuild
index ce38d4f05e82..65915f36678c 100644
--- a/dev-python/pdm-pep517/pdm-pep517-0.12.7.ebuild
+++ b/dev-python/pdm-pep517/pdm-pep517-0.12.7.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 6bf2bec1de82..0563ebc6ff7a 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,5 +1,3 @@
-DIST pillow-9.0.1.tar.gz 49512045 BLAKE2B 14f0969c87c57bad8fc38d873bba7a118d666e8b2e62e777ea17197e5ca973b3994bafb56b4464cde4059f2fc4040d73e7ddeec2a1053aeb1f201bf2ec2b38e2 SHA512 73893fe079bb2405c87b73b13b6eff198fb8970a891a7c9586bd2620ea0310d54cb35b1d594c6c6d3859e47d8d467700f987ae32aa6d3dc4a2e9286e8749869e
 DIST pillow-9.1.1.tar.gz 49753799 BLAKE2B 969a338f768951c340177d0590c50ba1213f48810870ac3fdbc2556c57344e356e0cf1ef080bde29bf89291adbf9f64b2dd1f950260d2ce5c0eb28d197f2dfe2 SHA512 8c05c0af6be992667d764046c6d7c189e1486d6ab987474c15e3bc8a64b9955d4c91d94b94ea46ef6d1c6f343ba424240dfa7d758c666bec40fa580728206a5f
-EBUILD pillow-9.0.1-r1.ebuild 2881 BLAKE2B b33c7d8e8e2bf651c3a1a5d83591b96a7465c944089a5ef0b3d29bb538e803a27d93f2d4382815140a36b9c54154cd1fee2352bdd242f28aadc748ae9948ea7f SHA512 07c5fc23b6cd89a680bbe45bf656d750543e3d6fd540a29ffc5b915b4829e386a0ec9468418a849246886932b83604bf8175428062eff4ecc56a9b204e79937a
-EBUILD pillow-9.1.1.ebuild 3149 BLAKE2B 2f9db5a0971494792fac1bb75f46438c960e94df06d350874d7c213dc995a4b465393871b0ac82c1e259ef6efaadd84871d21f0c90bbef62af1d14d3edc7711c SHA512 e8e5eb096ef8460e83ea077facbe55d778f5c5116bc3678c665681add91117f91a73ee3e9d36e4059586b47d8a168582182f107fbc1803caac82cfd309343ea0
+EBUILD pillow-9.1.1.ebuild 3143 BLAKE2B fad8ba84632eb7c3629f29ffad6ab4446b867c406ef050beba384d11dd378f9fd6445d587dee4822c4c487dbc152ff49cefb0073199e614188af44e6244a00ce SHA512 2826d15d906f484a431629d69894da2a83dd6c966bcf0404d9c3bd4412e6504c8c94521efbdb1524d787c7ad2df91264611a94c47aff987b48ccd841f8393ee2
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-9.0.1-r1.ebuild b/dev-python/pillow/pillow-9.0.1-r1.ebuild
deleted file mode 100644
index 6f9c47da31be..000000000000
--- a/dev-python/pillow/pillow-9.0.1-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	xcb? ( x11-libs/libxcb )
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${DEPEND}
-	dev-python/olefile[${PYTHON_USEDEP}]"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		|| (
-			media-gfx/imagemagick[png]
-			media-gfx/graphicsmagick[png]
-		)
-	)
-"
-
-usepil() {
-	usex "${1}" enable disable
-}
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		disable_platform_guessing = True
-		$(usepil truetype)_freetype = True
-		$(usepil jpeg)_jpeg = True
-		$(usepil jpeg2k)_jpeg2000 = True
-		$(usepil lcms)_lcms = True
-		$(usepil tiff)_tiff = True
-		$(usepil imagequant)_imagequant = True
-		$(usepil webp)_webp = True
-		$(usepil webp)_webpmux = True
-		$(usepil xcb)_xcb = True
-		$(usepil zlib)_zlib = True
-	EOF
-
-	# setup.py won't let us add the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but it doesn't for this setup.py.
-	export \
-		INCLUDE="${ESYSROOT}"/usr/include \
-		LIB="${ESYSROOT}"/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-9.1.1.ebuild b/dev-python/pillow/pillow-9.1.1.ebuild
index 8a69de12cc12..0359d0ccbbe6 100644
--- a/dev-python/pillow/pillow-9.1.1.ebuild
+++ b/dev-python/pillow/pillow-9.1.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index f8d53d0eda2b..7a545f48efb6 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,6 +1,3 @@
-DIST pkginfo-1.8.2.tar.gz 374689 BLAKE2B bff34659d77c3f9f870b130ad0d86fa730c42f1f3db78468a4557df855eb57e6b1dc2fefbebf9126306736f680538bcc6cddcaefdcb9defdc99c22e04ae2e9fd SHA512 06164b6c17000cf25e72d39e4e025a395cdd09afaab6169180cf096bae5a1ff863930d3b368274b6a03458a9ae1c3cb996559c0b042807141435b1868189b5f6
 DIST pkginfo-1.8.3.tar.gz 375734 BLAKE2B a3e9779bcb7cd326d8bd8137fa388055032fd4ee7732d47a341807201a97f1d44652d8e46adefd301cf7cd3c1d041e49a6ed2b8752e12347a8a2a2349cf397bd SHA512 54a67bdf078b38600651cb94afa62e9d86fce512022b1e79eb4565289ae3fad2325647654704488968e18cd85cbba4bd0ce28392fd09ae9638ee449e802273eb
-EBUILD pkginfo-1.8.2-r1.ebuild 683 BLAKE2B f7a68d9bab4f7da9e753b621ab7840a9d2335efb759de45cd2b608681273f27ef17e7b9c934cff9a336595cdbd22d08fd5d0cb5ac73997e74c24b8ab7c557d0f SHA512 a8de06b90bc6a9c43d502e82886c74889f22e93ec41094259aabf63f818a5c65277241d95cee7a5291a3ef09ce35e2c2085192a958cd33df51ed04cc04e9e035
-EBUILD pkginfo-1.8.2.ebuild 606 BLAKE2B b20efb10398edb54e868e02bbf90e63471a999278eee940ffb1d3ebb8245643ee8278b1e96366124d839e5109ef4ac6d8f8376b53f58cc7da1f60c9a1ca3c5e1 SHA512 e8836c43887c6d98b1a2e5f3201dc934b0c24bbb9be2ca8528999d4196f0c62a216f8f87f460e31f2bba0c2d548e9ea3358e317a11c48d74cf3eb2b34220e702
-EBUILD pkginfo-1.8.3.ebuild 683 BLAKE2B f7a68d9bab4f7da9e753b621ab7840a9d2335efb759de45cd2b608681273f27ef17e7b9c934cff9a336595cdbd22d08fd5d0cb5ac73997e74c24b8ab7c557d0f SHA512 a8de06b90bc6a9c43d502e82886c74889f22e93ec41094259aabf63f818a5c65277241d95cee7a5291a3ef09ce35e2c2085192a958cd33df51ed04cc04e9e035
+EBUILD pkginfo-1.8.3.ebuild 675 BLAKE2B 0bc2a787bc673fc106f50b484bb9987b99cefd880e13b3dd1b9b91da211b496152b8de428ffee896ef00683c8db9c9ef4d25dded995a19a95d186484f1b2fa65 SHA512 4c33fa944601b4b831efcdd606dd36b9417b11a49d612421b2e8fa6146d3980fb0a4d5d0fccce36c1816b8ca335c29b8a4c7e5511ce83f1241b6da2af69131da
 MISC metadata.xml 346 BLAKE2B b5a7868643825a1bd22054657ade61cf2470a128044535fef6781c9319f1e0e240638f74232f6e4fed110421cb56c2ad6cc1c98e49ff8c1acb88585465829470 SHA512 00afd3ed2f6cc2e2806845dd0b96ee154dcaa73ee036d27a8e3bd6c85f2445fca1cd4948cf60b9f424d41ef3b67941d564f831008b1e18ef8952ccadbdbc8001
diff --git a/dev-python/pkginfo/pkginfo-1.8.2-r1.ebuild b/dev-python/pkginfo/pkginfo-1.8.2-r1.ebuild
deleted file mode 100644
index 0d4b0b97213c..000000000000
--- a/dev-python/pkginfo/pkginfo-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
-HOMEPAGE="
-	https://launchpad.net/pkginfo/
-	https://pypi.org/project/pkginfo/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
diff --git a/dev-python/pkginfo/pkginfo-1.8.2.ebuild b/dev-python/pkginfo/pkginfo-1.8.2.ebuild
deleted file mode 100644
index 74ac7d42116b..000000000000
--- a/dev-python/pkginfo/pkginfo-1.8.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
-HOMEPAGE="https://pypi.org/project/pkginfo/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
diff --git a/dev-python/pkginfo/pkginfo-1.8.3.ebuild b/dev-python/pkginfo/pkginfo-1.8.3.ebuild
index 0d4b0b97213c..6c2807d22d3f 100644
--- a/dev-python/pkginfo/pkginfo-1.8.3.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.8.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index b564461223ea..d9253b450dda 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -3,5 +3,5 @@ DIST psutil-5.9.0.tar.gz 478322 BLAKE2B 763c8ae14ae546bed64a360047d2ce38783e9e7e
 DIST psutil-5.9.1-tests-r2.patch.xz 3516 BLAKE2B 6a16d6f89fdeb06c7aa0d9d986eba84deae5f8d2bb829c2509744f954f9b274d8a70a00f94127f1880cea71f8d7e7b85097517f8516ee6ef14f17522ee9297b2 SHA512 b69efb32cd0229056ff9fbbde963f0f01f6bf1d0820f028527f464e38a9bd4211a55bd725cc8962a20608c12c28edb24b2063f5f58b53fdb6b001fe2f95da103
 DIST psutil-5.9.1.tar.gz 479090 BLAKE2B 88f35a9134d942fa56b5fbc79753e82245c3bfdb1f640dbf3b56815b89d872517f9ee3a3945532ebd1a399c3307e160ac80394766c3b2cc7e3fb36ffdd555eef SHA512 1ddb119a10243d17d808417817ec8659d22447f12a4bbc0366c13f6587a4b0b59f4e74f6ac5d1e1a908bb5fd287be630466d32beabcb5008f6a19c24a1557c27
 EBUILD psutil-5.9.0.ebuild 1157 BLAKE2B 10236f0cfb2e5b2f58e6c79e029edebd7e5d8e9ebc53f12b8620b6eb649db6ac7198cb0abdd18e0a17df6e3a86fe84a642ed202f09742a3b93e2f91e29f73297 SHA512 77ff144ed2f3c70555ec8c92b6feb73350a8ee97e96b1e92719a7847a4fd3014b26df9cc608813f45b63e0e4ef5ad3ea091774fb2e753522ec01a7c6a588b950
-EBUILD psutil-5.9.1.ebuild 1244 BLAKE2B 30e5ed3cf8dbe5cd4daefcb539fb608fb83899a0d1c0db4326dbc3ee236d5833623d00db40d0d491a27854af13a579c6d35d8eee9bb3d8b1e08dfae0a0dd79a5 SHA512 b4f5cbfb221d8c507c1a0ed69a0444eb09e65cc6768db5a00d582c777b83e5604bf79c20e1f397976d5496d4ceed379a7318e0c83bc3a0b7343c0332682a79b2
+EBUILD psutil-5.9.1.ebuild 1243 BLAKE2B 593488caca3f7ea620c813a4a87d85cec302d0c4a722722150507c39caf386ced35e56e54b0f28c913a7c10dd457dab598449579710daf9604d47eeec27472a2 SHA512 b7502bf413428481a6afda607fb56ea85b7f0d07f8d180b3978e98860a15747f437dba5bb734d3a7c204687de4623b5a035866b90f66bf0323cf3a83ecdf269f
 MISC metadata.xml 378 BLAKE2B 235c056a427ab18383c401143074ec62b91d471087c34e2bd48d5192c6221e089e32170d18cd0d69d51eb2bb02fb8a0efe59245af9224b284557812b32c341b5 SHA512 96492308dac753fb176e4810efa71757e66413d16589e52a942b02c91256b48f9873b53a698006923aef12aa7d1539d6fd7aa07632c073b6a92cc8920f6ce6c0
diff --git a/dev-python/psutil/psutil-5.9.1.ebuild b/dev-python/psutil/psutil-5.9.1.ebuild
index 42ac56705b81..1345a4d6ded7 100644
--- a/dev-python/psutil/psutil-5.9.1.ebuild
+++ b/dev-python/psutil/psutil-5.9.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 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"
+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 )"
 
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 29dca9bedd5e..b4447a09172a 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,4 +1,6 @@
 AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e98b085336f5ce815304e326a5a2bd5cc8ff5d33b6efba440505767517b79c2f0bba39ab33f04d7434a3f0ee529b880ff7552aee2805dab5 SHA512 d53677c0ad96f161f9aed14b8f353a8cc12c92f31de9733789f9c4151710376d33e974fd611b763de94c631796d7a57cd8787656e3c1e985696e20537b34760e
 DIST pycryptodome-3.14.1.tar.gz 15339859 BLAKE2B 72748a4eaf9f34be1ac3200a0ed0285a96111f52077b6d7cc5b4fa26599b6b8c6c17d79cdce4cabd7257cef840daf71440a78d00ded65deb52fa13e6b1b1efe6 SHA512 08e904aa2f3df19fcc75a8283fc867349617afe3919532912801d8abc9610f1cb64b878b56202cbdf0759cf5506ec5f793123093e21f18ba99acbf42fa4d9cf1
+DIST pycryptodome-3.15.0.gh.tar.gz 16547902 BLAKE2B ce1a6eaca4946d656c08f960f67537e61b9c82a69777fcb0b01b91a9a649c605dcc66a2a6d9fdc5533521a669544c7695e83db856dfcf8e4b2ba7301654b5555 SHA512 fc611174cfb4ca89fb457cc0d1220326ac813de5a83a959a95c1928a5220dc8c652655ac0a2b7d116b60cb4a8317959d8c2b2f3595e19b9b359a32beb042b58c
 EBUILD pycryptodome-3.14.1.ebuild 1161 BLAKE2B b0874894b4bd716bc3129a5b110f1b5697830b9554913afca5e98307be354dd963bbfec9ce9780bbb6af9d8da96304a7cd3807c57ec8db20931d5f3fb4b479c5 SHA512 e03092dd0f2a82057bc7b1a88c150590ac48f23d4487444c029a127ec1d18893caa2b29cada83b6a126a4651b40628ff088e322645d5da02a51a7a355cbaab32
+EBUILD pycryptodome-3.15.0.ebuild 1334 BLAKE2B 0a304f9fab2dce9030355fb0ca716471983424754e38b850363b86aa41499161e0568602c09a78a2bb5f187f5955f504b415fc85ca7802ab55033e4abfc0a99c SHA512 1c250f6bba72376d848984b2452cde8de241a62795c45c2ea14dbf96ff21bc6d4774e67305ecf40895a2ceb5896af2b1eed38fb35f9b5f6c28f7ca909a8dcc22
 MISC metadata.xml 386 BLAKE2B 1ec04c0cb752414f063177e637f1fc3e3c401db0c1f245cb33a3690e25597098b25fb2cd5f3ab99838a8bf8339906e2b23e325af5c7248fd880563c872c6fb60 SHA512 f19e2537c5a985389182860eaa45ae68a37ef1167c4b76b452513987fae6fcfb3534d102a079a003770372bbdb4f1997460c982b355f76d09f2387996e18091b
diff --git a/dev-python/pycryptodome/pycryptodome-3.15.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.15.0.ebuild
new file mode 100644
index 000000000000..9aa00023e3d2
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.15.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="
+	https://www.pycryptodome.org/
+	https://github.com/Legrandin/pycryptodome/
+	https://pypi.org/project/pycryptodome/
+"
+SRC_URI="
+	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2 Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	dev-libs/gmp:0=
+	>=dev-libs/libtomcrypt-1.18.2-r1:=
+"
+BDEPEND="
+	virtual/python-cffi[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+	!dev-python/pycrypto
+"
+
+PATCHES=(
+	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
+)
+
+python_prepare_all() {
+	# make sure we're unbundling it correctly
+	rm -r src/libtom || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTHONPATH=${S}/test_vectors:${PYTHONPATH}
+	"${EPYTHON}" - <<-EOF || die
+		import sys
+		from Crypto import SelfTest
+		SelfTest.run(verbosity=2, stream=sys.stdout)
+	EOF
+}
diff --git a/dev-python/pycson/Manifest b/dev-python/pycson/Manifest
index 3c8d311b9ee3..6ed6719fa7b6 100644
--- a/dev-python/pycson/Manifest
+++ b/dev-python/pycson/Manifest
@@ -1,5 +1,5 @@
 DIST pycson-0.8.tar.gz 10448 BLAKE2B 55e2ec4a447761d6764e9f25cdff534d3dcdf2a0e3bfd9255f02b1a5cd9834e4f4323ba47a1659ea973f995c34519622e36c691bef763ba83c8caf87fbc49f58 SHA512 873f1b0d825ad318ca5c62fccbdd12a8738c8b9ff58b4fe27ea611aa47575e24218b5010f6d6b12f5ebda835c2778dd15472ca5c73b634b3004aa08496f45328
 EBUILD pycson-0.8-r1.ebuild 480 BLAKE2B dfcd1b5e7a5cef8eb3269be4c3493129925d0b86ed9348bc71b154efa7f2e71ee7259238d0b22ff842b25c5eb86341748cd804cf7555c181d3bbc1924249c1a2 SHA512 27fec327e4d8bf3cb8a83bb08b7c57bd3cc5c34d76a3ccfc9798f5026f9b487ca09255e8409819a332c14ce23795a7f8455059f0c952b2bcfb8d85af0bfb9dbf
 EBUILD pycson-0.8-r2.ebuild 483 BLAKE2B ba9d5a95d4262a9ab99f10647db956e5099588a6805683dd3e7f5ac9ecca58b3897c9a687e5f49ae50c6567a089f9534583b0c43969da39a3af051623689a7ec SHA512 6005bd57f1e4ba6a97df15476d91d2925f6165858c20e4c602233f984d57a3de6ea59657eb7058c930b2af42ca39c97f84710cab523eef78fd83e2f28d392a74
-EBUILD pycson-0.8-r3.ebuild 533 BLAKE2B b64627bb8388a0103fe66d4a143e93114fbd7fcbcc8ef339ecad091fcad3fa02654b625900955fcd5a296d69176d88b625217506f58e1e4830d0cab8f672e067 SHA512 0817fab97b9d54764eaf1aac5aab6d7cc75892493def115259d44b0f894b58e645cda79917ed48d48a20bd0811ef4d96741a677d855b7d01a46e8b0686d738fa
+EBUILD pycson-0.8-r3.ebuild 531 BLAKE2B 4fecbab32310ee1618d8233c3eed2d189b4313a2832daab616a424a8a61563fde2d7f79e5acb3efbd5a491003dd8c3c680b25671a7009f58c4cb04b782906a6b SHA512 a7f69afd7f28889e60c68894438094f56eb1ef70a3fd89cd82c4a912283ff2068a8d785a604adbe0bbe0b903fe1835b7f010827f8ed62cc6ab868cb650cdf490
 MISC metadata.xml 404 BLAKE2B 2e69b57992fd74e8ae5c3c31b60c475faad1cfd0d27cc889fab184ec698c81ebfcc3016270ed000d3d2eace0929cfaa67be2feff6339d100a66388bdca2db837 SHA512 019ce3710f16f501f961544f638da92a268f83403bf7b58e3bc1fca957d2f36ea870c9c4b8c44cb0e48de93380e1a0155bfe16758e1d73595d2ea88b40cf9464
diff --git a/dev-python/pycson/pycson-0.8-r3.ebuild b/dev-python/pycson/pycson-0.8-r3.ebuild
index f0115a8f8e55..e925eb8a41fc 100644
--- a/dev-python/pycson/pycson-0.8-r3.ebuild
+++ b/dev-python/pycson/pycson-0.8-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/avakar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~riscv x86"
 
 RDEPEND="dev-python/speg[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 793e39c11d66..eb28f510f7b2 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,6 +1,3 @@
-DIST pydantic-1.9.0.tar.gz 299758 BLAKE2B f6c2b89e598fc94db74b8165c449c752f11166752b12bbd37c23902b74c1f895bbd49b8fc4dc8da86b10880ac2e37178275cc28a42964e1133397364ea268d02 SHA512 ace542ff12698d568f2bea6121afc889c51892042b1a1b98464a6da6f71e50ecd8aafff7abd7ffd16983769844f7c970099d1fee7aa788f2e78172c0d5c4f472
 DIST pydantic-1.9.1.tar.gz 306846 BLAKE2B c22e892f403b6ca5eff7f888c68f9df5c198fa03c8dab833edc556b3b1a4819fc28c9818a649bf5d9c4bb745b0bde826e164eda7760cd26f88e278c86776ad84 SHA512 19d2a50ef054b76cc7e8756759f3d67a14a58614dd6ff1b4f60e73354b0028e08743aa3bb5944da7ae357ab279134d3685c454d6affa6524b267c7cd9a40375e
-EBUILD pydantic-1.9.0-r2.ebuild 1781 BLAKE2B 1abc19250b73f7675214ed0f10aa8fae0f3b8f57302167e1af93c2830d05b3c080a62f1d7d37088aecb47765688b7f314017d3f0348d127422a7856a92a130b5 SHA512 2bde02fb92797d94a67ee7cc247e0cf862a7910847d9e94043b8377476db6e2ad9d528f5fbb95ee97d17b70f05573c50780965c1440f2bd84ab5dec628fcb53c
-EBUILD pydantic-1.9.0-r4.ebuild 2046 BLAKE2B e97b3adbb7c234d580b1c2476843a01f9eca49a7fef9b38ad0c9b71c3212438ddf0eb22d07cde79495c78997ccff231cc0be2c2ed1c16b6b87db5bcb81b67337 SHA512 f6a8b7672c8e55938003d20aa1baf37430d2d023ac5990b8631c4c9a3448a4785efe0ef534c8e8a44524f90b77116aeb48bdfebebf4034e7fa5b2b3cae573d9c
-EBUILD pydantic-1.9.1.ebuild 2100 BLAKE2B 67660ff4fd1bdbd4c6d24bd5ceaebf87459491873f4fdc9c9e2147225d6dfd9c50275fc2ef99e48453e9d934da234892f7b32f0e9841f2eebf471bf38e727e40 SHA512 47341d28f610efa584fff57982e717c999c0245a7953d00a4e89edfc4ddfd66e5c8a372f57dbade727dfb23b3d8b7359034a9d17a10a6f607ea7e8045a4832e2
+EBUILD pydantic-1.9.1.ebuild 2099 BLAKE2B 10a509b9b1b527e01c0aac2542a09dd9dd0a38132d45c2e02f3b8c0fc1d469d4d4ae6a5245e27ccc7cc85f8538edc86cf249c14e365e43233dee0a5127f85852 SHA512 c28f602375c529b5081ba5823c68452f5372fe97b9cddcd09100a617834f01fc9bfac731643cc18dc370387934c14c40a9afb4405a8c56f589545b243f82ac05
 MISC metadata.xml 492 BLAKE2B e21bc5a40669b2b321ba310df9dd4c6ff424e77d9d961b3aebc1f62b579444c7f505c19dae02590de999cfd8168ac522034275583fb4835e97e8db9b153fefda SHA512 bfb9c7a069a79735543dc12101af7cca16acc5fd93cae01515dc35a106c16a419c0e0e3a97a6bc8426c3db776417f7d29231022cb6ac27020f97e5dcfe0d0cbb
diff --git a/dev-python/pydantic/pydantic-1.9.0-r2.ebuild b/dev-python/pydantic/pydantic-1.9.0-r2.ebuild
deleted file mode 100644
index fa8a4597f362..000000000000
--- a/dev-python/pydantic/pydantic-1.9.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="https://github.com/samuelcolvin/pydantic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		<dev-python/python-email-validator-1.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/CFLAGS/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock
-
-	local EPYTEST_DESELECT=(
-		# flaky test, known upstream
-		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
-	)
-	case ${EPYTHON} in
-		python3.8)
-			EPYTEST_DESELECT+=(
-				# Those fail on python 3.8 as None changed typing semantic on >=3.9
-				"tests/test_types.py::test_none[value_type3]"
-				tests/test_typing.py::test_is_none_type
-			)
-			;;
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_private_attributes.py::test_private_attribute
-				tests/test_private_attributes.py::test_private_attribute_annotation
-				tests/test_private_attributes.py::test_private_attribute_factory
-				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
-				tests/test_private_attributes.py::test_underscore_attrs_are_private
-			)
-			;;
-	esac
-	distutils_install_for_testing
-	epytest
-}
diff --git a/dev-python/pydantic/pydantic-1.9.0-r4.ebuild b/dev-python/pydantic/pydantic-1.9.0-r4.ebuild
deleted file mode 100644
index e7687b5727a4..000000000000
--- a/dev-python/pydantic/pydantic-1.9.0-r4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="https://github.com/samuelcolvin/pydantic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		>=dev-python/python-email-validator-1.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/CFLAGS/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		# do not build extensions on PyPy to workaround
-		# https://github.com/cython/cython/issues/4763
-		local -x SKIP_CYTHON=1
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock
-
-	local EPYTEST_DESELECT=(
-		# flaky test, known upstream
-		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
-	)
-	case ${EPYTHON} in
-		python3.8)
-			EPYTEST_DESELECT+=(
-				# Those fail on python 3.8 as None changed typing semantic on >=3.9
-				"tests/test_types.py::test_none[value_type3]"
-				tests/test_typing.py::test_is_none_type
-			)
-			;;
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_private_attributes.py::test_private_attribute
-				tests/test_private_attributes.py::test_private_attribute_annotation
-				tests/test_private_attributes.py::test_private_attribute_factory
-				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
-				tests/test_private_attributes.py::test_underscore_attrs_are_private
-			)
-			;;
-	esac
-	rm -rf pydantic || die
-	epytest
-}
diff --git a/dev-python/pydantic/pydantic-1.9.1.ebuild b/dev-python/pydantic/pydantic-1.9.1.ebuild
index a8d4252b6f35..1c247df8fc3d 100644
--- a/dev-python/pydantic/pydantic-1.9.1.ebuild
+++ b/dev-python/pydantic/pydantic-1.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
diff --git a/dev-python/pydiffx/Manifest b/dev-python/pydiffx/Manifest
index ee2f12254ed0..547db1525b9e 100644
--- a/dev-python/pydiffx/Manifest
+++ b/dev-python/pydiffx/Manifest
@@ -1,3 +1,3 @@
 DIST diffx-pydiffx-release-1.0.1.tar.gz 82838 BLAKE2B 80ac477ff6b72dd089f134afc988251b20f7675e05c429e12238800145ed70f57acca835ddfdd77a2b22e53767b77d741537aad02f93bdefcee06a44965c7904 SHA512 dcb6b9dad321c5bec940d13dcf64853587c4e7636d34ea3ac4bc2b54df8915e1ac9804932034c069fcfba5f10f05972cc7dc46ba0d37c2e08c684bcbb2c2409e
-EBUILD pydiffx-1.0.1-r1.ebuild 850 BLAKE2B 46d1aa39dd7d741c3d23238c8810620c778e9c9e9be57c65a0facac35d5f9d973a283e5e5131a21e99478dc761cd0c37d63296608b3df292e81e1b93873feee8 SHA512 07d911a9733b0129a408d14f45d856977c1a296399adb811e5d90a83984c7509dc41d8012791c21c9d6a5b25f16b7703bd6e6b89d3ecec3e70a78a92a7181489
+EBUILD pydiffx-1.0.1-r1.ebuild 855 BLAKE2B 40717678dd1d34802f14953f3cde16336ae8e80d233bc0147d6a6e6fdd667fefcd0fb60aedfe5ca54aebce0fd4367a9a952de746565c4a7cbb6379fff5955990 SHA512 accd8ffd126b6dfdd4f5500ff9c69a46126fafc7653ae6a8ad88b9c48dff98372fe3a523405be020a6eab03a25b62fcd82aa4f747ff0eceb7b77767d2de85785
 MISC metadata.xml 391 BLAKE2B 76c0b2eac63df75f2ad64518c4afff762891acab6983e22f7b5e7e270fc3eec64f5e8b05dfd82125cf2b9a251dd827eca9a5173852345dcf37cb5a7a41940ccb SHA512 2f15007d5da3fb592458d72cb0ad267f5fdc2e3cbb1c6df351fcf28f897ff7a98992d6ffd7e3c1050edcd57b1d40ef66874e8bb25178c01762feae62f23e436c
diff --git a/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild b/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
index d20ee3c8b60d..a5106d25a571 100644
--- a/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
+++ b/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/pyfeyn/Manifest b/dev-python/pyfeyn/Manifest
deleted file mode 100644
index e7c28122dbad..000000000000
--- a/dev-python/pyfeyn/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pyfeyn-1.0.0.patch 1012 BLAKE2B d3d8ba8f46c9fe6eac5db4183c18fbbe118ba36bbcc3b9a263a470fac702ac81c17bb77acf7b913c3a3bb51d4f12bda60b07d8152a324b8f4c927f1800b104c2 SHA512 43811f881c479062af0376c9d3dbe440383599d7e6937481ad2ca8dbca3ff404ab8d04adaa4afcdf1c4eb001340ed1870a7f50730fbc3d4c458f5d6a1936cc73
-DIST pyfeyn-1.0.0.tar.gz 27316 BLAKE2B f1ece2e64be35f6e64dbe539406462c1802bb0149577662a92658769c1b347c2d98786cd83998e8887cc609f8ffa5aac3e3c995c253f54badd5bed43050dbf0f SHA512 edecbb61cbc63adb5d218cd53e45568f42aa018875bd57485afe612080300a16dd93d1dd0a1286b040a27aaf727a9e35e210f2a2edccaf9e6e114301a91c839a
-EBUILD pyfeyn-1.0.0-r2.ebuild 556 BLAKE2B fa2d388d486be83249356df9c766aba9781b1eb5f5d9e524e49e3220ea7f8a5d930f3c082e360b11e2e52d7caca625bef21b60b766f1420653e967e6bdefdf68 SHA512 797d7c8519b3124aa32fe21631e9df7302e1b5e9323f9bf000307969730bd4dd4d2ddf74b90a7201eeba8f09787687354f491beac2647c8a8a509cc96f2d82c1
-MISC metadata.xml 417 BLAKE2B 5e6d04e745bb383861b98e36e1d75928dc350806aa27ebd831789ea5520f101562d6f6adc9c52c8f8edc154bd7cb8ec3ab7e936a70a7a5392832a200c51f18a8 SHA512 65e098a0a5cc965770dc674bb6d9ccbf8e60fb24080fd382f8dcd828f8124cbd046e8b82e8af52a8e8bb7fc7554d8861e50c98dd66492b9370754eeb5788c79c
diff --git a/dev-python/pyfeyn/files/pyfeyn-1.0.0.patch b/dev-python/pyfeyn/files/pyfeyn-1.0.0.patch
deleted file mode 100644
index 0b4c29e74033..000000000000
--- a/dev-python/pyfeyn/files/pyfeyn-1.0.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -r -U1 pyfeyn-1.0.0.orig/pyfeyn/feynml.py pyfeyn-1.0.0/pyfeyn/feynml.py
---- pyfeyn-1.0.0.orig/pyfeyn/feynml.py	2016-02-09 22:48:29.000000000 +0100
-+++ pyfeyn-1.0.0/pyfeyn/feynml.py	2016-02-14 13:11:16.034537778 +0100
-@@ -257,3 +257,3 @@
-         if self.root.tag != "feynml":
--            raise "FeynML Error: <feynml> must be root element" % self.root.tag
-+            raise Exception("FeynML Error: <feynml> must be root element" % self.root.tag)
-         for element in self.root:
-@@ -266,3 +266,3 @@
-             else:
--                raise "FeynML Error: invalid top-level tag <%s>" % element.tag
-+                raise Exception("FeynML Error: invalid top-level tag <%s>" % element.tag)
- 
-@@ -328,3 +328,3 @@
-             except:
--                raise "FeynML Error: invalid bend amount %s for <propagator> element"%element.attrib["bend"]
-+                raise Exception("FeynML Error: invalid bend amount %s for <propagator> element"%element.attrib["bend"])
-         if "style" in element.attrib:
diff --git a/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild b/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
deleted file mode 100644
index 4d4853433857..000000000000
--- a/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for drawing Feynman diagrams"
-HOMEPAGE="http://pyfeyn.hepforge.org/ https://pypi.org/project/pyfeyn/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex"
-
-DEPEND=""
-RDEPEND=">=dev-python/pyx-0.15[${PYTHON_USEDEP}]
-	latex? ( dev-texlive/texlive-mathscience )"
-
-PATCHES=( "${FILESDIR}"/${P}.patch )
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index 95680a5cd7c4..f4fada5259e6 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,5 +1,7 @@
 DIST pyghmi-1.5.47.tar.gz 243783 BLAKE2B 4611df2616c7681c10664b645969b40f85a41ea2f16c3bcd4123230e90087903e6d7265b0147d93f994a4af32a77750685230d4e977418ba129a3e2093f8065c SHA512 f4122537488ca05035603f15106646e539c5081ee71ba3fc1f37e8175ffe98dbbc59446fa4683816a4211b90bb9f82adea4c5d42e4ce8b2b301c35f862262394
 DIST pyghmi-1.5.48.tar.gz 243927 BLAKE2B 8395aa3bbba752654c2ad73f76735370f31f9548f91e7e0bbb3e52afd2d67a00b316f7e1e25a49ad16004308a635104fa57a00a6bed63639068de86d96e44316 SHA512 f3ee4d44504b2fa5950817e1957ac23c666af6ba36b0ba65dafa5b42036d12d204accf996c75947ecdb5f9533025b9b0d17b0e96612019d622fee678fd0ff592
+DIST pyghmi-1.5.49.tar.gz 244142 BLAKE2B f35b483cc4d48c5bc3fe6bd5c6ac3ea320d7c131a0e77f8ff8af1d14ecdc38972170d93b830070ab8c2d27ec8b8f1607ea0c065af4ad402bd0ee2e25307b9658 SHA512 9c8ce9ddf61b613cba59a49af4f5ebc40e37f83debf10854d2781f6b47fb0fff058cb9f784ed2d527f84ed1bad7c12acb97460fbab6a8552876510634c1bf5dd
 EBUILD pyghmi-1.5.47.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
 EBUILD pyghmi-1.5.48.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
+EBUILD pyghmi-1.5.49.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
 MISC metadata.xml 439 BLAKE2B 0c7ccbc424041a506c60bb0934e40465b64a9779d4d2b6992ba5d4c8563b114da1470a1b221798773824b92fc7b5d6e7b2f0b0afff7f266ea1fbf450f336c497 SHA512 0c919c41bbef88b080cd5941d767cb3f79e935dfedb6da16353b80da2966d488936768b8ad04c7fc695b3c6376143430115f5533b3492816bf293ab2ccf37fb8
diff --git a/dev-python/pyghmi/pyghmi-1.5.49.ebuild b/dev-python/pyghmi/pyghmi-1.5.49.ebuild
new file mode 100644
index 000000000000..1844c945d4be
--- /dev/null
+++ b/dev-python/pyghmi/pyghmi-1.5.49.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure python implementation of IPMI protocol"
+HOMEPAGE="
+	https://opendev.org/x/pyghmi/
+	https://pypi.org/project/pyghmi/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.5[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 2b3309bf1da4..83daf83b8b15 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,5 +1,3 @@
-DIST pygit2-1.9.1.gh.tar.gz 317487 BLAKE2B 56855e656eafc27f24d8d59a0f21e36c49d292d322e6809257036ec0673f88d3299bca76c8f1c1a16bc79d667f0c6a355467ac5960c9999b11c8eddbf398cec6 SHA512 cfc050ef8cb6af7eace49d2e2ca10c77893abcafa1b319e173d39553e01a595ba084e345dedff22e22806527ecaed5387584f813b30184931820bb2bb1c93e58
 DIST pygit2-1.9.2.gh.tar.gz 750593 BLAKE2B 89eeb56edbb7f823c0439e511e3a525789483a80760f6dcfbbdea7f45f1e16241d9772b54288c0acdb471bfe62a457e8fe82ec520d808d01ee8d079076278761 SHA512 523af14ae418b56efd3c541fb306c3a799224db400053590f1676ace9b53ac4c731a1731081f245cd78ab5d233c9e67fa2e5c13e02b6f62de05123cd47a1a70a
-EBUILD pygit2-1.9.1.ebuild 869 BLAKE2B f912f869ad8775a1e7b3a8a7ea5fbd7149ea3d0b9881c31428072a55f8adc15b024c4166a2e8dbd3da9e248c963cc8d2cb84c1efcfb910d266a1806e2da7137a SHA512 2da48fde929e424f1b900ab2112465df3a5cb757e34d94be5b798d04f766ccde0bd3b5d3b1d422f3c454ab867dccf672f68e4f726aeae64a0aff7ad83922462a
-EBUILD pygit2-1.9.2.ebuild 872 BLAKE2B eb581843c9149569b0f6da360069fd3fedf49da50b42c915902e5be38c067baa47787036fbed4b066f94d656b451d5142e9a5b938f9795bfe37f3ad83236dc2e SHA512 88b6c90afbbb4fb9d3d436db2c6e1cae2b5b127dfeda8cbebda6979c36a788047ea35b2ab3f28022bbae351f256257100bb8b9a063d16c0b683f301d600bda7c
+EBUILD pygit2-1.9.2.ebuild 870 BLAKE2B d15704061779a3431fd04c42c2470bbbe1eed31232335d0171f679c3c91c96ee666c84aca5bc44dd10f7cebe1dfd2c2ce8bcfeae3713ea88e0ae438bfd542476 SHA512 9faa85311b249d276ad7c33605a3b2fe3284a8284239a3103595960708eb0888fc4cd3e543828523373680f0c96d3370624cf6b1aeb97f5f6aa8055c47c0f271
 MISC metadata.xml 490 BLAKE2B a53da88b5fe40a56d831bb5589d03d247ca1d1d843bde9a1fe6999563a42c076a9f6462b6947ae217086e5edde35a4788f4552636871891f9820534a6f0bade6 SHA512 57cb7356bbb0a22fce2d7ecd8ab346ef5c8155d0941d6a15bf2e98364e755d6e5e5d6aacf24017b4b827b983032e4d46f2363483ac66d6e3882c8be12e60fb39
diff --git a/dev-python/pygit2/pygit2-1.9.1.ebuild b/dev-python/pygit2/pygit2-1.9.1.ebuild
deleted file mode 100644
index 51bfbad8388d..000000000000
--- a/dev-python/pygit2/pygit2-1.9.1.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="
-	https://github.com/libgit2/pygit2/
-	https://pypi.org/project/pygit2/"
-SRC_URI="
-	https://github.com/libgit2/pygit2/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-DEPEND="
-	=dev-libs/libgit2-1.4*:=
-"
-BDEPEND="
-	>=dev-python/cffi-1.9.1:=[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-}
-
-src_test() {
-	rm -r pygit2 || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pygit2/pygit2-1.9.2.ebuild b/dev-python/pygit2/pygit2-1.9.2.ebuild
index 803654ff18f9..14b86977a62b 100644
--- a/dev-python/pygit2/pygit2-1.9.2.ebuild
+++ b/dev-python/pygit2/pygit2-1.9.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DEPEND="
 	=dev-libs/libgit2-1.4*:=
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
new file mode 100644
index 000000000000..9dfab4d37305
--- /dev/null
+++ b/dev-python/pyproject-fmt/Manifest
@@ -0,0 +1,3 @@
+DIST pyproject-fmt-0.3.3.gh.tar.gz 14399 BLAKE2B 82af6d6c4424f83ed9a5539d64bfd517cf08df4bb14b7f1321a379a4d87d140f1518444b503731344e5fdbb4b94d92ce23605fe2a1cc978d26901eae98a31b8c SHA512 49c4648e140b34a6d2f27cc01be7253693e79687f2ff8dbcae5ca3cc64c14f5945f942ffb42d1d286ff221e5aaed22dc1f9953216f49232ce311c4c18130754e
+EBUILD pyproject-fmt-0.3.3.ebuild 776 BLAKE2B 6cacc964e5da9df0ed7b6a89e6cc4b2a1177ee2fca7dfd97b4e1564f0c9e13644ac2897f9bc8193cd7defaec18820a5f5d0b70740d5a82dc5b734ee2f480383e SHA512 7521d1c96aff9a1b3ea7d84311e410c5730b7a3cf83c12543e49b62c523b688ef009493fdc05de3a8debe29276a884fb5be3e9d01bbca505f0125e0da1ed3fff
+MISC metadata.xml 356 BLAKE2B 9d15eb809d02ee235382282c3eaaea6ae0f3c0192045829495fae1244f88907673f5e5ec26ee5234f25267add21b34fe416d1d48e54f3a899773160bad1cbc8d SHA512 77a3e6273b92141d5a337ab28b162ee27f3f1970316fe42becf2efbd4cdbc5ed6cb26f1f24201d0605c26dfaac75db467f42b00cc47df0093336bd0629f0a1cd
diff --git a/dev-python/m2r/metadata.xml b/dev-python/pyproject-fmt/metadata.xml
similarity index 50%
rename from dev-python/m2r/metadata.xml
rename to dev-python/pyproject-fmt/metadata.xml
index 5d31d72e555d..2b685521272a 100644
--- a/dev-python/m2r/metadata.xml
+++ b/dev-python/pyproject-fmt/metadata.xml
@@ -3,15 +3,9 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
-		<name>Python</name>
 	</maintainer>
-	<stabilize-allarches/>
 	<upstream>
-		<maintainer>
-			<email>miyako.dev@gmail.com</email>
-			<name>Hiroyuki Takagi</name>
-		</maintainer>
-		<remote-id type="pypi">m2r</remote-id>
-		<remote-id type="github">miyakogi/m2r</remote-id>
+		<remote-id type="github">tox-dev/pyproject-fmt</remote-id>
+		<remote-id type="pypi">pyproject-fmt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.3.3.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.3.3.ebuild
new file mode 100644
index 000000000000..bf9e0c458bdd
--- /dev/null
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.3.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Format your pyproject.toml file"
+HOMEPAGE="
+	https://github.com/tox-dev/pyproject-fmt/
+	https://pypi.org/project/pyproject-fmt/
+"
+SRC_URI="
+	https://github.com/tox-dev/pyproject-fmt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.10[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-mock-3.7[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-datadir/Manifest b/dev-python/pytest-datadir/Manifest
index 1689025f34bc..4e5dfaa884b9 100644
--- a/dev-python/pytest-datadir/Manifest
+++ b/dev-python/pytest-datadir/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-datadir-1.3.1.tar.gz 15230 BLAKE2B 72c5daaeb93315be55ae052d39a22eee4e64a1aaafa344ae64b527eebd137dc4667cee2f60af887551f00814d7ea4e5788097d0f59f7769335545c5083aef356 SHA512 2ab035ea4e6c4eaaead746a5fd3988feed31a314f73e18270faf4ae606521aa045f3d6c5e1301adcb87f8fd5b1ba5f3f1784f212ad778707ba46ad638d594f8c
-EBUILD pytest-datadir-1.3.1-r1.ebuild 695 BLAKE2B 052088c53ea189e1e5ea4ffc83194685886cdde5fec0a96c297ee6afa68d576a03ee150409ceec4f0e52ca0ea390d599f7875c795198adae7d483f09e280dbeb SHA512 0cefef59c15343574eaefb88a5115fb3399fabf06de27d2b623ce52a8beac816329e6068eb3d6f19e347f480c33cc61026d531a398d2e1edf925eac06079931b
+EBUILD pytest-datadir-1.3.1-r1.ebuild 751 BLAKE2B aca38c3e98bd47fb7997a67c745c2b8eafd8ecb998415ab30c34098b38cfba7614d6c0dac4c5bd1195d3af78b54b7433c151c7c382f323974f201011282a695f SHA512 93c65524982c8f39158622c726d51613b0390a61b36bfa158603f9e7911d165c977c41f6401b40687a1c9eae879e0a58833a061da019c5233096335ce00dbe48
 MISC metadata.xml 360 BLAKE2B 32eda1b71737f15dd195beeb8a8b8a94c2c931a234e2c582d6841e2ec10e5e40010cb461fea2abeb1eedfa460da3edff78bd0befe638feee5b38a4dc453f221f SHA512 cf15128efd3dcf4b064a051144f9e1a7b2cb236f90ef437849204026ca2997e808866fa4b7972212daeae5b438a157a2b82d3db34084c5f3a94d7012b36117c3
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.3.1-r1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.3.1-r1.ebuild
index 9c4d8231dbed..29016d5497a1 100644
--- a/dev-python/pytest-datadir/pytest-datadir-1.3.1-r1.ebuild
+++ b/dev-python/pytest-datadir/pytest-datadir-1.3.1-r1.ebuild
@@ -4,18 +4,24 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Pytest plugin for manipulating test data directories and files"
-HOMEPAGE="https://github.com/gabrielcnr/pytest-datadir"
+HOMEPAGE="
+	https://github.com/gabrielcnr/pytest-datadir/
+	https://pypi.org/project/pytest-datadir/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index aabc93ea1814..7e2f904a11ed 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-httpx-0.20.0.gh.tar.gz 23106 BLAKE2B b44890bc0f916a10d57b1fe16523808cc9ab9a364d39980c49b4d26823afe7c9388b442cf99225605d741d192b5f282acdce0c7929e00ea076f10f04a55597a3 SHA512 54f588ddaaa0b9909f38a25ae1cf08d63f943a0fa169d4b77d2e8b967fc001af1f667b7c91dfcaf14bbed948d72df22ec133468ad692157b31259b2b155ebd88
 DIST pytest-httpx-0.21.0.gh.tar.gz 23123 BLAKE2B a9a1bc9effc557829071f13cec76aa1d164ae7040b685390c92f33c644c804448eba1ad3e841abdb667a2c0289abd64f5d3633779bd8b0355a1c03d390d94bd5 SHA512 6be6fb39ad1ef233ce9be7cf510422754b6c97a1b565d49224e82cbe4218ee24051b6c5865215ed575f200446dfe8dd1470908467c67077c51a4f5412b113c2a
-EBUILD pytest-httpx-0.20.0.ebuild 769 BLAKE2B 6e4ce988918503d8cfd0361690b4d46298c0d41cdba4089c408cfa0d33ed3fb636c4a64ed96ce3a47f2ed8194b8d160d7401b091a7852467d0115724791da7de SHA512 0ac2c85bafe2716b22e4924a1bfdc5ea371a7ce69c487d1e1d4beaef2e5a1dc71bb38159875b8554a38edec5f19fb20edcecc03bc80114f623b301110db193c1
 EBUILD pytest-httpx-0.21.0.ebuild 769 BLAKE2B 97cd781f719ab8478c394d961ab45506ac8d30a374706bae1cb0fc4e0f2b8d2f62f78deb5b283da7e66db18c7aff58d6545aa8d366f752ad1e21f19cbca28643 SHA512 0c7647d481c7bb97e95eafce830c03cfb02b596c23548c33d0baf6d69413e4d1db8ad9d4610cc706f8c6fe58818b36b13f436f71d62b284df04e1b899b8df981
 MISC metadata.xml 468 BLAKE2B e0f824f05936a831a958b027366ba18cad85307ac6c81b74b299f58270bcff53e06f32b2471d6433bd7014ffde83ddb24f787c07632453d14f4ee6e4679ffd10 SHA512 16bf024801db3c0d7b789cd1f16520a1ff2520e8b3e2abbeeff5b1192c19b8ac64f55fa678c922f8a817debcfe05242ce11e0164a00422445d7301858718b359
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.20.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.20.0.ebuild
deleted file mode 100644
index c43d99511ed4..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.20.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/_}"
-DESCRIPTION="Send responses to HTTPX using pytest"
-HOMEPAGE="
-	https://colin-b.github.io/pytest_httpx/
-	https://github.com/Colin-b/pytest_httpx/
-	https://pypi.org/project/pytest-httpx/
-"
-SRC_URI="
-	https://github.com/Colin-b/pytest_httpx/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	=dev-python/httpx-0.22*[${PYTHON_USEDEP}]
-	<dev-python/pytest-8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index ef6f9debec3c..fc27bfe9f227 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-mock-3.7.0.tar.gz 29311 BLAKE2B 27227b66008c70c4016c8e15d0021a67e84730a8b49c5664dc4f29e16d5f163df293269ab332707e44b7a0b182e15e20ab0ebaf4b9d923eb911083377972dad1 SHA512 6ba69e86bac8a430a9f1f1c615ad21f505b87848ac50fc551bc02f81306bf8769fd015615d96085d87d4c695c24b0686a95116721358687b48b64de5d0ae6901
+DIST pytest-mock-3.8.1.tar.gz 27671 BLAKE2B 6bb4a3d752ae0f4e751cb50fd6018802bb7f3cee53429693161185ef369bad8addd8637d2526750fcf9ddbe9205da3d1d615efa19b1d58ae71603ca3902c67a6 SHA512 db8c0e2cbb7f8741569035a4e6ab9335ec0b03e05f0df07de0de8dad769974f96752c15d85c439da432623b51296b88970e3e29a212930e2bac33ed47d6055f3
 EBUILD pytest-mock-3.7.0.ebuild 1059 BLAKE2B a16270f47039f3c785b0ab4887a8d254ef0c2ddbd9f3f47eee3c836aa306bd6c753527b46000a27cd52828ab721314b334e27b5058cb807316f6148cf7768248 SHA512 3c944b84e9242582e3e773d491d732bb16952e53e1948a73eb475d11420dc040042552b23048124dc43a709d8fbf3982bf645ed2e95ae2642596be1b1d3fa09b
+EBUILD pytest-mock-3.8.1.ebuild 1067 BLAKE2B 2054d7347b138717e9c83954c1c813a52b09081e375fe73de0bfa6dba9881656f54921a7a0c63d030e62abeb74c4ba4295cb58196af46801abc3e511c6dc33dc SHA512 427607c7a44bed7a2f47593ca67db71ec97f809dd91ceba04cd4fac564f041a22aa1d7d4ba0dd544bbbe465a4db21c6c4487bf4d857b1ac9b4777f91d495fdb4
 MISC metadata.xml 379 BLAKE2B 47a45606cecad3ecc9b902d9ec690c33a89728ce93038433f11ab8c3369089ef12e86c793ab06dedeef7a816dc973ae8ea2a6b717b13085c7912d69bcd68db65 SHA512 b5e43e5e0a1cfba50868ca542b00d40084aeb38f764f203ed112a9359e966e94d34a99bbb072b98f9401a0383d3fbf834b8b87572e073592263f18d73f09db2e
diff --git a/dev-python/pytest-mock/pytest-mock-3.8.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.8.1.ebuild
new file mode 100644
index 000000000000..ce9187b4e2e5
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-3.8.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-mock/
+	https://pypi.org/project/pytest-mock/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/pytest-6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,pytest_asyncio.plugin
+	local EPYTEST_DESELECT=()
+
+	if has_version dev-python/mock; then
+		EPYTEST_DESELECT+=(
+			tests/test_pytest_mock.py::test_standalone_mock
+		)
+	fi
+
+	epytest --assert=plain
+}
diff --git a/dev-python/pytest-param-files/Manifest b/dev-python/pytest-param-files/Manifest
index 0872291dd779..db2323a2f86e 100644
--- a/dev-python/pytest-param-files/Manifest
+++ b/dev-python/pytest-param-files/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-param-files-0.3.4.gh.tar.gz 6882 BLAKE2B e2e96bd2cf7b8676f92eeb7821ef76f1f82bb066210170ed4d04a16a7fb3ce346bcd63688ef9d46118c03fd74812fd821fff0414565befb8c558d03d15af2945 SHA512 2df6fe798aab743fdbf892b88ee1d09c554119429167e85bccb87e4ae9d487f8ab5a66c4157827500e8a5d2930277c7490348f6c38f23243e421d5449bde2df5
-EBUILD pytest-param-files-0.3.4.ebuild 642 BLAKE2B b069229d3f3dd3f104b6fedc7f25d1fb125296486ae6040a974f97ba917ce5e395fee59479b0ec7b28a9ce7b6732cc09a5dc48d82d53bd9b2acf013026c5dce5 SHA512 b3a1903f6616ec5d9b2406df015e0175d7730089e488829ce725a1dabd06d0a0931b1ffc488e253fb30f26b296ad4c569088a5135e63dc2f897e02bb1c498fb1
+EBUILD pytest-param-files-0.3.4.ebuild 656 BLAKE2B 7edf2380892e4cd9248b56ed240b6d01fec3d00c516ab0b5cc3a3df24fdcb535281fb3bdc9a0e273707abb4f0fc9c774ee2abd159e4f3c747aafcba2684b5a33 SHA512 07758a726d321205427f1eaf8d281f89f95079e46caad6f74e2508e1c3e3c213171537a4febbb929c6580f1870621566eaeef12929439f29d8af60f144b17f9b
 MISC metadata.xml 417 BLAKE2B 94bde89ae7cf0181aba1215f8a406889a4473736c37cc325c57635f590f72369402e54f8e54f0b528c9757229b4fdf8608b292a15cc6fa83a997aeb53a64b4ea SHA512 f5b341a0619f750edc6e3f22fc3cfb0c5204d2ce19a756df0f5b282f97fe133f8891105c48b532711bba826ef4cca935eeed4fbb0703da5213cbc3074b7229c2
diff --git a/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild b/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
index f4a729087867..816bb8658910 100644
--- a/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
+++ b/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
@@ -3,13 +3,16 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Pytest parametrize decorators from external files."
-HOMEPAGE="https://pypi.org/project/pytest_param_files/
-	https://github.com/chrisjsewell/pytest-param-files"
+HOMEPAGE="
+	https://github.com/chrisjsewell/pytest-param-files/
+	https://pypi.org/project/pytest_param_files/
+"
 SRC_URI="
 	https://github.com/chrisjsewell/pytest-param-files/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -19,6 +22,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index 8087bbec1a0f..cf1a7a4292df 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-qt-4.0.2.tar.gz 113466 BLAKE2B 73ba6571958f3f4cd76c3e891eaa014d464b94a7965afac6cee5b43bafdc63d4d640f84c7bfa1666146ab5139f79c760bd9f5a2a44f788b6384df200ac48ad0d SHA512 7f59c499e1395460c2ff20a969cec16ca104f742c648faa0d7eb1528c04d8ee52c04c52798478bc01c5467bee33d3389b141424491ba5442f9df4e82f0dff173
+DIST pytest-qt-4.1.0.tar.gz 119702 BLAKE2B 7c906c94761df6472ae65a6ebb38dff07de8156730e3e10615ea8e08f0bd9f9fee07127ee6e8616055117b1db1911bc9b4486345d84b249664d317561195ad77 SHA512 bfb56abbaac47bf9da26eb19d6913d59872f2a9923da339e9a30a2145d0a094ddec36bcfa21d39c4cf318f95a83c72c249fe70034294a6791f9d84345f77451d
 EBUILD pytest-qt-4.0.2-r1.ebuild 1578 BLAKE2B 36e13e3720c4e5739b2673992c2f888fc45400ac04a3a5d091d92bb32712ce39f7874c61e3c6e2f1511023b2ce5e8d2b06e75b0366e1d655be5e88e7c2a8f7b2 SHA512 68a89df20780c5d41865ed9b3d560667401712abbfce2e6dfe9071252ce95877b8c7854e0f7620d90543cd4f1381685d750f0fba4f6204a8b65e5252d886b04f
+EBUILD pytest-qt-4.1.0.ebuild 1695 BLAKE2B 11efdcf4e0ce3ef578e9a803476c0928f94ed3a8fe41caba28c6263c3d1996896370002347b8c9b7dc109faa26986971e0950e705394a02b222c7ce1306ccbd6 SHA512 238e661ac00081736d35fa3284f83f7e57d72e21c5ba34a91ccb171de511cee4c566dc197a397e8e44471fe1c4f9d34f53911754ecdf41c52ea591e18e4bda82
 MISC metadata.xml 516 BLAKE2B be5241e39f672681b27a003d02eca0e047644cad7da57de6b3393f58760c094c1661b9d168e44bea4efd56b38225d49abd5be6e71031a0d854b878716286d3ed SHA512 77981d63d3214fd2c052f8a7eac1a439899318973807299237a9105730893ce01d4423b060f532bd4f4496418683fc5128508c7d8747ba6ee6ed0eae67e5569f
diff --git a/dev-python/pytest-qt/pytest-qt-4.1.0.ebuild b/dev-python/pytest-qt/pytest-qt-4.1.0.ebuild
new file mode 100644
index 000000000000..69dbc6a6d79f
--- /dev/null
+++ b/dev-python/pytest-qt/pytest-qt-4.1.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYSIDE2_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Pytest plugin for PyQt5 and PySide2 applications"
+HOMEPAGE="
+	https://pypi.org/project/pytest-qt/
+	https://github.com/pytest-dev/pytest-qt/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/QtPy[gui,testlib,widgets(+),${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
+		' "${PYSIDE2_COMPAT[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# warnings from other plugins cause the test output matchers to fail
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytestqt.plugin
+
+	local EPYTEST_DESELECT=(
+		# requires the window to be activated; that doesn't seem
+		# to be possible inside Xvfb
+		"tests/test_basics.py::test_wait_window[waitActive-True]"
+
+		# we are forcing a specific module via envvar, effectively
+		# overriding the config
+		tests/test_basics.py::test_qt_api_ini_config
+		tests/test_basics.py::test_qt_api_ini_config_with_envvar
+	)
+
+	einfo "Testing with PyQt5"
+	PYTEST_QT_API="pyqt5" epytest || die
+	# Pyside2 is not compatible with python3.11
+	if has "${EPYTHON}" "${PYSIDE2_COMPAT[@]/_/.}"; then
+		einfo "Testing with PySide2"
+		PYTEST_QT_API="pyside2" epytest || die
+	fi
+}
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index 277a3c29f4f4..0143f3c688ae 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-regressions-2.3.1.tar.gz 109616 BLAKE2B cc1c4f5bb221f9b2e53cd235a135a91a301de955fa46a6ab62ebe900878d22ca7814745df72de9a664e16cfc044d99c9048d637dd4f0e3460af25ff2895b6ca8 SHA512 e6c95a085263c9f67223a342a7495e3e46b6c278ad35af726edf7cd0212e516431626d7655250e68f922417d2224568db15992e15f4f4105aada7180372adb64
-EBUILD pytest-regressions-2.3.1.ebuild 1516 BLAKE2B f983dd5083e60121bd26d2d0054b51a75d518ab79f0577340a3515e088a58233e2a558fe516b7b01cec636dbb0013db94d23205e322fdab895ba3015a7aae654 SHA512 a18d2de9348d1d81e339d87ab75910749fc98d7e0c77425535725894fd69162947ac859c9d58ea7c49d009b6e515eee18c7b37feddc85ffa947f32603849f2f9
+EBUILD pytest-regressions-2.3.1.ebuild 1522 BLAKE2B bc46559668916cbd1f725de9d37dd2190379642a88749823ca9607c4fdff1f2db234794e22b7dd659eedf6d2e3a47daa2d118ae559b4e40dae6635beb4c83d85 SHA512 7f0b2dc1913bb16d97b47dc6c7b044da54cfff9934df2246e1ee0909e0be777c221d617e6f9288604189bd932efb362b02bcd4acbfbe63f3610158400865b401
 MISC metadata.xml 465 BLAKE2B ae41a884052ebc7399af62f7c8375c1f32088f7ebc23625b521b1dedb31a9844b86fd05a55008178d248f2c9e2a552868301bc35649418cc0a767038f4a484ed SHA512 b698190fc24eff3235795959a1b165860a21a001bb0e05cfefca7d0fa6ee7e987b1b31bea3c69c8dad82ffd9df24ef665a57f8c39a6f17e872b9d2946a69c010
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.3.1.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.3.1.ebuild
index 43659d0570c0..ae062b79157b 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.3.1.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-skip-markers/Manifest b/dev-python/pytest-skip-markers/Manifest
index a14bce49bab4..db2ef6e544cc 100644
--- a/dev-python/pytest-skip-markers/Manifest
+++ b/dev-python/pytest-skip-markers/Manifest
@@ -1,6 +1,3 @@
-DIST pytest-skip-markers-1.2.0.tar.gz 79343 BLAKE2B 7f24b454fe19210d9ecadf10317a5a32830d722b64adbaf0fa6fad70a4c0cb598fa93b782a2b0f71bd23c4f91f2007d21383b488d725f61519d064e98ddd48f8 SHA512 76c1d0f0af7f7a56fa95d33bd5cb078792df3f054714d2ca1baa6d861e9404e2ec734a88a0768985388b1226c399ee6b54fe082ef7fcce6fc190fcae6201a416
 DIST pytest-skip-markers-1.3.0.tar.gz 79882 BLAKE2B 2c44711e6194aebf0a0299f8a50e6162a088023c2fff6bdb7c142060695a6977b1d4a5cc574199d8f11a5a94e413d7444f81d9e954327e8317ed1bcf3725a60f SHA512 bea602032a7796be7c2dad62ba750e987b77f04349c96f6f8e1f15f5d2b58c3ba1e549a775ce7e541f6041091a578def59900a726872c8aa8b31c585e3f0c3e0
-EBUILD pytest-skip-markers-1.2.0.ebuild 1580 BLAKE2B 70ba4fe95d5b71e17b685f45bd8127b6582346b8b23d20381dac9ad3052b407b1b1117cd57e81a0dd37df39b898520b93a7f1ff53efbeb8b72f6a0cd8b8859c3 SHA512 c8457d502fb0e48a5fe24c8d7749559e2c9a67990080144eeda26cbef27abb1e9059463ed3b341995fe0f4250a49073d519f8baef9fc876dd6790757fd2b7d1f
-EBUILD pytest-skip-markers-1.3.0-r1.ebuild 1011 BLAKE2B 7af0a7bff6ada12fc40f555c7f493a754189eeb1ac50d9c8066233cd1a951e8e083d9fc383320bd206c6e18beb33c8b4c71c04a3b5fd7652d341d184354fe9ea SHA512 324468fb6194002d6a9e7f644390a1b748a158264ee5d62ed540b693c4347b8d8a8a210f122f9a6349f46c727024640eb97c064cc77b993f24fda1c0b1f8d39b
-EBUILD pytest-skip-markers-1.3.0.ebuild 1581 BLAKE2B 0f4da0a78e83a949f96a16a4019dd29f0aa96736769a64167ae70d88b64fdd234615c61bf4ff1e529aae2037e40da1aafa4d089758c0d848ae4d54f7da6db931 SHA512 1793ba8b9be8b75df611e88efbddadace8ca513bee85a871ba0c2037643ecdd808afa9d0410f4a3ea45f102ddccd92de0ffe4f2193ce3dec3b129672ccdd7f2f
+EBUILD pytest-skip-markers-1.3.0-r1.ebuild 1009 BLAKE2B 13d913d2577c5b605f7433680079e64078947d5b4a9e23b82ea1ae86febd939c80d15d0989686573ba6e28437cefa5919722a0cb62789b2d3a7ec8c2d9d3a638 SHA512 a6e5def5a19c2950dddbcdc2bc694b4af4a50877e0946a310bd5f2f7259370137a9e1397c9f738a3644cfa6fa8746bc38b4951a0d17b285fb9af7a47a167131e
 MISC metadata.xml 433 BLAKE2B 07de1af137dd4f1644c069f92e73f7558023095fb0e965ae3e1fe04ecf80f65fe267aa66cb54bddfe4df70c65f1bbbd87ddcb018e4e6bc52e8a83347d0720220 SHA512 842b3fedb252ab2493f2bd349fe6d1dd475bfd4b2ac6422c5dc4eea0ee422dcaebc09bf57a87b3f52260408e56b1036961af3accfcf43cc8a10c2d957ea18573
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
deleted file mode 100644
index 0fdd92751034..000000000000
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Pytest plugin which implements a few useful skip markers"
-HOMEPAGE="
-	https://pytest-skip-markers.readthedocs.io/en/latest/
-	https://github.com/saltstack/pytest-skip-markers
-"
-SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
-	dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/setuptools-declarative-requirements[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e "/setuptools_scm/ d" -i setup.cfg || die
-	sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die
-
-	printf '__version__ = "${PV}"\n' > src/pytestskipmarkers/version.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
index 2dffa25dc6d5..ea590b0e73dd 100644
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0.ebuild
deleted file mode 100644
index b04007948c06..000000000000
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Pytest plugin which implements a few useful skip markers"
-HOMEPAGE="
-	https://pytest-skip-markers.readthedocs.io/en/latest/
-	https://github.com/saltstack/pytest-skip-markers
-"
-SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
-	dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/setuptools-declarative-requirements[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e "/setuptools_scm/ d" -i setup.cfg || die
-	sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die
-
-	printf '__version__ = "${PV}"\n' > src/pytestskipmarkers/version.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytoolconfig/Manifest b/dev-python/pytoolconfig/Manifest
index afa5b51500c5..f4baf563989c 100644
--- a/dev-python/pytoolconfig/Manifest
+++ b/dev-python/pytoolconfig/Manifest
@@ -1,3 +1,3 @@
 DIST pytoolconfig-1.1.2.tar.gz 12066 BLAKE2B 9e1627bebd1cf8e5cd36e3d772ec3abc26d46b55bb582fb4c11f3073b2a0c1bcc64022a559791b3c63e4c92db7a762f5c2656e353f69dde223c319e419e61adb SHA512 bae9636d23ab3df1bf7f64d10ec7735b741bbab53afb79bccac3586774081c1d2170fc4086725c13bc6d296c3460098956386f9707ef9aeb6b57a21a4c9ba16f
-EBUILD pytoolconfig-1.1.2.ebuild 684 BLAKE2B 1fb30649ce9547edc96abc5414733a0208e04b456fba0b338fbce2edbc3e55ecfe8b8361b6a401e06176f83a9d1b73e2b48b62728ad79060bc75d575ef86f722 SHA512 ea7a5f1c518756367ae54961f400acf9566596b03a325baef87fea31c5e3adb631f85eac44457506013eea1767776c6b8f3b79d1a7a8cdaa00d3f23a74bb0b31
+EBUILD pytoolconfig-1.1.2.ebuild 723 BLAKE2B a5c3d02d2f7a312a0641adb42e7777f6f800651ff6ff6db905b2b1cf859983db808fa70510eff2c14b1c38f52d81cc68891c18940c627377e29834dcaa70060b SHA512 ccbc3fe26187f1bf0ff8792e3880ab46a90d99ea8a377d49acf7eec65e381a687ec0abab586b5505c3c2e2651d8b469b67d4c56a82b8b886a3727e3b625f3361
 MISC metadata.xml 423 BLAKE2B 3007e2ab50dfd0a5b91d18dfa30099586f14daf29583323da9b275fdfa8c8c2e1cfc575e78a0f5b7983c6d23b03767ebe8f2f2dfb83d35638c0577257e2de62f SHA512 556361958961c85b7f3fc8b5d15009329b0534db086c15392e0c8067357576848a5533fb5ad4d2b75295b7a245f69fd81de63cc5aad555e77211e8f46552e147
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.1.2.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.1.2.ebuild
index e1cf0230c848..1e765af00d7c 100644
--- a/dev-python/pytoolconfig/pytoolconfig-1.1.2.ebuild
+++ b/dev-python/pytoolconfig/pytoolconfig-1.1.2.ebuild
@@ -10,22 +10,25 @@ inherit distutils-r1
 DESCRIPTION="Python tool configuration"
 HOMEPAGE="
 	https://pypi.org/project/pytoolconfig/
-	https://github.com/bageljrkhanofemus/pytoolconfig
+	https://github.com/bageljrkhanofemus/pytoolconfig/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9 )
 	$(python_gen_cond_dep '
 		dev-python/tomli[${PYTHON_USEDEP}]
 	' 3.{8..10} )
 "
+BDEPEND="
+	test? (
+		>=dev-python/sphinx-4.5.0[${PYTHON_USEDEP}]
+		>=dev-python/tabulate-0.8.9[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 454b148bd636..709d5b3c1fe8 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -3,7 +3,7 @@ DIST pyzmq-23.0.0.gh.tar.gz 399818 BLAKE2B ebd99acb5270f4ba2f851f3df9a7cb81f9867
 DIST pyzmq-23.1.0.gh.tar.gz 401651 BLAKE2B 8e78f993bc7ee0212c6fa598d7993fc7b9cff8ebfa25ee833039d69214a00a6cf82ecb388ed6fb06caf8a63f7cea3be84aeaabf6f451f5889ef20943edcb9fab SHA512 06b71c641381f6efa57e1dc21864855694bf6a160ea388dc55da6092482257dcf776bd777edd318bd39d1462450e8c8873336cc0c1c5e15639f8f77ce7bff46f
 DIST pyzmq-23.2.0.gh.tar.gz 402085 BLAKE2B 4ab26af04c76205d0770163e248e28a22aa8f710a66c9dc96e18c772338c434ad06227d57edd5aa3476fad68fa7320e9216a102b2cb19649393f1e9ef5d9599c SHA512 348482f4b6fd4ebeae8e4720a7005ed35eccee2bf26b0128115b756ee560156b34e6f043c96b71a84d47b1313bd2d8e0ed0f74c7768e23cbf65bd906036800c5
 EBUILD pyzmq-22.1.0.ebuild 1750 BLAKE2B 9a9b161f6109ddf4aa44ee5d996d3e5e48567bc259cc6b84d494b6077de02543f9f80e00a173bda74513d2de0e1de6ac008da3bf2f7b9bf1cd4bde501e764301 SHA512 97e3ba80e576ad03eed07ae94fb7bb08433b7b75d3510a9811dacfd10589e6361c81dfce0ea14e6d8aa98d17dc77cc33346e583caf9619fd83ff7e3f60563231
-EBUILD pyzmq-23.0.0.ebuild 1860 BLAKE2B d271dd1436cdfa6080e8ec0b951e5a084aeac68540498be3e703103556cb4bd9e72a91252ae6ec8f8bd3d6a7490d9848fa1073d00804fdf719b9e7336d4fb6b8 SHA512 b934c64c698cf258a7a978b4ad276900a507803693d7f707c43b54f8496cce774a60042bf46eff61d16b38019ed1747d68c2c4bc5a59d6373bb8dbb48b6be424
+EBUILD pyzmq-23.0.0.ebuild 1859 BLAKE2B 6a99d9e4f4a500d6d8e7c33dc7601dad94cdb191516fd70c43750127fba1813f73b0a26fa3c4183bc642e150ecd8a4f4b85185756a9a5b4236dd3c8eee417a2a SHA512 8b190c1687f22070ee95b53f18f6e6dda6603f98123e0cbb45088514580782f80ddf419e71f00a727852667e7474ab260f869420c263ad04ddbd5608dfdef053
 EBUILD pyzmq-23.1.0.ebuild 1866 BLAKE2B a5f14054580779d5ce85837b26835e0152afd5a38086601fe1099a183649049fd21b41aa322d2db6fdf202fc41e5006a5abce700da854282a816bc347c72978e SHA512 ae901ef0d324ebf059a39c01669efabe24e349759a1eca780f7390d4709fd8b87237b610f98ec384e7f39d8e5152e8eb8291d19cf381679a11a93b7b94087fd8
 EBUILD pyzmq-23.2.0.ebuild 1890 BLAKE2B 51ea9d5f9442873f63f9a663cb66ff67cc1d934cfcce5340e74dfc88476a8b25efd29a3c2ba53b7d84c330c0fa29c5116eb55f82ad1817cf032be68f7bb987ee SHA512 deeff0b97be6d77f148e1e98009bb505d97f99efe773d47cc19f5184138f75808dde0311e48418b263044c46123f0ae37e63536560d4ba0bbaa8154004d845b3
 MISC metadata.xml 548 BLAKE2B 0120b82c6a48537f80d08237f4184ff855c109a0a461adfe7921e25468928ea053cc7727c7b00ff96ea556d719e453ee27cf534b285f24f62f7d1ca4ab326770 SHA512 124145f71518d39daa57522eadc27ab4782c3fc1794543396a6b6c91dda29175c4c097d6be90d7d405823621ce66f62e169b97e086c983d7f08178e6d85cee40
diff --git a/dev-python/pyzmq/pyzmq-23.0.0.ebuild b/dev-python/pyzmq/pyzmq-23.0.0.ebuild
index 827df90ee823..5ccb5da82fa1 100644
--- a/dev-python/pyzmq/pyzmq-23.0.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-23.0.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 993200e1bba4..ec3a8abac7c5 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,6 +1,7 @@
-AUX requests-2.28.0-unpin-charset-normalizer.patch 808 BLAKE2B dd6f226871ce4343dbbcb0c595d901c71ee4da886511db133b928c5738109cc220b3b67b010773f342ab07b409d83936845a3eb00afd1c53590b89caeb8d233b SHA512 da2b2114725cb01387042daf503c2acb08b3abd881384e0e6c86c5fcc059dfcc85788ba66ba4538f577f203430d3a17ea42f7dc7210778259ff9ed74bd68805d
+AUX requests-2.27.1-unpin-charset-normalizer.patch 670 BLAKE2B 09d25ce8300c2dbbe57724bbb61362953602694d0c61b168e2304bf3c428264d40a5b306322f94119db0b27f0d25168bc401600ce0ed62cc0656f2c2126506eb SHA512 dd690477d181702d0a421794b98b8841573a6eb30402a8edc76e9f51b12365dbc2c3d72da1c261e370aa64eebab53b6aea99dfe5016aba0124fcd482c365c1ad
+AUX requests-2.28.0-unpin-charset-normalizer.patch 743 BLAKE2B ed605c62ac0d7b87f802c0cb80b64288d5a0de7f81e11c3a2e89513652f405b525bfcffaa603bd6b9eb4f394b7327fd78920c7c8525bc2968f33cd1ffea4531d SHA512 124e703a0d80d02bbc21c00fdbbdbd97d7e74469f6019cda338be6067994c9b15704e584649fcc91e88799801efd6cd41738115d61e099ef02869d006627087b
 DIST requests-2.27.1.tar.gz 106758 BLAKE2B a7fed53998fa61b3d03abd254a0cee76450c5b60d76f80aa6b91f32dca1dae5d2c51987b3d3f2138d72c50790e35c36cb03eb5974554ac4eb1a902eff79b5bdd SHA512 e51916abea8125254c5ee72c97e84a73e6981cab09961486873387522d2ce041ee3fe8fa2ff0b9bbe6707eefdc05145e9adcf127bcd999dea127acdfabd5312f
 DIST requests-2.28.0.tar.gz 109748 BLAKE2B 1df85b90ab1f6c551e46593dc8640aa0629505c9b395ca2100c6af04435e1360503b215d9796c34fb09122ffd616e1a01ca3574ac4543b4857c76a3dd86f13fe SHA512 111cfd2d0b0267111ccad0a97b33c5e9565812e6e6728b7d5bdbe06c32fae9e637b220bda605d799409e57dc6aaf3bcc66a4a4605cdbccb439367dc492fb836f
-EBUILD requests-2.27.1-r1.ebuild 1836 BLAKE2B c60f74ef2314557ea7ea9be79ac3c01ea9c8f3effe435d0106c98a1bb40c0c7365ff8ad90757f083fb646d7c598387162f61becb87dd25fe6dc73c45a6b87743 SHA512 cae0e12d044ba719329040c383062c13ba45777181e25aeb07bba8e690e43e9ec6546e204e838bd9ee8ba6f57d9104a4820c4469a70e89615a759dcbb4dcc12c
+EBUILD requests-2.27.1-r2.ebuild 1908 BLAKE2B a953b0fb34062bae636f2dce4f31f6a17d2cb7b0d1bb6d1cc9093d0d14e50d11e10288df067e660a5b8abffeda281e57b2b2fa0986c152cd12f7b757e18f746c SHA512 03741ec47b5468e168bb5173b8652d9c619ce10c10186adc45a9f0bff1838d7e06d2503b9f6d62d869b85bc2fbeb86f939bfaa96948a1ffd734cbf8cf828a36e
 EBUILD requests-2.28.0-r1.ebuild 1916 BLAKE2B 467e0a6ef9a367b47fa241435437028c4194c1c031ce2109a7f81072061eab0a597f5d97c3122c3bd21cdcf6265eb297120557d1d4513ecc610cbecb190ac6a4 SHA512 88deb82e4c2e046c68d0ee67e676dbe25462a51f597d128dcf4c049ad8e93bdd8a38374758c3d95bd7ee317cd8e52b8a247147314b214afab412583dcce106a2
 MISC metadata.xml 770 BLAKE2B a085a3bdbcc34c2297ad7d5a0e811c553aa77f12bba1ee8164cf63af2cd86adcef7b6080c984ea73a417ec690252540a0fc6072ee97b068b70f0f695696fc65c SHA512 de5c6a99ae18955f25895a93911570d41cb458eaaa9dc8b6edd09021c6dff3dda7bc2611d090b933837f83b8a7035769bb275bb844e1ac91b89a088dde3c7222
diff --git a/dev-python/requests/files/requests-2.27.1-unpin-charset-normalizer.patch b/dev-python/requests/files/requests-2.27.1-unpin-charset-normalizer.patch
new file mode 100644
index 000000000000..418cb519ffb6
--- /dev/null
+++ b/dev-python/requests/files/requests-2.27.1-unpin-charset-normalizer.patch
@@ -0,0 +1,25 @@
+https://github.com/psf/requests/pull/6169
+https://bugs.gentoo.org/853247
+
+--- a/requests.egg-info/requires.txt
++++ b/requests.egg-info/requires.txt
+@@ -6,7 +6,7 @@ chardet<5,>=3.0.2
+ idna<3,>=2.5
+ 
+ [:python_version >= "3"]
+-charset_normalizer~=2.0.0
++charset_normalizer~=2.0
+ idna<4,>=2.5
+ 
+ [security]
+--- a/setup.py
++++ b/setup.py
+@@ -41,7 +41,7 @@ if sys.argv[-1] == 'publish':
+ packages = ['requests']
+ 
+ requires = [
+-    'charset_normalizer~=2.0.0; python_version >= "3"',
++    'charset_normalizer~=2.0; python_version >= "3"',
+     'chardet>=3.0.2,<5; python_version < "3"',
+     'idna>=2.5,<3; python_version < "3"',
+     'idna>=2.5,<4; python_version >= "3"',
diff --git a/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch b/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch
index b9f3a04aa02e..d4a4a1596296 100644
--- a/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch
+++ b/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch
@@ -18,8 +18,6 @@ Subject: [PATCH] Allow charset normalizer >=2 and <3
      "urllib3>=1.21.1,<1.27",
      "certifi>=2017.4.17",
 
-diff --git a/setup.cfg b/setup.cfg
-index 751c171..99166ef 100644
 --- a/setup.cfg
 +++ b/setup.cfg
 @@ -5,7 +5,7 @@ provides-extra =
diff --git a/dev-python/requests/requests-2.27.1-r1.ebuild b/dev-python/requests/requests-2.27.1-r2.ebuild
similarity index 96%
rename from dev-python/requests/requests-2.27.1-r1.ebuild
rename to dev-python/requests/requests-2.27.1-r2.ebuild
index 64d160cf6d34..ecfd2cc3e0ee 100644
--- a/dev-python/requests/requests-2.27.1-r1.ebuild
+++ b/dev-python/requests/requests-2.27.1-r2.ebuild
@@ -42,6 +42,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.27.1-unpin-charset-normalizer.patch
+)
+
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 7fef516168b6..43957c1887d2 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,5 +1,3 @@
-DIST rich-12.4.1.gh.tar.gz 14890981 BLAKE2B 7eb8424ca5e3a985e6d000ed2c74784dba104237a67315c59d3f3cdf71a7196621566b9f40f7ca0e9f74d6bcd1daae781ee2aef871f5fbf738d3209ae13dba4a SHA512 ee02526c5e717976c2b4a8e750dc9f87d5b2d15a9b144aabb8e84de01ba4df78985ad5ed6bbcf9f6e42a76a63cab6da76c05da917aa8c09d678858fa148db76c
 DIST rich-12.4.4.gh.tar.gz 14891341 BLAKE2B 7829951edb77b8e78bcbdeb340fa6c96901d634fb59ab16b8866b898973a95bd38de9dd1a8f6c821cd2222447878a5d22773abec329f49753e207b5b358c3532 SHA512 c1d077bb1448fd436fea87697d31b484615f787c9259418d6ebd12da45bf14f25f192198e4522653c5bd4e5ba218da7d72597e20d04dbffce4a3ea8bd82ce27c
-EBUILD rich-12.4.1.ebuild 1449 BLAKE2B 3d1825adb18151c0e55ad617457319d987ce93dd93d6b893d5cffc0806e934a4bfed4d9bbff1c7e7d87338c877db311c4c42fc6e7b8d8ace7bfedb49f41a3ab7 SHA512 8e4be2afe375b6d98bb3a7c73380cb458596bcba41fdecbff646be8a447bfe907d80ef346754a9b145ce8862094b620fbaf56d38269505a056866bb2cfb321d5
-EBUILD rich-12.4.4.ebuild 1492 BLAKE2B 2df3ff04bcb438dd0895f51a2c2de3da823c4a9fcc52cbb52e4d4e0f6de296ca97546f987b8be5551deabbf6227ee3b2061ccc5bd3c03ac6c7f40964021645fb SHA512 240f45da29c490f9ea76097dbbb23cd3a3e4c2e8d1017ddca37e353eaabf9bcd246c1b731a7b9c350224cdc9b9054144a813fa0853e83f430ec8d34de216ed2f
+EBUILD rich-12.4.4.ebuild 1484 BLAKE2B a51891d479aad08cb6b3077beaaebdc550917d5f65c254f6445b3ebf446a121e6789178e5c34febb707be699c7dface9c70df548b8d24d0e552b19aaaa114c56 SHA512 490be77fc00accfe30d9076464d5c29a61a838fdde564c94ecd9c42b2ad294fc756d75c89c9eba2fb206138f261b5ac8ecb7cdac0d96fc461bfee47b107443eb
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/rich-12.4.1.ebuild b/dev-python/rich/rich-12.4.1.ebuild
deleted file mode 100644
index a86c979a9f9c..000000000000
--- a/dev-python/rich/rich-12.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/Textualize/rich"
-SRC_URI="
-	https://github.com/Textualize/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# broken with =dev-python/pygments-2.12.0
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# the usual deal: output changes that cause test mismatches
-		tests/test_inspect.py::test_inspect_text
-		tests/test_inspect.py::test_inspect_builtin_function
-		tests/test_inspect.py::test_inspect_integer_with_methods
-		tests/test_log.py::test_log
-		tests/test_pretty.py::test_attrs_broken
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-12.4.4.ebuild b/dev-python/rich/rich-12.4.4.ebuild
index a049e4167d88..7bc3d6877b3d 100644
--- a/dev-python/rich/rich-12.4.4.ebuild
+++ b/dev-python/rich/rich-12.4.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 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"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 74383b6d4a33..2083b4a23223 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -3,5 +3,5 @@ DIST rope-1.1.1.tar.gz 274610 BLAKE2B 52354453305ee58db70f86392f7ec27179e1e4a9ec
 DIST rope-1.2.0.tar.gz 289239 BLAKE2B 314cf382e76a448dcddff0b9c52ae437cde032b54f1c9edbb05c1d47832ecc7a0b35b8eb14cf48ef5b296011a273cf3e21c5433a70e2627c11f2cdeca885e1a3 SHA512 d34a47a6453a85fcaa253287224b7b5265e08d2cba46377d17502f78642d3468d074b43d4916758c2225f98e676080af2b7896ad6194e0ee0234661343259fd1
 EBUILD rope-1.0.0.ebuild 571 BLAKE2B 9ff4cef2258e69d043c2b4fb2140959f1c17418c731b5bd294aceb693015f7c8dd063565762019479cad2f8b4b912b9e8e565e86e61841f78d385936193f79b5 SHA512 93d08ddb4b985b5b749ad5fe47756dbfeb3b7c43bc25655d52d96a27c18a85bd5ccd2e979b73f40f9d92c9dabbaf195d7d3edd5970631458627fca780923a66e
 EBUILD rope-1.1.1.ebuild 573 BLAKE2B 8e321219ff4ac7b8504491b522c18b090e84391d486a278d7d9f9963679f9509dc5fd8930dd893896fb36e8ecd217d8707eacab606b002deb0793b699a9b8782 SHA512 c7cc112f31d6569b5bdeb712aee1f8100b6e3d479e7b1b095028d6c7a1ce09f4e29067850c4fc1f63657efbb80b6ee2a4f384d81b7a19b3ade063ff4ffd30a1d
-EBUILD rope-1.2.0.ebuild 916 BLAKE2B 099ed2387c39854e613231a77f5cf5cd0bba9d7ce872dac2f8791781512e4973615f5147da7c7b469dbb5542bfbdbfd1b22189059eca78b59615d99254a2c2ca SHA512 16798f9a7b01cbbff1b220fa26ae7577751150210af28e27ca7e5c347b4819842f944a6cf1c633bdcd811694d4c03fe3e5a080286346cf7f9d51326f1f9a7df3
+EBUILD rope-1.2.0.ebuild 923 BLAKE2B f7a62177405535b3b867bf15c9d947a89621b7f46f19153824cdc4faf116c686ac1a27ac74b9a0506f8c1de74769a63d8a9fc50e1bea7a742e8b9439c5926ffd SHA512 b0dec73b8bb520d95026ba92c730ababa70e08b2b84f9ee4e84792620c6d393bd22df39f79082b3249fb636930b62e3d76ed7d72bc546d1a843976f4ec72ddce
 MISC metadata.xml 452 BLAKE2B 6bee424d801bad8728f10ec3a1618e3a48776a7b0af2a04efafd07e6ae5ac8e0b88253ebc35e457c791e820f8c3b1dabde73aabbfd3636cac5e169e8aca75aa7 SHA512 4f88e1157e4838f321b6f208ba6b89fbf2b7a72ea6e038cdd6cf3e9e211c2788dda137e3adf76072c1d52026c554750193d9938054670dd995a91db24ea8da76
diff --git a/dev-python/rope/rope-1.2.0.ebuild b/dev-python/rope/rope-1.2.0.ebuild
index 7904dc6c9642..67e1183ee5b0 100644
--- a/dev-python/rope/rope-1.2.0.ebuild
+++ b/dev-python/rope/rope-1.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index 401588d37b84..1f0bc88339af 100644
--- a/dev-python/routes/Manifest
+++ b/dev-python/routes/Manifest
@@ -1,4 +1,4 @@
 DIST routes-2.5.1-pytest.patch 229759 BLAKE2B 826a053e82b5cae9996c73c56948b24b8c508b33440c60aea62d8d2dfa6461a43377ee1748c8852dd8c2527b0666e9c4c64e38eeaea22fc67ee9291ddcdffb6d SHA512 e6dba07207bf52b931e2369ad32450ebbfbc26571502b9b827b6200f4ce7cfc7b784e4685f9f11472bed63b3711af10ed9833eda35003cc2010924eeeaae4235
 DIST routes-2.5.1.gh.tar.gz 198777 BLAKE2B ca3487af94677889c5249b501fc6dc07e155dd4a862df4f1c8391154598a343ee35b7e8be2b5200bdb234b606a837c471af806c9dc8aa39796b4f4db04bbb164 SHA512 939aebac11f5499ea5c4009e016c52b8b161e7d67c4a540cdbf456cb3db5aec80a4054e7bec9862aaaa02559b081b09cf699c6508e1ac9acffbc5706acd56f30
-EBUILD routes-2.5.1-r1.ebuild 1080 BLAKE2B c4d2927fed8cbe855e2f621936903e6d85d7945b8cd7fc67a63653503ed9bcd9446da42a0ef1b862c7203af3660d28691e7b4855be38dedbdca2a26c673a4973 SHA512 0322cb03ca21f935ce4b315fb42b157018778fc910e4ceaf071656fbaa86a2cbc0749a554b7034843ec266c74105f51ff1301671da7d163cb71de364860de023
+EBUILD routes-2.5.1-r2.ebuild 1143 BLAKE2B 531cf918629dbc0ce9990f1b7b3a5249974bff79612748a9a70e42f2bd173e92d4a823c674ce9607295aaab631ac22cbb48bbc542ded4aba2772505b284fe3bd SHA512 664c47cb961e1b6098b80cab08940e1224239be63d94b4706297b49d6404d8f76e10fba22efb721143b40517ccba78959e8179da6cda3a099480a22bae6b73b6
 MISC metadata.xml 334 BLAKE2B c7aa5fdd9bd9a77881619a3e7fb7332b28d9fb024de346707c7a966d7ba4e1ca10d0db6106cbb528cab879ce23a2e96adb18059d71122302b6a7b0e5c10a45a1 SHA512 43dd546f7b29a6be542e1286b40941854edd22d782d80bbed0861d94a57bb09f8c07a273f1c518315b585f77223fb440c229bc4863e554bb569518f0cf15e265
diff --git a/dev-python/routes/routes-2.5.1-r1.ebuild b/dev-python/routes/routes-2.5.1-r2.ebuild
similarity index 94%
rename from dev-python/routes/routes-2.5.1-r1.ebuild
rename to dev-python/routes/routes-2.5.1-r2.ebuild
index 31c10c505693..d03227f17e9f 100644
--- a/dev-python/routes/routes-2.5.1-r1.ebuild
+++ b/dev-python/routes/routes-2.5.1-r2.ebuild
@@ -45,5 +45,7 @@ PATCHES=(
 
 src_prepare() {
 	distutils-r1_src_prepare
+	# fix the version number
+	sed -i -e '/tag/d' setup.cfg || die
 	find tests -name '__init__.py' -delete || die
 }
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 0f1ba749887e..ad84673471ec 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,12 +1,9 @@
-AUX scipy-1.8.0-skip-build-revert.patch 712 BLAKE2B 3637bfe30dc1bc4caf9ed9c8eb24e8d92d6a715218ff472d72cb2ddef895309a95307e18f38524045ca8010c7ba2e0d5359c36e08d427244a5cc684accd89158 SHA512 3ca5fb6c44c5a20c09292b91aaf0a74464e4caaba628f97306a805a64aa2f5ef5bb4c1c5886735503d4859df9a1c30d4827d3359a1820f955ad992275a4dc306
 AUX scipy-1.9.9999-meson-options-lapack.patch 1013 BLAKE2B 04cb7b3bc281ef06fe4360f31ea6befe91134bc68ce2a981df704f52814487503d35100bf7fd429d854d0716eaac20f5d55aadad02a4d48eeed8ad55955232b6 SHA512 6d8f6e4c6399f5e8a641a87168b1e2abd31b69a23f90582cba5d8d22d46de0c89d7b0719a25f3cf4e6cd9f81c9ebe0c94d1ba8b6c6b0209020491603b1f548aa
-DIST scipy-1.8.0.tar.gz 38313602 BLAKE2B 3f071ad3dfa350bba7eaf8e06c8bdb660f9dc1ef0e0bfc1eb1be2c400f947b2b26d62066a4b0f603ae56244131aff6e4c5b7e87cfd2aa7b278e3071062a4bf02 SHA512 674652728ae76479d17189e6974895bb838a8e83b17b9fb91c5f86faebf2a1387e1466555ac5b51d05c293f9b31b9a72e634f5858105ea984ca94bd2f05bbb4c
 DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0 SHA512 f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
-DIST scipy-html-1.7.1.zip 32435246 BLAKE2B fd8173da41aba95a14b1376f848bc668c4659bf1bbbdd0f87d926633d36f29c039957d38be145a5583010ebd83f6458090f75bdad773cc0f1591664e13c04c20 SHA512 ee59722878f6ef2d2319cdf4e6a60d3d1184f7c22752f9a8859eaa46fb677ebac9e8eef9c0826998e12bac9399e336799843341ef203224a82c9101347149672
+DIST scipy-1.9.0rc1.tar.gz 42045828 BLAKE2B 8ecb112f611d52a69564329764b63d6f97bdcf6ba2fedc32134fb9f0da0c7f91d8507136bd81e2193c8a796273019cf2cf1a0f6009f6ac0803924a27ad216c37 SHA512 74d0ec0b94d33da683549b9c56966ec58dc807a5b60101413530501d2b1e789209b1b0e6cbca0a3bd0317dd0911406efc900dee5f90f1ea71c9aefa00f4c2dbe
 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
-DIST scipy-ref-1.7.1.pdf 33542025 BLAKE2B 6c978f06b770805f0fae06db740e8596658d98bbbc93c865127eae909957503bb38e02a9c97319aed07608718f8f373374b1cf3a8c3bd624aa3143f1d21bc428 SHA512 45720dc299594bac5c7539f950a0ff135b125d86bfe9847032cbff1f294601fefd0a1ac3fd7e3928b2702390c318ae2f8adca6403ba06ea1ded705fcff94ab79
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
-EBUILD scipy-1.8.0.ebuild 5334 BLAKE2B 8aa3bd115c742d44e8fc71524e23e7592413857e554c5abd7aaa7893a036ad475428a676eb96a74579d7e6d24e87bed48b65d68a6bd1d77a55c6b2c896f22539 SHA512 f57ecc5342c5d4ab71b0aa11e8416a1de3c6497e63dcb3c6f7bea62449248cd6a41658cbcd6f2be8d040297b2b8ff1d75b10a56791902f67e5f814f8067999b8
-EBUILD scipy-1.8.1.ebuild 5276 BLAKE2B 315011629f54d10b950e14dc6aeeec27b4f5d0a450d19793632ec1b99bf372c5ed9c29d264de87daf586cead66d4e5de9d9edc8e313a63e172b4ced2306eeb76 SHA512 7e5272835e584b44fa866af91ea2b34f65f13947fd1dfa02176113814aa007a579bf42624c864ae975bc23aeb36625268f74ba7c7d38b7cfdc0ff22c60a4b8c6
+EBUILD scipy-1.8.1.ebuild 5275 BLAKE2B 0b2f1bb8c37c253aae87941aa9cb15352d82ff5bc34089ae7cf93cad7d264b0ceaecd7f8f0ff02670d24282a61032eaa52bf16de03e1d25d8a18fbfe7d63c981 SHA512 d7ed5f3bc61e27f898937387f88cd934147149ba40ccc01b160571db97074ccba2eb68510899bb4ee70083e47cf3e2c5c6e53435f56933cc5652e9b21a231763
+EBUILD scipy-1.9.0_rc1.ebuild 1820 BLAKE2B 92723d62cbeececd71f58242ad0e5277461e989fc7c580134e4ab6debe6bddea21842e4a933d3bda4db1947a7135f317dc8bff16c165eba6d08e6cf6a2835a05 SHA512 2e4bb9668ce70fd343ebdcf8f1562ad7e7b816ba4c95f15784392ca92b4188abe599aa5f634aad147790143a9e95b4f9e72b8a084876078bf3e641a1bac9c00c
 EBUILD scipy-1.9.9999.ebuild 1716 BLAKE2B 792f32928ff5ab56eb65a750d93c73cf2d1fe3a36024582580c91f747d8b9ebaf3925aadd2eb9f1709021d11366555b1ed5cc403a5436eee931d80ccc0a7a76a SHA512 cdfa9cf32379faf35529a260f420a9b00e62c4324a0689315a3e9a7a6d6e6d289441ebf3fa90cb37a341afe2ca323c801da5a6c4a2c30cecc4e22b46c3706cc7
 MISC metadata.xml 1127 BLAKE2B 6019c7fe056a0198db927c1b149d5a60bd583a523d749e57c86ad899a880fd83e688e040cb693ec3f34be63cae1e5b785d5f6f7a378b98e992d6cb9368ea1b2c SHA512 f7c45d801c3344b3d8de3fabad26a95814cfdf92b604e8215bfac2cfd1cfb181cc8a9a9fa46c0b95c7fb55a34e44bab51c2d1cd7a5adcf421cd965a755722e73
diff --git a/dev-python/scipy/files/scipy-1.8.0-skip-build-revert.patch b/dev-python/scipy/files/scipy-1.8.0-skip-build-revert.patch
deleted file mode 100644
index caefc334a973..000000000000
--- a/dev-python/scipy/files/scipy-1.8.0-skip-build-revert.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 2b6392eeeb8ef5225ace15e8a1553fa87409272f Mon Sep 17 00:00:00 2001
-From: Ralf Gommers <ralf.gommers@gmail.com>
-Date: Wed, 29 Dec 2021 22:47:13 +0100
-Subject: [PATCH] Revert "BLD Respect the --skip-build flag in setup.py"
-
----
- setup.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 002531fcc00..d91916e5894 100755
---- a/setup.py
-+++ b/setup.py
-@@ -488,8 +488,6 @@ def setup_package():
-     if "--force" in sys.argv:
-         run_build = True
-         sys.argv.remove('--force')
--    elif "--skip-build" in sys.argv:
--        run_build = False
-     else:
-         # Raise errors for unsupported commands, improve help output, etc.
-         run_build = check_setuppy_command()
diff --git a/dev-python/scipy/scipy-1.8.0.ebuild b/dev-python/scipy/scipy-1.8.0.ebuild
deleted file mode 100644
index a502daa1354f..000000000000
--- a/dev-python/scipy/scipy-1.8.0.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-# upstream is slacking forever with doc updates
-DOC_PV=1.7.1
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="
-	https://scipy.org/
-	https://github.com/scipy/scipy/
-	https://pypi.org/project/scipy/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 -hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="doc +pythran sparse"
-
-DEPEND="
-	>=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack:0= )"
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-lang/swig
-	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	pythran? ( dev-python/pythran[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-skip-build-revert.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF || die
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-	cat >> setup.cfg <<-EOF || die
-		[options]
-		zip_safe = False
-	EOF
-
-	# TODO
-	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
-		-i scipy/stats/tests/test_continuous_basic.py || die
-
-	# Skip known-failing test. Broken on all versions in Gentoo for years.
-	# bug #743295
-	sed -e 's:test_bisplev_integer_overflow:_&:' \
-			-i scipy/interpolate/tests/test_fitpack.py || die
-
-	# Skip a few 32-bit related failures
-	if use x86 ; then
-		# TODO: Tidy this up and switch to epytest
-		sed -i -e 's:test_nd_axis_m1:_&:' \
-			-e 's:test_nd_axis_0:_&:' \
-			-e 's:test_maxiter_worsening:_&:' \
-			-e 's:test_pdist_jensenshannon_iris:_&:' \
-			-e 's:test_align_vectors_single_vector:_&:' \
-			scipy/signal/tests/test_spectral.py \
-			scipy/spatial/tests/test_distance.py \
-			scipy/spatial/transform/tests/test_rotation.py || die
-	fi
-
-	if has_version ">=sci-libs/lapack-3.10"; then
-		sed -e 's:test_sort(:_&:' \
-			-i scipy/linalg/tests/test_decomp.py || die
-		sed -e 's:test_solve_discrete_are:_&:' \
-			-i scipy/linalg/tests/test_solvers.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	export SCIPY_USE_PYTHRAN=$(usex pythran 1 0)
-
-	# bug 721860
-	test-flag-FC -fallow-argument-mismatch &&
-		append-fflags -fallow-argument-mismatch
-}
-
-python_compile() {
-	# FIXME: parallel python building fails, bug #614464
-	export ORIGINAL_MAKEOPTS="${MAKEOPTS}"
-	export MAKEOPTS=-j1
-
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile \
-		${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
-
-	# Let's try using pytest again with xdist to speed things up.
-	# Note that using pytest is required to avoid dying b/c of a
-	# deprecation warning with distutils in Python 3.01.
-	epytest -n "$(makeopts_jobs "${ORIGINAL_MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	use doc && \
-		local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "    echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/dev-python/scipy/scipy-1.8.1.ebuild b/dev-python/scipy/scipy-1.8.1.ebuild
index 0926ae33a5f8..df38fbcc3ec2 100644
--- a/dev-python/scipy/scipy-1.8.1.ebuild
+++ b/dev-python/scipy/scipy-1.8.1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 -hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 -hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc +pythran sparse"
 
 DEPEND="
diff --git a/dev-python/scipy/scipy-1.9.0_rc1.ebuild b/dev-python/scipy/scipy-1.9.0_rc1.ebuild
new file mode 100644
index 000000000000..aa0db9c53032
--- /dev/null
+++ b/dev-python/scipy/scipy-1.9.0_rc1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 multiprocessing
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	# Need submodules, so git for now.
+	EGIT_REPO_URI="https://github.com/scipy/scipy"
+	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
+	EGIT_SUBMODULES=( '*' )
+else
+	# Upstream is often behind with doc updates
+	DOC_PV=1.8.1
+	MY_PV=${PV/_rc/rc}
+	MY_P=${PN}-${MY_PV}
+
+	SRC_URI="
+		mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
+		doc? (
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
+		)"
+	S="${WORKDIR}"/${MY_P}
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc +sparse"
+
+DEPEND="
+	>=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+# TODO: restore pythran optionality?
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/pythran[${PYTHON_USEDEP}]
+	dev-util/patchelf
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+
+	epytest -n "$(makeopts_jobs)" --pyargs scipy
+}
diff --git a/dev-python/setuptools-declarative-requirements/Manifest b/dev-python/setuptools-declarative-requirements/Manifest
index ed41498fd572..a25e7bbc5624 100644
--- a/dev-python/setuptools-declarative-requirements/Manifest
+++ b/dev-python/setuptools-declarative-requirements/Manifest
@@ -1,4 +1,3 @@
 DIST setuptools-declarative-requirements-1.2.0.tar.gz 17936 BLAKE2B a5be2b64fc22d5a45136ec2b98c1d4cc6c20e17dc81070d12948b6f536a517ec8a660c105dfc13a4319d1de54409fb4f7a4c6bacaf1291afa13c7ecc27fd933f SHA512 ce0eeb8692ff2ea80db91cad981853da74c0ca80f58b698753de92f6df3ef5e1c158e314d0ac4d0b4fa99a2ad8ee2d7d80a9d1a13f334966c948dee1a0ae3d98
-EBUILD setuptools-declarative-requirements-1.2.0-r1.ebuild 1263 BLAKE2B 645eb85f4c189bcb08eaf1f00c61f80d3fdc07078b1ea40df8b5fcc64df626746601d2d2f7f2ca0394a490a3f77f32e377f0a1f1dc4e3a96ecaa4773b40b0e68 SHA512 ee6fb04d41a723cf9cb77175ede98c422c83ea0449a4dcf9eae4f26afb5170c9595ef6027bf2744493874575fb94a4f85d021a529aaf97dd1f0bf61e633c3ecc
-EBUILD setuptools-declarative-requirements-1.2.0-r2.ebuild 1140 BLAKE2B 848a3cdcb578be33304f9bef8d6f3762327cb5165b607ad8f99a222631761360461b6b38318c92f97c798d0bbe08650e78ff23bff641ce78a75942f7e7e24ad0 SHA512 d08c6bbce720902dcf45dafb9e82b8a6b605426003af440e7297ee198f8e5a3306dbd47800a26a874f5ec9c32c182a5cd544840b49cb575c1e60f1fc9c732c41
+EBUILD setuptools-declarative-requirements-1.2.0-r2.ebuild 1138 BLAKE2B 926dce22a36f53b765295694c4ab89ca49491abb99c8d432229847d072679f5654e0f34c08608b25748439e9fa35ca677de7a9af51d1ca5cab8f28c94afb44d5 SHA512 4ab88af7c2fe995acf09196cb0f7779beb697fb0009bad8a52334035c5ae2533549492d39fdd6be9dce16346f43ed6791f42993d99e4256b50bea964e27e1c3a
 MISC metadata.xml 449 BLAKE2B e7161aeed6be695483f0d1ecd12d5dc2095255959babe854ef5b965bad0c68bd3f879e60d729f080c8f10bcf71d3880203f1a1cfff91e2d5020a2e566ebc88d6 SHA512 f764de1ee5b2dc29c53157c7c6683673623a7f491bd50afebc980a88d6af898a0d23898f49941ba7f14bdd230b0745085f279a22bd4397c1cc911098abbd4d13
diff --git a/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild b/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild
deleted file mode 100644
index 9e7e724e53ef..000000000000
--- a/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Requirements Support For Setuptools Declarative setup.cfg"
-HOMEPAGE="
-	https://pypi.org/project/setuptools-declarative-requirements/
-	https://github.com/s0undt3ch/setuptools-declarative-requirements
-"
-SRC_URI="https://github.com/s0undt3ch/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pypiserver[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e "/setuptools_scm/ d" -i setup.cfg || die
-	printf '__version__ = "${PV}"\n' > declarative_requirements/version.py || die
-	sed -e "s/localhost/127.0.0.1/g" -i tests/conftest.py || die
-	rm pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PIP_DEFAULT_TIMEOUT=3 \
-		PIP_INDEX_URL="http://127.0.0.1:8080" \
-		epytest -k 'not sdist'
-}
diff --git a/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r2.ebuild b/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r2.ebuild
index ed9228e2ff6d..9dd0c2513c1b 100644
--- a/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r2.ebuild
+++ b/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index df2cad499085..bd9cc6d81430 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,5 +1,7 @@
 DIST setuptools_scm-6.4.2.tar.gz 61305 BLAKE2B e1b5191425cf5db8334761a6857b0bc39c547c167901cbdf8401af441c5941cd75744162417ff42dbac792ae867d71c7576c5e9e533fe8039a75954f4c2ba439 SHA512 224dfe543e8658e7d8b7272d18eb657fac1774a206d079d65bb6e22bfa68b35e618a31b3671418d095f8b7b492339ea18491a1711be3a87eeecf50c6703a4096
 DIST setuptools_scm-7.0.1.tar.gz 67921 BLAKE2B 15a4a8953bb9cf8754fe465b53e11483ade33b09c5b407f096ecbdaed80081fa554e0c6da1accdbc629163019bf91968f4edae40166dc4598b25e0a51c5881d1 SHA512 49d296ca4af3175c47a385d9d935fe32371d39c31ff4e6d704ea6fc8dd512e7ed6b0136677e7768836c0ec2ae558c47f156adc5975ace30a396fa81644e61acb
+DIST setuptools_scm-7.0.2.tar.gz 68142 BLAKE2B 11bc3db134c3ee90b9262cf663036a6119a559e134b479a42e10c4b54005029c0e192d92e32d14f8d2dee2d09258b9cbebe9b45f07b553507b80ac7f2ecee110 SHA512 c9782a1b5bbfaaab2bbfc223477e92e8ee2fb0b2a393ff912f0c54fb99494d1c014a4e6c103a3f852d335733b02bcaa3b15eed8ec3a5c1ef54c4691fba7cb0de
 EBUILD setuptools_scm-6.4.2.ebuild 1186 BLAKE2B d99353bf7e44158acccf0f8fc1a33a72211c1f8fd735de1cb59cb6eb1927e510b6fd196e11f1a8a122f2529bd6399739fc8ccfb456b2d3868d0dcb1ff93d948b SHA512 903990604ea97b4fd412d041fdf9764dfafdde3c66ce1756d8c9efdc351811bd7bc2062acc65399db6ba3eea5cee7d8bd2e1ac3128bdaa0cc67002f7307dc498
 EBUILD setuptools_scm-7.0.1-r1.ebuild 1322 BLAKE2B 7f8e059beda99fd1f0c030a56f325cefbe2c1399ec0ea6d0a065e848c51aad7f19674f1e5b6ca742f05775d55aa6e20083550407088fe7dda1013fccdb7e1b5d SHA512 966bb2d39c8feafd545d62931e162c5e1f9d74c89fd56d3644d32d64e5104405cac2450ddaed6f686aa7ab7568a60e0abdfd4a177f4bb6ae73cc6e5bb5473623
+EBUILD setuptools_scm-7.0.2.ebuild 1310 BLAKE2B f405a051faaeb080d2f1a30b51da40517100e28e5b96932a6eeeb293cd32e457b73f0c91347a6f57018e283c2ae62764c1dc13a61a04336cba9e9ddb5447c54f SHA512 d38568331d425cd71c2f03377567fd4c0ad6795f03fbcb3c1df370c439a037a00e36ae9a2346f89c9bd126af009b3bae21f0d2444641ee70ee1dc0cbd239532e
 MISC metadata.xml 401 BLAKE2B 288e77f725debab548d96fa06738fb8262a93deb6df1ecc6c0a77e4a30cd65c4e76e38e86f8101112db95dd67a11ada6c0659e1ac13cf3c0e65dcce44e19bf8a SHA512 61b009eacedf191242659d6be6f62d17f9335674c651cfbdcc88abd074e320ddd79e1610de44e7c8105503f6d8d058ed5910f63b2e740492a982a69c52b30730
diff --git a/dev-python/setuptools_scm/setuptools_scm-7.0.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-7.0.2.ebuild
new file mode 100644
index 000000000000..a7e35478d252
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-7.0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 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=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+	https://github.com/pypa/setuptools_scm/
+	https://pypi.org/project/setuptools-scm/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+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"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-vcs/git
+		!sparc? (
+			dev-vcs/mercurial
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fetching from the Internet
+	testing/test_regressions.py::test_pip_download
+	testing/test_setuptools_support.py
+
+	# the usual nondescript gpg-agent failure
+	testing/test_git.py::test_git_getdate_signed_commit
+
+	# broken by... pbr?
+	testing/test_integration.py::test_pyproject_support
+)
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index dd3e6b9fd5ff..63139d30ff52 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1,4 +1,5 @@
+AUX shiboken2-5.15.2-numpy-1.23.patch 1180 BLAKE2B 744f36a26e934c31e5f499cb07b5c4384932392e4d55303dac0aeb932533a548ce3ac385b23f16f87f7d7705bed38fb863b92acb74ad49185831f60976bcbfdb SHA512 f775c5ac6a9a7a692645f33d8bb017bafacd297777f04f4bc581bd0810b1f7ec083ceb6eb495ffc0a9a9851f72658da7bad2ed3d1604a56e9fda042cc969cac8
 AUX shiboken2-5.15.2-python310.patch 4408 BLAKE2B cd1a5c3f8c473a6667f8c942c248285babb468339283a8cc97064bd119194b72bcdb47c758044774a415cec08562b7875fd7298dea50e23d7fc3830e8291a8c1 SHA512 10245617f1aea656d3ba2e8736d51fd119e4d01c4fff129f557203bd1d5eb40ca10b40eaf55a8bd98b56f8e2e7503028818e333fee8ec86cb7b050e48a5e0387
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
-EBUILD shiboken2-5.15.2-r1.ebuild 6512 BLAKE2B 436c049eb7d11b460ca333e42316680f965095eaec200c375b7659e2c40e6b198417ef7a2a6cbd434e3512db6ff7aef935ad5a8e2bc55f58a5179043df3c21ad SHA512 0994ccbc010a7bada8edc7ee59071c3c73cab79ba02febff582098ac3ba0f754e991a04aff6c101a0c204f99887325328aaaec87ded1a96ab6ee1e0a0dac2fc3
+EBUILD shiboken2-5.15.2-r1.ebuild 6551 BLAKE2B ba5cd749b4641a87c5d4edcf9c8e10d5c199dcd1f9888cd620b801f0d1e5c87d8988131011ecb5b4ea4077543f5a3c91bb5241ec21de091957b7e2cfe0b754bb SHA512 5a14af1ec01cd89b54652e6a1dfed547fcdccff6500ba221ab27796103605c5c9c16d812655478daa14be2fdc1e5a613223c44b9df67d47ef04a30882826e6b0
 MISC metadata.xml 576 BLAKE2B 567c84dbf819c5944e5b35146e3dff7b1581aa0275a732e8f2cb6df4b32001e2020eca2469ee422bd6fdd53b34c1453db4ecbdec6e85fe5ee3e4eea4a2283336 SHA512 f1c5964cb99b61c1913b7c031b994b71948e7b26f18d4119b7b3a536bbf7e659cecf539ec54992e157170159186ede2af3b31dfa03fbc1170bc7e12c25814a31
diff --git a/dev-python/shiboken2/files/shiboken2-5.15.2-numpy-1.23.patch b/dev-python/shiboken2/files/shiboken2-5.15.2-numpy-1.23.patch
new file mode 100644
index 000000000000..6cd9feab800b
--- /dev/null
+++ b/dev-python/shiboken2/files/shiboken2-5.15.2-numpy-1.23.patch
@@ -0,0 +1,28 @@
+Backport of https://code.qt.io/cgit/pyside/pyside-setup.git/commit/?id=1422cf4a7f277fb13fd209f24a90d6c02641497d.
+
+From 1422cf4a7f277fb13fd209f24a90d6c02641497d Mon Sep 17 00:00:00 2001
+From: Friedemann Kleint <Friedemann.Kleint@qt.io>
+Date: Thu, 23 Jun 2022 10:44:01 +0200
+Subject: libshiboken: Fix build with numpy 1.23.0
+
+Pick-to: 6.3 6.2 5.15
+Change-Id: I885c332d6c948820140946c73ae1926e88834143
+Reviewed-by: Christian Tismer <tismer@stackless.com>
+--- a/libshiboken/sbknumpyarrayconverter.cpp
++++ b/libshiboken/sbknumpyarrayconverter.cpp
+@@ -116,8 +116,13 @@ std::ostream &operator<<(std::ostream &str, PyArrayObject *o)
+             str << " NPY_ARRAY_NOTSWAPPED";
+         if ((flags & NPY_ARRAY_WRITEABLE) != 0)
+             str << " NPY_ARRAY_WRITEABLE";
+-        if ((flags & NPY_ARRAY_UPDATEIFCOPY) != 0)
+-            str << " NPY_ARRAY_UPDATEIFCOPY";
++#if NPY_VERSION >= 0x00000010 // NPY_1_23_API_VERSION
++        if ((flags & NPY_ARRAY_WRITEBACKIFCOPY) != 0)
++            str << " NPY_ARRAY_WRITEBACKIFCOPY";
++#else
++         if ((flags & NPY_ARRAY_UPDATEIFCOPY) != 0)
++             str << " NPY_ARRAY_UPDATEIFCOPY";
++#endif
+     } else {
+         str << '0';
+     }
diff --git a/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild b/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
index 594d5f6bf09f..c8e150bc7ed5 100644
--- a/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
@@ -60,7 +60,11 @@ DEPEND="${RDEPEND}
 "
 
 DOCS=( AUTHORS )
-PATCHES=( "${FILESDIR}/${P}-python310.patch" )
+
+PATCHES=(
+	"${FILESDIR}/${P}-python310.patch"
+	"${FILESDIR}/${P}-numpy-1.23.patch"
+)
 
 # Ensure the path returned by get_llvm_prefix() contains clang as well.
 llvm_check_deps() {
diff --git a/dev-python/speg/Manifest b/dev-python/speg/Manifest
index 0e68093c876b..24d756d9d2ec 100644
--- a/dev-python/speg/Manifest
+++ b/dev-python/speg/Manifest
@@ -1,6 +1,6 @@
 DIST speg-0.3.tar.gz 2592 BLAKE2B 1b82d6e122783fbc58f2c711a67e9b8b721d69c08de5ac2815d1ae459ce337552d10bb747cd1e31363f48f4a50bbc967b650d7e6048668d28d4133b5875aed14 SHA512 9faed6af0eb1a6ff0a7dc2e2f5b885a58a5430938b463420ad52277fe2900ae98531057ebbcc21d8cd259d4779bfb0c919125043503635721afe574b4f1f99ce
 DIST speg-0.3_p20180819.gh.tar.gz 5771 BLAKE2B 1d0a97d65190cd26776509627cc2ada948390af3457d3967fa0a6a3cbe1bc0c566db8188a9bab3a28d5bd8cb85ce0853c903d2c7a7d6faf79766b9f48c229f4d SHA512 01f0913a59b0a3b32c72c937f948508e303121bd35a8d057f1c043ab77a8b5c3a63b696f5aa8a6bf300901131ae56f50d187e7259dcc7bbaf4d1368e6bdd8bb1
 EBUILD speg-0.3-r2.ebuild 465 BLAKE2B adbdec2eebc3b605c63c79b2d71e1503363ffae73a93c46d499899f8cf3861749aedf808249d85fd23e6c6ceb4d5423bedc0c27cccc07ed139183c9e87140ff7 SHA512 144207c110dbcaaf45b93986fe74d5d1cf670a62012bdb13ebec5951791f1571c2be0ae81f320dbefe2f76d2ae8db411fc3a578ed8dae92b75dd93293d2327f6
-EBUILD speg-0.3-r3.ebuild 468 BLAKE2B 9655bd3221e97677aa0225054fae9e8b39e21e22ef781ad3ee4caa87b95d0ec663a00ff0a1f5d67bd46af51c21415f8a4b195b21d8f7f22ca288d1249299e8c8 SHA512 b068dba6a5b14d9847f510aa6f124e7e4398dfb31e5c654c8d1602a9fa26d0d40bdb8c37ecc2bcf442a929dcfe50a6ebd99458590c85a79045ef40cec0ee51b2
+EBUILD speg-0.3-r3.ebuild 466 BLAKE2B 561d78e9ced62c429203eba0cc6f3af02ef3e398723dfd2af9a226b200fe3ce1e8e8dd7ef758a2d1c42b89930565a8650b178fde3af4b5f332a506637c6332c0 SHA512 7877adc26b5745b6e8e1d3d970f99413b5f2862600c1f10a355ace38bcba5baca1d044b894df3b98a4e3e9f424aea44788676300ac87c67224ca21499bf07176
 EBUILD speg-0.3_p20180819-r1.ebuild 616 BLAKE2B 1ad45421de56714133601277e6902b57d75e448f1c1794a8b625deaa66582fdf95f7839ed2db9a7b9ce856fe8eae4e293a38cf0a7e796e8139b5666e8e04cfa0 SHA512 617772c823485826d6db114d41f71f17a56f1dee4575e1b4537cb578570a8a9d2b934e9b313fe94718e2eca3a41c65f9b8c4fb3c7b46673f80011b92d10ecc01
 MISC metadata.xml 402 BLAKE2B 75d9fb9dd5201d402fb66fb1802c838258efc61d164c1e353c65f5a9365351c2c553c4d792701a7d216eba80935e2f22b8647fdf51c8aea6bbf4c094f592315d SHA512 e270523cc4c5c534ac06286bd23cf56b20bff25a73572bc2e87f509242b5adf156e625040092c7beabf2f38b50471a5ec46838cf78c337fb5cc78a296b58597c
diff --git a/dev-python/speg/speg-0.3-r3.ebuild b/dev-python/speg/speg-0.3-r3.ebuild
index e9d2b1824422..54f74fe9f7b7 100644
--- a/dev-python/speg/speg-0.3-r3.ebuild
+++ b/dev-python/speg/speg-0.3-r3.ebuild
@@ -9,6 +9,6 @@ HOMEPAGE="https://github.com/avakar/speg/"
 SRC_URI="https://github.com/avakar/speg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~riscv x86"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
diff --git a/dev-python/sphinx-pytest/Manifest b/dev-python/sphinx-pytest/Manifest
index 71bfc95909b7..9b3cc183b652 100644
--- a/dev-python/sphinx-pytest/Manifest
+++ b/dev-python/sphinx-pytest/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx-pytest-0.0.3.gh.tar.gz 5898 BLAKE2B 08fe98b3add1d76454c30a11f4d82bd04123e44fa5c28d420401014e5aef11354541781c0ba43a5d95c0c6fd35b12742ecf630005faae68125f5c6686c19ef59 SHA512 f1ee23fd5f320b5b4ac48638d509963638322374136d98516a17075e0d5b05cfa64107541c80daad424dfcd9e769a95dd5aa8d7f86d8ded214c9a3cdf901cf1f
+DIST sphinx-pytest-0.0.4.gh.tar.gz 6196 BLAKE2B 24b8be165a58b15a845f076b33fb7a2525afefa7fd8bf836ac679280d271716ff02bf3adfa9b485507bc3f8a6cb91b0458a0b5bdb62bf8920c09eb20468e8949 SHA512 25bf3fafddf02aed8b2478dc2beafa251027652d03f31bbac67eb98913e359f9497a9018561aff0fdaf568ece4bcfa15705dcfa2fd3734f4db6c613b24d6a568
 EBUILD sphinx-pytest-0.0.3.ebuild 657 BLAKE2B 0d1421e28be5e079fe5941416f04194308ae97cf78f8de661fad8ffe0a71300bc89ab5d30a667eea0b253d54878211b2b444e5cced3b32de987d1a9ac34e0cc6 SHA512 677961345eed6a5c4f687b85299f3271cffdb8df85216d192d8a822407d89bc7e792b5ddd041da9b54e62efb3caacde03194102161d85b37118cc0c87cd81a6a
+EBUILD sphinx-pytest-0.0.4.ebuild 657 BLAKE2B 0d1421e28be5e079fe5941416f04194308ae97cf78f8de661fad8ffe0a71300bc89ab5d30a667eea0b253d54878211b2b444e5cced3b32de987d1a9ac34e0cc6 SHA512 677961345eed6a5c4f687b85299f3271cffdb8df85216d192d8a822407d89bc7e792b5ddd041da9b54e62efb3caacde03194102161d85b37118cc0c87cd81a6a
 MISC metadata.xml 407 BLAKE2B 13becabf5e4e4ebc10ca9e3db7fb4da1909369b6a66651b2f40da2e635c851a14ffc39b7a50e4650663746abe1aaeb32b0e332c04f413f223b458b646fb066bf SHA512 8aa7f61f15f906b26c27719b2745ddaad1bd5fe70f840a7dc2b729f3c6c4f9106531c3d52860a4f98a64746582592f370b59a409acf9f646dff5ebb578fda1e1
diff --git a/dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild b/dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild
new file mode 100644
index 000000000000..5dda95b0b5eb
--- /dev/null
+++ b/dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Helpful pytest fixtures for Sphinx extensions"
+HOMEPAGE="
+	https://github.com/chrisjsewell/sphinx-pytest/
+	https://pypi.org/project/sphinx_pytest/
+"
+SRC_URI="
+	https://github.com/chrisjsewell/sphinx-pytest/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-openapi/Manifest b/dev-python/sphinxcontrib-openapi/Manifest
deleted file mode 100644
index a5f8023122b1..000000000000
--- a/dev-python/sphinxcontrib-openapi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sphinxcontrib-openapi-0.7.0.tar.gz 193897 BLAKE2B c0f1c46c6e8c67ddf95d163a68f5e22e6f2dff6622a3c21651b301dc1266b53b088d1b882e5e3347fad6347b86392bc9428b56f537c1d2320e7d9cd113c478f7 SHA512 36a7b6473b43af8d6fe2cf1bf22fb90848343911f69414cd742b942ff2ea33ac5ffba79c516dbb076b87c2a6e7e44d6958796daf06c9245a7184bfb6fdb53569
-EBUILD sphinxcontrib-openapi-0.7.0-r1.ebuild 1151 BLAKE2B e59f5bfbf2c397bf9a779ada92bbf98be82ff93a49412dc40c448b190332e4b119e50b1215d1e25745ca1e39422f7847e9ea4803260a5dec32fae077a9989ddd SHA512 500372fe7bf4f62e41623546434892a5fc8fd6bc237c1a3816aa5076424fe6581a5d90c9fc8fa1b7ddbad1f4c9f3fa27b5f459d058eecd8e2bcbb68a95574370
-MISC metadata.xml 411 BLAKE2B 9f2dbd78b774a2e1a7c3223dd3b53fdfdda65ed4b09fff4ed0fe3b7ab3e8fb14a817cba5084e1e3979e80c386bac251bad94fe750701c3781d5c6aab7773d892 SHA512 a1ff8b1e5ae27a9cce5677f38129f01213881e99a60a6f77b860a6931330c9c924575b881726a1d3048059e3974f6015d6201aaa5c739ad6cdec5c3576398b9c
diff --git a/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0-r1.ebuild b/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0-r1.ebuild
deleted file mode 100644
index c3f2a174bddf..000000000000
--- a/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI (fka Swagger) spec renderer for Sphinx"
-HOMEPAGE="
-	https://pypi.org/project/sphinxcontrib-openapi/
-	https://github.com/sphinx-contrib/openapi/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
-
-RDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-httpdomain[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/m2r[${PYTHON_USEDEP}]
-	dev-python/picobox[${PYTHON_USEDEP}]
-	dev-python/deepmerge[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index 8404d0ee2b5e..c9a8c1d44882 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-websupport-1.2.4.gh.tar.gz 599695 BLAKE2B 909fc3dd77377769b6242963c2228a01dae4c73b2c1128094ecb5c113517ddb103498fa8615a0690cc41333778a21ba62a7638e36e3d82ad89c74b76156580a4 SHA512 4b5a382037988079e12e5c022ce0351c953e65dacfee7e3a63852370deddcee083cb65914b0bb9a8dc42481015f33d1ac2b5fea61c676ab947f8b0cbe331d7f6
-EBUILD sphinxcontrib-websupport-1.2.4-r1.ebuild 1415 BLAKE2B e3cfe0f399f58848f287dd6b7b105c630c23505b23062a6b95804ef7e9bc623c49d31cdb0c1fc102e110e26f18c5e34d684012ea27c4369a568c046e5cd1a42c SHA512 f1031da74f33bcb15084efbf29352f7fd858770d5f7c95adf208b2d9c8b7dfb3ca711894143acf1e7c990cb55e09eb6a533e511c049d0693d74fc2170f316728
+EBUILD sphinxcontrib-websupport-1.2.4-r2.ebuild 1494 BLAKE2B d30a13d73a5b2e7b73285c66f2da7db504cbdb513e10ef27cd996ea7bfa14d6ed2b2bc3634fb445efd7646f887cff064a231eae26fae5e8096994c6c2581dc61 SHA512 c5a117a82a0cd12ef795598451b7f25c8b3e9cb47565ce1ebea97580bfaff2506ba5d22e76919114b94307aa2f34f18034f762859dc9d9d0debbf0000544e7c8
 MISC metadata.xml 614 BLAKE2B 4029475965c4514884e0ca09ca1ba257806fa222367acdc77caf7878d8564f46a6050a06e7f43a5483d9c855e746818c037dd80889fba245c3626537722281d0 SHA512 014e0efd914a7fc32fbb8bb432efd5d7e4b2efd6e189ec33da2c409281e67529de574f7708c9963723d314d45d1daefd33eeabb9f25e5af389ac0d0ed6f37d51
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r2.ebuild
similarity index 94%
rename from dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
rename to dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r2.ebuild
index 81c38872592d..5de0c967feaa 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r2.ebuild
@@ -45,6 +45,8 @@ src_prepare() {
 	# breaks tests
 	sed -i -e '/pkg_resources/d' \
 		sphinxcontrib/websupport/__init__.py || die
+	# strip the .dev tag from version number
+	sed -i -e '/tag/d' setup.cfg || die
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index fa7052f2c262..049f8bfebd40 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,5 +1,9 @@
 DIST SQLAlchemy-1.4.36.tar.gz 8146415 BLAKE2B 62560ac2f2c542d60588a24eef225d39f1b6c4cf6feddfac4631e06731206a837cc0f76b88b40c73600361243857e9e1768b4b4ac0bf5ee8e28736d81028ae58 SHA512 c9bb38ce5eeb7817727e93695f10cf5c247710b809f3298b233ed8be4e2cc08e5a14581d0c5aa2af02d7a49f036fe3a0bb7a88120b58bdce0f115016bdaf2c77
 DIST SQLAlchemy-1.4.37.tar.gz 8155965 BLAKE2B cf21c2ab73a5ba2576a857a12f30ea516265af946e25c1b137e57019d862bf04f4757b4755cee28e6f53642d1f1b58f43c99cd1c69f87640e47ac8a1d1ff8d28 SHA512 3f8a814f9bb6fa273f7b210c4567bf7411d0cf2e5caf010a5387fb946063704c342072145a858fb906545dfb1b959155d041e6073273674e51715356fc1f39e6
+DIST SQLAlchemy-1.4.38.tar.gz 8211925 BLAKE2B c65a8bddfc77bb6262e24a9b191344da312641dcd759de8541439e13cc532d9c2ef92da50c0b46ace60f2fd8582dfa6ea37b2f393fd979b3f122d962c688ede8 SHA512 4f54873fe2ba14b00cfa900251bc81d4fbbd62ed2b0f5f35bd3d5157796b869a3b7a9acf162f65da3f05b4b43cfc8bba437600f7fb81887a1839043a6ad516b4
+DIST SQLAlchemy-1.4.39.tar.gz 8212369 BLAKE2B d65993c4342c2cb5bc76ea4ecc986d0ec521a6eb785604ceeca0c9c22187e4af29fc8bd940a130162ca9dd5c30d58b5d0999472285382c6f6bed3863ff9f20cd SHA512 a7c6b73250044289add492b2d7df9010f3b9a3a5126c8b3448d7339cf743c4be3f1c08d238107bb12c579b2bbd7d20e216e331d3ee10dcf79c0f23ca44d496af
 EBUILD sqlalchemy-1.4.36.ebuild 2839 BLAKE2B b19eea5aad1cb6309d4b8b93777a0dbc9bafce964aea03a3cda6a80acc603fc1ff18cfcf324b6a9a65faf00354f49c778203e02277b8c277dcd484cc381654b5 SHA512 881a5a1b470dcb2c15ce0dead3ea454ec11a130202bb243e14c0622a0d7ab424747b42ac349eb3d7b4f68c27495e273f23d5d1d4c0f8d5fa4cd1efedec785e6a
 EBUILD sqlalchemy-1.4.37.ebuild 2847 BLAKE2B 2f86c2ac04799d1f99503d37ecf027aff9197ba4eb2f2c739b4d6d66ce69ac83e1c12a621563a44a07b0e150ba2f3702446684f70a7808e57fba81ccc5458304 SHA512 802c09ba8a51a6d432cf7b5e7df0a7e970702659eafc6cba108605a66be8004aec2cb867da1646c194dcbcedb77d6d819109d8ca0c3572eb2f5f2adf80314d13
+EBUILD sqlalchemy-1.4.38.ebuild 2625 BLAKE2B cb12c0a41a713cad62ed92c4232a24a3ef0293e5d48488ed3ebf9cb70106a9febab2caa70bfbbb7c22e281d6db222f1a0e3cc5ce782272880effeda6a4ae2fd8 SHA512 dec936b66e10c04ce2c9eb2af65cf48c64a5e9b04ef1279c1133fb56d9a424853544ef5c3e7412d5cd5bc58c36c3697f34e2ce05cf847335872891d5f397e16c
+EBUILD sqlalchemy-1.4.39.ebuild 2625 BLAKE2B cb12c0a41a713cad62ed92c4232a24a3ef0293e5d48488ed3ebf9cb70106a9febab2caa70bfbbb7c22e281d6db222f1a0e3cc5ce782272880effeda6a4ae2fd8 SHA512 dec936b66e10c04ce2c9eb2af65cf48c64a5e9b04ef1279c1133fb56d9a424853544ef5c3e7412d5cd5bc58c36c3697f34e2ce05cf847335872891d5f397e16c
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.38.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.38.ebuild
new file mode 100644
index 000000000000..b9b2ea0d21f1
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.38.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+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"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
new file mode 100644
index 000000000000..b9b2ea0d21f1
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+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"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index 631941a6443a..bd03041d48f4 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,7 +1,5 @@
 DIST python-tabulate-0.8.10.gh.tar.gz 49453 BLAKE2B 9bf5c9e937f8ef051792fc57dcd56f1150636bf29493fabe56d4b706df04add41fdffbe1108cb93aa561edc96245ba85e621d4a8b402ace513b55710e6e5498c SHA512 d216076112c0d0f0879c1eeecf2d2c0c30edc84d7289396f1a8d24bca862ef90fcf221a09812b409547696c3b7d4472d431043e359c3a7f67bb8392ce1e95ddc
 DIST python-tabulate-0.8.9.gh.tar.gz 42562 BLAKE2B 6e6e1017379d07d5ede0cdfb6a8e3142f60656fd5d5b409c1259239e62637824c3bab0bb0f6b03f8733a24e9e3ac074a80a56d44939a8c6eeab8e9a830ae8277 SHA512 68a4d194068f692b57b2cca0fa42a58ba571b46adaef7f8b1a8cea7e34c78ea0a1c523286c3f1df631897cc60ad39ef6b11bfee61d46c04e2de1fb9ec0b497dd
-DIST tabulate-0.8.9.tar.gz 42562 BLAKE2B 6e6e1017379d07d5ede0cdfb6a8e3142f60656fd5d5b409c1259239e62637824c3bab0bb0f6b03f8733a24e9e3ac074a80a56d44939a8c6eeab8e9a830ae8277 SHA512 68a4d194068f692b57b2cca0fa42a58ba571b46adaef7f8b1a8cea7e34c78ea0a1c523286c3f1df631897cc60ad39ef6b11bfee61d46c04e2de1fb9ec0b497dd
 EBUILD tabulate-0.8.10.ebuild 1289 BLAKE2B 3f663b2d1094d20ca3b634cfe4439c8c2cfc4b9f5cb274b276f49210df63f01f5bd158397cfcdc1e10d0d89a7f1c8092eb70b6a762b02ab82e732bbe0fcb3638 SHA512 2ad30f43fc0e29c40093da2626b1adefe59c188a93db6e5c5253c29206f7a4c04bab07975693adff661b4c4d879368c5819df9d5fa3ef53d96a9dd9c6672f91f
 EBUILD tabulate-0.8.9-r1.ebuild 1287 BLAKE2B f05fe2089ed8092f04ca65d90e1e1fdbbb0870bed8cc56948f16e30a5200ccec8a6379734c68c07b9989a55185d1fad682cb7f17096948ad39abdc613697cc72 SHA512 00b891e8cb2a64e594555a94dfdddc604ba18c587f680664762d9279004d1f38d75525421e080d27e32de702b11265d7fea374c34ac15a1d6cac38a3c930b220
-EBUILD tabulate-0.8.9.ebuild 1171 BLAKE2B 7452d7fc3bf7715446a0d15eb94f7142a691f09acaab3ae1c74363f79e32af65c49ab74ecec8d0b908d2a12a3eb544fdd9dd9db4689615484c0dec4e1d3fb850 SHA512 c8e93d12c29881c39631b92fd428fae62d90d01a3fcaaad7324ee4646a5636a194fee3903f8492dcf18c5a50f1129916ec8e8af90ef5833b66f8817d7ec797bf
 MISC metadata.xml 399 BLAKE2B b92bc308afead78cb604ddc6bc288fb28ed5a2a523c890270ee87eb5bfee21133748c5861829bafcc8a7b3401b430dff84dd99264ebf3e7ea74342f99ee8cfc5 SHA512 2d8c4dca9558e5a5d6413a6bd5e2cd6e15d1d0d447e6c692af84c8575be899f3d78246782e6c908a626326662aaffde56b2c3f96f4e9cfa0473c976109e3dcac
diff --git a/dev-python/tabulate/tabulate-0.8.9.ebuild b/dev-python/tabulate/tabulate-0.8.9.ebuild
deleted file mode 100644
index fd5ed0277274..000000000000
--- a/dev-python/tabulate/tabulate-0.8.9.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Pretty-print tabular data"
-HOMEPAGE="https://pypi.org/project/tabulate/ https://github.com/astanin/python-tabulate"
-SRC_URI="https://github.com/astanin/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/python-${P}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep 'sqlite')
-		dev-python/colorclass[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python3*')
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# avoid pandas dependency
-		test/test_input.py::test_pandas
-		test/test_input.py::test_pandas_firstrow
-		test/test_input.py::test_pandas_keys
-		test/test_output.py::test_pandas_with_index
-		test/test_output.py::test_pandas_without_index
-		test/test_output.py::test_pandas_rst_with_index
-		test/test_output.py::test_pandas_rst_with_named_index
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index d5490b769c8b..f7d1746e277b 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,4 +1,3 @@
 DIST tenacity-8.0.1.tar.gz 37492 BLAKE2B 10438b3877862baa88d164837b201773c287e7ce11b6213c677c227cbddda02434b423c0f331746495e68ab130ff9a9c720cccd2def3efa8ca6df8eef441eee9 SHA512 b5a615306e25c93d2734d408cc73f4db5361d92b713c1e7bbb57cd7bf635f82c5ccffafe9c0a6bc0da4057d11c92012d2337a5e4f15465bf4e6839d1fa97b877
 EBUILD tenacity-8.0.1-r1.ebuild 814 BLAKE2B 122c2bc7038e4c29da0a17b5228ec76409fab09b80c52d5c66f1f05657638f572c3139b0b6cd951c349a8b61a5bd36191bd80777b9e14c71a922854729f9471d SHA512 ab74ea742872306f8ffad9942bc38ae92c0846390e20f9efb284135ca2056f5447f36e1a22066aab775ea52433326a66e6e857ef253dd5b93546d32432f62f05
-EBUILD tenacity-8.0.1.ebuild 695 BLAKE2B d1e237c8dac54fc033a5918c6172fb28d1121a5554e33a6bc632541ef05ad95ece7f416c09d09f025c113cbc0fa55920578a9c986fecd92a68d734cd3e9ef569 SHA512 5016feae5ca37d9b79ee6f9315826667b37e9e09110e172eca177bbbbebcb2e1d3892f8adbf6bac80bdc3ed35586e860b36241f6877b2f3ebf996061d17f8324
 MISC metadata.xml 856 BLAKE2B af0d5417912404af6b5be19c32d150db197d27b55681871cbd45f983d1caf8b8ba7c8c44936b1465ecf00b4d185552399d0023bbfc16e84451e4fbf006eefcab SHA512 1fe2c8617bfaeba198a8b5430c2b38acf60f17c29fc89599d198037310589b4a5bb1170919e2f57c3e27951288d06ab281ec5a55ae64e6a0a33296a89be17839
diff --git a/dev-python/tenacity/tenacity-8.0.1.ebuild b/dev-python/tenacity/tenacity-8.0.1.ebuild
deleted file mode 100644
index 1bb3fdfb5e08..000000000000
--- a/dev-python/tenacity/tenacity-8.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="https://github.com/jd/tenacity"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		www-servers/tornado[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# TODO: package typeguard
-		tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/tlsh/Manifest b/dev-python/tlsh/Manifest
index 39394eaead01..e9ecc06b743e 100644
--- a/dev-python/tlsh/Manifest
+++ b/dev-python/tlsh/Manifest
@@ -1,4 +1,4 @@
 AUX tlsh-4.8.2-setup-sources.patch 1029 BLAKE2B 6b1a252693940df0856361aa38553a6a684566c4ab80ac4e01b7151a611b5d27bd9065c5560e958931108399b9b860405ab4119615f8f6ab6f8d05e8ce2f4c89 SHA512 04fce865f3a7e73a9a6814596255f86eb1d24086372479ed993b7faa362973808d2d45f4d81506c1bf87bfc534caa410a0c8758250ccb3fa4337c0952610be5e
 DIST tlsh-4.8.2.tar.gz 3345458 BLAKE2B 27d5eece16bb36225b9ae8b3d3a9d055a0f214fffae08a58c39211c3d918dd842497315a62237b291ee1055dfadad78826bbd24f7b9d88f510e9a31f74654039 SHA512 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
-EBUILD tlsh-4.8.2.ebuild 784 BLAKE2B 790e48411b207a07a865ddfd234ca0997d618d7cb73921727e2d0d702d125f078b226ebae6132b1792121aab6f2fcd7bf97b7368c58e2eaefc50c6e1b8b9ca26 SHA512 84780929c34b98c784a346f0d570e182ef31adc6f79d7b606aa70b23648debbc2eee3e7ba787ed53c598aa0a0fafd36831e4293839fbc05b9e6f3a18a0355745
+EBUILD tlsh-4.8.2.ebuild 791 BLAKE2B 10bfc9448a9641bfe125ec08161b51159117c48c279ac65134e920a3f01ea09efbbecd04fabeca919ec60c38a5390235732b6f69580987e06b9fd2292b0ad048 SHA512 aa962f6b2850cc64bdc6477dea1b9a06331116c75a7d97c0224934438ddb776c4bb68d3580680a581f9c188e042b764e65fbdd03cf2bd66aef99b25834de8f45
 MISC metadata.xml 520 BLAKE2B 97d64e94859345f4537e1a95dac94190cf54cf608cc851a8cdf24f5f4b71c0821c778d24f99fb076ed08247a085270d4c36aaa66583916c0a420733b7b8543be SHA512 95dc94ca2c08d71246453ccee139901e675ec84b2c4af224b90057270f4bf5494ffb761e2d3b4dff25cfcac47185d4f7d2f4b3080182f8c9526b746e99519211
diff --git a/dev-python/tlsh/tlsh-4.8.2.ebuild b/dev-python/tlsh/tlsh-4.8.2.ebuild
index 750ce1919ead..a9f0bf677081 100644
--- a/dev-python/tlsh/tlsh-4.8.2.ebuild
+++ b/dev-python/tlsh/tlsh-4.8.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P}/py_ext
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="dev-libs/tlsh"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index 7213f982449c..b627808f1db8 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,5 +1,3 @@
-DIST tomlkit-0.10.2.tar.gz 184537 BLAKE2B ab912e1c45d641e7c57f1121a6281ed0609c3ddf18c55eb887a67ac8a4df669a3e958e769a07f7ad456c80713337af4b892d4bb73671ce12e4b2fc4d09af0734 SHA512 e1d5353659f9a0f4ba2f6a0b82980f0b50b012e3b299c2c6b12aa8a63fc4772649bdc2b5a755c21acc46fe2d226241918fb09a4202cca596b6e9633be95e79d8
 DIST tomlkit-0.11.0.tar.gz 185695 BLAKE2B cd2a22afb8ea445e39567cdc65f636d8d9f2aef07575a2dd989c19abf1a6f7baf2e9adb78003576af9cdefebe4e8c6031efdabcc9487e10770565589a67b0c86 SHA512 2e89748140cfdae217ac3ac999f0b718414d28218d61fb5219adc503ede2ea1f4003be9ef4453f189b0ee86df463c59520244b9fd26553bd4d8047674cba61c9
-EBUILD tomlkit-0.10.2.ebuild 819 BLAKE2B b6edad59101ca0aaf277192dfcd7f6437f07e8cc200481d77580aa9a8a45754ee42b827916f55f9539e1968af615b33f9635ae808324f99d1117968a109de2b2 SHA512 af4f05b4d651cb485f9913f19d38cb57bb498cd28d74535df959e5734dd6176677b7b83f6e73eed6ae1c8bfb23fc6616344a1f46bae4deb08ad06b02fa55016f
-EBUILD tomlkit-0.11.0.ebuild 818 BLAKE2B 87ddc686dd14ac5ef59c37878dd1b72c6b6b281ea1d49794c4fb0b481cd458da531ce33cb7ecb0207c66f4510e4a3a1f16b9a56477c16122f2a2acf15e1436ee SHA512 c8d41d025284798c0926e3a64ef45aa9ffd7c5f7a03c85f5f8fa3cfba59b2166dae450327e3b86fc730f7e0b5beb636780ceaa7cea1c44111e1bdf61d22d2012
+EBUILD tomlkit-0.11.0.ebuild 810 BLAKE2B 37d3168a8b555cc7e4b3116e05dd9f9d554dee22322e0796cd379ceb1f39d7f09036fbee267e82f318da1bc3e5940ebe9e9edbb30fc42265c7c1953ecffc853c SHA512 726e6c2b38ca8d736a1a9fd093092d691d0d750f593be44cc7d79b58873d80c1dbf52e9f85c61413681306581df8abcb79d6c1ed49abca31a0a42f15c56f4490
 MISC metadata.xml 525 BLAKE2B 663169c851817eb7368c49d678119f1f2dfebe642325d3dbc59498f60b452710a257ca5cd5173a4fc8391d33038cce079b3fba112ad7e9c0caf0c1872ee43f13 SHA512 5a6cf412fc06854557d001ae4a6f654b36d351c8c0b4bc08c1a7c40f49d8dceba931598f5eed6c75e1d7797570fcf8fb7799f5f035931f80d05b1e9bd0d258c0
diff --git a/dev-python/tomlkit/tomlkit-0.10.2.ebuild b/dev-python/tomlkit/tomlkit-0.10.2.ebuild
deleted file mode 100644
index efdc6369cdae..000000000000
--- a/dev-python/tomlkit/tomlkit-0.10.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Style preserving TOML library"
-HOMEPAGE="
-	https://github.com/sdispater/tomlkit/
-	https://pypi.org/project/tomlkit/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	# use setup.py to avoid circular dep with poetry-core
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["setuptools", "wheel"]
-		build-backend = "setuptools.build_meta"
-	EOF
-}
diff --git a/dev-python/tomlkit/tomlkit-0.11.0.ebuild b/dev-python/tomlkit/tomlkit-0.11.0.ebuild
index 8f575bb2866a..ae58bab0c59b 100644
--- a/dev-python/tomlkit/tomlkit-0.11.0.ebuild
+++ b/dev-python/tomlkit/tomlkit-0.11.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
new file mode 100644
index 000000000000..2043f7729f02
--- /dev/null
+++ b/dev-python/trove-classifiers/Manifest
@@ -0,0 +1,3 @@
+DIST trove-classifiers-2022.6.23.gh.tar.gz 14950 BLAKE2B 7203b8edb6f8a8886371a60f3c273b02b7fe045230a3a0c89a7282a896e513535a47fe06834fd6e33b98c480695b69be524dea1402f463f3c82fc80ddf8ac320 SHA512 c2c186b5d13f626a43f29a1eff6ebf2f17f8240af554f27ffdf05b506d428dd59582e7357a85b62f94714e024ae98ea216487726526639371c24c6b46b96df4e
+EBUILD trove-classifiers-2022.6.23.ebuild 659 BLAKE2B c50af928a84398969b7e57b00688ab13dda9ae3a476560222ba27590ded65d6a1eafbe79b2d1730a8fae8e714a7b39ea0b892808b46941e81a862cf02885ec82 SHA512 9081abb9b701b392d6528fc0242c79d72e145a2e6f620b965148e8bbdab7faad10034b23f8557ae16a08ef45b10ce9a9814e386ea0c5e8d6ed82daf710629d34
+MISC metadata.xml 361 BLAKE2B fd91e587a440e18c3030c6ae2992cda3d70ddb506eb78dfdff7b3e8b2d6456fd0cb13b56a7cb360bb80cdb38686d52938b5d6e9d873071e20a0802b11836181e SHA512 d34a508b050c6f1148e8ff6175b7f5f3dfa8aace0be8c02a01dae94b3824e7c1995deef16e5ad518e4260f51814dcab5f2afbc8b13126b1babe117746bf99ab7
diff --git a/dev-python/trove-classifiers/metadata.xml b/dev-python/trove-classifiers/metadata.xml
new file mode 100644
index 000000000000..210953a4e27e
--- /dev/null
+++ b/dev-python/trove-classifiers/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="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pypa/trove-classifiers</remote-id>
+		<remote-id type="pypi">trove-classifiers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/trove-classifiers/trove-classifiers-2022.6.23.ebuild b/dev-python/trove-classifiers/trove-classifiers-2022.6.23.ebuild
new file mode 100644
index 000000000000..964617661415
--- /dev/null
+++ b/dev-python/trove-classifiers/trove-classifiers-2022.6.23.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
+HOMEPAGE="
+	https://github.com/pypa/trove-classifiers/
+	https://pypi.org/project/trove-classifiers/
+"
+SRC_URI="
+	https://github.com/pypa/trove-classifiers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-python/calver[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest
+	"${EPYTHON}" -m tests.lib || die
+}
diff --git a/dev-python/typeguard/Manifest b/dev-python/typeguard/Manifest
index e56c31f6222c..bae61decc5e2 100644
--- a/dev-python/typeguard/Manifest
+++ b/dev-python/typeguard/Manifest
@@ -1,5 +1,4 @@
 AUX typeguard-2.13.3-test.patch 1436 BLAKE2B 993cde140e693129636598fb2245bd3db3ef2e90a0e369b84f13bb1e268de01da6fce0887ce5f8773c94329004a572f6af0faa9d8e9615775ac039ccc860e20e SHA512 5ee8579344ff5a5356d157933cb67b25a3854ef2e64abf2a6864a49f8fdde7ecc8aabf31baa952e10a986f04235f1e2214947a7f064eaa155e40f60249350e68
 DIST typeguard-2.13.3.gh.tar.gz 37436 BLAKE2B a3cb616692119c64a9dc0d0bae25cc661b7974a0b6cf6632fa403f7c5430873570b1aaa310bc03843deee6f77a831c303ea9d9091db596eb565fce43980bbb13 SHA512 26c31ee9670650d1969320187a924d29d986894a38f1026af58f705b132b64be3b6e2ac34729f966f5d302d486334b5a5d9e65fb206245b82b0ff0852020b609
 EBUILD typeguard-2.13.3-r1.ebuild 991 BLAKE2B 51aff6cc0d422148a35805e2da530b6cd90c3997968d80aa791fa2599e4f6d729b42e82c48698c757aeffc8093e681c0ce0d246039605f6eb5d1b05bdb79ad00 SHA512 1ea080ed184cec3007b4583f7890045dcb8e15f9b3f5d36afd25d8cac202b3f7f1a1eb39ff907a208b125d59d8323d60aca28d15be53b9ce129460a7326bdd25
-EBUILD typeguard-2.13.3.ebuild 846 BLAKE2B e1baeae595157360ca01503c75327f9a8105d797795ceca35fa6c0ecb4b8d7bb47c3b9ea2f728e157acd9e43b5316da6e6a1213114df827b656ce11f6fd1c737 SHA512 4292f277d7251c86b559d21be26346a8a55bf047da85cdd1a78199e9fa697a0e7ba7a885a4dbd41ecf843e3d5968f7025bc4b255036da753da79ce49d9b28f27
 MISC metadata.xml 350 BLAKE2B 78dc7293e08dae7974b38d84ce457ceddc5888a7278c1b149b8ba3057f07130b2e002dd78a9df91fd09d85b7ebc26272b4c78dd96c6cdd3938cff67b9c451366 SHA512 1fe4c4164b0732bd294815dacdd46a70ace6e8886343491232fb59b6b3697316c3eac5dd72e2e4758d87fd093d845f4453b8f278009be640ca1555413f47e869
diff --git a/dev-python/typeguard/typeguard-2.13.3.ebuild b/dev-python/typeguard/typeguard-2.13.3.ebuild
deleted file mode 100644
index ea613cada856..000000000000
--- a/dev-python/typeguard/typeguard-2.13.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Run-time type checker for Python"
-HOMEPAGE="
-	https://pypi.org/project/typeguard/
-	https://github.com/agronholm/typeguard/"
-SRC_URI="
-	https://github.com/agronholm/typeguard/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# mypy changes results from version to version
-		tests/mypy
-	)
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	epytest
-}
diff --git a/dev-python/uri_template/Manifest b/dev-python/uri_template/Manifest
index d8827c895c7f..8e008a0b41f5 100644
--- a/dev-python/uri_template/Manifest
+++ b/dev-python/uri_template/Manifest
@@ -1,5 +1,3 @@
-DIST uri_template-v1.1.0.tar.gz 18014 BLAKE2B 01ac4439b6661d0d1e7adb5b5ebcc594497cdaeef24b33cbfc8a26f607e779a72ae20838dbbcce28278886c87df475adfd53c73287a4768d848f65b95ba2ce58 SHA512 b6d34931e750acc6c160e7157fc000984acc099023e9794163777679cbe706b8a646bab89e82171c0318827b7a7b9cfcfb997768120cabcf36e7982214321665
 DIST uri_template-v1.2.0.tar.gz 18284 BLAKE2B cf857ccd8496111f61fb95af020514f1c484e5c3ff19829f28bc2dc112887fe276dac68aa21e0d092d42a22319e8d6ac8aff95c734aadd8417c56f57b0076256 SHA512 81b046bbc2dc4d5c0b40a76f13713c10e69d803e3d9da13ab69cc6d40569ef0a39c786a6637a66651a5c3d3e68807f923ad48a7feaf898ae3ca6fd03c0e68c37
-EBUILD uri_template-1.1.0.ebuild 658 BLAKE2B 7f4c44c92a22390f610a16ee6f067973040706c2d468ac2fcd5c65a64771e5e97584ce761dd5b12423ddb64d18b85343556424ebab74083c47590d63e4280d14 SHA512 67841fd510d2703a616d47a80544d43a917524ad997872fcf81729a0aba268a7ea30ca5fda04c43df802146ab14487b5f57960fa48a71f78ce86eb87c001c7c5
-EBUILD uri_template-1.2.0.ebuild 709 BLAKE2B 4e0ac649ce6e2620c296b9128f31a512935b227374e48c8684b2f06ac79e303cb2b21adc719435826eccc0c7963e6bbaba3ea3a7477c2359e025827a409c0f52 SHA512 c86bfc1d30a2230e7aa878d943e3f5656d22085b68d55cbc78d8aa003ff2b9cd7d4badd7f856a111cb2f965f6b1592983c6b1dc8e37e5888478144b003baf7b7
+EBUILD uri_template-1.2.0-r1.ebuild 835 BLAKE2B e22f184da083b2801c45044709ae6596dd76d33f85bcfbfe32428fdf5701ccef7833b6bb6ea7cfd16bae3baead49d432661aa4b1bbdc4ad2495cca74dcf452f3 SHA512 fdd587c0344fd62d6f1b643f50ec238563677493fa77585159d96134d16f8207f1c8314c714a758ddf1338f660332437911c37f5daffe0785f607ba17164eebb
 MISC metadata.xml 596 BLAKE2B 3dd78f11c031a0810c2386cd362bba5563405d3bc9347efdbea8a54a29b76f72dfc0343f59c82f46802fa80437fc24e96477ae64626a12a46ca21a85e292682c SHA512 39d59df7ae7d6c9b3ad84406abd93a051418ee0b82b008e28c3e872697bcbf0ff89ce27684bb05225b65e79655256e0c44b38096cc5e7b2eca224370721e744a
diff --git a/dev-python/uri_template/uri_template-1.1.0.ebuild b/dev-python/uri_template/uri_template-1.1.0.ebuild
deleted file mode 100644
index 2aa659f49c57..000000000000
--- a/dev-python/uri_template/uri_template-1.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P="${PN}-v${PV}"
-DESCRIPTION="URI Template expansion in strict adherence to RFC 6570"
-HOMEPAGE="https://gitlab.linss.com/open-source/uri_template/"
-SRC_URI="https://gitlab.linss.com/open-source/${PN}/-/archive/v${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-python_test() {
-	"${EPYTHON}" "test.py" || die "Tests fail with ${EPYTHON}."
-}
diff --git a/dev-python/uri_template/uri_template-1.2.0.ebuild b/dev-python/uri_template/uri_template-1.2.0-r1.ebuild
similarity index 84%
rename from dev-python/uri_template/uri_template-1.2.0.ebuild
rename to dev-python/uri_template/uri_template-1.2.0-r1.ebuild
index 90ea54cc924f..6338f0309acd 100644
--- a/dev-python/uri_template/uri_template-1.2.0.ebuild
+++ b/dev-python/uri_template/uri_template-1.2.0-r1.ebuild
@@ -23,6 +23,12 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
+src_prepare() {
+	distutils-r1_src_prepare
+	# fix the version number
+	sed -i -e "/version/s:0\.0\.0:${PV}:" setup.py || die
+}
+
 python_test() {
 	"${EPYTHON}" "test.py" || die "Tests fail with ${EPYTHON}."
 }
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 333224561138..c6e62fd8a1f0 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,3 +1,5 @@
 DIST uvicorn-0.17.6.tar.gz 708048 BLAKE2B 83b06907c8109b38e13930d8b73584682fa4e34fe7e51fe14b6ca1ddc7ef8122d950a09e31cb364a02f5f12eead5d0522b41cbf428509c6900604d4e2776dfb2 SHA512 d5c5223759d59648f279e22f7e6af728fe8117ed75488d125c1db3e5e9d385a50d574cff72ac46db4eb0a78d0e4f690096cfe78c774674dfba61860e55b7494e
+DIST uvicorn-0.18.1.gh.tar.gz 712588 BLAKE2B f99c173015d3efdd6f7d6257384045542cbf95ab65fdd84f47ee5df4677865d0b4d6de5f23db0bc2713cb286242a029b056c4076268b14d238a3e9f57c02fc42 SHA512 d8650ace78d19c44d03de8413bf06b2dd3208c7e47c4d9e17ecbed99eef938ec08eb249b204713139b985ae4b117c7da64836c25bf8d20610363bedcf1ebf990
 EBUILD uvicorn-0.17.6.ebuild 1394 BLAKE2B 1f9eb4a37f3476787f643dd1b06c846ee2d4f0aa08aedfb74589097e9163b24a4b5642bf8fdb672bbb61537a15bdbee3ecd69962bd5edb42f969b94202307320 SHA512 7e478a4e05e4ae6b097eb018ec4bc105812a368389e0b663100f1ae0abad5c11a9ceb8555119d01c1d5397bc56df9af801129ed83e246a69538aa262fa39157f
+EBUILD uvicorn-0.18.1.ebuild 1681 BLAKE2B 3197c880ed7f44d0610a270db52c07957bd377388abac1a19991a324782523c7c26669575fc6195ee403ecfc12cad7b85001e4920f6de5dbc237c03dfe42570d SHA512 2c32dcbe9e0eaa273f7908a6208751438951959756ebae3924c21039a30b0815e5cf0131bb9c1631b869cec033c1a32740d2a9b68fc1571c2145fe30c6425e1e
 MISC metadata.xml 451 BLAKE2B af9be617c95128297e3455b503e198e13c373244094f6aa9c80837945c3f9f023f1874efa28d4ffa8b241feb9a4e8c7f3d3534e96966733bd5593bffb90904a5 SHA512 4d76bab5c20f7cad81fa56a28c9be07bf2c2ebc412fc647f073215d437a2550eca247b8419df71d04200d0fdf545520684db0b6f4953e73848f69a4f4ad6931e
diff --git a/dev-python/uvicorn/uvicorn-0.18.1.ebuild b/dev-python/uvicorn/uvicorn-0.18.1.ebuild
new file mode 100644
index 000000000000..de246a78f9d4
--- /dev/null
+++ b/dev-python/uvicorn/uvicorn-0.18.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Lightning-fast ASGI server implementation"
+HOMEPAGE="https://www.uvicorn.org/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/httpx[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/python-dotenv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		>=dev-python/websockets-10.0[${PYTHON_USEDEP}]
+		dev-python/wsproto[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# too long path for unix socket
+		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
+		# need unpackaged httptools
+		"tests/middleware/test_logging.py::test_trace_logging_on_http_protocol[httptools]"
+		tests/protocols/test_http.py::test_fragmentation
+	)
+
+	local EPYTEST_IGNORE=()
+	# love from Rust world
+	if ! has_version "dev-python/watchfiles[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/supervisors/test_reload.py
+		)
+	fi
+
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "auto reload on file changes" dev-python/watchfiles
+}
diff --git a/dev-python/watchfiles/Manifest b/dev-python/watchfiles/Manifest
index 8d1f512a83ad..ea03efe8a796 100644
--- a/dev-python/watchfiles/Manifest
+++ b/dev-python/watchfiles/Manifest
@@ -38,7 +38,6 @@ DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd
 DIST unindent-0.1.8.crate 8326 BLAKE2B 3123c6b540b152d89cc7a9a76ff1315549f973c6a26adc6ca1b40518973fcc95a9f8da94d1c52ee551f2870181a265aac7e4339a3d46ba5280021b49ad842df2 SHA512 7752f4a29306b3c43f768bc400d610d1537457b22cceae8a5ebba31c857e219dc433a10a676d3cf94316a7cd6c7013c8960c825c6f1f9db5a3c2edd0a60591a8
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
-DIST watchfiles-0.14.1.gh.tar.gz 38276 BLAKE2B 1007b4822774b6d04ffa4ea61b1e30a4c2da358e6561891599177f4060c606dc4f46f15a8fa40ff22e292440eb67ec33eaf7048db973fc8ea9c90d6f6adb9e14 SHA512 098ca0d3a7e2eafd3706e08753ac7b242bcf1aa68609a89531405ce7c69cb6ba205c5d72d28064acf9963c81e969e8ba753510d27ef525e007e1943bf9d07c1e
 DIST watchfiles-0.15.0.gh.tar.gz 38496 BLAKE2B b748904540c28bac3a3be3a1a236352bdba316d1230b196ce1d0ec90324299664c065d1644f7eeafa232e197493aba5b8685db5583c9899f57262651f0e53dc7 SHA512 1398c3337cd0f36bfd489dbca4c968bae2c23949d43567777411c1e9773ac633962164d61dcc84d462adba9d79e108ec98fc31866f364bfa72c26599d12a6fdc
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
@@ -50,6 +49,5 @@ DIST windows_i686_gnu-0.34.0.crate 772343 BLAKE2B 7c3fb8d9b375ea82ab3e28da0c462c
 DIST windows_i686_msvc-0.34.0.crate 733497 BLAKE2B fe7588e946d95c1570ea0d90db82dfdb8a050ca331dc3edae6a786c2a10fad88ae99906959334b396c1972d88dc40010dacf655fbf9f5d39a6bd78bacf2025bd SHA512 86771e1fed40e7398d3ce65bee46fcbfeb630e0f77766eeb1da0e5b2c47f94bd728f645a5c799ea8f7ef6653b37903d476b5b3eb763218bf10dd7af6b31c76dd
 DIST windows_x86_64_gnu-0.34.0.crate 744301 BLAKE2B fb0775c40069aa42fcabd01ff09fc7557236e3cd270c771b3648d7f556e9aeb9add7130b117fb107f3562bc199b728d3636779a99c9a1aad96aaf6b99f975f3e SHA512 61f532c2c95edf42f79ced48be9d4a9810dda327f45ff2dbff19a5fb888e3ba206f2b875c5b5571884f27742fb380d5f1e105e6d5fa460a2e529b53625123d86
 DIST windows_x86_64_msvc-0.34.0.crate 669900 BLAKE2B 15a851bb19557ee896ade2db29872754549e4df9cf895a1387d9ddfbf8c599e6e5a2bcb835f450d8218296a99d08fbfb2db469e244b0abdaa13f16bcc38b35a9 SHA512 3bf5308993a259f5d1b3964698550151c5819a0d28a02928c6f7d70443be69131255a896d423f086a298842ba773502de8a8e8bb2ce8adbf7bf848ab40184bec
-EBUILD watchfiles-0.14.1.ebuild 2086 BLAKE2B 5b449743d8f995a7e591ea9f30b700ada223fe3a73ed05de88191b94bba20bf3dea50772c05aa39fac38f621adbd1c2670f04e5497df723888c3e3d6278c2812 SHA512 6856d4650a42b8c25c333884ae0f506904c722954af15564617527660890029fc55bf3a43c9595d06e8dbc943556fd5326e8ab564bc65583dabd33cbebc5cef0
-EBUILD watchfiles-0.15.0.ebuild 2065 BLAKE2B 957edacb4423f24c3dc81addce535929fde1f74ca91423e30870583f97155c09bd18660eefd06f83bd52eb9524d42f3a5b25a2a4005272c1df561d4bab04fb27 SHA512 4ae2cf62be50fbac75e87e0a28b0cafb7ea302bc02d2d3a606d228146c5a6630fddcbdcd10b0f37d25fdf6c8b46287efdf2685cb397d18e87266862c2b228f05
+EBUILD watchfiles-0.15.0-r1.ebuild 2191 BLAKE2B e35bf13c5d94f165a23fb2a5eaf04f46c6963142aacf39714336f3b60fb6162bfbfc3fecfe4cf3cb9aa8f23c731af307916138a2d25cf264cd3905c9e473587f SHA512 2ddd215db029b9706a4bd630b35de55d0bd09c9c2552cf4afa997e9648145cf34df42c8821cb0a3a8c8a7b712d25cb505a8cadf984352f5dc32dcbf553166a71
 MISC metadata.xml 355 BLAKE2B 95253406e11c30a7a3b5462d3c835010313bed3122f9d16ff73d6959a5c1f4c8922e324c839fcae9f541c7b1d84544cd38718ffcaba039b8c61292eaefa37447 SHA512 e1c11224e0129eb696e4e92a41ec0e35819febee2eb967982e016f7a0d02d95df8465867e0202d8e7ac59cc579f73c79d9ed6b87eebd44b3b64d63a5642ac458
diff --git a/dev-python/watchfiles/watchfiles-0.14.1.ebuild b/dev-python/watchfiles/watchfiles-0.14.1.ebuild
deleted file mode 100644
index b53106ed08da..000000000000
--- a/dev-python/watchfiles/watchfiles-0.14.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-CRATES="
-	autocfg-1.1.0
-	bitflags-1.3.2
-	cfg-if-1.0.0
-	crossbeam-channel-0.5.4
-	crossbeam-utils-0.8.8
-	filetime-0.2.16
-	fsevent-sys-4.1.0
-	indoc-1.0.4
-	inotify-0.9.6
-	inotify-sys-0.1.5
-	kqueue-1.0.5
-	kqueue-sys-1.0.3
-	lazy_static-1.4.0
-	libc-0.2.124
-	lock_api-0.4.7
-	log-0.4.16
-	mio-0.8.2
-	miow-0.3.7
-	notify-5.0.0-pre.15
-	ntapi-0.3.7
-	once_cell-1.10.0
-	parking_lot-0.12.0
-	parking_lot_core-0.9.2
-	proc-macro2-1.0.37
-	pyo3-0.16.4
-	pyo3-build-config-0.16.4
-	pyo3-ffi-0.16.4
-	pyo3-macros-0.16.4
-	pyo3-macros-backend-0.16.4
-	quote-1.0.18
-	redox_syscall-0.2.13
-	same-file-1.0.6
-	scopeguard-1.1.0
-	smallvec-1.8.0
-	syn-1.0.91
-	target-lexicon-0.12.3
-	unicode-xid-0.2.2
-	unindent-0.1.8
-	walkdir-2.3.2
-	wasi-0.11.0+wasi-snapshot-preview1
-	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.34.0
-	windows_aarch64_msvc-0.34.0
-	windows_i686_gnu-0.34.0
-	windows_i686_msvc-0.34.0
-	windows_x86_64_gnu-0.34.0
-	windows_x86_64_msvc-0.34.0
-"
-
-inherit cargo distutils-r1
-
-DESCRIPTION="Simple, modern file watching and code reload in Python"
-HOMEPAGE="
-	https://pypi.org/project/watchfiles/
-	https://github.com/samuelcolvin/watchfiles/
-"
-SRC_URI="
-	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(cargo_crate_uris ${CRATES})
-"
-
-LICENSE="MIT"
-# crates
-LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD"
-LICENSE+=" CC0-1.0 ISC MIT Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	test? (
-		dev-python/dirty-equals[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-# enjoy Rust
-QA_FLAGS_IGNORED=".*/_rust_notify.*"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf watchfiles || die
-	epytest
-}
diff --git a/dev-python/watchfiles/watchfiles-0.15.0.ebuild b/dev-python/watchfiles/watchfiles-0.15.0-r1.ebuild
similarity index 94%
rename from dev-python/watchfiles/watchfiles-0.15.0.ebuild
rename to dev-python/watchfiles/watchfiles-0.15.0-r1.ebuild
index 016dfca13ef4..aeab77a1d524 100644
--- a/dev-python/watchfiles/watchfiles-0.15.0.ebuild
+++ b/dev-python/watchfiles/watchfiles-0.15.0-r1.ebuild
@@ -96,6 +96,13 @@ QA_FLAGS_IGNORED=".*/_rust_notify.*"
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# fix version number
+	sed -i -e "/^version/s:0\.0\.0:${PV}:" Cargo.toml || die
+}
+
 python_test() {
 	rm -rf watchfiles || die
 	epytest
diff --git a/dev-python/watchgod/Manifest b/dev-python/watchgod/Manifest
index 1cdfbc9b58a6..e170c79cf772 100644
--- a/dev-python/watchgod/Manifest
+++ b/dev-python/watchgod/Manifest
@@ -1,3 +1,3 @@
 DIST watchfiles-0.8.2.gh.tar.gz 15515 BLAKE2B 97c17737c6970c8b799707547cef760c307cd000d09cf3a338e47c0735d537e0321643066eab592f7f7e6ccc25272ea1e7e0bbc02f6274864f7cc39a177b83ba SHA512 a44b831352ace03c450781bc815b1813c44c386d666a9b724b562ff69228705651bfc23e81b7344d0f79c62577d4f910b323c734298e2a609f85bbc4a0f0498e
-EBUILD watchgod-0.8.2.ebuild 1302 BLAKE2B 584b66de1d1994827e5cad48220f51aef5169fcfe38b9819b1c6eb8781f844da793fc240bfe5012d67b845c06d2b1796e7dea0e418cfddae46faea12d02fa814 SHA512 c56d2689111a3ea637fc91a87b0a1b7ff0fd22a4d21c3f3efabb9ef53dbaebe2d4d1f9a0b3c4daee1c71cbdf17dd6c7bbb799491fecfd6d9788d30505a4b1f16
+EBUILD watchgod-0.8.2-r1.ebuild 1396 BLAKE2B 02d1a30949eff5193cfa07751044f4eb068fbe3cd85114507b5fdb683641b6f94641604f99938de8ef46e6b36571545ffb143a6695f45e6a233a11e9b0debe25 SHA512 df3a4f91fb9cab84864405b670c27246564812ae7eb5c82574c8853c1bb69b0efd4efe93629944f5e24ca96596c2add167af1c251aee1de60d37cef692f99a66
 MISC metadata.xml 353 BLAKE2B 9fba49b9fcbfb15db8c5709ba52b803063c010ebeaed0ab6ee715e776a7da16c295ef6ae6495dd94372835970b34676dbf5b05d96b6bfc737bd68f504384d9f1 SHA512 ca0d0d4135e2ce7678ce004a48389ac614f512f502194ec542d461592ab73d63d68ed5d9a4f9ccc1a37b74435bfb6c75d309bccc43eba8d53fdc36520199d751
diff --git a/dev-python/watchgod/watchgod-0.8.2.ebuild b/dev-python/watchgod/watchgod-0.8.2-r1.ebuild
similarity index 89%
rename from dev-python/watchgod/watchgod-0.8.2.ebuild
rename to dev-python/watchgod/watchgod-0.8.2-r1.ebuild
index c855cb747b3a..a19fe1d0b4f5 100644
--- a/dev-python/watchgod/watchgod-0.8.2.ebuild
+++ b/dev-python/watchgod/watchgod-0.8.2-r1.ebuild
@@ -39,10 +39,12 @@ BDEPEND="
 distutils_enable_tests pytest
 
 src_prepare() {
-	# increase timeout
-	sed -e '/sleep/s/0.01/1.0/' -i tests/test_watch.py || die
-
 	distutils-r1_src_prepare
+
+	# increase timeout
+	sed -i -e '/sleep/s/0.01/1.0/' tests/test_watch.py || die
+	# fix version number in metadata
+	sed -i -e "s:0\.0\.dev0:${PV}:" watchgod/version.py || die
 }
 
 python_test() {
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index 26140faa1488..5e7b83d838d2 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,3 +1,5 @@
 DIST widgetsnbextension-3.6.0.tar.gz 802154 BLAKE2B ef6b56c9ba2e40dde4a6ca40687488fd823886ab5eae474558b994f8a4206c4665e3ed4d953deb93a6261d3f55f3b514ec44eae3aa10bf699e8d2378f1669631 SHA512 d00b0e8d5edfc85ea1a9ac036dbdbe0b0ac6cb0eb694fc999f81e8f615e2a637890a2d5383c0f0ea041d886dbddf2e7036f8163fae0b8c3b5aa315a072b3ff7a
+DIST widgetsnbextension-3.6.1.tar.gz 802619 BLAKE2B 8b1d829137d418d35386d64b71050627ab8639ecae76fa0dbda46925ed495405f234f16b29213d3520e20f8021f139064e1e844c2a63004ab2bd0f3830af2a80 SHA512 0c7a723648299b2839d04b85bec0909f780f32a1181940b8b6ee985b0703732cd6ee57f904ebcbb678c069bd4fb2c27f94a554ffca91890176a7147ab7fd8faf
 EBUILD widgetsnbextension-3.6.0.ebuild 539 BLAKE2B 829fca499c345d0c9eb6914b3a058dc55ee5629c0bf4da6895d4d29fd29c270be9b6063d5bc581a72cb54e7540e5822b43c941680192bfd1af446b0d773a6287 SHA512 7606eb9764a1f690bbfced2278da4bd6a5239f40741874124d2248fc13be1f24e95dfa6c6be5e529b5173cfebaff2be12c031cb4dee7634a2d973b9758059f58
+EBUILD widgetsnbextension-3.6.1.ebuild 597 BLAKE2B fc2f2c035550f21c5bb3941c071932d4f3c560ecea8084285228912607ca4f2ba9d5669fd5c79deef77721a6fae147e160b838fb83799de37694df289ee32cdf SHA512 c65d30470bfcc3e2182b4e8524192922e706828a8efd73bd66b99771d91cc977cdaf7b91a2165d6da09cc88c61ee0edab47b07ca402d7f80a73a323d83ddfde9
 MISC metadata.xml 545 BLAKE2B 5127e5910c792643b4594231c8c04ebd2db8bb3f0d12f41d33642126970f8ff36f60503bd0bf7c5863b39a4ea4358f1b0ae786653d2c086a49d5305a879a0f66 SHA512 fa7da731b4f342572c0c284c7e03a521dcf754160223016fa77890e8de0bf05b65fca0bd096ba65e303dc034473654dfe5e9b5d2a556f0e2bdc861e24d462cf1
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.6.1.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.6.1.ebuild
new file mode 100644
index 000000000000..d890ca129178
--- /dev/null
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.6.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="
+	https://ipython.org/
+	https://pypi.org/project/widgetsnbextension/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/notebook[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index ab459604e003..3ff7a46a8fdc 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,4 +1,3 @@
 DIST xcffib-0.11.1.tar.gz 84713 BLAKE2B 6ab1ad6e582d71214cd719fdfa898e561e29d5750f5befe5c71173cfe34f2dff7dbd52fe93e618aab695646850f7ef5420114e2b1e725150c643904cdaba560a SHA512 09f4e19b88258446af26628c3a8e694c1f938fe3b5456e797b06174602fa0e9ef6e4eab76daccfd169d98fb7e869c910e6216d1f71fa2853e62b82c62c667669
-EBUILD xcffib-0.11.1-r1.ebuild 752 BLAKE2B 4a18cbf60260adf9bdef5a896c2678271a4014cc4caf88e57dabecd677972c83f3e4d891492ae4268867bbc2aa8b82c14fa58495070022755762c094f1bd45dd SHA512 a9e9c46e42762ffb490c5e7dd1a59a1c4b98c5b83330e998fed2234f640129c245eee70e20d0bad100883f262f783087b6d0a6c0e0204d069f0130f5c7ea228d
-EBUILD xcffib-0.11.1.ebuild 712 BLAKE2B 9220f9eafbf59aaa59d0d28f8672fc9d50880f454f02e89918945d575bf9bd5ee91b05e9e1a428a80ae1280518b3e8875778ba9c2485e61e7a094834f73452f4 SHA512 46360d6b61d11283badfa437339222670a09e2ca7c3e5ef11baf2f7638c4563d525ebb5603c88d5ca121d2c3a4ebe99df04fdfd582811d3a85ae43c7625b2625
+EBUILD xcffib-0.11.1-r1.ebuild 745 BLAKE2B a0e3c87ace0f3dad3d9759b8ec6ed0c5b288899a13447e031f97be66d744a8101f6d10b0d4995c1559c837664d6662eb3e0f3f992a7bd7d0dff2e91c25222168 SHA512 0790044af8566cad69538bd6c3044b64861b1a2610e40cf0fe3d30c2d2be4998c94fe777ac9cdb6dbc3fc8089d45b2334a80ecf02842f30e030870ffd228e3ca
 MISC metadata.xml 374 BLAKE2B 7f2845d0839dff2568de08f86ce6b8387e76ff450467e14b5c291ad1f55256cb9eff1ff318973e54846ad394b56a3e1e6aa8574fcc0bc39a1c9f7d3b42a1109d SHA512 9403d3d706b5281d6abe2d2fca33b1a70983c7c205f8a5899ad0469fe9a1cd0ceb6c9b27916e1e152467d029d86fc9e6dc28f967bc108499ed901582ad1bbd00
diff --git a/dev-python/xcffib/xcffib-0.11.1-r1.ebuild b/dev-python/xcffib/xcffib-0.11.1-r1.ebuild
index 1be25014aed3..1cbeb6eeca07 100644
--- a/dev-python/xcffib/xcffib-0.11.1-r1.ebuild
+++ b/dev-python/xcffib/xcffib-0.11.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="x11-libs/libxcb"
 RDEPEND="
diff --git a/dev-python/xcffib/xcffib-0.11.1.ebuild b/dev-python/xcffib/xcffib-0.11.1.ebuild
deleted file mode 100644
index adbe92f9e203..000000000000
--- a/dev-python/xcffib/xcffib-0.11.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=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
-HOMEPAGE="https://github.com/tych0/xcffib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-DEPEND="x11-libs/libxcb"
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
-	' 'python*')
-	dev-python/six[${PYTHON_USEDEP}]
-	${DEPEND}"
-BDEPEND="
-	test? (
-		x11-base/xorg-server[xvfb]
-		x11-apps/xeyes
-	)"
-
-distutils_enable_tests nose
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index ebfdc3ce3f49..88cae0ce6e11 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,5 +1,7 @@
 DIST xmlschema-1.11.1.tar.gz 454932 BLAKE2B b80885b7bde87115caece3cdcd036c5ef7cc225acb01ca610c97b2759142a6deb1c29e9fbaf08f60ef4ec80ac4d7dd4b382dd5cd0b74f0f766101664a3cb7fca SHA512 58800377e4bdec70608286057093827fd72bce82117424753a37632c2dbccf2b4e354bfa6e62c3dec06ec98ff262eff258e18c0c6e6af2b5fd520ad11118531c
 DIST xmlschema-1.11.2.tar.gz 476302 BLAKE2B 61d194ae9d269c2bb8231b8ce9068cf0fb0019022abdb24748c4df8ede8821e1c197ea040e07bd267c060944ea1dcd4ada300995287f47e617daf2f923c54abc SHA512 777743e1a0711ceb3aa752b33d65b79e56252284cb911c504751152a86281fba9a39e96271fd8058093c65d69badecdd8e30d836578c9138ff988843fbe9b90c
+DIST xmlschema-1.11.3.tar.gz 477008 BLAKE2B 30e0802e271bf82a1baa8f38317048f4ccda994e2dd04c2fdbf70e4240c2227e821bd416326347d0817b27635dde2c67f446adde2cdf443301046f15ac84175c SHA512 5920573900f0cfc159e3239883aaada18502ac0d33dc7a9aaaf4ab63b41f6d37ba68989aa931e0e2e3e546d335788cb55b1d350d5856d06f12904549cf3cb723
 EBUILD xmlschema-1.11.1.ebuild 832 BLAKE2B 17e3942b555bc419a77695077c676163ecb80be93436724601c3d414d7c530a87e4845384108a6f99a5c8ce8895416aa5173f88979f4bfb771c357c1f2051ab4 SHA512 1b232654938e4bdbc443f080f7cd80793a52ac483ecbdf5540debb15cc16657fedda7845f7d89d0f2ef4a944c4cca9ca8e454710ad4c744f7cab2318e960a46c
 EBUILD xmlschema-1.11.2.ebuild 840 BLAKE2B e9d3ec065b1e72a9ad47329591f125f4ed683105f98cee1590d21309a357eb56794c8d9a3efb01af87819beef145aa3cc652d19e14d638bbfaf497a7860149a1 SHA512 d3c02d15745686e2aa0690a530a31eb57e83a3487fd09450fc7ed8cbaa089114bba443077fc3195e5ecc7b3eb7041a8b05b998c39337af71b937e34197cad4d9
+EBUILD xmlschema-1.11.3.ebuild 840 BLAKE2B e9d3ec065b1e72a9ad47329591f125f4ed683105f98cee1590d21309a357eb56794c8d9a3efb01af87819beef145aa3cc652d19e14d638bbfaf497a7860149a1 SHA512 d3c02d15745686e2aa0690a530a31eb57e83a3487fd09450fc7ed8cbaa089114bba443077fc3195e5ecc7b3eb7041a8b05b998c39337af71b937e34197cad4d9
 MISC metadata.xml 376 BLAKE2B 6aa6c0ef38b17f49452a3db71c7f449dfda8951e2196b904235592921620b6a2064021aae7a1a30639e637c3b9bdb46bcaebec1903a081a41832bd0c5199dde9 SHA512 b814209cd4b87ad5cb8bc447f1d485043d8386339607f39575faf2d26c19b69befa9fd7b7eb2d3fca4b5e60499091a59c1466cfc2f0d9651430949893e2edaeb
diff --git a/dev-python/xmlschema/xmlschema-1.11.3.ebuild b/dev-python/xmlschema/xmlschema-1.11.3.ebuild
new file mode 100644
index 000000000000..02ebb8c6be86
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.11.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="
+	https://github.com/sissaschool/xmlschema/
+	https://pypi.org/project/xmlschema/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/elementpath-2.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index c9191e91af91..c8419ec790eb 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 838d56d72844..353ed388edaa 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -3,5 +3,5 @@ DIST qtlocation-5.15.5-gentoo-kde-1.tar.xz 3952 BLAKE2B ddab14fa3b17d080ea47a6bc
 DIST qtlocation-everywhere-opensource-src-5.15.4.tar.xz 6559260 BLAKE2B ea43ae7e788f7d117fea9db50660cc2f4e7b6f8cf4ae390b41ed3adfa794d66596d8d7ac184d1edc432d2aa6057727321459a29ddbe399201ad428d290982297 SHA512 6208052d6ac173d19dc77496d8108558e7f31696dc5792fcbbeef2029539db76a60c5a51a7d198f54ea6c0ec23977a57cd8c8f8fa80fe5eac9528d2510c3dbb3
 DIST qtlocation-everywhere-opensource-src-5.15.5.tar.xz 6559912 BLAKE2B 4f546293b2cfddf5512f3648aef9c527762d6c6ddbaca6583cf0287178524bae9f84e4b94950ce1139042efa995a4f31ef20f26b8d5479048df2ba75cac35d23 SHA512 5090f68926a7bc2f25ea5ae259cb87653b83fcf337c3255a7a2700724f6ac83ec2e1d9b6f38f185ab7dab84e5e042b72c58f4e4cacada6fb7d729378b93d9b3e
 EBUILD qtlocation-5.15.4.ebuild 1152 BLAKE2B 94668b0c9701804380400a3dd605cbdee83cf1bb23507d359b0fe24042a433091f41d36f55c5b78867fc4b134d68e1670982995c11835e33210d75f0ca5c3a7e SHA512 27e9b6a171f0dd8819549a7f69fa87282b23a3bf0f8e3e73629d1e580aa9992ddf64831e9d62ebb627e0fbc1d5c44044fd9ca168e7edd6578e9b078b5788cc15
-EBUILD qtlocation-5.15.5.ebuild 1156 BLAKE2B 8f130cd2fe90dab996320629d22085eda16e66a79399de97fbfa152b782077ca2e333c5b18a515ad4003e64d49fb1d61ca25f95307c38a1bbcbdb01f8f3d8eda SHA512 3f0390a86aaeaf71dc95a294a20b99f7faa00050cdd93e1f56d61a7afacb6c8395b45b928e1119b4cc7b2617a873455ec011689981655c904cd5302536117e5a
+EBUILD qtlocation-5.15.5.ebuild 1163 BLAKE2B cb4ee099401a8bf0c4b7a1e51c7e605d709672536add0e5f7b71b99f725184f1dd1562370a647f730c588d3711e4058fd6735116ee5eb2e85fbe0274fe2aac8a SHA512 441abc5fbcb9ae879122725959685b6b8921ef0718324c3c70d59b03da5dc7588b06295dc00f590900ca11ada9562d4e508c3e2738f37d1ce1e2dd9cbc5e1576
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtlocation/qtlocation-5.15.5.ebuild b/dev-qt/qtlocation/qtlocation-5.15.5.ebuild
index ba9e9fc91df0..89ca4935539a 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.5.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 IUSE=""
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index f533d59ba937..773a8c8432d7 100644
Binary files a/dev-ros/Manifest.gz and b/dev-ros/Manifest.gz differ
diff --git a/dev-ros/ament_cmake_core/Manifest b/dev-ros/ament_cmake_core/Manifest
index 59c672a2a9c1..a6810a65720c 100644
--- a/dev-ros/ament_cmake_core/Manifest
+++ b/dev-ros/ament_cmake_core/Manifest
@@ -1,6 +1,8 @@
+AUX findpython.patch 543 BLAKE2B b5124bbbfdd97548aaf61bc5c0693bbd230a253302054103b83ae3136c4152f1b692b92a275dcb64713e1baaa0478a65a78a3e3bab9b8668fb14bf5e2c55ffac SHA512 1bd15b358230d43e7556536550287fa3b1e1eaf73fc852986ae7cec82bb13d883f08ac08b89de327465a76a0acdb94a1b09b4a80c4285f85224a2411ab712799
 DIST ament_cmake-1.1.4.tar.gz 94117 BLAKE2B 612bf25301b9794cf51b460819cf4a029547fbc97f7a428215a19f0a7747115de02d3f2cb5f5e524e73ba30813388ca7bff059ab7fe472916eaf2b23ecc76355 SHA512 56acd3d2a8d4b15a164dfdcaa2157fff2889a4c5c0b155ad65a815760f531cdf10226d158f40fc15660c52dd1585b85a2566e402f31881378351624f286efb3d
 DIST ament_cmake-1.3.0.tar.gz 103040 BLAKE2B 8220d380923a591667b3b4bbe785f30ac935ce10c4fd6bf8bd22149586373f353cd9e71723638dca503bd54ff709783ea1e133c5034901fe2d891fd6bbe7c560 SHA512 44f71102e22fe9f6cd8c3cc13960d63af377eec0a6f7fb7ae99c18f2afae07f3997c9f226f7db8cc8020acdf45561ad9eb1006c6834125d6da137e8638617df8
 EBUILD ament_cmake_core-1.1.4.ebuild 1075 BLAKE2B ff884eddba246893586a32fd06e24bd72119d430d3191b1c3e88de924f8994dea0063299946e3a1ab3bf484e696f610f636833d67fe3db1abc0fad18c55d0367 SHA512 d9f881098dfbee87dd5c4c387641353856aa37a4de85019943b4f1dce4bd2e6e04e43fadc5ef9ad5f40c91b35a5ca7e9f8054b8911962541681519f2d7a363b4
+EBUILD ament_cmake_core-1.3.0-r1.ebuild 1118 BLAKE2B a52ebad923bd46201e5d03d6ed84d929c325fbb1abeb215dbe2bdf158144c69103a0f45b0a71026efc43eccb574b82c5c4af986ef02b069cee248f073ee14f95 SHA512 868413b27d322859a673f8bb6431b4110b302a49c10a2c34bd153f7945ea202335b78cc3603bed0186f7099609527fca30f53bb6d3b964c58bab3022e49eb5d9
 EBUILD ament_cmake_core-1.3.0.ebuild 1075 BLAKE2B b316f88d4917bcd603d931c4dbf322910332d87a787e4eb004e3cac909ef0d9dbccc903a35d5b39534cf7b740c5da917d131ecaf80cac9a1702839b1d94d8eb3 SHA512 31c22b3cc6e68423f3f23aa3b0605fae6d6304c4fa194f621035fee473121a5df90eb7a29f6926a265174816dd67e88d556a54f2976c05d44e1287d84957e2ed
-EBUILD ament_cmake_core-9999.ebuild 1075 BLAKE2B ff884eddba246893586a32fd06e24bd72119d430d3191b1c3e88de924f8994dea0063299946e3a1ab3bf484e696f610f636833d67fe3db1abc0fad18c55d0367 SHA512 d9f881098dfbee87dd5c4c387641353856aa37a4de85019943b4f1dce4bd2e6e04e43fadc5ef9ad5f40c91b35a5ca7e9f8054b8911962541681519f2d7a363b4
+EBUILD ament_cmake_core-9999.ebuild 1118 BLAKE2B a52ebad923bd46201e5d03d6ed84d929c325fbb1abeb215dbe2bdf158144c69103a0f45b0a71026efc43eccb574b82c5c4af986ef02b069cee248f073ee14f95 SHA512 868413b27d322859a673f8bb6431b4110b302a49c10a2c34bd153f7945ea202335b78cc3603bed0186f7099609527fca30f53bb6d3b964c58bab3022e49eb5d9
 MISC metadata.xml 332 BLAKE2B 4cfb0cdd190fee00f82e219ca7ed55bcfcdf350b2a4abb5001133d0d577e95925c69b7e978aff53a9a9313f7bead35df2e325f878fde235ef28e3580c859b8b1 SHA512 09dca0eeafb32ae8219fa2b0a09b8fe6269ee620900f71ca5528879d961f1192d73584af07c9501a4b3a4c9ad9f2af2b0bd1a9bec0f4099cdc9dec7b177537aa
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..3e96c689fcb9
--- /dev/null
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The core of the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	PROPERTIES="live"
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+PATCHES=( "${FILESDIR}/findpython.patch" )
+
+RDEPEND="
+	dev-python/ament_package
+	dev-python/catkin_pkg
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
index 0bc79bd3fd0c..3e96c689fcb9 100644
--- a/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,6 +29,7 @@ else
 	KEYWORDS="~amd64"
 fi
 IUSE=""
+PATCHES=( "${FILESDIR}/findpython.patch" )
 
 RDEPEND="
 	dev-python/ament_package
diff --git a/dev-ros/ament_cmake_core/files/findpython.patch b/dev-ros/ament_cmake_core/files/findpython.patch
new file mode 100644
index 000000000000..790b0631b82c
--- /dev/null
+++ b/dev-ros/ament_cmake_core/files/findpython.patch
@@ -0,0 +1,15 @@
+Index: ament_cmake_core/cmake/core/python.cmake
+===================================================================
+--- ament_cmake_core.orig/cmake/core/python.cmake
++++ ament_cmake_core/cmake/core/python.cmake
+@@ -17,6 +17,10 @@
+ # Example:
+ #   find_package(Python3 3.8 REQUIRED)
+ #   find_package(ament_cmake REQUIRED)
++ 
++if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)
++  set(Python3_FIND_UNVERSIONED_NAMES FIRST)
++endif()
+ if(NOT TARGET Python3::Interpreter)
+   find_package(Python3 REQUIRED COMPONENTS Interpreter)
+ endif()
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 0bb54f1afda7..5a277b4dc4f4 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/cliver/Manifest b/dev-ruby/cliver/Manifest
index d85ce39c28e3..a9edc647caa2 100644
--- a/dev-ruby/cliver/Manifest
+++ b/dev-ruby/cliver/Manifest
@@ -1,3 +1,3 @@
 DIST cliver-0.3.2.tar.gz 14022 BLAKE2B aaaec8d52db1ad5f2b6cbe483e7e63ec8204ff4b465239f4d2a4b714037c922c2b417cd26e1fbf2da86aa9f999b1c1bfc6dbc7efb363fa016e713385f8713189 SHA512 96786561c3cacfce1f3d3be71461cc227620e81035ca594e65fb351e477ebdae9057c8cdc3a91ca62af7251afb39bf3aa633e79fbc77d2b7e921fbf398974014
-EBUILD cliver-0.3.2-r1.ebuild 736 BLAKE2B 7481e936c789987263fb0895c0fca463b1e1f2677865c0ac4b63f5f897a3553f3e831cee249292fd20562e2f02c941da25e65267edc5dc2e206805c35879123e SHA512 b778dbc1bf77ad822fb4e109152aabccbb9c3930093342378d957ed3a56ccfc5c5e743294ced28f465ac24a403b50e596aa2772c8206567f21be456438ee138a
+EBUILD cliver-0.3.2-r1.ebuild 743 BLAKE2B 980fea9303ce2bad60ec8d84911791f93a3ab5861874614a2f47381daa6bd552b88bc76648e97b0506324a37b1634dcdff80745e0db72343c606ae98733abdc6 SHA512 0a216580dd59836bb774b21aa9d5b0e98a60681375d049fb45df229edb4bd36314c545a9b3370609481af9f33481ce1ed9c90dd0192cfa38685686cead2a0d60
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/cliver/cliver-0.3.2-r1.ebuild b/dev-ruby/cliver/cliver-0.3.2-r1.ebuild
index cb0672b6d985..1dcd65d24267 100644
--- a/dev-ruby/cliver/cliver-0.3.2-r1.ebuild
+++ b/dev-ruby/cliver/cliver-0.3.2-r1.ebuild
@@ -21,7 +21,7 @@ RUBY_S="cliver-${COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~sparc"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
diff --git a/dev-ruby/erubi/Manifest b/dev-ruby/erubi/Manifest
index 58f958b547f0..902a938c8e1f 100644
--- a/dev-ruby/erubi/Manifest
+++ b/dev-ruby/erubi/Manifest
@@ -1,6 +1,3 @@
 DIST erubi-1.10.0.tar.gz 11212 BLAKE2B 1a31994bc02a6acd0a5ec025c71961422dc8850de1b871a23b6b89fba59b0d3221153a1e1418d2c279ae40b2a942c53290f4695793b0fedba0a4e7b7c324b41a SHA512 adf62511ce9324b4c5f7a95863254c9d95cf40f2107eddad1118ef97d7f534fb74d79b48575ff17209e492811a9a8f87c52fa7a30e4b6ea4e50504cf5572c024
-DIST erubi-1.9.0.gem 13824 BLAKE2B 00cb428e3433090370e9f61d2445f98553a45e2a92181076114db2601fa7261d8ffc44c3f4a0ecb73d616fb5e93dcc52ca6a2efab3945b11bd17d4a53c68fed1 SHA512 34770c01215b323797739af54c5c821d28e982309a76f0a212657868629625ae6dfca3e9e2f5ae16893813fc81b5afbb172c397ddad1e2f93108c5112c540bd6
 EBUILD erubi-1.10.0-r1.ebuild 680 BLAKE2B 8a5b86c0ab18124b417d0131472676aa6fc0d98bf3ba614eaadc2178817255799c6db42bfe4a9193d4f60dc147cdb40ffcda6b52bba1ebb132e99af260233f5d SHA512 4a38894f89b461fe1051776ef9c7fb23c9d3ebd341ae498690da944c139879f9a110e3e0e85cb027f66876af2a0ec625c3dfaaeacc2986ec9a1bd75bcb7fd0e2
-EBUILD erubi-1.10.0.ebuild 674 BLAKE2B 60bacb1dedcd659a0c777ca6397c8c51991d2cc03407d23f94b3e106ef4e97333c3a93c3eeb5a7944fa2c0f199728da6c402c7346a7cc6f4b027ea4d8dda48b6 SHA512 07130e99dc2e8997b38116eaef7128f1e6c9a84d7e81dced3a74f50b54ccff51fb5736faed85ead68cd173c36d25634900523049018aa2f09c027670af128ce5
-EBUILD erubi-1.9.0.ebuild 552 BLAKE2B a91c6fa724b5b3667de2ce9b68653deee079f87a30d1f98dd963d9a2383aceb5782d5431219b16e2c86b10ac8ae6d13ec19a8d27a55470d836873226bdaa8f4e SHA512 7169ac29042525609712634b46857e2bbfa122b77f3430a77864d6987964f86ac159b653910203e40445d2487add5b79433403f9a613fb4bed22dc0d5613ff21
 MISC metadata.xml 393 BLAKE2B 9471b64d59937408d5e1c68e23ed6ce5aa116c2eb141afbce293064755410b38daa6c35dd72412fbc71477923189caa094017769544db6cc489ef2cc2af8e95b SHA512 41bb4dcb0c47bb0ba8f4156ee3790f451decc3427afbfda092c77068117672dd6c701e501c7a94e6e76802766a572423b81416b4e5f9561129df50d9eb119c9d
diff --git a/dev-ruby/erubi/erubi-1.10.0.ebuild b/dev-ruby/erubi/erubi-1.10.0.ebuild
deleted file mode 100644
index 21d0cfcff33f..000000000000
--- a/dev-ruby/erubi/erubi-1.10.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-RUBY_FAKEGEM_GEMSPEC="erubi.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a ERB template engine for ruby; a simplified fork of Erubis"
-HOMEPAGE="https://github.com/jeremyevans/erubi"
-SRC_URI="https://github.com/jeremyevans/erubi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-global_expectations )"
diff --git a/dev-ruby/erubi/erubi-1.9.0.ebuild b/dev-ruby/erubi/erubi-1.9.0.ebuild
deleted file mode 100644
index 1c6ae0679c7c..000000000000
--- a/dev-ruby/erubi/erubi-1.9.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a ERB template engine for ruby; a simplified fork of Erubis"
-HOMEPAGE="https://github.com/jeremyevans/erubi"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-global_expectations )"
diff --git a/dev-ruby/fattr/Manifest b/dev-ruby/fattr/Manifest
index c6bfdb054633..a22e333e395a 100644
--- a/dev-ruby/fattr/Manifest
+++ b/dev-ruby/fattr/Manifest
@@ -1,3 +1,4 @@
 DIST fattr-2.4.0.gem 14336 BLAKE2B 1be45d17eac08dbadec9e0a4177f7b1ad7d39c060ce1162961aa8fe3b1c9b0107f10c17a2a9a5d27e652067df7f33aca0afb57b6a268b52999ae7a7b540ad131 SHA512 df3aa4fe187f7922fceaad3b30d4ed9c869ac194f819bc6c57dd574a27e69a74cf9fb10042163d941b0edc7129dc5ede5f92c60a75c6744bb9e8f358f5cf24bc
+EBUILD fattr-2.4.0-r1.ebuild 552 BLAKE2B fd5549723173dac9e9c8ca4c248759571560567f9f4e725aa8d25b0f2eddbbc532c8f60d27ca21b2f0845e26e1ed39e3bc6eb1f7851605d83ee0ef08a45f0068 SHA512 2b293b02efd9e09664d425790b81766d450f6f9823a5b9f17d885060de62f0d7211e9ca437b610e65f18578b20285b7bbee43c446cfdf27bdabb52446f649a16
 EBUILD fattr-2.4.0.ebuild 552 BLAKE2B ef697b5a1fb873e06e03d5d85b447485aa7009dccb883aafd78d4ad3109cef511da2184bb69c3abb5250549805e88d5ed15542f2a1fa630b919d1f8d47ff6230 SHA512 f68d92166c206357cc63d957ac34bb3cfbe5a98816f97cc30b766ae6675294ebfd96a10f982f9bccc1ef9850396abf0554f9334906d47faf58f8d6134fcb5b93
 MISC metadata.xml 330 BLAKE2B 02304daa03a344d11e0a51605ad0b7bb43be5036488c14854aec2828bb5ee0333d8da411aa9db3cad542c637cd525950a2489b043efb3db3f761542534467a84 SHA512 be157986c269ecfb2abc7d140e53a9a048c4e111cba2b7ead7fd714b1ef21436370e68b66d985a4d67e33364e87a1ca8ae65f6e496807d7743723e54ae076b03
diff --git a/dev-ruby/fattr/fattr-2.4.0-r1.ebuild b/dev-ruby/fattr/fattr-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..4d2e4eb49724
--- /dev/null
+++ b/dev-ruby/fattr/fattr-2.4.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="fattr.rb is a \"fatter attr\" for ruby"
+HOMEPAGE="https://github.com/ahoward/fattr"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+each_ruby_test() {
+	${RUBY} test/fattr_test.rb || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/fuubar/Manifest b/dev-ruby/fuubar/Manifest
index 15dc3275d259..9852cbfe3659 100644
--- a/dev-ruby/fuubar/Manifest
+++ b/dev-ruby/fuubar/Manifest
@@ -1,5 +1,5 @@
 DIST fuubar-2.5.0.tar.gz 32763 BLAKE2B 841f85cc867a8215e00f720f2ffc25aaa5444ee6536cd17663b789d7a947e957987f3b60659828d310c0fd816abfedd9c7ef90effe37b6f847ac119a41f134a1 SHA512 c0ad302516a7eb7df2b574c038068298aece8bc1606adcb81c53bba1f0315a774dd65f5c742586ef2b7f188bc01ea94e0c5a3eb8b3c5f225ad76027340165453
 DIST fuubar-2.5.1.tar.gz 39138 BLAKE2B e36c5a4ca67b9c2cfd6775f554ebf1c027f9b1f24b36cfb1e3c062a07034eee472ff06f750755e7aba9e0b1f4a3704be213b44c9d9cf5c6b50cc1cf24b84c572 SHA512 d3b200690a483f131faeaa0e6164ab4103584324b02a928be1c8845f14984e3695d8cd1cf3b9edf945acbd9876dca879029c04b9d76b0ace4b7d1883c73ca924
 EBUILD fuubar-2.5.0-r1.ebuild 843 BLAKE2B e9cfc05768ab6510913fd076e754c438ca3cdd517b551875ead8dbefb9788b36266aa4d8590e7c0f2bcf6c63349f043b42ab0e0cc8a6e8e2ca715a1dc5af52e5 SHA512 1cd707ddf643a2f4c1e4833b39e1bc23b37bc2f112754e579ad0441c74a3577e6d739270bc7d48829aa3d68917c7b02bd185a95eb25a2dc9709a7f855d94612c
-EBUILD fuubar-2.5.1.ebuild 844 BLAKE2B d53126df9c77ba38f9a9c55f17052aa2742739e2696a885329e66f2ed3cdb56aa368b8586a7f96e3b6b30fb00e25d6b3ecde40d21801ed8a5329b49598112d6d SHA512 6223d9286cc107c260af5238edb28efa5c584af89d2924fae58c0f7b7ab30adde35f28e1dea6fe5a698d7b55cb45e88e93dd9096f15eac86b56bb856a4bf31b5
+EBUILD fuubar-2.5.1.ebuild 843 BLAKE2B f2cfc6aae622b1b316f4de293b94acacfe7bf520c2847e8a96b6d59ae8989e41fc63bf36ac5ec46be3ec584d1aa0e2955f090963ee7cd96fcf103febaa655266 SHA512 f56e203545b1ebb9beb3bf1a8f9d30e6886f833b3962377192ba5998f79309360962ba87228f2f60f1cbc5d0266f40e1039f96357b0c52fbd42077e0d6bca930
 MISC metadata.xml 350 BLAKE2B 7478b2a6df65be521a515a51620b05666cb29ad6a7f6999fe133150a94376e4cd04dceef1aadfb6f563dd44318033cc7f1291cf60ec38d6c941318e51f87cc6c SHA512 291f9f42987d8ed1224d4f7471510e57e9606231823d0eacd729860c53e79c8aee7b25e99b282014786790e5da4906ce423f51bdae8de6ad3cdf613980630201
diff --git a/dev-ruby/fuubar/fuubar-2.5.1.ebuild b/dev-ruby/fuubar/fuubar-2.5.1.ebuild
index f40745c62fef..66ea40e471da 100644
--- a/dev-ruby/fuubar/fuubar-2.5.1.ebuild
+++ b/dev-ruby/fuubar/fuubar-2.5.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/thekompanee/fuubar/archive/releases/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="${PN}-releases-v${PV}"
diff --git a/dev-ruby/gpgme/Manifest b/dev-ruby/gpgme/Manifest
index 90126fb6a932..fa5e10494d27 100644
--- a/dev-ruby/gpgme/Manifest
+++ b/dev-ruby/gpgme/Manifest
@@ -1,4 +1,3 @@
 DIST ruby-gpgme-2.0.20.tar.gz 2801991 BLAKE2B f5d4c58fd9ef38e0e843e3c59e9653166666ce3635cf479fcd007581b6c6c42ce7852bd36542b378e4152bd471af0131685c8a9f1024953f41832a54c477e1ac SHA512 3267cc77b57c22de3e505c34dfb0a8a4a76cda1fe6dbe547dfdb9ca1a75cf949ca75b3718fe6b6190c06dfdddf21d76b0d0a71631e53e4f439284ce7cf95f6df
-EBUILD gpgme-2.0.20-r2.ebuild 1427 BLAKE2B 631da04e3abce8b61a901c7977aa6c0934533b200d8864153ed03d81a4a84152914a9507dfd0e8f02baa5c232818378ab12c73d4bea57a08c24529157cfc317d SHA512 2bce0dd2902baa7cf2dd1f767b97359aba649235c9654068cc6954456598eaa0b15bae61334e13c2c87951957be638fa7e4e268209a12b764c09f050c66267cf
 EBUILD gpgme-2.0.20-r3.ebuild 1308 BLAKE2B 1de43a9c895d114eb12c0c45dd6103f9841823bbc17f4e9cd8a70604f83df2ec52dca922d960cb7203002516e91e2979c074b69c8c6da58fe25da53e95642a4d SHA512 e3334daa7e3c319d8a39f43ff14e7ac8e847fe71e8459d14629d77711f95fc0b968c75491fc736b46589eed04ecbc1a82d5ee6b3a34931928a69bb90c53bcff9
 MISC metadata.xml 468 BLAKE2B 0ede8ab453101f97cdff99ad2f3d7412e21e4799622f242ff8771ea0761591aa26aa66f5788a8a8e00fbd42f8c42618c0d49a92a78eb0e1dc77dcb1a8a9f7c8e SHA512 9ffed8f871ca6952d5a73f4c11c79293db6a9b66dfd38431d377356c340cf1245a1176cf0531e5e3aebaedb6f75249a38015cdfac7dbd65ebf560661b659edcf
diff --git a/dev-ruby/gpgme/gpgme-2.0.20-r2.ebuild b/dev-ruby/gpgme/gpgme-2.0.20-r2.ebuild
deleted file mode 100644
index 5b45be052d93..000000000000
--- a/dev-ruby/gpgme/gpgme-2.0.20-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-ng ruby-fakegem flag-o-matic
-
-DESCRIPTION="Ruby language binding for GnuPG Made Easy"
-HOMEPAGE="https://github.com/ueno/ruby-gpgme"
-SRC_URI="https://github.com/ueno/ruby-gpgme/archive/v${PV}.tar.gz -> ruby-${P}.tar.gz"
-RUBY_S="ruby-${P}"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-crypt/gpgme:="
-DEPEND="${RDEPEND}"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha:0.14 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(coverall\|bundler\|ruby-debug\|byebug\)/I s:^:#:' \
-		-e '3igem "mocha", "~> 0.14"' \
-		test/test_helper.rb || die
-
-	# Remove failing tests for now. This package was added without
-	# running any tests :-(
-	rm -f test/{ctx,crypto}_test.rb || die
-
-	sed -i -e '/portile/d ; /rubyforge/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	append-flags -fPIC
-	export RUBY_GPGME_USE_SYSTEM_LIBRARIES=1
-	${RUBY} -C ext "${S}/ext/gpgme/extconf.rb" || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -C ext archflag="${LDFLAGS}"
-	cp -f "${S}/ext/gpgme_n.so" "${S}/lib" || die
-}
-
-each_ruby_test() {
-	unset DISPLAY GPG_AGENT_INFO GPG_TTY
-	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index e5ed2999dfd1..9c496f37ad9b 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -1,5 +1,5 @@
 DIST hiera-3.8.0.gem 40960 BLAKE2B b368ef92bca06081c99ec7e1a1e04b69f3c1cae285fcb17f9d1b89683fd679b037d2ef26af6912a776d73d3a553a8323c6820482383065927245898c9e78daa1 SHA512 0aa8d306cce33760eee9ca702f6d1f8a0137c551321c7553a25644a4097b8539945d5432e94ff83ed9c3392603dc962b33ab1e1702ed1ab5699d3ef179de9379
 DIST hiera-3.9.0.gem 40960 BLAKE2B 863fe37ecfda2153b5e94afde6d53893a0b5baaa10aa3bc3a939cc7df54168bbcb709f85bb50ffad11376d7434337ae3c79bc5d9fac99433da31e7dd77213004 SHA512 6ce3598e7c7a628198638a4b75a65efcc529089c7c80d7f3dfc072c26e8a65054d8bc5c71f40ce2833465ccfaa333c5490ecdfe58578532eb3455be46a69ad0e
 EBUILD hiera-3.8.0.ebuild 523 BLAKE2B 1b7a4f94b843d62acb9c728aa02a90bc61eef8f171e0a63de00900a69024f8e12b97d50576a0ab08f3e56fd1196e0e9785c6502cbb6fa61476a39e00d8c0bf05 SHA512 09ebd67149a83f9bcd406a5945bf3f0ad52d9a795dd5a8e8ce56f2e0975a0e089697c3b8c1e01defb18b864fe58690eb5c2b3e6fbb1616227a5724f5408d8550
-EBUILD hiera-3.9.0.ebuild 526 BLAKE2B 7a8644a99a46ddbdb894dbdb10d324aa69829f3f94b55d8cc1750ad9b110cc156da5ab20c9f667d33817ecf3d72a93659cee5935150e63b7b3ca2e0c97184129 SHA512 41aa0dcff4c98eb7ec80d875b2dddb43c0cef196fd509524f33b9d7b8e7523f333527620d139d9bdca4ce01d509038de84d41d853523f1a296f4010f4ef99464
+EBUILD hiera-3.9.0.ebuild 523 BLAKE2B 1b7a4f94b843d62acb9c728aa02a90bc61eef8f171e0a63de00900a69024f8e12b97d50576a0ab08f3e56fd1196e0e9785c6502cbb6fa61476a39e00d8c0bf05 SHA512 09ebd67149a83f9bcd406a5945bf3f0ad52d9a795dd5a8e8ce56f2e0975a0e089697c3b8c1e01defb18b864fe58690eb5c2b3e6fbb1616227a5724f5408d8550
 MISC metadata.xml 442 BLAKE2B 108e882fb6805ccf19e6fa6754abfe678659b6d6f7572b57ea33a96515535b61637229d9338b67631c02648565435200d09605d13c2c61febada77ea75e4941d SHA512 6fddf1ff56b57c26963b6a42f4e0552c77090dbf7a97a6076cbedec86b38c0204455c390c335b4ff1749235f1cdedbe49379bae5e65eb94340cf3103ca9e320e
diff --git a/dev-ruby/hiera/hiera-3.9.0.ebuild b/dev-ruby/hiera/hiera-3.9.0.ebuild
index dc9baceecec1..3c2808823277 100644
--- a/dev-ruby/hiera/hiera-3.9.0.ebuild
+++ b/dev-ruby/hiera/hiera-3.9.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://docs.puppet.com/hiera/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc x86"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha )"
 
diff --git a/dev-ruby/hocon/Manifest b/dev-ruby/hocon/Manifest
index 567a8d4f7de8..77de19829d51 100644
--- a/dev-ruby/hocon/Manifest
+++ b/dev-ruby/hocon/Manifest
@@ -1,4 +1,4 @@
 DIST hocon-1.3.1.tar.gz 146330 BLAKE2B 4eaa791f148347cf30cea04c79ed63fbc804a0ef7f4bdf1640da706f857a46a99342d338a8444b2df316ef972e11d5a3e10aae8d82f464b2964aa30c2086274c SHA512 c73cfd8d6c77751d1d2a35d85cad2f2eef700a01e8b8de9449c0c9dfefe8d4a80c4a79dd3db8ee4a6d2c3649f26d6780cbe05fe9b067de05ee3711b00faf4255
-EBUILD hocon-1.3.1-r1.ebuild 643 BLAKE2B 1eccc6e6e62243b4c9f69313aa979cca38463a9480676c37d7bfa3ead1674ef9dedb54af67e32f2fe0e94e558b9b8bf55fbe088f811becd161a4c85a35eac372 SHA512 2274bbaf6901bbe7e947c479f6cced181dde48c26d1cf9d6531b6a89e89f224e05fe0f43d7c0e67ea1d0e2b3c7c859155bd326e66303d98e8fc2c6b63e2a19d2
+EBUILD hocon-1.3.1-r1.ebuild 641 BLAKE2B 35103215b00079ccc60741b526f6e57d21dcd505ac80235446a38d44dec35f1e1c29f642e82c295e7cb30f2d63c8f987f4f1c85aecc608ea17bae0e94a69a753 SHA512 734c684140566dd6c830704ef960908fcdaf43a2f378d9893d1a8223bbcdad77360b26606ee4d0c922f47757cf70009164dbc318b790b7cf33b6e98e87f14d3b
 EBUILD hocon-1.3.1.ebuild 634 BLAKE2B f9aa887019a7247e0c280390db573321bc0d5c46264211b4e1250814cf676382cc4afb62ceeef152d3346959a451aac623d52a0d981b24844a151295fe859691 SHA512 4c204ed96e8abd87c000a23f2c099643177c0a1d2e163905017fa8daad129478ff5648f0b0aacf6b80af3f31e6423c7518faaf158fbb47ec4e2235ad48fda3e2
 MISC metadata.xml 515 BLAKE2B b9365c4720afbf0e7391467b79850bd1925b0e074b9799b9a7b8686244cb9d5b16a2740950f921bbecea176eaf925a8a9deaeed5db8e3a3ef057f55c3f41fb44 SHA512 cd21280aef08d17c83c6069c1fad07ad58f442a04136d37d6cd626cfc1528b7f44d4ac22135a405d1291e0305d9b3fb92cd26945698258581c609f487b7ecff4
diff --git a/dev-ruby/hocon/hocon-1.3.1-r1.ebuild b/dev-ruby/hocon/hocon-1.3.1-r1.ebuild
index 4c81ca1206b6..e32ec34f1f2d 100644
--- a/dev-ruby/hocon/hocon-1.3.1-r1.ebuild
+++ b/dev-ruby/hocon/hocon-1.3.1-r1.ebuild
@@ -21,4 +21,4 @@ RUBY_S="ruby-hocon-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
diff --git a/dev-ruby/http-accept/Manifest b/dev-ruby/http-accept/Manifest
index 88c00005419e..11faf0803ea3 100644
--- a/dev-ruby/http-accept/Manifest
+++ b/dev-ruby/http-accept/Manifest
@@ -1,6 +1,5 @@
 DIST http-accept-1.7.0.tar.gz 12289 BLAKE2B 5eda9bd29e2dd2b52c8f2589adf57872a80aaf93c37d28b1668dc24fc1e2fa81d00ec12766dd558691dbf3e6560bba013f456a659ead47fffd77b1565c186a7f SHA512 3502bfbd07f6bb0164843c728cd5ef27adfd675317fd60372539180de212d02d6d446cff8eb081d1cbe5a19b30d5759a55b22bc63736cea83254595bd691522f
 DIST http-accept-2.1.1.tar.gz 12488 BLAKE2B b909736c0fda14b32f30c38f12f4c4c2b2bf1a36ddf753069484b6b7151d518b80a6ae8dba929e27f8f758c0c0ae0c52c24802f02b1bfd4674ca33b50d7a0de0 SHA512 e0231cae90ce9180006714485df2cf205bf1f114887dc581ea50fb558c1c7e434838d10d0c9f69c1d747249b8d0c73e628a6ea7b1ffa1ffa7059ba2447307df2
-EBUILD http-accept-1.7.0.ebuild 491 BLAKE2B 9208b766abd74a8af829261e289409beef797d91e442a1a24ccea6e47aabbe803ef848d336ebcdab9a2ad26d78a1de9b5ebbcfa3822b8868ba6e3fa1d2718ec2 SHA512 fac2c88a82cf813e2131af55a02da2fa6d07adc49a471323ee14c56584e70d76b6c84e427e56aee1a709e75574045fab1118159c0d50bac62376783ef4c4716b
+EBUILD http-accept-1.7.0.ebuild 491 BLAKE2B ebb11d4bbca3fa4380abf958733ea3714be6ff8937d7061060e62bcb50569bbb9e80cda29ee82457daa8509d71b92c7e61a853bd927bcf2eb9beb2b2d2115bfa SHA512 4951502d13a388b88fbffd849abe2f88e5d1fbc91c9a798fbd2eccb50f667aa9f9e22ea521e54184adb2124740203384946647911e09001f47e7fa30855b630b
 EBUILD http-accept-2.1.1-r1.ebuild 737 BLAKE2B 1fb0caeddeafe49d69f8416f9769fa67418ca0ce89f4ad12f5b893dbd7c0a7ad348a4a401823830f1a484950354faf1ee85a08e79ecb757097fa2287d32a6d49 SHA512 a14556a4bf004498fe9618d21e5a63eef7214213ea393d3251fb9aad952e14d7e48a3f24918b6f7c578539f042677d6eee73d69e4c3032fe71a9a8859897d351
-EBUILD http-accept-2.1.1.ebuild 573 BLAKE2B c20dc015ffcf0bba2befbd24baf07c7f743704700d705f3c022e85b2065284896265b68aca7c458e83e723ac74d9c57961c4cd5bd0dbfa1b2d41327ef7158fb8 SHA512 b7445cf86adbf4f0c16ebcd86804d564ac3a67f45f5746e779b657c0a97506f1496637f4dab0cb577df0432bea11bd591818ea6183dd2749856cddf4d855a7ba
 MISC metadata.xml 347 BLAKE2B 94d85022fee1a9bba34d8d2e184cb2169dd91c680c15f1d6032d6989c22b8ec5bfc4e84c6b36452ba9fbe78f420d62bdb547fbe98e736f5830ca94126ae7a4eb SHA512 0efdea66a1d6d83efd16aba20e1dd0634bff7cc6bd5570d27a4e101a5307fb358a954b4b70253e08698afefcdff81455e2a3e3bb2f9054992354dd3a863c00ef
diff --git a/dev-ruby/http-accept/http-accept-1.7.0.ebuild b/dev-ruby/http-accept/http-accept-1.7.0.ebuild
index fe574509a5c3..3b1739a9ab9a 100644
--- a/dev-ruby/http-accept/http-accept-1.7.0.ebuild
+++ b/dev-ruby/http-accept/http-accept-1.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/http-accept/http-accept-2.1.1.ebuild b/dev-ruby/http-accept/http-accept-2.1.1.ebuild
deleted file mode 100644
index 905cafe31da3..000000000000
--- a/dev-ruby/http-accept/http-accept-2.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse Accept and Accept-Language HTTP headers"
-HOMEPAGE="https://github.com/socketry/http-accept"
-SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/http-form_data/Manifest b/dev-ruby/http-form_data/Manifest
index c135d14832f1..59757ddfa806 100644
--- a/dev-ruby/http-form_data/Manifest
+++ b/dev-ruby/http-form_data/Manifest
@@ -1,5 +1,3 @@
-DIST http-form_data-2.2.0.gem 17408 BLAKE2B 35669a42e366297eb54cb3b291b0cedcd70387f3e903056ff3dbbab52a6efaa9d536111f00dd9cd360268e75dffcd8cc91ad0ed898236f0e7af89f14979d3240 SHA512 dbcc2453388ba586556b86d4cff9cf12fcde4ee5f5a913e8c5f24857b10010e920fba447c1d34bed78a1e636c2ef2649ea4dd1b428c29842b3c45eeaa1281e74
 DIST http-form_data-2.3.0.gem 17408 BLAKE2B faa29c86d57fac1554680bb10e1a71e591ec873a04c63c0d0fa2c993c03df03dd35f3b762a290d188285efc0cf63d5040b262d386cdf7a4abc4b7477a6a1e00f SHA512 c070126d18a66bd505005d7dae4ece6c751e52593806daf618bbb437b7f9296a5f18aac2e317b3526c9b34adc2f4d9fc7b7bab8cf2a8c8ca67fdc5940969ff21
-EBUILD http-form_data-2.2.0.ebuild 577 BLAKE2B 097f3c2df484ddc3ff90ad7607f6a7f9c5504e7f5551bc6563492f242acbb1c6c238ca545890acf90040986fbdb281a182a88c5f4fa3c05a2a5bf58bf5e258ac SHA512 7004f6bd7830eb20ab50a406572fb7a88be6765163d1503752f88284032872ebffa170639d6a869c41bf5f35167e0ff22aa7c64ca1184992c0cba6af3b5b6c94
 EBUILD http-form_data-2.3.0.ebuild 577 BLAKE2B a2a703c3834d2c5787b1f2ada6d64e12f860c3eca996f9ae4aaf76fbca38c0f1ff4f900bca3731b2ccf80221cc41386c798e02a81b12b1b7ade8e204558decb1 SHA512 25bdd2d3824ce2f8086fb9d74d02e98abc493b088b08df908ae306617029b9fe1daf93d32af8c672eb5dd2044207423b1423ed2d71e7fa9cbf0f270794a22b9a
 MISC metadata.xml 346 BLAKE2B ad8cc4bf9933af9ca4bc5120d808db05143f7bc8aedaf5cc786c035ba839e6bae47ed784c28e3f087c205ad52868872557e7b04c49b11c3888782e006c79049a SHA512 5c74820fc17edadb072550e76852e7f2a7d63e890f7456f4d8e7f441bf84ceddcad1ff82f0152c6b44550594acc3791d4af2681504a5a29780f39035f218b847
diff --git a/dev-ruby/http-form_data/http-form_data-2.2.0.ebuild b/dev-ruby/http-form_data/http-form_data-2.2.0.ebuild
deleted file mode 100644
index 2d3968c6b5b3..000000000000
--- a/dev-ruby/http-form_data/http-form_data-2.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility-belt to build form data request bodies"
-HOMEPAGE="https://github.com/httprb/form_data.rb"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/SimpleCov.start/ s:^:#: ; 1irequire "json"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/json_schema/Manifest b/dev-ruby/json_schema/Manifest
index 2c8ef4bde597..472e39b4db78 100644
--- a/dev-ruby/json_schema/Manifest
+++ b/dev-ruby/json_schema/Manifest
@@ -1,5 +1,3 @@
-DIST json_schema-0.20.8.tar.gz 36456 BLAKE2B 4159b8a293ab41d0d5f6c3877de98fe3ba0f1f9f151e938ebf03cdbd563fc06e80603b49ca0132877d0369901b8724229ee618bd2133a159fc34201de7d9541a SHA512 f3e2314d66fdd4fd0968a1e98f363e5f008fa91c46c068c198b89f54cd856d4d87bcab02eb23b46fbce34749885579178955a84d22aad2ae131928ceaaf80065
 DIST json_schema-0.20.9.tar.gz 36498 BLAKE2B 5eb79271b3a1627e2759783b176917d09ae9c20f84723f526f48653c99f1ce52f6e377ac9835bafee64ce2899222edc19ccbdd186e1fa82f66ab40601975800c SHA512 7dd2d7394fb7300d34dcd3e8b5fd6ee29259a762065b99cb55012248ef385dd89460fc58bfa4ac4c3f6255f1546cf3ba363310420d89057c27d1be55ef50ae73
-EBUILD json_schema-0.20.8.ebuild 753 BLAKE2B 17dcba97667e6895c9e76e6f770fbb32f43815025e76c698970a5f3164ac1f117c66e99a65489a62242c3bd92ec840f8c3aa8c3b013f04a2ff163db35d098b30 SHA512 b72551937918559dfb6177c6c80092aaea437e800a4a44c97b34f6a397bb8e4c386b08e74a6deee1d6ccfdd304d2b18000e6a69f057142a99d56b7625af90b88
 EBUILD json_schema-0.20.9.ebuild 760 BLAKE2B 11500044e77773a32256df8bb47c220cdc215d58267634d5a10a0049efeed55556e28d4420eb4087ef04f9eaac1c1647fc96fa6839b4f4948936d6a43ba5eaa8 SHA512 0bbc2dc13e21c0865fca750d443b67e3e95de0159c9775a0bf185a966995de19fcac13be5f9679c4f3a46d4bd826e4829fcff36aac4944f6b957c625e181623c
 MISC metadata.xml 330 BLAKE2B 2725105701d02050f9c9833642199aac0e34541bad8eeea6b603b2bda0af400773299723f56253b48879f5a10409533ea9648eb9eeab37e64bbd577d81524d28 SHA512 4f15d747d34c8b961f02d49f8a43546893d365a00bd5f1d8f7081def70e7b97262c49707f9971070ef803bd12bcba563649cd766c60bde41045bf1a2e43773e9
diff --git a/dev-ruby/json_schema/json_schema-0.20.8.ebuild b/dev-ruby/json_schema/json_schema-0.20.8.ebuild
deleted file mode 100644
index 548559b4ebb0..000000000000
--- a/dev-ruby/json_schema/json_schema-0.20.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="schemas"
-
-RUBY_FAKEGEM_GEMSPEC="json_schema.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A JSON Schema V4 and Hyperschema V4 parser and validator"
-HOMEPAGE="https://github.com/brandur/json_schema"
-SRC_URI="https://github.com/brandur/json_schema/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/ecma-re-validator )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-	sed -i -e '/^if/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/mail/Manifest b/dev-ruby/mail/Manifest
index f193e37e410e..f2ceda1ece74 100644
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@@ -1,4 +1,3 @@
 DIST mail-2.7.1-git.tar.gz 625251 BLAKE2B c1efbb259042155e983c1971fe9821eb0dd850089bd04cb0c74513f6f17dabf8ecc3155d9e5846ae657383f522872323f8fba37d51fba4318ac682d18a6d4c50 SHA512 17c601c86715135331f750048339a11a67a17f34486dbafa3ba7e9af9970d60927a2fa95c72a398418548df1fdf5addb2ed3afe9da7dff1f0bd949438726be1b
 EBUILD mail-2.7.1-r1.ebuild 894 BLAKE2B c46405743d560d3b0f967628c0a87aec4214c5a6a96a7655594a3b34fc273fd3ebda48c746ccf085551f9d5ca34e0b6f34f6af47771aca7c6d37d4170c2eb787 SHA512 b55414f61b4c4a6fd1e99029a73dc2b91f05e6807e43bfb9b70cdd7aa357105035f9537702b00cd4af56c5ad85a263b5b71344905a0d493ba100e0cd2220eb04
-EBUILD mail-2.7.1.ebuild 904 BLAKE2B 379b56b701fa0a0cb2aa9f690eafe914245e3cde8b29607425b5c352401514f0b1b4f55cd5a669d6c95a0c188e0ba2ad85b86310728b152c91568dca22cf4917 SHA512 cf3e5f7dfd4a3382def661c6819980a33abcfdad8e21cabdb9a68e955e28d97d7bec898b68fc77ac9a2c46ccc10aa1156ff5f41f0ca0f78c5eccc6fcb6e21e5b
 MISC metadata.xml 337 BLAKE2B edda3267d35eae7a763cb191424ad231a356da5d17ce213061d0111e9addab8d34ae9bb52e47c0ea05d58258d04befa284aa3930d316429ca4b82c2d676bb61b SHA512 06ff50f20204499fef8bf6eb3af793ec7b471c2d1a29fd30b821086f934344a6251c0304cc52c9b720af5a7b7214831a68813c33f36fe4f679deb8667d3cb7f8
diff --git a/dev-ruby/mail/mail-2.7.1.ebuild b/dev-ruby/mail/mail-2.7.1.ebuild
deleted file mode 100644
index 8e17aa55074e..000000000000
--- a/dev-ruby/mail/mail-2.7.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
-
-RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-GITHUB_USER="mikel"
-
-DESCRIPTION="An email handling library"
-HOMEPAGE="https://github.com/mikel/mail"
-SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/mini_mime-0.1.1"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
-}
diff --git a/dev-ruby/minispec-metadata/Manifest b/dev-ruby/minispec-metadata/Manifest
index 3f7b66f04823..cfdea9e37f14 100644
--- a/dev-ruby/minispec-metadata/Manifest
+++ b/dev-ruby/minispec-metadata/Manifest
@@ -1,4 +1,3 @@
 DIST minispec-metadata-3.3.1.gem 12288 BLAKE2B fe8b921d7c2927cdd413da29b4953482b8b673c3ad0e997d2fb4f5b1f212e46c1597125378524213a4929fa3db5e6dc75a56a0e42f478cfa0000332b6e1b9073 SHA512 54d08b96f39e3fa7fbffcc4fdb5ef22725af1e3eada333d8a5963304d2d736cb2a6be7166a70a5ae893029fb920a0541d93f0bd7a2e3c51066536a3c02567b75
 EBUILD minispec-metadata-3.3.1-r1.ebuild 569 BLAKE2B 4e01819ebd90110ac85080ff6c2a449963d327cc51dad0567cb84e8ea8f6c70826444dea9a93fa21e7cb24e4857272e8c47a104d102701106beb3750c03ec27c SHA512 d60f8d97b1605d8753215c99d76402adc913145b3eca7da7d2ebd306c22737df787a4b195974cb1eb65441d52bfbb714959d71b0cf87c931e3fa2019fbc61cad
-EBUILD minispec-metadata-3.3.1.ebuild 562 BLAKE2B fa0018471192c954985dd849b783d79e0c22559f54981759e3ff2d72f6808fb076c0716822ae431f5c6f62c8ea9e647e342340bfdb91fdd8f28783ab28ba6c34 SHA512 32798cb68078c2cac3b5057075508f776e95c82d463e2bea31d159bf0d6c071992bd783b5cb902d14c57044c4bbb71032a472ff1170af4622e5166d02ffc74b1
 MISC metadata.xml 358 BLAKE2B e5ac83de67a0359e4a8a2c63e2a1b09ef47c216b34097997a1211f351c77ff5429c522c57a5334d61f416ec86f2b7e2bfb013615cea74d6be4033434dd9e1fb1 SHA512 f2a0e4ca922fce4c8f0b198a15bb1bb3a48bfcd58e1459cc9a38853236ff6200c2de2e125e565ded15e50229c8957ea99c1f7d6d2b3d9132d98bfb267c944b32
diff --git a/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild b/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild
deleted file mode 100644
index 7e8bf819e44c..000000000000
--- a/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Define and access metadata in MiniTest::Spec descriptions and specs"
-HOMEPAGE="https://github.com/ordinaryzelig/minispec-metadata"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/minitest"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|awesome_print\)/ s:^:#:' Rakefile spec/helper.rb || die
-}
diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index 3918c1dc13cf..9c26e21cfdb3 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -3,5 +3,5 @@ DIST msgpack-1.5.1.gem 91136 BLAKE2B b5e75c9788cb02c6b96a8543c90d1e601a188943c97
 DIST msgpack-1.5.2.gem 91136 BLAKE2B fbbadcb82f327f991016e96eb89440dcc3522d67be69cb53a24f7df07d7314edd07dc7f248d26327133fbdf0be44f8b08daca7763af396b55ef7578b19659eb0 SHA512 0a28fbde62527c4344e20181f9538f99281c7b24e1f69d7b9386f1f79486d7ec39bbbde82794d1bac9d827cd3710a672ed5ee411dd02cad5ec5f5ebb5d81f89b
 EBUILD msgpack-1.4.5.ebuild 760 BLAKE2B 42dbe630c18b8b12e8db26aed145a7047daa6eceee18a66bd82e6904dc521f571bbe299f3ddf1d25b41ce1070b5c6ea1620b18c63466c1233323c866a69cc2c8 SHA512 9011acf147e2e6b4f1d6e5c452e4cebf589c34029b8ef7c806cd853ac868d7e2cabd955017837259e9dd3dd78cea3b59f8ff84e4f9e053a031b6e7ec904eab8a
 EBUILD msgpack-1.5.1.ebuild 767 BLAKE2B 4a3ba24543650edb338fe4f13776451bd01fb35f58c5d593b3e51cce8c34892506bd84fd856b3bd77fb6bf91eb848aecc0f740a7cc75adde7faeb12deeb18ebe SHA512 0505d521371378c84339b14c2236eb61386fe31a380a216aa3e1260c487e2f6f95fa9c0eabd431b0f8c9b52d3ef890a7b76a2c8f1ca9a165a3c1a0b37186fb7a
-EBUILD msgpack-1.5.2.ebuild 767 BLAKE2B 4a3ba24543650edb338fe4f13776451bd01fb35f58c5d593b3e51cce8c34892506bd84fd856b3bd77fb6bf91eb848aecc0f740a7cc75adde7faeb12deeb18ebe SHA512 0505d521371378c84339b14c2236eb61386fe31a380a216aa3e1260c487e2f6f95fa9c0eabd431b0f8c9b52d3ef890a7b76a2c8f1ca9a165a3c1a0b37186fb7a
+EBUILD msgpack-1.5.2.ebuild 774 BLAKE2B e016c0a13ef3df6a94d6ba21cac8c435157e2a08cbd351d5d40fdaec47e84ee59e43352720bd63aafb424067316f19709571b94afdbf173a0057c92a0e177fe1 SHA512 fdec2810cc60039694910d6392a043d953034d686f9c80ed0bba5c938bd11b06839852ff802f70cb0d7e78b9198bc7908bda17a081f7e8f72feab21c51ce6a05
 MISC metadata.xml 322 BLAKE2B 373b64422e0bc265a8fa2c1e3e158b154505d093ce39bd9de9ed90f3a3de0360ceb0dd5a8faa744102a2031e047305bdfa98f1358e6877bea58e8d346a19b922 SHA512 7a212cb2a391a582ef160829455b54ff8ada2a96c134e5389fc945fa394bed41eb9e34e6ac3e4c571a205bdabca9addd65d85516b09d9d75abfbdcc0dd5444ab
diff --git a/dev-ruby/msgpack/msgpack-1.5.2.ebuild b/dev-ruby/msgpack/msgpack-1.5.2.ebuild
index 7a785b90e317..2ef38672a7a4 100644
--- a/dev-ruby/msgpack/msgpack-1.5.2.ebuild
+++ b/dev-ruby/msgpack/msgpack-1.5.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://msgpack.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/multi_xml/Manifest b/dev-ruby/multi_xml/Manifest
index 483b71210ca5..ec6d8bc8b842 100644
--- a/dev-ruby/multi_xml/Manifest
+++ b/dev-ruby/multi_xml/Manifest
@@ -1,5 +1,5 @@
 AUX multi_xml-0.6.0-ox24.patch 866 BLAKE2B 366aa40e831d76b4dfd6516d0b80599c70e0b0c2cd804c2f8f96b82a1582c933e931153f81f27bba8176bbe3ee8f6c4517468b58bd8bc7b380fe6c6257cb953b SHA512 f054a4bba4990f1ff8d6236ed2a99b97182b96c343b749e18c90c63faef10ea25d8f40ca0dd92e58aac8924d0cee15915b3ae2ebe5a6e6c024ea6d4b38b5e05a
 DIST multi_xml-0.6.0.tar.gz 16571 BLAKE2B 1492eab7782823915167ebdb529b6d4699b31f3b66c48eee5acf7857dc25caae62b63a0da10a0bd862ade22865432bc6c4290a3f6ff8e99a889fcf09b56f6b7f SHA512 67e280d838ba07373a6ad5cbe4658b32655102906d8e0ed5429d21220475c21e07ea2ec0d2729df4d30a1bf7d0a5e6ff2d4482342098873135cb12e18c53194a
 EBUILD multi_xml-0.6.0-r1.ebuild 966 BLAKE2B c5e47a049141247dbe3e93a922487cc011424d23a0e4b287d0d353740788a1b4589ce23b488a6568959f20b9a3da9c8e67547ac62990d348fd95f11c12188dd4 SHA512 8f04748d8d74ba669677a4b0ee30b037a9e13f70bf8569bfc988065c9ae6a7669bd19ef550bb28ea07086b224d5b088ab13799e9bd5da2855fb2d573e05d51ef
-EBUILD multi_xml-0.6.0-r2.ebuild 967 BLAKE2B 9792df94a05b210c2b0d6f8577375a2534104458a25c28237060408a993e04ade47fc1455b3847a0c8272da9ce11366578abafa76c6f39e7a91bfa586855c721 SHA512 cd6f7fd3e18cb17d8a8f9450863521c8a28f947d98a0b2a14705222ecd6f452e332b6260986569d06a1a34937b3f0d57bbdc770e8defa403b10ad2514cf1ee28
+EBUILD multi_xml-0.6.0-r2.ebuild 966 BLAKE2B 561f7aa23145e93702909185ecc45c8336623503b11dd992101eef1b6707016bf871285a6db08a317f4971234f684e1aa7ba753d2e6ecdd3f10a7de5e63c285d SHA512 15cecb46e6ede56e3d8a1dc45eabfcde064a6ca245fe60d640b46934d02e5339761ef5d839c1d5982d292e328b29aafcc29fab9eee2be0bc615682e6df309991
 MISC metadata.xml 333 BLAKE2B f1a72c5112ba70c8f41be64b8b8e2678d64a6270cd05fe5735062204ce9deab09e7ae29a386b259c9c628ae22293d08b55ac721012afde24e4a1b3ca6f9913c8 SHA512 15ee9589bcd9f2c41c5f36aa030b6dc9fa8a17192c47d18047f32e09445af981d7a7d89ee26c4f70a37a1d53ab9c0edf86587d6622d2becb19349e8d1d03e5a3
diff --git a/dev-ruby/multi_xml/multi_xml-0.6.0-r2.ebuild b/dev-ruby/multi_xml/multi_xml-0.6.0-r2.ebuild
index bf9b47ed2436..0ddead2eb594 100644
--- a/dev-ruby/multi_xml/multi_xml-0.6.0-r2.ebuild
+++ b/dev-ruby/multi_xml/multi_xml-0.6.0-r2.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.rubydoc.info/gems/multi_xml"
 SRC_URI="https://github.com/sferik/multi_xml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/net-telnet/Manifest b/dev-ruby/net-telnet/Manifest
index e567fa91b99f..c85b377ab828 100644
--- a/dev-ruby/net-telnet/Manifest
+++ b/dev-ruby/net-telnet/Manifest
@@ -1,4 +1,4 @@
 DIST net-telnet-0.2.0.tar.gz 13299 BLAKE2B 6b87974281b4e1857a1e05efdfc751a5149f9057598c89b8b288219b95268955ee3f80e21cc787ac767ef3126c9ee23d9b62e29ebcb8c317def703f0e0dc1fe6 SHA512 a4473c42d33c10594c4445c29db73f4d611555710228cce263f7fc273e71140423dcbc2e89eec2a26f35f98de48aa72eca9f44cf0cd4626d702709963ce7b02d
-EBUILD net-telnet-0.2.0-r1.ebuild 1061 BLAKE2B f02341e9994746f9bc6138a19847107d8e1abdbaa7b4b3af03a028e5ee60e9c29e65c0fa747d149eb10f22c83a6b82ca2cefb21b8bae1ab21b69f399aa8852e2 SHA512 f56d8462883c8ef41bc24d3ae5a6f3f334059b6ede18f5092e2330bfa67926e3009f83b4c96a004143d3c213d4c6e317d44d5bfbab32584d6743920cc2375c58
+EBUILD net-telnet-0.2.0-r1.ebuild 1053 BLAKE2B 11badb5076039c40190c17f57c290cae657d4b9ae05987ee0d9bbf23faf54a1aa3ad5fc8514be7e870d66b4a4e05a8d77380823d003cbe5698f8c3fe76bb1769 SHA512 a5e63478b1bbe343c6e594c760e27ed449acb85844402d6fc928c8b72b33cd3e8d106166085de565fe1814318e07afe5f1050dfac111ea5a254dfe2a66fdfb61
 EBUILD net-telnet-0.2.0.ebuild 956 BLAKE2B 60aa4eb2b4278c9dcb83217f1bd47c7c0924ce21b45092f27579e9bb4b7258fd3c3c683f199a3627e7fb159a132eb350e7274416c7d6a5e23b203df9cec4fc9b SHA512 f27adc1c97108669ed91cc14c3e4249548f86a18bf4aa40d77bba69495305f4cfc245179efcd8d46d023f4b2adb4598fb38fcdbbafc9b7652b88118fba292ef9
 MISC metadata.xml 342 BLAKE2B 9a659f3d0c58ea00e32e060c2188f6b38821ffc8225788b707d21a1071024c87bdc17b394ac654c70c8830c7f88b9ccd08aeb26d8bc859a53d29bebb2c3868ff SHA512 adffb5054de27a4371669b6e373548c941e7f7398fd964e8150ce13604adbdf806c463950c5f50d3b7dad17f30c06c5342bf950ca5c8433ae3c830cc8dc3ab02
diff --git a/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild b/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
index 4fa7921d96bd..341cca7bba9c 100644
--- a/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~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"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/network_interface/Manifest b/dev-ruby/network_interface/Manifest
index e43ed109c4a8..1947ee938723 100644
--- a/dev-ruby/network_interface/Manifest
+++ b/dev-ruby/network_interface/Manifest
@@ -1,4 +1,3 @@
 DIST network_interface-0.0.2.gem 16896 BLAKE2B a0e7898aa5989ea38c8a9214f3aaf5f9d0dbdf39e86f7e9a4d62ec6c94f29f9612a08c1465513b62351a4c62ed776e427800eabe562062ce7c9b4b75ec757a3b SHA512 8850325e7e0c5ab51b060270220099c2c00cf7031083a511ae9f8dd6d1b9219b37169fa7620e9648eb071784a840e14ce965f8d1cf5d475ff82691bfba25a202
 EBUILD network_interface-0.0.2-r1.ebuild 647 BLAKE2B c409e8bd81da457eedeba182c969e8a501e93c3bf2b2593c642be4a294c4fa772ccce97cb4cbb401a0803fcdce62ae3d660fe1023da30d28b0667c849db13167 SHA512 577e6215237c52508b28bdf86b8766498afb624c6897d1b20f6ff1e7b7d4167003c7ad87336ab4515cf686759f033ee2ac999854346d624beb0f14c0b42a3c6b
-EBUILD network_interface-0.0.2.ebuild 823 BLAKE2B bb65f6f170cbfdd7739d44c5c61f000405a2eac1d014f7eac0822059f0fea957c82a2b354e6e47572aef0dd3e87617659338148172852a7d4c8fc65958d9e384 SHA512 f9bac94b08c17f3a15d22637ea5cb5034c9f1b8181f9a37a956d5c18e649178c98a6ae14b520e0555ea38cfd6f0d85d8cfb5b64132edb8bc51293777a70466f2
 MISC metadata.xml 347 BLAKE2B 145ba4bea55a624f1bcd5bc1792e13affd91c283ad59e9c3934048ad2298c9724fa156df4325a751b4a60376197e4eeb1f2ca6a13b04e6675697704df7fcd1e3 SHA512 0f338ef12f1d7196fe43d2be855281ee4f947298bbc6622d4280d827e671643f9e8f4f4d54fe9dd56f60ca4e8a14b51d7ba94592205fd241261f1f09a03eab4e
diff --git a/dev-ruby/network_interface/network_interface-0.0.2.ebuild b/dev-ruby/network_interface/network_interface-0.0.2.ebuild
deleted file mode 100644
index 153cf1a9e375..000000000000
--- a/dev-ruby/network_interface/network_interface-0.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="network_interface layer from metasploit pcaprub"
-HOMEPAGE="https://github.com/rapid7/network_interface"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# Tests are brittle as they cannot deal with all network interface configurations.
-RESTRICT="test"
-
-all_ruby_prepare() {
-	sed -i -e 's:/sbin/ifconfig:/bin/ifconfig:' spec/spec_helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/network_interface_ext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/network_interface_ext V=1
-	cp ext/network_interface_ext/network_interface_ext.so lib/ || die
-}
diff --git a/dev-ruby/oauth2/Manifest b/dev-ruby/oauth2/Manifest
index c7ec548d58db..3e6758d84d26 100644
--- a/dev-ruby/oauth2/Manifest
+++ b/dev-ruby/oauth2/Manifest
@@ -1,5 +1,3 @@
-DIST oauth2-1.4.4.tar.gz 28477 BLAKE2B 925008fcf4dd48da3b17c539713bf0f05f649d431ab1676293de625bef4165f31153271d48bbb0c6265c67d7bb6a3cbc7217ce155ba331b22a00d572a855a8ef SHA512 5398a25664e53d1942b0ecbe5d74ca9cc8f04a928c96073f40cfff207c4bf220634185320954a0d1f36944547fb48264855c9523318fbb79dd4a3779a7a46e79
 DIST oauth2-1.4.7.tar.gz 32341 BLAKE2B f3db3ff7ebcf7bc0958a564fdb0812c1bfb613148c5a16655f276fda4d6dac7769196305d854ee0fc3f8b4b53a93b4ae504b348029e1b363bcb704293887347a SHA512 4a43b3f75e827e9a12a74a6fe13a29b141c0d5bcb6a0d5c86dc8d8726f650a9fd5250ecc2c31cee5e985f0cb50e02f828d27fd07577bcac4dfc8ff4e009bd710
-EBUILD oauth2-1.4.4.ebuild 1429 BLAKE2B a665d826a2b4094e5a48c8321efd4cab23f13fa9eb2b183590d35c4cd3fae6a6c7d5b8800bed929538180bcb7316538b2e161633a8c88a7232e9392fb1967b76 SHA512 965168e464c1d2843756eecc19e7f3527b51aca89b7d5dd0ee87f064660f15dc973c6c7d955414aecf5b7b28f6c8209b40aecf1774d4111f2c5a6ec665ab02f9
 EBUILD oauth2-1.4.7.ebuild 1478 BLAKE2B 5dd9591470cc825729a00b24de2332d27d4baaab0a78525187ac89d5895a80b7908e3b0fc485cb16d7f7673f8c4613780b5c72eddef1de1d93e99759cf717a37 SHA512 b22a376f34809b148fbfe899adcb65f8ee1544f8abd227eff9937fd05ba824a4f66ea1199515f86976bf4e6ba591e0571b4aed972e4b29c2ae961debc3787edd
 MISC metadata.xml 342 BLAKE2B 14d2af934a4327d3d6c1c5236c0b5a0436c91cc3988d6957188171153c60a0f40b6dec75cb5acac49aa60518f89cc5bdb00e92021ca99249903f937df51f1b23 SHA512 cc8c7abab8d16e0ef97ec14f58bfc5941e161b2676950aaa45912812d53e523a54570407bcb2e9cd2527a0c6acca8f348422efdde66402c162e8a04dcfaabb8f
diff --git a/dev-ruby/oauth2/oauth2-1.4.4.ebuild b/dev-ruby/oauth2/oauth2-1.4.4.ebuild
deleted file mode 100644
index 0604c34eae04..000000000000
--- a/dev-ruby/oauth2/oauth2-1.4.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
-HOMEPAGE="https://github.com/intridea/oauth2"
-SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-2.0
-	dev-ruby/jwt:2
-	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
-	>=dev-ruby/multi_xml-0.5:0
-	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? (
-	>=dev-ruby/addressable-2.3
-	dev-ruby/rspec:3
-	dev-ruby/rspec-stubbed_env
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
-		-e '/silent/I s:^:#:' \
-		-e '1irequire "uri"' spec/helper.rb || die
-
-	sed -i -e '/yardstick/,/^end/ s:^:#:' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Avoid spec that is too fragile in relation to ENV
-	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	CI=true ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/openssl-ccm/Manifest b/dev-ruby/openssl-ccm/Manifest
index 751e5025d581..edb028ac0c74 100644
--- a/dev-ruby/openssl-ccm/Manifest
+++ b/dev-ruby/openssl-ccm/Manifest
@@ -1,4 +1,3 @@
 DIST openssl-ccm-1.2.2.gem 24576 BLAKE2B b94a205ce3b9d557ad649c0391428526339b050dd7a85633ee955b3532a94637e7c40a7cbb9bd739ff50f2922c97721e4dadf7e392c2aaaa38f35123858c01f2 SHA512 5f04af1ac65608e519fcf68259b2690f12882781cdba411939f809e1a6cb602723bf23d9cb920949e8eb7c4bfddb3e65446ae16d0276af78992de21cbfcdfc49
 EBUILD openssl-ccm-1.2.2-r1.ebuild 461 BLAKE2B 7d10d77b6f8dc0140c9b6509708e838640591f72ab2242ed13db8848eb9ca600ff1389a9d7f0e07f4d2c43d911d0497b07cb197368d8f0c1e813aa0d4404407f SHA512 68a34a80011135591e31a2a81fd7b40e6dffd1dfcf2646f033b6cb18096c7918502d5d8ddb69947799c658cad99a3d98768c97408596b712d40988a98e2df6eb
-EBUILD openssl-ccm-1.2.2.ebuild 493 BLAKE2B 5486db1d0ab8fd75e7eec06043440ca10232808abf2f95f5cb3c248070b297ae32b8ddb7fa878811f2d4c7ef1215e16ed64bb7eb10a1408e00e483f125f87ec4 SHA512 cabff8973220f5c35eb431d37c9218729864b02685a8f628b3ed076e7f38736244cee5c83e0cf0df178f7163b3ad798291191e110441131b727a2626e54a83ed
 MISC metadata.xml 344 BLAKE2B a8d224a63abfe1adbe0a829e7d2c7da31692d734d512a6f31f336a94a83c21b8c6d8caed1248f4b62d8bda8973e048e89c65cbafe118317a16c6c0c408ba9ee9 SHA512 600fea2b0131a02daf48eab55eb6042e0af24f31cda8606f207147f2ec53c749655a0a7b616bb669a5dfca0ff0f45da02c18f208e55eb06838567f9ab8dbdbaa
diff --git a/dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild b/dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild
deleted file mode 100644
index fa9c498b8873..000000000000
--- a/dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="OpenSSL CBC-MAC (CCM) ruby gem"
-HOMEPAGE="https://github.com/SmallLars/openssl-ccm"
-
-LICENSE="BSD"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/coverall/I s:^:#:' test/test_ccm.rb || die
-}
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index c75cc6e0eb21..008f43ae0ac2 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -4,8 +4,8 @@ DIST parser-3.1.0.0.tar.gz 287924 BLAKE2B 042f325c12718a8d05dbbe1052cf3792bfab54
 DIST parser-3.1.1.0.tar.gz 299759 BLAKE2B c4fdf278c1ae90529de414d9cda2770524f051f05d457ebe3224c49a84c55abfe8ac11799b0caf4d74200c4be494c3f655ed7f9c03e11d198436a7f54bec77ce SHA512 9c51aaa7d19e4a679d9d4c40716a90ef4c15d22728a21a8a4c278245114cd8cdeace19018d54dbb73b77897d531f3eb446b99c6dfaf9e205aa54346933ada215
 DIST parser-3.1.2.0.tar.gz 299753 BLAKE2B b5c991ab0834ed5e5b7107935500659828a6f804d9231462dc8a658346bab3959ac56b514045c25af4adb84af3f0cdd9615c9aafb2325ab24a04c0c5617ca732 SHA512 d8becf7e5b633c0a1ddfe8aac98c2f89d6b713cbabd2877a4eac36b0fd4935bd1a05990c100bcf58f04ad78218af0a5f79dbb83bf369708750c8834598286cfa
 EBUILD parser-2.7.2.0-r1.ebuild 961 BLAKE2B b983259aeb654773b384d9be90469bfef79587de6b376e60cdc643c433fc67e287272f8290589266443caee118e3fadd07d1d5e25f067581ae95292f8dda8f8d SHA512 ee6064b566299e4b600bda95314eba535b39c8ac7909440fdc5ff62f4bdae280c6813b62b44e8e73e8d45e189852c8431d0da63c007b8ec23bf91e2b5ca8143d
-EBUILD parser-3.0.3.2.ebuild 961 BLAKE2B 570ba46abad8fa1dece217f940a0e53d4456c62408a66dbcddf1f5ea675212ac9417554b8d3ed4af2c42966532a2c09e9ebdcbeef24c93f7e8a43e3e7f635297 SHA512 6ead78988b39f0dea2418ea682de47172f2459b5192f6f0ba92fca3fe25eab4af8393be1710a0644899cd490412a1011b393e5430f626387a74119eaf452e3f4
-EBUILD parser-3.1.0.0.ebuild 961 BLAKE2B 2117170d2ea7d7e9297037612bf8232f9009f6cb01cb96d3da1c878a5010bb5f415b59d41c35012a2a242e13884f3f47db2c516a12150ac7737aef567d514cf6 SHA512 536bd2d0b4c0582fb7442b03da58479997df906e13f8ca02fd93457f0351fbe02dcc6e82b5aeea6a68e75ea6fe1412d25c1c2786b7aa47fe3509c25c34e6ac8b
-EBUILD parser-3.1.1.0.ebuild 961 BLAKE2B 2117170d2ea7d7e9297037612bf8232f9009f6cb01cb96d3da1c878a5010bb5f415b59d41c35012a2a242e13884f3f47db2c516a12150ac7737aef567d514cf6 SHA512 536bd2d0b4c0582fb7442b03da58479997df906e13f8ca02fd93457f0351fbe02dcc6e82b5aeea6a68e75ea6fe1412d25c1c2786b7aa47fe3509c25c34e6ac8b
-EBUILD parser-3.1.2.0.ebuild 961 BLAKE2B 2117170d2ea7d7e9297037612bf8232f9009f6cb01cb96d3da1c878a5010bb5f415b59d41c35012a2a242e13884f3f47db2c516a12150ac7737aef567d514cf6 SHA512 536bd2d0b4c0582fb7442b03da58479997df906e13f8ca02fd93457f0351fbe02dcc6e82b5aeea6a68e75ea6fe1412d25c1c2786b7aa47fe3509c25c34e6ac8b
+EBUILD parser-3.0.3.2.ebuild 975 BLAKE2B 7f6c0df8260f6b74c326f074eff661b8ef8688176ba975d277e8b8995690e6bf1d9a3e12afa0e461a999c493aaf023b06256924ec374a2347d6eea4bea2582c8 SHA512 6743a949d4b9ed2d743ff4d60df0969a0ba6e903b654607986b1978429fef6d684b49de00208403c2a0e388b6b0ff2cabfb99ce7b733b5020f14af4b680b575e
+EBUILD parser-3.1.0.0.ebuild 975 BLAKE2B 842507f70b0ff18fe8a7b897eb61d56e4e070636344f14b5bd6c6206475ddb5105469f1d8f98a83aaa08da3c1b8a0aaa08c87ce6095772a2aed5914e7d33ab95 SHA512 8340d66160f7a497c17a02d0190c8b747dff4cbbf360a5f1734a0167999a4dc447820156c95feec70fb4a886cb47805fe054e5607b1c7247537a27af87021cf4
+EBUILD parser-3.1.1.0.ebuild 975 BLAKE2B 842507f70b0ff18fe8a7b897eb61d56e4e070636344f14b5bd6c6206475ddb5105469f1d8f98a83aaa08da3c1b8a0aaa08c87ce6095772a2aed5914e7d33ab95 SHA512 8340d66160f7a497c17a02d0190c8b747dff4cbbf360a5f1734a0167999a4dc447820156c95feec70fb4a886cb47805fe054e5607b1c7247537a27af87021cf4
+EBUILD parser-3.1.2.0.ebuild 975 BLAKE2B 842507f70b0ff18fe8a7b897eb61d56e4e070636344f14b5bd6c6206475ddb5105469f1d8f98a83aaa08da3c1b8a0aaa08c87ce6095772a2aed5914e7d33ab95 SHA512 8340d66160f7a497c17a02d0190c8b747dff4cbbf360a5f1734a0167999a4dc447820156c95feec70fb4a886cb47805fe054e5607b1c7247537a27af87021cf4
 MISC metadata.xml 344 BLAKE2B 00abcffb45cb3f1cbcd61458b7bcd8a4a81029fd58aba3f67a270c5ec37e8738f4d31b09f8b382987615acd4a8bd5ad335c54b60662a862f3828a1af360437df SHA512 4a28a0ed71d39d82fa69378ab26f4cf5844d01e58cc1805372df985a5ce25892f268a75db5a0dd3ca00bba3285a7cfb5447a1f261d79c7bcd41cd45b6cc68677
diff --git a/dev-ruby/parser/parser-3.0.3.2.ebuild b/dev-ruby/parser/parser-3.0.3.2.ebuild
index 70d2b1439d34..6e1ce3f34845 100644
--- a/dev-ruby/parser/parser-3.0.3.2.ebuild
+++ b/dev-ruby/parser/parser-3.0.3.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_TASK_TEST="test"
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~sparc"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/parser/parser-3.1.0.0.ebuild b/dev-ruby/parser/parser-3.1.0.0.ebuild
index 0bc9672c1a19..53805a815992 100644
--- a/dev-ruby/parser/parser-3.1.0.0.ebuild
+++ b/dev-ruby/parser/parser-3.1.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_TASK_TEST="test"
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~sparc"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/parser/parser-3.1.1.0.ebuild b/dev-ruby/parser/parser-3.1.1.0.ebuild
index 0bc9672c1a19..53805a815992 100644
--- a/dev-ruby/parser/parser-3.1.1.0.ebuild
+++ b/dev-ruby/parser/parser-3.1.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_TASK_TEST="test"
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~sparc"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/parser/parser-3.1.2.0.ebuild b/dev-ruby/parser/parser-3.1.2.0.ebuild
index 0bc9672c1a19..53805a815992 100644
--- a/dev-ruby/parser/parser-3.1.2.0.ebuild
+++ b/dev-ruby/parser/parser-3.1.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_TASK_TEST="test"
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~sparc"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index f9c51c9ac93c..0a113d76128c 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -1,7 +1,9 @@
 DIST pg-1.2.2.gem 196608 BLAKE2B 068be98d190cb4074cc89bdb5b376322f323950909f7a6fddc8669a3ff0f85eef9f512bd2ec7121707e9ea077b2b428f698e84f2118c76e34f5def75ca303fca SHA512 5c7cc90afb75a66e80cfc34c4875cf22b005aa0a27e78db6f71d1829f870c6409b73326a9925f79c0d642e93ea51d1f84c7383323fea44b7488e83deb7754951
 DIST pg-1.2.3.gem 196608 BLAKE2B b3e9119d068c833f7352b61802d5fb03616ed2d13f957c8d4b51966444523ef9d884a860309209dfbda5931aa1f8199b7a63a51a89c194758de309f00bdbfbd6 SHA512 dd8fa7b256102aea7588fd7e1d4e28199be2bf9910149d266b5379e78a7a57aa2a22763d04a559f4763842cad4ba8d0fbc33e8b43b7497dc77039edfd1029585
 DIST pg-1.3.5.tar.gz 256197 BLAKE2B 8a8cd0135eb7dcf8389d2b0afa174059d12f542b1e2897fba0e292fd16f31508293ca90f64f731db9bc14e55e9ba2c740ccf744a5fe30c449d64344264e409e1 SHA512 44e8ad97a6f4136d49641c5a59a70a489d766d1c1e511f5a6f003c2ae2900466b02a2504dc0fb26c872ce3fcb56ac83ac5299a829cca99d9c02c4b7ce0f0ac75
+DIST pg-1.4.1.tar.gz 258388 BLAKE2B d2f2c81b51fb159a95990382cce316938b97d8ecb1c9590c4a70be741f4806bc47dc99423c1d54e939bc156e287cc7cba28d854dc68900501c10fbaf15cb3076 SHA512 e8e0ad7b6df4a98d8ac6dfa8006044f7fbfc45713e1aa866e80a83061be5a6a1a57456cc2ffc14d976c2d108ce526c6fa9d4ce59222a9d9bb3ef676e9dec8da9
 EBUILD pg-1.2.2.ebuild 1595 BLAKE2B f3dcdc64b69e3e8da9a9981ff97c72ebf9f58044e43be2283cceb70e45a70f349970f003d12ec469827170192c441044e92547e9ae0bd8959fc9cd34fc6d1aa1 SHA512 b90c98ddd7ee4de299f7bfad52955e76a54cd615218c8e86ed1cb20e98731cdbee20e0f8cc3b8faa125969233f3b974803f38085feece6c0cd125cf04261835d
 EBUILD pg-1.2.3.ebuild 1426 BLAKE2B c93244066819920772e2dd6bdc0412e3b0011eff3b6c9fb43b4ab9e785a311cc105dc3c6f570125b3ddb0da8b9463f7fa7c1c29d31f975e459e71dd853d683a2 SHA512 4e3c4f49004464ae462d79bb76496da6759ca5aec19d9348f96bee4daceaf2c2e0d44608344521fe6a7b1f7cc181df8150dc5999b51b8bfbaabc41697322ec8f
 EBUILD pg-1.3.5.ebuild 1930 BLAKE2B 794db20988a9d74027ccdb8fdc3e2bdfa0077021a02e4ebae4d81049b908ebd185222a95a3c3a07fe4663d8213cc39b150421ad11eec77ca7ca0fa20b6d0bc1d SHA512 c8a5653828cfb7d73a822ca26f78120a969b64ee06491cdd2fd3e01f564fbd3ac7c97dab53ecbc2200ed6823cb46c811d87bb86fcd0e115044d85f18ace0d13a
+EBUILD pg-1.4.1.ebuild 1930 BLAKE2B 794db20988a9d74027ccdb8fdc3e2bdfa0077021a02e4ebae4d81049b908ebd185222a95a3c3a07fe4663d8213cc39b150421ad11eec77ca7ca0fa20b6d0bc1d SHA512 c8a5653828cfb7d73a822ca26f78120a969b64ee06491cdd2fd3e01f564fbd3ac7c97dab53ecbc2200ed6823cb46c811d87bb86fcd0e115044d85f18ace0d13a
 MISC metadata.xml 338 BLAKE2B b827b967fa6a0795016f741de3ad7738103580b06bb6d1f56957fbbcde06a63eeacc6b9aa2bbd726bad77c91b28659a3318e6ec43d141cd1cd05982b209c2f1d SHA512 8f1ea2d36aaa43547b48d39df2f403bbbf63b5bd57570bddf8515f84bea573793f1ecacc807d02f05d96a919c8778465f4c87822bd1807ebeca115f6dec81e99
diff --git a/dev-ruby/pg/pg-1.4.1.ebuild b/dev-ruby/pg/pg-1.4.1.ebuild
new file mode 100644
index 000000000000..a041e4e6ee51
--- /dev/null
+++ b/dev-ruby/pg/pg-1.4.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_GEMSPEC="pg.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc README.rdoc History.rdoc"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
+HOMEPAGE="https://github.com/ged/ruby-pg"
+SRC_URI="https://github.com/ged/ruby-pg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-${P}"
+
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND+=" dev-db/postgresql:*"
+DEPEND+=" dev-db/postgresql
+	test? ( >=dev-db/postgresql-9.4[server(+),threads] )"
+
+all_ruby_prepare() {
+	# hack the Rakefile to make it sure that it doesn't load
+	# rake-compiler (so that we don't have to depend on it and it
+	# actually works when building with USE=doc).
+	sed -i \
+		-e '/Rakefile.cross/s:^:#:' \
+		-e '/ExtensionTask/,/^end$/ s:^:#:' \
+		Rakefile || die
+
+	sed -e 's/git ls-files -z/find * -print0/' \
+		-e "s:_relative ': './:" \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests that assume IPv4
+	sed -i -e '/expect.*hostaddr/ s:^:#:' spec/pg/connection_spec.rb || die
+
+	# Avoid test that only works with bundled pg
+	sed -i -e '/tells about the libpq library path/askip "gentoo"' spec/pg_spec.rb || die
+}
+
+each_ruby_test() {
+	if [[ "${EUID}" -ne "0" ]]; then
+		# Make the rspec call explicit, this way we don't have to depend
+		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
+		# the whole extension from scratch.
+		RSPEC_VERSION=3 ruby-ng_rspec
+	else
+		ewarn "The userpriv feature must be enabled to run tests."
+		eerror "Testsuite will not be run."
+	fi
+}
diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest
index d391ee697658..87963f4d51b2 100644
--- a/dev-ruby/rack-test/Manifest
+++ b/dev-ruby/rack-test/Manifest
@@ -1,4 +1,4 @@
 DIST rack-test-1.1.0.tar.gz 27035 BLAKE2B 640de2303850662c3b6a8fc17f2344223c9928b48abde6d1b251a634689793158f35498c4736e4e2d069efa921d37bc32da92a7e17c0761a6f6111b345b54c1a SHA512 36d947d9b13d33ee8322e5b9d18fe8266787ccb7703f1fafadc040123e34dd44e98e7faf8b6dd816e51ed167065b2ffe79e9bcee74564dc324ba2b7dba76f82a
-EBUILD rack-test-1.1.0-r1.ebuild 1070 BLAKE2B ac6a11196276e39efeb7dcc156e385c2cdaf96059c6316493d46e5a0e4f017b08f0cbb07de5a65120d60d3f98e08a07c3ccb8f004172102a642523b754b34118 SHA512 becbc9584e8113000d2dd31810ed02d48164316764b700362868132dcb1f5b04cc734d2e8b45327ed800f5dd7e12cc81a911a9a3f55c63c999d4341d2e3f3072
+EBUILD rack-test-1.1.0-r1.ebuild 1069 BLAKE2B 07c2f65bd1508d1452f2452fc1f5a4fd42473521b44067d20635954fae76dab4fceb83b225b3105e84d82e65fb26bd87a23ab1a6d3dc43657a5e158d9b70d0b4 SHA512 7e6d15f29a800ce10d9c8233171b1ea68e0263d2688fd4f897740a123928a1ab38cbb94bd1b2e054bce12aa66faf47fe99633a79283f2a5d0a7fa647ea71a966
 EBUILD rack-test-1.1.0.ebuild 1108 BLAKE2B 1534d576f8d11d3cb0a968d203c6858939206c5c24f0d923a38a350dedd7dd8d1ccc6f0fe999982bfb0e89ff2297ec41e828d342eb82d7b3fd006a860965dc6b SHA512 37e6bc3b2d4bca5d16f1d924a7a99fddcb19f19a1490bbc47dee4843c5a47c30ff334f544e810c93883dab387c04dd7608c17862fe2104c72b88a50e15bc9085
 MISC metadata.xml 344 BLAKE2B e30c148bc0cfee01a015a9f33b641e93cafb8791f46ea7c1ec56942da88eec469d0259780c697b3bae0cbaf806dc47f919b78f2aca4d7565effd47a630f6485b SHA512 93102d50461492b9a866f74783d9d6c3d04698a8766535064d1b3c2600c11f1002b3a8bba79c81b4294e19a33cb06f8b407442c73d24fd2efcf361e39623ad9e
diff --git a/dev-ruby/rack-test/rack-test-1.1.0-r1.ebuild b/dev-ruby/rack-test/rack-test-1.1.0-r1.ebuild
index fff17aea6b0d..0c5ce5f3d97a 100644
--- a/dev-ruby/rack-test/rack-test-1.1.0-r1.ebuild
+++ b/dev-ruby/rack-test/rack-test-1.1.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rack-test/rack-test/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rack-1.0:* <dev-ruby/rack-3:*"
diff --git a/dev-ruby/rails-dom-testing/Manifest b/dev-ruby/rails-dom-testing/Manifest
index 03fbb9135b7b..8c3c1191a098 100644
--- a/dev-ruby/rails-dom-testing/Manifest
+++ b/dev-ruby/rails-dom-testing/Manifest
@@ -1,4 +1,3 @@
 DIST rails-dom-testing-2.0.3.gem 14336 BLAKE2B 8740433474e88a7cb5be14b4357dd0b69d45a39972136cfe9a4d695d2478b5b535e2b407eb0acc9ec3abd633cb1f8591a634abe6eacd8ec38bba865ad32ed92e SHA512 910549bd42e6651b7160af0a4aaffbbdeaee829aa7c3f3552a73ba985ef1230d5586f5bf723018f2cd8c6d5c6238d045a8f3e686704b6989e5a56664061f6c72
-EBUILD rails-dom-testing-2.0.3-r1.ebuild 669 BLAKE2B 5d5df2d86ee23950ef7d455a33654394df77fd5f23a27ae858838b4e8db7ea90af45882e91c833c00c1e585c2aae1fc9c10cf017ac7376ce5341bdace3689cd4 SHA512 6d435568f6e9a8ad8dcb3a101a09b66ba18342032bb1b020c780b0dd328ba0f53a99084886c2c827ed88ecc6c7fac4cb1b2e468e596617d13bf866c1d95aea2a
 EBUILD rails-dom-testing-2.0.3-r2.ebuild 638 BLAKE2B 768b192a765d8876da651543b88715426e811a0d72cb2fb5369cf5fc33c1c399732df7a072d30acac88d08d4d0cfa0bf827b0e16bca2b9de3440a8647d07bd4b SHA512 dff435a66303b9f470f0fc5d90b96aaf3eb0c334e6f00caa640c7d05975b4d326dea6b84ae0febab59237dc26b76a7ef8cac73a1aba81eabf1c4937afac898ee
 MISC metadata.xml 351 BLAKE2B f41c4494ab4cdb4300fcfec165838dd843ec89352955baa20ef14ac367c8b6305184e7d5514ff64fef0c0293fa4151c6d6aae40012401303249e58c3430b017d SHA512 fc7889faa9be9081dbf07ae7fb56b9220a56566e8af2eb6eb4388a998532210a8359af7b78b813e691145fb845c2594d3833c2d93d1a0384badf6de569e37fe1
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
deleted file mode 100644
index 50bbca2323b5..000000000000
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compare doms and assert certain elements exists in doms using Nokogiri"
-HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-4.2.0:*
-	>=dev-ruby/nokogiri-1.6"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rails-html-sanitizer/Manifest b/dev-ruby/rails-html-sanitizer/Manifest
index 09ed805a8e42..5d4d79accfdb 100644
--- a/dev-ruby/rails-html-sanitizer/Manifest
+++ b/dev-ruby/rails-html-sanitizer/Manifest
@@ -1,9 +1,5 @@
-DIST rails-html-sanitizer-1.3.0.gem 16384 BLAKE2B ae0b9acfd4ffc53b84b92cb42c149022312112f90d64866de916be2b91b680ecfbbdc94d278626c992cc90b0061705c11c9a604f6d9e91092e1117e40e003e6d SHA512 01d67f750ffc6ac857e4dc47b77d66e02acc4488f353af97e2fc367590fe85107b631aaf8b32f61f9e1f375c93e1b24fbf966f738e35483f5174880a0ffe5ddb
-DIST rails-html-sanitizer-1.4.1.gem 17408 BLAKE2B 4d503bad7a84aefe3bfbb1121eebe768ecf388f502e9ee58f2daf9d1a497ecfea2ad29e7bdd7c2b06e6914355b8eeaf2eeb730aadbceadebdd5a342b9fdc0969 SHA512 c778189fd3fdbdca4a586938d0f22b600f499a174d4d0e34567f0a2a92b8095a2c6c544e47cca3bd7d1f8ae09916898c200d4462de2d31f6bb8eb2c920ab69b4
 DIST rails-html-sanitizer-1.4.2.gem 16896 BLAKE2B 97f09d43ad99c13c07c34c0f5c47e3b34983b94773923cf7d131d1115d818ede619fc0ef268c5523524c53178afde2c9ee2652617add6b4efc282d190591be80 SHA512 9f0872f1000c758918f66a889322d3393ec678604eb3b01fc21bbb861189ec04fcf05f5c9487bd5eeb63ce6d99a80064718c82bfce2daf25c07754979a2ed747
 DIST rails-html-sanitizer-1.4.3.gem 17920 BLAKE2B 2745ce137612337d4d85593b0af9a3e5102e399957b71dea366cc864a1acc66bb2bd099bd53701c71925ba64ae0287896bbd33eb64bb5ec22cbcbfb3173953dc SHA512 ead339d8ed5aefa737298d886a0db3c353254cfa57bdee7d2011f596ed2871dcad3bd16561728da2447e239fcaa908256bb6436493462bca6310a17a3812ffd9
-EBUILD rails-html-sanitizer-1.3.0-r1.ebuild 877 BLAKE2B 2bc799214a4ce012915610d1841cca4a0546e09acf63a53dd6b61487fe203855f80f596ed5681cd7e633e84aa7517fdd1fd3e001eb49aa68fbac00f91d3beb4b SHA512 f12689e221ded779f61a170de97adee0e921d5a9d2b0f01623b02ea5477d1201fdf51157701c022d43e29a972dc6479d98cb1d4fcd0892d01834d6072e620c4f
-EBUILD rails-html-sanitizer-1.4.1.ebuild 833 BLAKE2B 10204e476bbbd51d7118b665a0372492dff5bea48d01a1921c1864b4f98ff9361d9f7c9466025bb38f55cb479d51a0693e6989e585121f3bd33a249f0ddeab88 SHA512 dec76a800c3150c1209d1673b888a5efad1027fcd3a486090ec686c50f7a239ebb4edd4b208e0a3b4fe1bc471d5b4d59086fa9f8f9211211d48a7ec1d606f2cf
 EBUILD rails-html-sanitizer-1.4.2.ebuild 846 BLAKE2B 5d9e73cda1113fde701b7f468b2769e6dfde28e499246df3cb6edfe3a11246145c3b875c83871cc91e6ab79d8d0acb851c3c49c643ee8cb07343cc0a937b64f7 SHA512 98af080e21fcc33608e96c93a33a18a91c0432f3cf276c8d3fac60294237e2ce7f37e3081c7a0ef050c24a8185375bc9c777fe04cb9f06dda8591fa662e7a54f
-EBUILD rails-html-sanitizer-1.4.3.ebuild 854 BLAKE2B bd19964c46146bd1772a5fa3261d192bd60e38a08f2c8bac4e9c96752e29dcb7863a12d18b14c894f7bb9d9d35a9706e2cd5bb3b46e8d57ddc03ff1c2ea054c4 SHA512 03cf35cd19112fbdf442792c10df5b56e8c5c05f4d1f689eeada6718f47027be98f62c5be9bcf160cd08566a16dca467af8b81b1f4ad830a3064ff9662e91468
+EBUILD rails-html-sanitizer-1.4.3.ebuild 853 BLAKE2B 06d92b2f67342493ed538217eb0b4905de31e4afd3fb89bdc2799ee0353332736a1a5c3ee214aab4b9d301f2893a58f58f742de470aebaab6265278f506ba109 SHA512 a15208cc132e3e5fcc1d21a40431a57e336825c8f7c26d204ed9ce6da1aa29f70d7b12cced942acb05692cabc97e6421d9b09b63b16aa53ee8b9429593f7953b
 MISC metadata.xml 360 BLAKE2B e7d08120d5b72f9cf58b105b3ee904c54d8c45917ad7ca640c309e133b9fcc19476e60e247a66ddf317e7fd83dfaecad4dd17206f40fed73c5d01b7556f4e07b SHA512 31bcb326d30a4b9af02e12dcbf06d44c6e8ea7cd358aa2eb2443b640dff6fd9067e9d80c9e9f08320bac2195bae9bda2afb8ac6d8752940b8a2104ec4515daa2
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild
deleted file mode 100644
index b96d893f1ddf..000000000000
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Sanitize HTML fragments in Rails applications"
-HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/loofah-2.3:0"
-
-ruby_add_bdepend "test? ( dev-ruby/rails-dom-testing )"
-
-all_ruby_prepare() {
-	# Avoid tests that depend on nokogiri patches to libxml2.
-	sed -i -e '/\(name_action\|attr\)_in_a_tag_in_safe_list_sanitizer/askip "libxml2"' test/sanitizer_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.1.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.1.ebuild
deleted file mode 100644
index 144833b644b3..000000000000
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Sanitize HTML fragments in Rails applications"
-HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/loofah-2.3:0"
-
-ruby_add_bdepend "test? ( dev-ruby/rails-dom-testing )"
-
-all_ruby_prepare() {
-	# Avoid tests that depend on nokogiri patches to libxml2.
-	sed -i -e '/\(name_action\|attr\)_in_a_tag_in_safe_list_sanitizer/askip "libxml2"' test/sanitizer_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.3.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.3.ebuild
index 7aa360b9368a..bfd74c08ae4c 100644
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.3.ebuild
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/loofah-2.3:0"
diff --git a/dev-ruby/rb-readline/Manifest b/dev-ruby/rb-readline/Manifest
index dac9c56dd213..b860b2d251cf 100644
--- a/dev-ruby/rb-readline/Manifest
+++ b/dev-ruby/rb-readline/Manifest
@@ -1,4 +1,3 @@
 DIST rb-readline-0.5.5.gem 96768 BLAKE2B d854731957dad1dc6abe6a6e1ed72397e49faf08314c8af568c0f8e6412ecaa38e937a807ac326af4f306f24dfe89a51b830663cca1544a3618ec2aaa6cbd1b9 SHA512 53ed9919eb2c057d2b26e87ba0ecabc73f0aed7fa22398b9e7f98e82bd7a0ed7ca89cb1944bf94400bf4289d6fb404aadb9a2781fa964e2f4c77d7e218e459ae
 EBUILD rb-readline-0.5.5-r1.ebuild 650 BLAKE2B c50d5ce7150589e7863ee01dbe96a5adc1713ad7ae5338137e1bfbe44df6f7ed73829a3549b5eceb936328d5bd5644174e929adabad5fa34e339fa53cef5e851 SHA512 7491a13672cf2e345191c053664cdc3d85e20f6d3bc1fbdfe53a1e7bb6b8efaf0c5d8b0eba6ed10d151a6fb121be6ef5b948f32bb9ba6fd60cee190fe6c01147
-EBUILD rb-readline-0.5.5.ebuild 681 BLAKE2B 38422e549a648b38520bc5de3fdf8584c91267f53bef2ec71f2f5676576c6e3032cd617ed4b03e7ea1aaa91013c6a570e0ffc924f6ed9053310a722486d833b3 SHA512 a936cf7b31130488ec26106705483b9813d6b40a57cb6692f8741404d48c7e7126996aef0db9fa7c3d4f2a470045bfdadf813e3b94cdb1e35b9d1ff34d5aa608
 MISC metadata.xml 438 BLAKE2B 66ef274444ce68aaed0327570260b660b95626f56762e3c3e0d91e3addf63dc4c0fc9d756a1cdb27b283b3965d4689c1cef39d829a6133e96055e93f0636f021 SHA512 a23b1312aa9254c799643938f153d9e6c305fc737f372210c12b542773e27f0eebb01445d335acf06c47e5532fc86b6043d7ed610c6d78cc41773fdbcd9a7844
diff --git a/dev-ruby/rb-readline/rb-readline-0.5.5.ebuild b/dev-ruby/rb-readline/rb-readline-0.5.5.ebuild
deleted file mode 100644
index 92b86661dc6c..000000000000
--- a/dev-ruby/rb-readline/rb-readline-0.5.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby implementation of the GNU readline C library"
-HOMEPAGE="https://rubygems.org/gems/rb-readline"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rake
-		>=dev-ruby/minitest-5.2"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-
-	# Skip a test that fails when run in the ebuild environment.
-	sed -i -e '/test_readline_with_default_parameters_does_not_error/,/end/ s:^:#:' test/test_readline.rb || die
-}
diff --git a/dev-ruby/redcloth/Manifest b/dev-ruby/redcloth/Manifest
index 87de6a152563..26056153b940 100644
--- a/dev-ruby/redcloth/Manifest
+++ b/dev-ruby/redcloth/Manifest
@@ -1,5 +1,5 @@
 AUX redcloth-4.3.2-load-documents.patch 988 BLAKE2B 75e2a385abaf14caef523ae418e87b000900c93d3afe4491300335dd9d5a26fef28a34b3318fada0625e91cafba42a82fb05a2d8acfd6c5afcff4e8ac491890f SHA512 cce18ba0c30d6820020d71dd032d1b193976eaa103ca7bb294a7b1cfb0e61b82aa31e0d8bd8b8d9305e8c087a4109563897a7cd77ec9c020b453c8dc97d48003
 DIST RedCloth-4.3.2.tar.gz 91880 BLAKE2B 0feac1ec59e23fcff39e2fdf9beff896be7949764e53a5a834c5f4e7d18813dc59bf354103d4fab82a709341a0f1b6919bbd3a463fd601564888672dbe73d343 SHA512 377fef21e646beb1658a4b8b8d0228e9730c6c8f33075a14137afcf80e8d37501ede8c05b720d0dfb36a680017f4dedd01565fe9b326ae06ead77afee6f122ca
 EBUILD redcloth-4.3.2-r1.ebuild 1503 BLAKE2B 9c347450a57a184e67388e4c29e661e13aac23060972dfa43a9894d52f1938cf2ae7395be21caf33f3507fb4e8ee639c3ffee3c2a5ae5c3e9106a64184d09090 SHA512 8628c0aa015983329502b2b71ea4325990b562feeaf2f8e62c7f6e015508380229f908dd8c6014be542af371557dc63008ef030e2c037e633701a4837146a6cb
-EBUILD redcloth-4.3.2-r4.ebuild 1383 BLAKE2B aeb9a8c79a19aca2a7010c627eb24425fdc98847e47d12857136f9699f8c43e5d6ffd3916181116ae500d6f05ca651022fde0ae2b6c0f43f9e3810f789e7780d SHA512 5e3391cda15fcd80517bfaa4434f5333921295566ca150ed3ce2583ae3aeefb2a9c2f61964e04f83a27da488c7447333fb1b1d1db19ad45a8b38c4dcf5aadfca
+EBUILD redcloth-4.3.2-r4.ebuild 1377 BLAKE2B c55b6efb03a6fa8b32e6b3e96fa1c0fae21bf163cd35874c0f8e1c1a4921728a4a5dfd61ffa44b38a98448b143634892499608b0db9c4ee23eaa09e21806a72c SHA512 b8530e2feee76ec62fe1782f2dc4f9e73667831ad37c5d30f18e5d70a43ba5edf27943da32eb367f30321494c4d382a2fffbc22852e9a133f425da9dcfd908ef
 MISC metadata.xml 343 BLAKE2B bc8d08f10a63e9472843d4dacf05c70f08fdf9587b6811e062360185ad66f9d144f0f871369f6a4f049a51a292965b902a3ba346e649671a4a283cf93fbbaa7e SHA512 89848472f2bf75c4286766d4aa62799db98fc22aa2be9cd2c05453e0e6c1868fe61c46b7bc0e83ab97ec85f959826699eef36215c4fcd6186e70ee975ec878ac
diff --git a/dev-ruby/redcloth/redcloth-4.3.2-r4.ebuild b/dev-ruby/redcloth/redcloth-4.3.2-r4.ebuild
index e0439e6d1669..a08d0c686666 100644
--- a/dev-ruby/redcloth/redcloth-4.3.2-r4.ebuild
+++ b/dev-ruby/redcloth/redcloth-4.3.2-r4.ebuild
@@ -30,7 +30,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/redcloth/archive/v${PV}.tar.gz -> ${R
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 9be2fda8ab40..516f71360858 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -6,6 +6,6 @@ DIST regexp_parser-2.5.0.tar.gz 94251 BLAKE2B 203dcef35f36dec5abd737f56aeb826d10
 EBUILD regexp_parser-0.5.0.ebuild 878 BLAKE2B 065940af48ce7c93836019f0a9325e04db4e0ff31f0e9af6a13a637e86ced811bb38cd9c70b971e244df857e1d40b2ed2049fc0321a82141c43478822cac8b04 SHA512 c91492b8ea59137258d941e79659f1f511621c0d7da8af6e6c13aefa39f5473c2881e0893b68a56b428ce8da9a135e20371e4d5e0c6d5fc6996e6a77af5c22e6
 EBUILD regexp_parser-1.8.2.ebuild 888 BLAKE2B 5908b7be2be373462cd50b9445e1b111490dc0291dd4b050c2e0015ab6c77ee845b5b8dc0e34c4b223737e983a259dfa46a5c43cc0b10f825f8bb170e5e3168b SHA512 6ae591ed9ffa40bb8440cd05cec581a9a5126a2fe85768a0805d2c2e5b152aef482426a18836d2076e5cef313ce96484c686ab982ddaeb7f2a6f038ff55498d5
 EBUILD regexp_parser-2.3.1.ebuild 946 BLAKE2B 1c488c5a84b6d816c9a57bcfdf9e20e6cc8ddb95092abdd41580972aacae2f527776454af6ff11e24e5677b495dea2f736d249d347bd87487563c86aed28e4e7 SHA512 5f96b5ff1110a0c24b2d989888b268cbe5e205cc455b4a53ed54eaef8969898bced8c393e602b0e329945f48f8454ea4a34d6ba9da201a1b62eb5e662c6c3af6
-EBUILD regexp_parser-2.4.0.ebuild 947 BLAKE2B 97e9f9bd11427029254af7882489c65f49bc70bc916d36d06b1c1cb5d0e9563478b55f4a5f84cb651d949b1f411b2f4d177b2547d5e0b248bef204eb7fe1c81a SHA512 c5f08700a0dc3f3861a607a7e5a66f3a4263c768c785be8d55be2dd6ff38a8a319b825fa8b6ad0cbc615e46024a0b940e3f8bd2f93eabfbf86483638d6613996
+EBUILD regexp_parser-2.4.0.ebuild 946 BLAKE2B 1c488c5a84b6d816c9a57bcfdf9e20e6cc8ddb95092abdd41580972aacae2f527776454af6ff11e24e5677b495dea2f736d249d347bd87487563c86aed28e4e7 SHA512 5f96b5ff1110a0c24b2d989888b268cbe5e205cc455b4a53ed54eaef8969898bced8c393e602b0e329945f48f8454ea4a34d6ba9da201a1b62eb5e662c6c3af6
 EBUILD regexp_parser-2.5.0.ebuild 947 BLAKE2B 97e9f9bd11427029254af7882489c65f49bc70bc916d36d06b1c1cb5d0e9563478b55f4a5f84cb651d949b1f411b2f4d177b2547d5e0b248bef204eb7fe1c81a SHA512 c5f08700a0dc3f3861a607a7e5a66f3a4263c768c785be8d55be2dd6ff38a8a319b825fa8b6ad0cbc615e46024a0b940e3f8bd2f93eabfbf86483638d6613996
 MISC metadata.xml 346 BLAKE2B 91c8aefa1a1d1f9f8b70a36b65524b8e9bc41fb22d7e411e1501d74dde8abdf1fec981340832046edce885ee296cf1beea48fa57678bb5af2c39f957670a5f82 SHA512 15b3c9a8a7fdbbd2f782308687f6551cb626732c0858c2cc88640b8ac2246e453667dfe6e12ff3547c2d7e267304cfdf70fe913ade8d802c321a3df12b699a6a
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.4.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.4.0.ebuild
index 6f59b303702a..d7fdf1615b58 100644
--- a/dev-ruby/regexp_parser/regexp_parser-2.4.0.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-2.4.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/robots/Manifest b/dev-ruby/robots/Manifest
index a76aeb758c73..4650fe048feb 100644
--- a/dev-ruby/robots/Manifest
+++ b/dev-ruby/robots/Manifest
@@ -1,4 +1,3 @@
 DIST robots-0.10.1.gem 10752 BLAKE2B 02c2ab5d6dcf5f861a4f290a0eac59f69083928183f79692de19e4909bb0bbfbedf718a083732b7ad5882192dca6be26c0272cac87117c61a74c53ea2b25c851 SHA512 57d5619e172961128c7e2f4175f299ecde28615680dc9fa2721ab86053515da46cae03b03dbdbf9a03a96387a361eefb013a7b3c3b3e61a26592ec4998d10bc5
-EBUILD robots-0.10.1-r2.ebuild 457 BLAKE2B 65d70c72a746e6f3e65731954a50f306d39404b096eda5bbdc6587510e74602d2d044321bc9cd2a2ce0ad7bdbb17c9d82b80c4ddf099bc3bf9d6eea0cecf1f78 SHA512 af96b8a1b568b697a60c521affc711685d3d51f88c8fc8a980a961fd1af0a5ca60f2ada7eb0a03aebbe1c834d73ef6ec24fff3427210b8e4ed3c7353047b2724
 EBUILD robots-0.10.1-r3.ebuild 457 BLAKE2B 15146ea7b6c1efe589089fd80b030920b5b78add1b7bbc9354bb547657db862e54dcc37f361055e620c74ae5755c2faa6c3bd3668ff3cd203ead8440fadda489 SHA512 0f838ea3d14f2b3ca7b28544ca6834bd6d3f290b1c7d582bc0dabe72e20eb761401ae8b2d097069649295f83581d52acfb1d0abb7ee1dad696dca093d2fddde8
 MISC metadata.xml 433 BLAKE2B a8dbc3425875ab7b8068868b6cc1a2980c2e559ce7507dc9ab4d2fcf3f46beea0b325d0d0236f24f353019ea0fe60a24b44ebded7e1191ce53d9ba58e27014fb SHA512 4d86e71802ed857575b4de6e043fbff1ee46f4ca08fb9c1d11ac410c59f0e1ad10f7533b6748433f243a7d1d06181de2c3a592f6f76b1acd0a046182c46bac69
diff --git a/dev-ruby/robots/robots-0.10.1-r2.ebuild b/dev-ruby/robots/robots-0.10.1-r2.ebuild
deleted file mode 100644
index 93a59b26eccf..000000000000
--- a/dev-ruby/robots/robots-0.10.1-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple Ruby library to parse robots.txt"
-HOMEPAGE="https://rubygems.org/gems/robots"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's:rake/rdoctask:rdoc/task:' Rakefile || die
-}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 4502449dc960..63a7ce488fec 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -2,10 +2,8 @@ DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab6
 DIST rspec-core-3.10.1-git.tgz 398302 BLAKE2B 3ecd2a93b77435ef44dd7e52e2987155f71de3b04376dfbfc9c831ce075b4105f6a23a210f8508784b66c46f1126c188a3bd0548cc4f24060373b9c7e0b79101 SHA512 2d134e742e36cfaac0a52fa7ebd949391cfe58419956536a65fa3aefa2c7f3638fe19f7324ca3e0d2642cc5a9d33de11b09bd571844f1cfae9c077e5f27563d5
 DIST rspec-core-3.10.2-git.tgz 400299 BLAKE2B 82fe8689022f69f444549d654cd4799f8f1dff7c984016eba0835cffb518dce892a0af61a3ef6b251c598aa3caac66b0498620dc8d2b06a02795fc6ff3f46c41 SHA512 0ebeea8aed275f08bcac4846977b0718f85d95dedaed82b99280e5b52519713be6234d97b34b61a56e3276e767f47a13e6888401bd5a4b8a0003c9bbb518364d
 DIST rspec-core-3.11.0-git.tgz 403154 BLAKE2B 1a5043bd2120236e8e3ca931c1fd9562bc78d692674d3133ac3742ef7b7f81161a7fc550f4d11bf34575a85a8657aeb39fcc0fdccaab67cc189cc1d39a303ade SHA512 6121b805f6feade244fe13e273526e64c5a3c74a1f9d4316c895279f4ed8576dbe3189b06040f3f29fe7d3e90f862f2c78aacb0b4bef989660eae30d046ed69c
-DIST rspec-core-3.9.3-git.tgz 396080 BLAKE2B ea52a33586dc32af49a72950c7dbf24eef52a74891b2d7004ec4c5083e2e6d63c602f5033fba3a8ec1dfe6e8da349208b468a79b4e16aa5150d2fc8e93055c0e SHA512 f821ae3017c0fd9ac7f3ced0e81d0ebc54f2c17261f426c58a46c0bf1debb20efca7acc4b751b671e160de72ce5790f897bcb55d5d276fab228a4ea8d388a046
 EBUILD rspec-core-2.99.2-r2.ebuild 5114 BLAKE2B 5d08c6141e2a07a076c4fbbd87b27d678ae5188b79019577030457834a785be04a3b78b8a0f010ee01ab10e362f28e5371c5854c8d5e7fb71a502fc8281a9417 SHA512 9df8b0b1d841904915d93d6b225ab320638772736605a8b034130fac1cf64b075832024ee2bb354c6539e92e10d3d11ab8012b897e2f598de48e8d58040c232b
 EBUILD rspec-core-3.10.1.ebuild 3129 BLAKE2B 97a103f3a9db0325d58c51eac48056afb0bd50447821bae73611d3bf6de377edf14c5a3df6820fc66480dc1196cf3fbebed543ba17c122c48bc6a03d754e4ee0 SHA512 67adc087c6d1d571ab8b71821e2544bc747259c8bb281073a15c821dac4c80b9d6e3f10cb26ee77198db56f72143a7e187a920d0363170f88ea4628ee4cd9286
 EBUILD rspec-core-3.10.2.ebuild 3136 BLAKE2B 6c6f1e4eae24381752ac4760912700a895ed9567e15dbba09d8b616b8eda98cd1db49849a7ce7fb889f76a5f6a6f7e1e1491bcbe6f4bb9c59d12f3cc0ea6d53f SHA512 94c1453a68ba13e4c3bba8f445129ca87046ce3e922a9e1d4b78070e5a4935cb634b8f302975a4fd52abfd35eaf2a38ad101b4f03e5898c9a830d7535b0f08c6
 EBUILD rspec-core-3.11.0.ebuild 3143 BLAKE2B f4206093e7fbb90ea1cbb4d4d1022714b78f50e0272ad08707348a21f42e28486b1864fbbbf482530eee7b482ed2d0e1a7b4c6554151162bb16a5ce26149c0a6 SHA512 b69c76f107ac9fa648fc94191e5ecb33bfc7dc5e9e264df6abd0ca63fce2b4fdd09fc0d777e003184b7c1c29ca0c432c0fee3bfff06dd99f33604012954770c7
-EBUILD rspec-core-3.9.3.ebuild 3122 BLAKE2B c8dcd45114eeb2f4acf1aea3934f9daa173ff57899cb234586f7e720508953d960bbc5d8bee29695140f4177660f0ab4081639a5b274d747b7b0f6b4a7530053 SHA512 6050a529b3c922a832403288731ac2b4ded5719693d735e5e6650c62b3a7a8a22a3091d2f66376b23a51538c2c36a61f7b638a0f5f6c701a58e4ac071a8eb076
 MISC metadata.xml 466 BLAKE2B 008536967fd0a54923be3f70885dce7b04ca3746699dec4bd0f2ef56a41997c0e44cebd553d4c899fd815c587eb1f5338d86033d1d3e96289aaffdf9a9fcde06 SHA512 9a1f175cffe5136506e4d3b185a7bb974dd3de45683beda00267d47339472ebf8fc1cbbb37ef6012f14cb3b0535e386d98e3bfb7a955f9ee20484cd2ad9013c5
diff --git a/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild b/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
deleted file mode 100644
index 08da7b72ca8b..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	highlight? ( >=dev-ruby/coderay-1.1.1 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.1.1
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.8.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-		>=dev-ruby/rspec-support-3.9.1:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/support/aruba_support.rb || die
-	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
-	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
-	# dependencies, bug 662328
-	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
-
-	# Avoid a spec depending on specifics on local networks
-	# This fails when localhost resolves to ::1 which may be a
-	# ruby regression in the drb/acl code.
-	rm -f spec/rspec/core/bisect/server_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 8a1b3d973de9..df8a55f33d5b 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -2,10 +2,8 @@ DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc
 DIST rspec-expectations-3.10.1-git.tgz 212281 BLAKE2B a1872a7f71c198db1662eca48bcb34c054f05c16193395962cb47a7fa230c2f0f83bedee302a0ab6a81380a361640177ac3370d8829faa6bd362c07e3a551e5e SHA512 35999542bf70ff04a472e50434abb8815cac8bf10b680da458f5e0e6ee290a1a6356a22cc12f0a8a6310cf282bb6cd99f922fcc63a0cf1e252b167e451bcf7d4
 DIST rspec-expectations-3.10.2-git.tgz 213253 BLAKE2B 51c306d34dfd82d551b8390bed9790748f8f62b9f4b5243399486640d04465dc0c33756f7a575e98c8e61310cf6c25b93b4c1102fc1798814d916defb0ad310e SHA512 819f1b9e881a56d5563c9421e3e897726931c3cb27be5554e35f41077656e426cbac1ddced6a6e61ba21faa7c147c239433ddb9d21ae2e88592d91b286c170a7
 DIST rspec-expectations-3.11.0-git.tgz 214878 BLAKE2B f830a0a31fb0e7cd6639e711e4daa9faa98e514b6a1dd864c383259d199dc617c6c7ff45dc65f37cf53d3c4581c6ecb9148e42b77f3c37541d8985714d62af23 SHA512 209eabafe92db3de1a78524d98facda16b3f5fef11f8f0c8c74bc6fc68529c8d9a835a8196e84b8b8bdf828d548d4b00bb1acdd607cab14dad7874f55a42b0c6
-DIST rspec-expectations-3.9.4-git.tgz 206297 BLAKE2B c5dbebcf7b411c9cb5cd815dc06fb6f455e82181856661110f803b25f3910975f0676f3cf154e93fe771849363593e104e0f2dd298dfd3d8b1dd96a6ff991547 SHA512 bd025b89751b5b8d3c6bd61a90386fc05ca371e04247d93b29334bbb3eceb84bacea3f3846c20f08dbf53f174992b2dc0fe9f2bc449c4591188b5e428b1d8003
 EBUILD rspec-expectations-2.99.2.ebuild 1638 BLAKE2B a15ce1cfc2d48f2820daad095ca70e8969245eb04cbd69e1ab89a2482dcd53bb1968618396ae9ae3e7eb1ab6c8ea7aab663c4a91ccac49ea9cd7e28d6357cd3d SHA512 cc77361f64c0caa032c4ff553412f30994d8922623c5608e9cee4a682e8b08ee4d791b4738f716bd81ac567d98699791a779d138888eb3934c8dfdbabeb49984
 EBUILD rspec-expectations-3.10.1.ebuild 1311 BLAKE2B 9dfb52e62ff11b037678e39e986602c9a9d9982b1f230f126d060e5d4fd53a77e942d8c63f7a466fdabf3d2a66fcbbe21a75609643d0874b7712efa5d46df7b3 SHA512 3f82f0e97cb560ebc7d5df647dcef05ef70126f108da01dbe2d6b47bc1a54dbd19d503e9670883f28a7ff51488a69abee0eba2001223bd4e46a2c29216c87afc
 EBUILD rspec-expectations-3.10.2.ebuild 1318 BLAKE2B 728632075a61aae02e2b7457e48af0acd9eb2cd4160e211cf2b612d7b12619856f024d9c177360f700d4fcb32f1ae569b49e71531c778537ea5cc08146086747 SHA512 d46ff515a45bf7f501383296d8191d7ba07b149dfc2a10209ef9161ca79f1ad57577603fffb907779b1073b6c8f5a24a1cec5dbf13f225b7736172eba1c20a22
 EBUILD rspec-expectations-3.11.0.ebuild 1325 BLAKE2B 3ca7f8d244ab7207be1b5ed91a9b05f0efb2c2fa28eee1a3e6acb1043d577214cb647716e0cfe69ec6330c133e3ce10150402164a654b6eff97a095ace891787 SHA512 3e76740a1be944ca8fb28e1b55da0eba1b35c2d0adf45f2c215b0a7458548e49c0fff445a9e9b9899d47a1bf2240f38aa0c4dcba741e53cd5ac75251017be3db
-EBUILD rspec-expectations-3.9.4.ebuild 1296 BLAKE2B 17662e721fd6dedf56a32fe1d93828a0585dea6e8e43a546f552ef8dc173f3db2bc42492c82d25c263dae964f1af6436147f53cf0a9b1518ecb82ed41edaf9f2 SHA512 847676fecf6abcaee6801ecd477cc86fac1de5c5bf98c2af411200ae5005dc5598a2ee2e1de8679f0e7a9d420be97360421557cc40afa9f1734d0ce69cfd5dcc
 MISC metadata.xml 351 BLAKE2B d819679f0a74e7885241c77f001e1522143ea052a1cd511d128c3321aa96d6060b98ef11c615165f631d4081f5757c7ed463de58f44acb6187d026ce86a2042c SHA512 1f43d7394a1fc32d2aae92b66a513af0572ee1ed4bed3d391b4774df97919113ec9ec9d0da68e26f1c5558d877e1c8fef01aca6b92ce6b70bc3b256ad70dade0
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild
deleted file mode 100644
index a075d100db38..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-expectations"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
-	=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-mocks-3.2.0:3
-		>=dev-ruby/rspec-support-3.5.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm -f Gemfile || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-}
diff --git a/dev-ruby/rspec-json_expectations/Manifest b/dev-ruby/rspec-json_expectations/Manifest
index 28429df2c10a..a2bcdc56b920 100644
--- a/dev-ruby/rspec-json_expectations/Manifest
+++ b/dev-ruby/rspec-json_expectations/Manifest
@@ -1,4 +1,3 @@
 DIST rspec-json_expectations-2.2.0.gem 14848 BLAKE2B c2f77e908eb0f473a5bae0ed49e133ebe71d4c471e2b32a9620f84e3881ca6aa92d188b8aafae8d92ee9111edcf2cc3636598c59e9f92747422f3c43c7e14563 SHA512 90da15c4c02404ac518955d65612fc7db28e8f91a756e5a25d0e5667026113f7a1be69cdc9bc656eeb89ccc7cb41069dd241401a2680f69528fb77d5491f2a83
 EBUILD rspec-json_expectations-2.2.0-r1.ebuild 557 BLAKE2B 9523958d403914e01be4d16b71c1fe6510c00ecc8e89d3013fc59c89738f9e8af40ea34cf0d5316b2d38aadebc12af6e3db43c2afd6b42483ef60e175a634ed4 SHA512 a71455e077ee995b0e2c7a12ad0c0fe6b02176f76046175b94aa053e0d918d8e5ec3aee73f1300de321f29d40a1f8f1cf20372b0312e058366ea30078eddad12
-EBUILD rspec-json_expectations-2.2.0.ebuild 596 BLAKE2B 0f6120caf03cd9aefa0533f51537b7307526d452d16b9649fe7c4aee8412adf37db47e9d33eb1f3129bd37e88af01497c5cb16f3520e4a99fe104d380e3e889b SHA512 e9e17f91999a434744a7e9bf5971d2fab915da47cd5e6a2eda4afdf90367a39b281c3123e5a5c05f3f33ae119410696e290534e45ee49d381cd3c2dad1dd0ad7
 MISC metadata.xml 360 BLAKE2B 6c326af43c46464fe6a9bf5e5511ddbc3feabee9e53f829d4d689fb3b9984197c6827930cef434300fdb60f48eedf2273419b33ae888f048e2451937529ed57e SHA512 5d84579fcc4d87aa6f52d2f64ec075006608c783a6c074cc21539d14f4a15abb55b1dd3619a7e0639dcdc63a723e89d1b3868da0ab849529eb9ae92b14ea4a46
diff --git a/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0.ebuild b/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0.ebuild
deleted file mode 100644
index 85d7523db3fd..000000000000
--- a/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Set of matchers and helpers to allow you test your APIs responses"
-HOMEPAGE="https://github.com/waterlink/rspec-json_expectations"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rspec dev-util/cucumber )"
-
-each_ruby_test() {
-	${RUBY} -S cucumber --format progress features || die
-}
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 4ce9ea01b6a5..ffe7ff37d5bc 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -3,11 +3,9 @@ DIST rspec-mocks-3.10.2-git.tgz 196040 BLAKE2B 8e975dc8480d4709f650ff27c51710471
 DIST rspec-mocks-3.10.3-git.tgz 196996 BLAKE2B 22759a11cefbaccfef52b2a1a37131d3d0b6eb5eb20d042172cf30e14816112bce729c2648c0b22a6506f9959fd336024710e18882bbe42f42144f0bd43e1281 SHA512 b116094873f682f14cb38a5dd7c0aa8fffac868ca28f7302bbc655bfb0c0ff64afe345b71b797d01028d9fbdad97df5ecf8398a82fc0a7252f2b47a963dbeac0
 DIST rspec-mocks-3.11.0-git.tgz 198287 BLAKE2B 74b4abec79dc601fe734e0f657b239c2435b679d5624fad1fa9318eb4822be6d3899778af656913d3a89fd51a8334019aae51e45f10ab01b57655299187fb088 SHA512 7edf3a948a56b4f2c17f34ec2a00bf7289310f40a1561fd12dacdc27f0769dfb1f42632dd07c82831e27d21208499a2feac22ce92fdf6e450acbce38543a3b71
 DIST rspec-mocks-3.11.1-git.tgz 198650 BLAKE2B bdf06f0614bb7b6c4eb6a0ff0af84d4f6ce8f456aad7c1b4324544d9750ee2e8c8a156d2181915f49afb62ba2be946c349cbd7ecc29caecb1c688ba6e47dc241 SHA512 c0095c615ba9e64f4dc9f2d5cb2a495f4e0b094b25eaf49c0d6a78bd4ab201f534a061243fbe63e86b64548c6c942d405dc36627057742135ce3e22e7561b4e9
-DIST rspec-mocks-3.9.1-git.tgz 192772 BLAKE2B abcc8fc82648993e6a407a8c4ac4f5b146b821e1e842c1dd2b95824d8468aac0ea796438d77e376c897675f66bd2bc9024da8fa5ccaf60139ea296b388d542cd SHA512 f804783fca4cf2258e83f82515cd5881ceae0bdd3aedb452a1db901e01de5dbca1d2bdef0ac0828a4bd23a1de58d127a42150c8c204219bca39ea7072619098f
 EBUILD rspec-mocks-2.99.2-r1.ebuild 1623 BLAKE2B fd1169cf4a9bdab0faac65b0cd738c31dfaeb59c5925eabd2999cf0a0c7cbf60033c9109414dd6504ff6e29c85bfe6a6fc41001ced2e5cd4eccfcedca86943a5 SHA512 5c4e6639691f811cb0b3658c1d6d0ebfc546ed486868e37dfa808c8a86041d1b0fd66f877505cc8ccee7129d9c0e586f63671391caec55f0b148e51ac4f7d5fd
 EBUILD rspec-mocks-3.10.2.ebuild 1442 BLAKE2B fec61c4afdf328f06e2c2a9d7e0f3644836376b9925dbf27a55e959956f9c049343a56e95e3272cf9d062d86d2914998309d6cd51a6f6db1b86352d90cd5adc8 SHA512 11f1f35d5b2d59292a42ad277b3676c5c34bfaa72e22bf5705150eeff1d94fc3688e5f9daaf2b11e327767d481102f1a1890329562c0a6e78bbae0146e9ed3e7
 EBUILD rspec-mocks-3.10.3.ebuild 1442 BLAKE2B c980f6995e1c6e16b8c7ad463dc2a29ac19a2d9a0deae49a625d430f332ef3b1a49bf09cec4b46d80bb0a2f01abdfce478858f96731e5e771cc7430a025b83ea SHA512 a34266c160e0953251bac75dcf8ff18b19d2c42a49ab8844dea7033b22120563b29efe870755b1c2e8e4f099018c45011f77e2626775c8a1b1ee60d8351f1081
 EBUILD rspec-mocks-3.11.0.ebuild 1451 BLAKE2B 568141913af25f622e510c7287bc1ba6c16f4b119c231d6b3988abb9485ce0cf52f058219314effa3540f7cb78c212d0a87c5a8cdbc9157503cd91ab34788263 SHA512 fbc0a4d2a0d8d125506f32408b99c882ecc1849733a1c957af16b36e4e0c5bd5c0735bdf8e27bc04d6aa6f952eff70cc2767f7bea4d1ceaf2c1b15b53518c904
 EBUILD rspec-mocks-3.11.1.ebuild 1458 BLAKE2B 56d68d0f345b15d6ae06307d4d0261d259324ebbb79969afcd9e62975c3870bee3dc3d002a2917eb83ee7fc919bd413a406f9d17640da699cf8449f5794a8860 SHA512 dbe45a2f9757daf37f4953538be42840b16e4cea3403b4dde79541a560a5144e31dd0c6c60669a33b723a077a9c4fd5251cc148a9d5190c950fa1479f2a1d315
-EBUILD rspec-mocks-3.9.1.ebuild 1435 BLAKE2B 82814e4352a4fad72c57ff163fcfc10ef08ac94b3048b3b96fa5c5a42e0d2612a8328365b5aa8002e8ef97c3fdc85d592eb9faf6c2d90a3b0a4b0c7c2f11479c SHA512 a5b411e0173fa229e6e754335911807c10768311508d8a2f8c0decff12c422cc6185290c9d2a5b9e94c9b510c8e739ae7a6e6c5957bcf9d1becbf0c56beaa90c
 MISC metadata.xml 344 BLAKE2B 5b939c668a8c75c33348bff9e8a0fa6042702fb59cdfdc2c8b45db1d9d191950a63d6f9b1329e6a2717a097d7b001afecb9ebbd0fa08badaf95664d37b06eb17 SHA512 026e9a293c2f99d86a11f37267fddcf54dbdc33aec00f470a988d477d6e3198ccc478c03cca059be0a4e324b9f256719c99c7c81af97c75fd7cebab433d4b1a1
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.9.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.9.1.ebuild
deleted file mode 100644
index cbb2f5de921f..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.9.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
-	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.3.0:3
-		>=dev-ruby/rspec-expectations-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-
-	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index be266d6f307a..8f8772683d59 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,9 +1,7 @@
 DIST rspec-support-3.10.2-git.tgz 74812 BLAKE2B e6c7e768d0df05fa5e77055efcc69699192928a35029264300faccf500b1ce7367e74e9c2ae0f7f8f0a5e755692ac83b982d0a3dab3da3ab697ad2c5766aa30d SHA512 bd1fb5d737dfdbb7399d766854f0b173dad89675bac580cf65c5d42ab6cd04ad1773e7cfa875dfa4c6fac14f4ccbd6b48813bae5de26c931c804962d29b014be
 DIST rspec-support-3.10.3-git.tgz 75447 BLAKE2B d3eae3b148ef56d6a8668ad4c92ce52ea066c82442448446cbdc6d37137c6fa32bf54e5f579d4a39525305fdd795feee792dac29234c568ab85d59d684af4b84 SHA512 21d7f3076e11467ef6c5b7ce23d5a8635320ca21f61f0d640e45c4e7855995a672fe400fc11f7dbea37097f6eefe09f24d3b177c86e75b2454a97c898f9a1cdf
 DIST rspec-support-3.11.0-git.tgz 75644 BLAKE2B 349df9b326e98fd3564ae22c8659c95205d5e623f0e67721cdb3dd658bdbee5ec574f4286d9548984567079178997c6e9b419211c7c3da601dd02ad3aa0d448f SHA512 38bd7c132b6dea3036c8c18e6c535c2dfb5faa0601fb13eb406c8bb279e42e460cecb823527b04a22966f0e965eda6b539e48cbac20c663ae3a17c01f4fbd0e0
-DIST rspec-support-3.9.4-git.tgz 72490 BLAKE2B 03c3ba8316a2c6a79faf68db87adf193b684b82119dd9c5b67f2954f3ce72cf03e3e16898e2f5d57d76aef37bb8fb08ab8dacf8aaef6d1445a8257e2be14afe5 SHA512 95be2e03c37117d6bc132ce466779a8ac3c4fedadfb2a6dabb1fa11601aae908e341c87436dd526bbc8b02040b23200c95bd113d0475405afdb4acd099c67403
 EBUILD rspec-support-3.10.2.ebuild 1765 BLAKE2B fcde701c0554886322c31ddf8b8b84e6007e8bfe8a601facabed603ae36247193ed5dc5d9db16246bc2692f5d670a0945db08f8ce16bf8dcd7bec377d0556298 SHA512 e5f98158b36e72bbe08ac8b8ac56030776e0aa6331751b9fca32a75b03809eb4f4ecc1914d642d3f859f5285c12ae33a4c329304b0569042436fcdd0303090d7
 EBUILD rspec-support-3.10.3.ebuild 1765 BLAKE2B 7890f1d241eece860ba86de1d889539a8917aa8065b44e6caf83cfaad782da16ee7970db4575b023a333caf72fcf86a1ffaf89e10a607209a8b713530b00536b SHA512 746a264e2774ebde5fab2903db7b7f78e7154ec76899e1fa774640efbc800d92bd7f978db1c2d0bcb822d9c301cdcd7dc7dee873ed847d58cc5ae751e47395be
 EBUILD rspec-support-3.11.0.ebuild 2131 BLAKE2B e7a389de27cd9918d1d9ab0185f4f563bcba6907657e91293bfaef46893c522f46a198ab08c249789f8c02e7104c60c218e2ae84d37c162c240ec8f98c286fc6 SHA512 86a8a690d41c668476d5a6def290f48fca72418d310e5b0c9ba099b6effebecde94a13bf27344a4c0b88d6f94938694651eedd061f5a96cfffe2153bd8f1e924
-EBUILD rspec-support-3.9.4.ebuild 1751 BLAKE2B a68477e2a7e7deb6af3b4d4ff1a31cb3810b1e545ccdb309f73b9665527f14952caf2471b4f04da4174da930c25da66a348c804c80b214ce0a889f93d87fdc54 SHA512 ef906eb462681dfc4d95458228a9f796af4ccf59cba157392492601382a4eefe629bccee1f7d6359c877c159de40e31ca604395973f08cf700843b7604ae15b2
 MISC metadata.xml 346 BLAKE2B 74d62cfe1930a3bfaad9b1b14ce55b0de81a0963f1e4e5ba0f104ea51adac0ba86c7cbc38831630029a8e487623df0d279028b5d1b2391eb2bdf060582c80be4 SHA512 60c7dd2d3d9d103b3c0e505d62975571eab89bdbc92203c2bff8cd9b854dda3020490f9592464760798b8e5d973ab3be7b142dca2d03583b822fb0a83761a225
diff --git a/dev-ruby/rspec-support/rspec-support-3.9.4.ebuild b/dev-ruby/rspec-support/rspec-support-3.9.4.ebuild
deleted file mode 100644
index 0bcf347fe79f..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.9.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-support"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove spec that, by following symlinks, tries to scan pretty much
-	# the whole filesystem.
-	rm spec/rspec/support/caller_filter_spec.rb || die
-
-	# Avoid spec that requires a dependency on git
-	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
-
-	# Avoid a spec requiring a specific locale
-	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
-
-	# Avoid a brittle spec depending on ruby implementation details
-	# should be fixed upstream in next version
-	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Use the ruby version being tested
-	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib ${RUBY} -S rspec spec || die
-}
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 66fbc515ceb3..dba224133138 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -1,9 +1,7 @@
 DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a6703998885418460b2c0bb59574ef144c416518099a77905ca7676852903804169d1bafc2cf8b3f79654b669c43762 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8
 DIST rspec-3.10.0.gem 10752 BLAKE2B e0af9c31a5263b0656341be7432e1597afa56af9bfc5e6d21f1daa7553e5bd3daf2b383a7e1a5b6f761a5880540020e7accd8d4eb6cca6e57d616dcc41690970 SHA512 dd1a3a1c7c73ae9c053e071d7851780d8cf61e92ddba24072b9f2c00a342ed08c81090332ba2eaf7ab96adac3fc723685996195e5cc584e15de57ff02a4455ec
 DIST rspec-3.11.0.gem 10752 BLAKE2B 24941576037669a53373d263bda99c7c98e295f5d616c08964d95dd3b0697d64c5399ed554d15705c1ea3f11c8bed667de00e0aef28d6cd1fd119057ece5f626 SHA512 233f80500446066a61a50d8e3f8a602316071beaa82e95776390684f7d58fa0acf8807386bee7d08b21f5481933e031b968fd752cf97efa74ba6cd411a8d1395
-DIST rspec-3.9.0.gem 10752 BLAKE2B 212cebbae9e71b8a090757ec4b9902f20043eaf95b079a409247990e1fca4236e13d0e9a3bd9b9eacfbc2d2aaab19583452dbe08b298ca69a85e20f0163741c2 SHA512 a7dbb22f01d842a41b54c375d32d94c77a7b964d1ea5b1971e7c228dfd5dbfcfe03c007d687781addb93f819dde8de664dda307c266137fdd0a07dab96f96fad
 EBUILD rspec-2.99.0.ebuild 756 BLAKE2B 9ef59d83c8444553ebd284ccb1f4b380a13da2bd4f264f1c07a2141ae5eb161140209c25f939dc8797095b98bff5f35ab44c29c4d8536fda67164c137fb04df7 SHA512 1440ee45aa7f8e9d6fc9f9794b891a2aa9c6096aabec0ba163046c67096a2fe26295e9baaf971a068f4f1aff9562668c416359ab434394249aa2f8b5021aec73
 EBUILD rspec-3.10.0.ebuild 623 BLAKE2B c7e4ef791b19198ede72a0a35e595ea4cfb6751aa2710490c2750462c0540b4c74c94840af0984a052c359aded136d0139195ab0148929a6235735774515da3d SHA512 74804528284286c96c653189683ca97996e6325789ae0c4d48815c939d98118193868d24a057576ebbff3761902dc1023648f17bc620a62fc9a773235bdcd551
 EBUILD rspec-3.11.0.ebuild 637 BLAKE2B f5899e229e0280ee127a1910cda940b2554107da3bd07485bd1844284c518e15f4e4d2b33e793795bd96f46445ec53a87ac625813375f42ca612f1876b6d50a9 SHA512 1d7ccea55dcef85d425da79b499e6137cbd40d10fed1229d1daab24d7e3886d57e676938059b0eb2d138b3be5c333cabce3e246992712057d39b94001b9e9674
-EBUILD rspec-3.9.0.ebuild 616 BLAKE2B 5ee7420b2f39d491dd42555ffd63047cbfb40d598b39912210b37a09bc0e7f7ba633a2e4f3d53ebdc3e6658bd1fc869cdb08cb85b033bb8d18fb4814439924fc SHA512 6654d32e2f13da07e83513131653defd0717f63563c30e631e68bbb5d2ddb5dc00649b19002d94dfd5071a6af56c0234f595f4b53705929ea61e936cb615c8b0
 MISC metadata.xml 338 BLAKE2B 1e5e8d2aab4bb1d0c8d8826267a9d957cd051b4d9d687f38609d44f78222bcb13f415f7ea46aafb968f005a701b94716e00137d8e5afc55944f618694d9fdf5b SHA512 8230df512530fd14410adcb365feabe3e79b826b047759a2631d234bdc00ba807a790eeb646fba74547aac12c577a0b34cfe4ca1b71c0633728982f0b6d1bd17
diff --git a/dev-ruby/rspec/rspec-3.9.0.ebuild b/dev-ruby/rspec/rspec-3.9.0.ebuild
deleted file mode 100644
index 524c08e7e727..000000000000
--- a/dev-ruby/rspec/rspec-3.9.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-core-${SUBVERSION}*
-	=dev-ruby/rspec-expectations-${SUBVERSION}*
-	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/ruby-ldap/Manifest b/dev-ruby/ruby-ldap/Manifest
index c241f62a0b4a..de26d20c40dd 100644
--- a/dev-ruby/ruby-ldap/Manifest
+++ b/dev-ruby/ruby-ldap/Manifest
@@ -1,4 +1,3 @@
 DIST ruby-ldap-0.9.20.gem 67072 BLAKE2B 626a35ab764dacfb37c727d867e1d435222730a3e7ea745ee4e7ec051ce3a822cc5a1230b463bc12f4a2390db667ed3b61deceb9842c014f64cdf43a26d285f9 SHA512 4f4902e7eaf4fe0cd421d58c73ce4e625d61ee20ef02363d3cf5754c66237e0f378ac433b234c2b86d5f5284ae03b7ae6c46d3575c512487bc1a931d021c9517
-EBUILD ruby-ldap-0.9.20-r2.ebuild 1075 BLAKE2B 0151ea8fa3c3387b200d074667a4494cc2f41780fda788469c750cde96cc895fe249de8c6546df9117339805c1e3e107df99e44ffc57195f61241bf2f92b4d1f SHA512 7fd3c8c95b0657c0e6a22bd27c2a6b53fe4a7f8539084059577a0d8308d9752179ff1b4db3a5a282d1749fbf3e27093e53e942cd275b06a9c9f1f55556b04895
 EBUILD ruby-ldap-0.9.20-r3.ebuild 917 BLAKE2B 77226f8fb5862e45dd30fabeb2ccc2f47c9f1fe78bc6ce9f6dfb183e78c4a1c60586eeda8f1b4573306c7288ad193a005eb210397c62de9dd243fecd96e3244f SHA512 9551cad66f3f0fae3ba3506ae0533291ea56c8fa72e6637d7072d75697b271276b9072a9da142b0624c3cf45708c6a85dedc3603c7289812ebd2dc79f0a34181
 MISC metadata.xml 391 BLAKE2B c7512c86b40f4a8cd418e12633883da21a0ad0d9de73d05307f5f2b0fc2aca31b9835cd709f5f0a52b487cf7197253a3a2b579d38ff44c91ae50d8469ac3716c SHA512 763bd735ebffb233f9a66e77754de2092c868585565a2c0e770f9e8909d0bf7e3bc312658f6d6d0f124e93c45e06ea9bbd864137ad5d7a1e3979f56e24713180
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r2.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r2.ebuild
deleted file mode 100644
index ee6c408713bb..000000000000
--- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit multilib ruby-fakegem
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="ChangeLog FAQ NOTES README TODO"
-
-DESCRIPTION="A Ruby interface to some LDAP libraries"
-HOMEPAGE="https://github.com/bearded/ruby-ldap"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="ssl"
-DEPEND=">=net-nds/openldap-2:=
-	dev-libs/cyrus-sasl
-	ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-# Current test set is interactive due to certificate generation and requires
-# running LDAP daemon
-RESTRICT="test"
-
-each_ruby_configure() {
-	local myconf="--with-openldap2"
-	if ! use ssl ; then
-		myconf="${myconf} --without-libcrypto --without-libssl"
-	fi
-	${RUBY} extconf.rb ${myconf} || die "extconf.rb failed"
-	sed -i -e 's:-Wl,--no-undefined::' \
-		-e "s/^ldflags  = /ldflags = $\(LDFLAGS\) /" Makefile || die
-}
-
-each_ruby_compile() {
-	emake V=1
-	cp ldap$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/ruby-opengl/Manifest b/dev-ruby/ruby-opengl/Manifest
index e5034aacd309..0dc15816d094 100644
--- a/dev-ruby/ruby-opengl/Manifest
+++ b/dev-ruby/ruby-opengl/Manifest
@@ -1,4 +1,4 @@
 DIST opengl-0.10.0.gem 565248 BLAKE2B e427590865e7ff13110d22a21d04a936cbdc7e559e80b37be94938a4b15c71ca6341d72bc093a45ca10e7cf419fe720e7c68866724a3c99ddc44314a4b054414 SHA512 8d85d7f8a25e429b18245a10c186d07a85fdc8dc4e158b0001cde2b6e4bacfe4b09552a3b3fba5e14439d2fdbe000ad23bba89563f58f612f79958283b588dde
-EBUILD ruby-opengl-0.10.0-r1.ebuild 857 BLAKE2B db4d604b11a5461c06a1597164e0536d8f4c53b9286bf4bc55bf6c5ec0294b605afeaa2b5ea67c2f10cbaa9299bc96d2da340ee557572ee64c710cd5a2412127 SHA512 87e834e043ec2d83e1d0796b217c842ef03457004c0499c0c6f65a3de19c6bfb458a46e9c3b29de71386f93c52aa60b33c2507f4be1b19cb6a8ffb39e8022732
+EBUILD ruby-opengl-0.10.0-r1.ebuild 853 BLAKE2B 71de625b6946cbdaa3f038115d27970500348bb3acba04745f80571284230ab963394b26901fdefea3a5105b3eb3b9e94ab374c4034bed738da530f991fa60b6 SHA512 47a066d7ec7e921afb6c58b7327cdf092b3a06612d99740eb34b430f11dfd5299115794c1d56e2653c0e96b94eb49d1e87da1cac9e7716deb4def003bedb9bb5
 EBUILD ruby-opengl-0.10.0.ebuild 965 BLAKE2B 031da0ac40d622e72e5a27b4f68ed507a84758432e9a40939d0142f8cca4d5ce509557e0d2a574c8fde869e4432d5e91915a0d76fdf8a22f526499e0fcb3e05a SHA512 cd3bc1643fc2c5c808d60f0745c990e124f9c10e2989455c51d4642dbcfecede3debfc33e603a091eddfe5ff995fdd84259d2e549c83b8a5e89ab1ead922f223
 MISC metadata.xml 343 BLAKE2B 54945a00cee8667a145873b8deaf5d66c0e66a570474cf633fc2d03a9138080d4c2d37bd5f6fd222b6c0a266670cc6b9fbc82a66f10fa420c282ef595f834ad5 SHA512 4cac2d060e9080a9dfdb1cf2d58d5e37fab395cf43e08601cb4cae9d5e66295cfab373fac3bfa266e821aef98d49697cd09642688fe43503d91e1476c32fe616
diff --git a/dev-ruby/ruby-opengl/ruby-opengl-0.10.0-r1.ebuild b/dev-ruby/ruby-opengl/ruby-opengl-0.10.0-r1.ebuild
index 223e0018ba1a..f8f238fc1a7d 100644
--- a/dev-ruby/ruby-opengl/ruby-opengl-0.10.0-r1.ebuild
+++ b/dev-ruby/ruby-opengl/ruby-opengl-0.10.0-r1.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://github.com/larskanis/opengl"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index 3b30196486c9..08f2e464bbd1 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,7 +1,5 @@
-DIST ruby_parser-3.14.2.gem 466432 BLAKE2B 2694888b5b705733468eaf074f7f059814e2a230d1ec7390ef6b093c717534bfc6648a00240fd07d0f108ee1dcdc9f81b121a0ff0446d4ebf75fa5bf87006fa0 SHA512 65b8977fff322d4ecdbb8da1276d76318f08a13a25d8cf8429ba5ca7097c2b58c03431d60b05eec6cb62be316cf9b1efc753b86e8b67e076fd413d2324bc6655
 DIST ruby_parser-3.18.1.gem 634880 BLAKE2B 046ca70510a62e515873039c3846c6dfe7eda204b10c28d1a2892052ee9662be46c99e8f3474577e1e513bee395a404e05d2bcc133d293ae04e2b8b0accdf95b SHA512 820b7dd75f92daef364db9b691ac7c71e460ad0f7f20491036c659310fd08561ae83f227bb5d82748d3b4a40fbb745c57144d8503a395a30eaba934df47f33bc
 DIST ruby_parser-3.19.1.gem 777728 BLAKE2B 883c945e0b151ec937a710b1092ee72e8796bb77feeb7f483179c6d683b4d706536b97cf0e2dba8910e5a6adc8d519487109098f0270ed1d6345ac323bd8e8d7 SHA512 5f55b8a400cd81af837614122360af92f12f4625b68acf6caf6008ab1be604db55de336626118cb73ae20262d4123539bfd0eb3b57243855e5d487c5017df325
-EBUILD ruby_parser-3.14.2.ebuild 1067 BLAKE2B 75ab55434aef8bf6d53b49948b9050b7cd43f9b1b2f6ec816f28937d17fcdc40742e153b020b03120847f5d6359f251fd9f51ece19ff1f8c6ee7fa75826aeb6e SHA512 f8a847213cc83752ed30bfddccb4d709ce9444591d787901921279a198b4b5c57afbde22527027cb51ac2a13a5c5b50d1731ede3991672b791476aed8636a281
 EBUILD ruby_parser-3.18.1.ebuild 1061 BLAKE2B efe144589f1aab56609601e20777d3436ffe9dfe5e574c5b1633960889337ee5776aca705b45e768649fd48d30306883d1b51394ec7d8382e27664296abc3ec2 SHA512 1b42a3a4ad45cdad9c6ddd8648b794dea7f28f3728b88b00253a99cb0f1b604d66d0447578b3f0c34e3459176448f4299b17288e4e937b16bb27fa6887c595bd
 EBUILD ruby_parser-3.19.1.ebuild 1063 BLAKE2B 65cc88614f4d701e56b77d106a6c1ed9c2fc212c5c9d61fb057444ea8fe36483b1e41526a9b59c22f951a730611fc178c89f807595d5cd977891f52651f571a8 SHA512 df9309ffa9130089f0080895ca2ffbf90820226db6e4b3098c677479047802b699c53b5e903423118805153c423aef5a77edd9c13b681993a25c659fcf535c4e
 MISC metadata.xml 348 BLAKE2B 10262df68f010eaed20fa390ed4feff5d619e168319f6477d9d70ef15a91219af5b4f49f89316c0350f3cedee9a47eb46a67c9837d22ce58ac190c55a747ac21 SHA512 66eb4ff6e49c3249c2a952b39d3738f3c66252203b16cd635aa04d59eed907cfe9c11197a4e104fd8cf0585b9f3d60c639e4ffbe7ddabb211266f60a9e348bdb
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
deleted file mode 100644
index e1478efd9d0c..000000000000
--- a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby parser written in pure ruby"
-HOMEPAGE="https://github.com/seattlerb/ruby_parser"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4"
-
-ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.13.0:4 )"
-
-DEPEND+=" test? ( dev-util/unifdef )"
-
-all_ruby_prepare() {
-	# Remove reference to perforce method that is not in a released
-	# version of hoe-seattlerb.
-	#sed -i -e '/perforce/d' Rakefile || die
-	sed -i -e '/license/d' Rakefile || die
-	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/sprockets/Manifest b/dev-ruby/sprockets/Manifest
index 60c9eb0d6f25..2101a2e9cfd1 100644
--- a/dev-ruby/sprockets/Manifest
+++ b/dev-ruby/sprockets/Manifest
@@ -2,8 +2,10 @@ AUX sprockets-3.7.2-erb-deprecation.patch 1073 BLAKE2B 12821e697afb59cdfc4a05fa6
 AUX sprockets-3.7.2-kwargs.patch 829 BLAKE2B 406a79b455e18464e4f8e1028785f0c4d399430ce2fcbce83ffc4a66274e75f2d6e5fac3bfc49656aee35ebfcae5bbc59ca5770f5ddd961c8c4f0632467069c3 SHA512 1df64a17fae52832459ff2eb0a33e1bb3622d645037b035f5414179e2358c0a7306bdcfd8c7a80f4700d72983987d8febe7e5f0d4fb9875c9d8bf880476206f4
 DIST sprockets-3.7.2-git.tgz 369053 BLAKE2B 3c40de921d82b2f5c71e3ecaa114576293946352415da1195e60cdda6363066a6be05474eb7842ab1122e29fa6c19fd2f7a38fb0a7cf9972de0640eeb29d03f0 SHA512 bc7d79ba696a072644852b7a3a73ce086d297662309deb1d00318ad453f50ac6e494e6489632cb282795de2f334700155cfd21cc80be638dc471a3215422591f
 DIST sprockets-4.0.2-git.tgz 418502 BLAKE2B 0ae8d0e47708967a4208af852f21baf9d00c4216660b081170d7f68631ee1129fb78341e6012664fc519a0f330fac23203e314c1831d7031af50844e6b91c1f0 SHA512 f733b96c78be6466b63999aa7dc900af653a5b35f6482d84c41edf47f22b093231003f8874eee2ab31e2a2cfb7049a8109a314b51a0ef36ba30d5f6e8bd81f66
+DIST sprockets-4.1.0-git.tgz 421796 BLAKE2B 8544f8299a5abe8ef89a47d7849fd54f5a04eb623cacc316c2c4656b291c55879f1519d2f3628921af1eee64e67451a15d50d68d1dd93e84a95a833e76994667 SHA512 af964e614f414886cd737888119449b6d2829a41965ba7ab82806e3887ec6eadacc947a19e34568c5f418da7cf47175bd0cb0f4f402bd6e2db41f684ed0cc8e4
 EBUILD sprockets-3.7.2-r1.ebuild 1682 BLAKE2B 7a7a1851e0b5c7de0c211592bc80bdfff9045fdca7608f268ed682f8653f4b0fcf88ef757d38f7a9ea10e7f2956abe64abf6bb705b1705155fd6a57e9c68f6b3 SHA512 fc014d59ab8d05ec967a562ae35d75a2e37d8f85b45d2c0053c08682608161830318ebf62a892f4359b81bb8618cd77459626adc3a441aa6d45b681cb85fa9bc
 EBUILD sprockets-3.7.2-r2.ebuild 1736 BLAKE2B 12f784b4877082a54e1f52dc43e4e152b3052dfe1f623c2d1bd2b00d73952878222680112aa61e0030f030ed7a31c1ad84165b17e633293a400a35942ccd647a SHA512 bcad6e5fe0a4d5b4e7ac62ecb4e237432303e1d4cf1885ddeaac9fc05caf994853b9c3e49e0e4409dff74bf8487dec3f048fb62f359a9d6f516e4296e3c4ba48
 EBUILD sprockets-3.7.2.ebuild 1664 BLAKE2B 8281c517276e6e2535700784ffce12701b799fe2870b429fbba995155272da13bd97e310487c57636c036601694ddb2c731f95bdd2cc60ce548264593d2650a1 SHA512 e7abb4c060749720a0e1c6052118a2433d564aff59a9dc36c0ec5f61d3dad784186a08921f1637998150e5b4af9396a9d74c868ec42949deee952ae8dd5d3d45
 EBUILD sprockets-4.0.2.ebuild 2073 BLAKE2B 83ca1f1c975ec2f0e84dbdd3b988da08f767ae7773989fc0bed64c75c95e9b8f8dd6ac2f32c53da642b50f1c74bd16d2297e7c9e1622cb33d9e70f1eb872d546 SHA512 934e726b1b3711301bdbe0783d87239965270371b0f80fa910b7483fac24829faf98880b1ef1e205371127e7e629495240f243cba2ee77774cec364063ed5f1f
+EBUILD sprockets-4.1.0.ebuild 2090 BLAKE2B cc6c680b76936346259b71f6d06478dfb242f49a90156f7e9836e4115f27d3c715676d8d8cb93c937f8d0b4d3b1095b75e2d652acb479205671d45d4c0678d2a SHA512 b1892932bdcfd23820bf43bcb269684f89c906fb17883baf27ae4178f8a5d48dbef3abf2685328b3ef156c0613daf30867279dc2c1a068f73e3066b70d87110b
 MISC metadata.xml 342 BLAKE2B 227ac77350fe458144d05c09bef5156a9f7c06154b8aba9902f1611b7f3e22b5409231cfb0a44af0d6f5d87138a0d71eb230d8827773830b508d91848f5a8cb0 SHA512 ee0cc0cfbfed5e9e61386b885714cf26a3ca1e2e94b820859ea1b08f82fe3ab5bf13c5a4764dd2b4ca48d668f22e493d76a39cb48a8d3c784b55b78cbfc02ec3
diff --git a/dev-ruby/sprockets/sprockets-4.1.0.ebuild b/dev-ruby/sprockets/sprockets-4.1.0.ebuild
new file mode 100644
index 000000000000..8af84e6a868d
--- /dev/null
+++ b/dev-ruby/sprockets/sprockets-4.1.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby library for compiling and serving web assets"
+HOMEPAGE="https://github.com/rails/sprockets"
+SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/concurrent-ruby:1
+	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*
+	!<dev-ruby/sprockets-3.7.2-r1:3"
+
+ruby_add_bdepend "test? (
+		dev-ruby/json
+		dev-ruby/rack-test
+		=dev-ruby/coffee-script-2*
+		=dev-ruby/execjs-2*
+		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
+		dev-ruby/sassc
+		dev-ruby/uglifier
+	)"
+
+all_ruby_prepare() {
+	# Avoid tests for template types that we currently don't package:
+	# eco and ejs.
+	sed -i -e '/eco templates/,/end/ s:^:#:' \
+		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
+	sed -i -e '/.ejs/ s:^:#:' -e '/\(es6_asset.js\|traceur.es6\)/ s:^:#:' test/test_asset.rb || die
+	sed -i -e '/compile babel source map/askip' test/test_source_maps.rb || die
+	sed -e '/change jst template namespace/askip' \
+		-e '/find_asset. does not raise an exception/askip' \
+		-e '/es6 asset/askip' \
+		-i test/test_environment.rb || die
+	rm -f test/test_require.rb test/test_{babel,closure,eco,ejs,jsminc,yui}_{compressor,processor}.rb || die
+	# Fails only within Gentoo test environment, not clear why
+	sed -i -e '/extension exporters/a skip' test/test_exporting.rb || die
+	sed -i -e "/bundler/d" Rakefile || die
+}
+
+each_ruby_prepare() {
+	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
+}
+
+each_ruby_test() {
+	# Make sure we have completely separate copies. Hardlinks won't work
+	# for this test suite.
+	cp -R test test-new || die
+	rm -rf test || die
+	mv test-new test || die
+
+	each_fakegem_test
+}
diff --git a/dev-ruby/timers/Manifest b/dev-ruby/timers/Manifest
index 4c9a4fe7250f..9c7655b1c396 100644
--- a/dev-ruby/timers/Manifest
+++ b/dev-ruby/timers/Manifest
@@ -1,3 +1,3 @@
 DIST timers-4.3.3.tar.gz 12928 BLAKE2B af64b44116565a8cb6b68349de6a46e8b67d22508e16e204af104ed7a59cc1db1dae0c36917ccde1932c33e53d9d71fc57cb317570cc24aaee82531ce178f37c SHA512 4a715e4a786f98ec429a250de53cfa67bed6b5a99b6298c21251e6dcf1315f1185d8c45bea01025832046381ebac462cd35415f7573d58c55c30b47c2567d4bf
-EBUILD timers-4.3.3.ebuild 1001 BLAKE2B 998fb2e5c6e74a8dc1ba9b9ef8cf93272108aabc099008a064966b25c13f1319fa337c0dbd5d0730e80f0ea19e58944cb761316eb68c67159f4900dc57bd299c SHA512 8fe886c9bc6034cb9b5eca285b02b50fd40b1677ed8dc8d358f96c9ba8ac62881d5c8c201481ad324dacf8968370bc91182e7d61c7a80e8a2f383dc16cd5fa66
+EBUILD timers-4.3.3.ebuild 1008 BLAKE2B 5c9c9f6021a7132ccaa2a33b7f47d220490ff6073f7506c9b4c0411835ce4acec1f61a683e338674014720f34ebab4d5829d4fb18b69d5a5d1d753ed9a7fe62c SHA512 e5639ca0099c3ceea6f84277130b8b620c074e5153cee4af3f899c19034dd2eec482b9a781f56ed538a6afd4f1e6b1c6ab05e36784324bdc931f45f993cc33bc
 MISC metadata.xml 342 BLAKE2B 1e1df90153ef30ed421b6599df09a7786ca77570922602d7a90105207cd38c4abe7e5f9a332c07411d4656dfbd3e412b3a44f79cd67e16a699c7b0f6d5455390 SHA512 e87c41ec5ef17884e200aed12a2871544939952762ed87023492c35c05e7fbe87d3ae3ec1757d48bf40922cca1c89ccf59040f8e94017b3c97dbc35e69b79ab4
diff --git a/dev-ruby/timers/timers-4.3.3.ebuild b/dev-ruby/timers/timers-4.3.3.ebuild
index 3f05605b7f20..af0b264c02b9 100644
--- a/dev-ruby/timers/timers-4.3.3.ebuild
+++ b/dev-ruby/timers/timers-4.3.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/tarcieri/timers/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/uglifier/Manifest b/dev-ruby/uglifier/Manifest
index e1f8269732d0..9c6ea08758b2 100644
--- a/dev-ruby/uglifier/Manifest
+++ b/dev-ruby/uglifier/Manifest
@@ -1,3 +1,3 @@
 DIST uglifier-4.2.0.tar.gz 201913 BLAKE2B 90390308f116dc82fbf889b603b1ecd118adf9a6f541def408fe3229db02d78f3f7ba790822cc5524870317131260ad7f8c7191a69a9e158a43d9c3822fcc95f SHA512 869194db8fffdb7d243fc5639e0286d73dfa3ca9485efda760a9eb00424e6797f0bf7aa9f6c8f410daac556e01b6a1a1701300bc373eb492ea21d864494f8246
-EBUILD uglifier-4.2.0-r1.ebuild 779 BLAKE2B 481fc5f6e5bb30dc2344c975742777659dad5134ab47cede4da71ce3268416e2b93f798af03b448e93287920ced1e002d116eb20d11e92f5413419e32ac04a0d SHA512 e5e1f328c221893fec9f818a64f3ed4a33b20703be1d4550d639fc0486b2f960d86a220c9571cc7b029ae9ab0725871576db895b62a540350405362d2fb378cb
+EBUILD uglifier-4.2.0-r1.ebuild 786 BLAKE2B 0ef2c60aa17b1e7891295576a521b726e0282cceb6828dffc96aa1b55efa93697c0b015639fde82ddbbdc17edca3f13615e22fe69493509e56594de4c6352788 SHA512 8ffec65fd8f80c5511659c4fd6b8d7a32e594e96cdb3fc30ad976ff38e1a8df4288eb3b24bc54d8b7d1923075db01121863f057304b009efe941a7eec1ada62f
 MISC metadata.xml 342 BLAKE2B e59016392ac1884861b0f47461227593aa920690ac90fa9951d6361d2d89562de883efb0f4112e18fbf4e28e91fada13720e9cba75be2c935e2cb224282efb5b SHA512 5e8ab8b606114c96b5621c14fa2e3a3d9230ea912025c502cd9103ac00b520eb4ec1922a3e717991d4326e0d5c8b942643a8abe3685c4c646042644d70d2e0ef
diff --git a/dev-ruby/uglifier/uglifier-4.2.0-r1.ebuild b/dev-ruby/uglifier/uglifier-4.2.0-r1.ebuild
index bdecab348426..63f46cb9ffcb 100644
--- a/dev-ruby/uglifier/uglifier-4.2.0-r1.ebuild
+++ b/dev-ruby/uglifier/uglifier-4.2.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/unicode-display_width/Manifest b/dev-ruby/unicode-display_width/Manifest
index 02082d62ee2b..10fbc5e7522f 100644
--- a/dev-ruby/unicode-display_width/Manifest
+++ b/dev-ruby/unicode-display_width/Manifest
@@ -1,5 +1,7 @@
 DIST unicode-display_width-1.7.0.tar.gz 10822 BLAKE2B c3db387b9d61ba4ea9d5559824b22e40f173f9e9bcf7fdad3dba1edc36b39ae90276818bd54e74a6731bd2cb8c48b28e440d07f7e3cedbd8dc13441f79a2b56c SHA512 2b6d2b0118f4a2ad69e98fe2fac611ca94adc0dc59ad076083d0243c630a81a01d650965149a25feaf8986c262a5d55294e064361420e2140b53c5ced5fb1c77
 DIST unicode-display_width-2.1.0.tar.gz 11981 BLAKE2B b8e70183b1df9f17bd719e1193c3c2ade5d9186772e4246b618d882eda997a0c22ee0179778f7b8580e32ec89461453144d57d198075f0d400ea52f3679ff7dc SHA512 f8fb1375ba0e88a41633d4aca4628198c5ee55f318a7f0055c9178b39f55818ec892f6e455021cf5050dbd1d748a102b319b1d8b9921ed1ba54a1d106d7911aa
+DIST unicode-display_width-2.2.0.tar.gz 12077 BLAKE2B f7b26d41e3b70122ddccbfdd44d83550bdab7b59b6801881814f33e50544d9d68ad59f34b58d9e961aaf9e2c709dfc83da8040cb03667e1293958cb23cf987c2 SHA512 85b7b9ed1e82b7865f32ad61208013cf89bcc5df05ac59ca2315545b759ee8da968409cbe89e7e7f30b03e209e811584ece2e99d33ae35413f9b6c318fff7064
 EBUILD unicode-display_width-1.7.0.ebuild 748 BLAKE2B 19c16dc0ff2b95b1ed42c0f54579b7dff9dd197169d6e5489e11cc1a9160a4873614e032a788f57f585b4a37c8c31febb23899b67f09e5d26b4cb814b6913556 SHA512 f4ccc3cdbc986402756c2014421359ee95b2c2ea6544b962da0340f42bbe0652cdd71340d732f215cebb2e6979b9f542949282f25e7b58efe55b4d41e02c168f
 EBUILD unicode-display_width-2.1.0.ebuild 808 BLAKE2B 845734eb0151a09f11c1461c870bb17d4f9df412e67a3700c778794776abb818a3a732f537b6c96d090bf770c2e8c2298e463e095c917a18f38b6e27c92196e2 SHA512 ed57f2930157d03c5dba412280c2ea5a5ff80334561b68d98780a396db8d3db96aef8bbbcf43f38002f87f3fec8968b4e5e9a6861b576dd90e9e2e7299afae71
+EBUILD unicode-display_width-2.2.0.ebuild 808 BLAKE2B 845734eb0151a09f11c1461c870bb17d4f9df412e67a3700c778794776abb818a3a732f537b6c96d090bf770c2e8c2298e463e095c917a18f38b6e27c92196e2 SHA512 ed57f2930157d03c5dba412280c2ea5a5ff80334561b68d98780a396db8d3db96aef8bbbcf43f38002f87f3fec8968b4e5e9a6861b576dd90e9e2e7299afae71
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/unicode-display_width/unicode-display_width-2.2.0.ebuild b/dev-ruby/unicode-display_width/unicode-display_width-2.2.0.ebuild
new file mode 100644
index 000000000000..408071222f82
--- /dev/null
+++ b/dev-ruby/unicode-display_width/unicode-display_width-2.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_GEMSPEC="unicode-display_width.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Adds String#display_width to get the display size using EastAsianWidth.txt"
+HOMEPAGE="https://github.com/janlelis/unicode-display_width"
+SRC_URI="https://github.com/janlelis/unicode-display_width/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid experimental emoji support for now
+	sed -e '/\[emoji\]/,/^  end/ s:^:#:' \
+		-e '/Config object based API/,/^end/ s:^:#:' \
+		-i spec/display_width_spec.rb || die
+}
diff --git a/dev-ruby/zentest/Manifest b/dev-ruby/zentest/Manifest
index b25d9439d66a..6bf6a85489cf 100644
--- a/dev-ruby/zentest/Manifest
+++ b/dev-ruby/zentest/Manifest
@@ -1,5 +1,3 @@
-DIST ZenTest-4.12.0.gem 48128 BLAKE2B 32d2d5cdd95b8355b31ce81957cad823c1d5209f0c24cbdf920fe1276d952df4995484af7e576e498273c01fbfb70eb5ed99271405977820f68cd8feac08d388 SHA512 cbce7059ed48fba1a265c9a4360d032492cbc3a67131480e11bc06c1cc7fadcd82139231f16c5ff4fd2a9b771a574f834a71eae21392ee5fdbf335366748150c
 DIST ZenTest-4.12.1.gem 48128 BLAKE2B 6e42c5974aa20cc9f926d3baa633a39f0a87d7dfed132e685b9476ea5f793eae1e747ea289705a6607c1f3cb2c0aea9d2d41a3d2607244dd25d6d7ae82ccf824 SHA512 20d51c18ddf1d4573e7350dc5b1cbca461e7c422652bb4a14d9645282d813e694134c42be7243b113d841a761fa644b9394500858c5cffc233731a3ed3ed50a7
-EBUILD zentest-4.12.0.ebuild 797 BLAKE2B 26bea891652c5a4ac59a12be901aa1faf26b601430b5fc64588457ca58a1910e341638816d0f9b2325e5d4f5f2f78f9d910f49fab5d30f0713b0b6677ea6368f SHA512 9b0a53d894bce2a60cca7a3cf3c78a95ecae2cc96ef6b11f955fa7966ae4e31593affcf444bc69433c34849a3da89b9be068ac48a26ce6dcfdab3de8afadfcd0
 EBUILD zentest-4.12.1.ebuild 816 BLAKE2B 1598747ddfc1ac20a8379739beabd23774a4f3af925b8b1025a811e9232df05cf18b59df70a71ce4a51ed0ce5bf12a43a06b9bdf5cfee366e313de4509b94192 SHA512 539e828bd35cb5e4b3d6908732332cd6aa802a1667309040c6a04a066cc6379a85446fb2f83b48010b86ebd766b640a3cab452805260c8d748637f7517bf80e9
 MISC metadata.xml 334 BLAKE2B 369b507a1e9e591980d85569c6175e3dabd2258002983e4f0c58110dd112fdd45b64354b65c85f42444bf233ee2119e6791472b3bf8cd8cce1d07e6889d5bcee SHA512 07a984ac8c9f4fd86726d283396fa1df9c0f123136f98c5557bdb264ab76765ea2cb00c006c63255d7dca7aa82ca6f1d037fceb96d1177e43b6eb596cb84e179
diff --git a/dev-ruby/zentest/zentest-4.12.0.ebuild b/dev-ruby/zentest/zentest-4.12.0.ebuild
deleted file mode 100644
index 0abbf91d3938..000000000000
--- a/dev-ruby/zentest/zentest-4.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME=ZenTest
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt example.txt example1.rb example2.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Rails"
-HOMEPAGE="https://github.com/seattlerb/zentest"
-LICENSE="Ruby"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-	)"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e9488aa89aad..c2330045d619 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cargo-audit/Manifest b/dev-util/cargo-audit/Manifest
index 8e08dca2954e..4892099dd398 100644
--- a/dev-util/cargo-audit/Manifest
+++ b/dev-util/cargo-audit/Manifest
@@ -1,53 +1,86 @@
 DIST abscissa_core-0.5.2.crate 33957 BLAKE2B 8b6277c90a0debc33009c1cb0449668bcc11056d5561f481c2d908cbf4de5148ee40e33d9b9156e91a93748bd5be92e22846d0dde30e042e74d0d9574a6c777b SHA512 7e194a0330baa3ceac71be5b730f7c3f7dc276ca31ceffe52500b79491c81a02156fdef68cf122adb5a01da19bebc48187f1272e39925c25feb026023ce99352
+DIST abscissa_core-0.6.0.crate 30041 BLAKE2B 5f3dbe484ff17990deebb71aa745ae9dba1d33665a7da9a68064f002884d0886c6b1a8578dda5630b8317e3e57fbf731c7dd0b69395b2199dfafeb3da90ecaea SHA512 72d5ec5cd45a5f2a50f8de659a6de3665dfd256586a49ae2c3b8e5ce8e8216d18fdd7864e365caf2ebb124e1d0d13b54943eb46cc81f9589570c9c09fd7d3423
 DIST abscissa_derive-0.5.0.crate 5121 BLAKE2B b515a366ee00ba0e515d028f4a7e927970b22931fe706864be7c95d95a779ab6175288e290db9f70e79a69a98aa869e066891232bcd0d54eee421a594d5093f7 SHA512 b419919bb4922bfaecfae36e5a2cfa79563fbb6c6d5887831fdc39810a380fbfaecd4ad7828087adb515cc3709f25345131c8d072c65c63278c0430916461bb8
-DIST addr2line-0.15.2.crate 32966 BLAKE2B 471658962dc1ce9dbc44a6e44173114eea110c3ef5673d90d4e12935263ce99f7dcd9bf474e5e7d8d1bb458b914d1ab50ed3a55a17cfc3afc990d05c7a5c6d0f SHA512 9c36be4a476a54da90cff00ddc1621e827c995bacc04e3e382a6d22e724e6e03abc5228d24e13073c5cde63ffc2ed4f26a66c3814e8d183cc062ba6c6cb178d7
+DIST abscissa_derive-0.6.0.crate 4812 BLAKE2B f638d515bbe1b8b8fb84c508864c7a473533a3a872b192642c4f6f0efa2a957c565e343a226596f03fdd7eaf6c6329a09825c833092325b1aec9d01c4f00aa5c SHA512 648573cf467a087e43668f21e44d84155e2bd2824300f4359a1d725a1a1ef822f4bcc2911747931d60c0f3878147a44b87a3fe36424dc8d8c78358649e6350c6
 DIST addr2line-0.16.0.crate 33440 BLAKE2B b59a006ba732935d408d0574799037ef0a424ad3c27b894fbd7a9c91664460972a8c464aaad4e9b82b94e4cc35ee9016490bd469fa21358e11e6d78126378038 SHA512 7ea8fffcdff7f8f25c0a588fe2ee652053988ab2e1d39ac740f5199d6e7d30beed0272403d04b86ec5de6ad5459698cdf28f8efd5caab7b6693102df7ec4889c
+DIST addr2line-0.17.0.crate 32260 BLAKE2B 23c3715820a04260460a41695d535da3565f76519b7313d0ed684352b339de2ea668c44fe8ca58fc1a5b9f84cc5e9d04d889440abb5985bdc04b267dbdad9d9c SHA512 ef3bbd7c6d1dfdd0b47e3be1fb4c8b15ed61a769bed7e80dce80461a1ee13ef21c75e62e9a66328504f862341f1e808abec5790ac79784e18655afcc16206b95
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
+DIST anyhow-1.0.56.crate 44780 BLAKE2B 142a2c02e51dc6fa2709d349881aea404b14dbdfa379ddd6a99672df4977dcca0658897c9e9881e291fb56f5b522cf2a0e2da12afb7038d0929d05f436ff68a9 SHA512 9dc8233b87f8229676ad08903cc1507370588d63702c10bff3426d00ce10754744477d5ba3396c94e7128eeef12c647f8f042de8cc6d1943c2882785ac7ebab5
+DIST arc-swap-1.5.0.crate 65351 BLAKE2B c6b278134f6e29551302e27131639f3bc5bfb05042701cf6c12aab1697f211be0942c44919d374e196ef03605fb137334b42decb9623a137b6ead346586c2105 SHA512 b668a75b2ac77a9d2df3f29b70c8c22e5a961cd2478cd76b6d313e0e1ff809508887451b895f057d160860daa4b02cb74616ab8daa34d163ef3f42a009842031
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
 DIST askama-0.10.5.crate 7994 BLAKE2B 1cd6618948873bac056ab3a6a60b6a687a8532deb5c2b1140eef2b00088c0062960c20a30360e8acab8c7d66e19061a8ff3a48c3ed9fbe8310c373b13389f732 SHA512 c54ee508313e1d9a40c729df52329c787e2512798b148cdf49a1d431179a82fc4f0748572c6fa35cbf3e068f04adce4e020c0c07cdfefa5f5fe41a009c914d2e
+DIST askama-0.11.1.crate 8182 BLAKE2B 5cfa6a0cf5679e271c1d35500b5ae40eb4fe1f955f4356d913ae38d7dc6fa9137ff6e250b7f0ff2a3aadb747d4abc8456a6990c99908e602521ba28014d81ca9 SHA512 d75507a43d2ab12b046854e33308eeabbac6825282588554a678742a71f2521a33637b89d3b24088643d18e84cefa538031264c587896e6e1eb16cc15c93afb7
 DIST askama_derive-0.10.5.crate 6927 BLAKE2B 2467677f383a75b9375a5fbf526e54f68a5adc8fccee6711272d86361f1387ab65fe9a80fe3d6b7473805cdb5526ed5a791ba01f8215c9222c357c013e49380b SHA512 9c4d0115206c69c27151849010057eac60acf159c965af9e5ef0bb023730e17a37295706b717bdd34b2be4571d0a1dbb3bbb1bbe63bfc8b56e14f7d79c37758c
+DIST askama_derive-0.11.2.crate 7097 BLAKE2B 395811d68825531552ac9bedc30c1d59e15ade43b3818576212456974799c0713df8eb099970affed54397c800f62310d5f6f201bc2275f5168cd805f2330257 SHA512 c9b4c2b444c9c9f9054403b25a62e0415d87f0c8a0cd1ac9fc1cdd341c94c15eb91249006e59504a34a18703dd3b9bc5a4012804a4ce3d9401126b66c3632e65
 DIST askama_escape-0.10.1.crate 8535 BLAKE2B f0b525c2a08d34a3903d56c842c88fdec1c6b3afb1f02ccbdb4106f19b706075637b5079549c06a4afb797e3db08b2186333cbd6d32c0f3daca33697b6f35f8c SHA512 f5c95051bfac2b3c78c9487bc62b90f171babc41df1c57993c6618e5b254933dce710ae1932a08be6a53c2f7f704137d592e9f0c5b6c555e7e436fc65a2b2a7e
+DIST askama_escape-0.10.3.crate 8875 BLAKE2B 6bb88f18aa0bd05a36e7bf5cfcaed3138ddb96ed366e7da9b9a64c4e0345fba384cfa3e9bfab3674c1697a7722bd59a9428438b78d44bcac78740d4c53c3d3e8 SHA512 1978add567021fac7f086b6091c97de81919877726455828164642c55607d5b5f6f01c0187f8a8a3371c9b3a1ef41f4c3c9e14d9068826c38ee8a6efe2eeb5a2
 DIST askama_shared-0.11.1.crate 30554 BLAKE2B 1255ce2dacc9c728a457222376a2967db3c4baba460be7ac4e6af30881661717fc8f22ca73e702479f074ff7f44fb5ffa0e407cada427dbe3386bb7d007925e7 SHA512 0ee1f66d202b2aac92cec66ba70ed6255e8b0a9921c5a8be18777b1c3eb410963ea93ecb1bb332757750fcc270d5a699860dd7412abeb8e0a6f9904d0fc7e1a3
+DIST askama_shared-0.12.2.crate 38015 BLAKE2B 7f1f461abc5e1a6c692b254b939309be986435d8c7fe1adb8f3590478e0b0bfcd9c98b68f1f5cd72ea5b72afdc17f79927cbcc86500502965d5e2a8ff41236cc SHA512 05d9bbd47ed09700ea2ee32b5b27801c7b8ea3953a186ede54570a68e2541dcc07f49858cf55ff61c86e129c5d84ff1d92d555514064fd43b5fa2160bc24bb32
 DIST atom_syndication-0.10.0.crate 22710 BLAKE2B 9b55ddf3b3cd107d71b75a191c985718d0bbf63d90f05966a5b7d4d3fed96c4f3e1fc7b50066d54ae74edc94899feee073e5b4bcd6290d5a1d633015a3291aeb SHA512 5d98ef475c26388dce85be7f5cb1a1ef164ee04eb138ea1dd0160a0fbdd69fefc9683b6a019e067f935718e8f94ae69d465ec297302d093fb19e63de677b6280
-DIST atom_syndication-0.9.1.crate 20588 BLAKE2B a8bb70eb6709d68775e880a1d34ba48b2337189bcfb020c281ca101fd307da99d3979eb3de1cf757526a69e2be5b821cbf9c3d89a2e9e8b397535ccb6091f4fd SHA512 57f450e07edac16b5072c91f011728cb6f1b35e76d0f15fe90bd8fa5b078c668ec6663710aa40046fb0f1122c2f07a2c109d11e003948172f86bd1be45141664
+DIST atom_syndication-0.11.0.crate 24088 BLAKE2B 8a0bee082e354baaacadd6167b347308ce989c95b1b17924e57eba434d3ce8ba8b65e34566ef22ce058f26987b03b0aefb4297fc44ccc9793db5b91100eb40b5 SHA512 9ef34414fd8882f1f8dca16c2b65c050270f7fafd5be7a6692f249a4f29ca113e109a6202ac96089f8a31879bc530bcc1f85e977cc60207b8575926fec6010da
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST backtrace-0.3.60.crate 70983 BLAKE2B d47ad8fecb2a200e1d0e0cbad54df070186bddba33a6115aa2223db5ad0d458ec6608224d5f5311cfccc911f1cb35235dcee79a203480240e280ec89428559cb SHA512 f8b39daeff3ad26b2c66dd0712d177ee8ee2e1007377af9abec7e5197780aaee2d3a7e89ba311f4dc38185cf2a20e45e2ac4502e862e6d9aa6498493df522f46
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST backtrace-0.3.61.crate 74284 BLAKE2B 3e66726d5ed8130963a988dbb751828447073467bb6ab4bfa1c385d74f991b52a0f3ccf00823b74a48de3d043e6dfcb474644f7a81ea9cca7242b272cf715aca SHA512 209105f135720b54d584c7ccecdb16b49381cc7531c94b81ff7279a44752ee11075cd85960f86f809a22ecb3dac6728afa05903c1d355df3ad8abf4503eec861
+DIST backtrace-0.3.64.crate 74311 BLAKE2B 32650d755fec8a9e04f915572c999eb6cffc782284a4bd71f2e0f3f73519d5b84fa016199fc11fdbbe510316498adc2bd4f8e059e9c447e5a64ec5853e75243a SHA512 37435cca0587c1c7b511536478ff448914d423c9cf6152ec8bb884c19d1c2466c377b270ebce2028960b4a380f3152fbfeb940de943ef4071ed271c7cd576f2e
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
-DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bitflags-1.3.1.crate 22434 BLAKE2B c28ca81865f90d548623e6259170b07b6e8934bfb7391b919565622e88a3e0d204b4eeab60dd43e08195380a0ba5688c68cad112c8b9b6849acfd091d871182b SHA512 f61f201499efddf76f0a3f172a92941ca3f2ae8f81a6dafb1f654027a65b8570cb2ef3ffbc5091d7b3a52f0307efde1f521909a5a2c6348442579c9c4aa1829f
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitvec-0.19.5.crate 148200 BLAKE2B da9ad68fa928013a0f9403ca791072b35388d453b563d76d73e3ac34bb095bd1acabd158ccb1ce3a3e648e4ed602408d93065d9fb561338ccc80beec75ec8040 SHA512 6a2028f1354b39a734ceb5859664f9766c5a291b560c6f7e0dd8195b7f8d15a3e0552f6fba158009119103f217938dcaa22291af420580ce13b80edaed168459
 DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
+DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
 DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
 DIST bumpalo-3.7.0.crate 134261 BLAKE2B 15c4944abc803537c57076dfa8f5fb4b59949909450edd9e043a6cd438ddd227820e20e95236324c06e40cb27ec1e4d958bebf3d38df90f0723b8e30df79b6ef SHA512 0b570e1baee530b5c3f775330ead7cf5f8878eab75e5a6a61b5d3f64d4d82912cb26de1c098ec9492c29c7a04fc49565db97a54373c546d8ef58aab276d77c59
+DIST bumpalo-3.9.1.crate 77507 BLAKE2B b248a0c2a9faaf52061f2fe0a82b9fd4efb4dae01da9dbd986493941f3ef2632f1d5608d167f2d088536dc96b4cce28981602220062892a7af51c3ead7a74a4b SHA512 40bf3f0d261aaff1f7c30a539953b9c14f4526f05586af0dbe2e4df4cc042cbe6180e3dcc2fbc6f1802e694066f72e629e74de40bc2951c5527edaf551722a52
 DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytes-0.5.6.crate 46291 BLAKE2B 6d33ab47d04f2e469db2add31db118f95cad53002be7969738923d62a4fe3605ccbe9fbcae6d8741310c543625e80d9adac7d9e9fed01b71cb3943ddd015d920 SHA512 a1caa1f58754f4d2e54b8df8d0ca0083ee5282f5e4d3bb5b1735022933dd2e66fb3f39c7a82216bf7a7e29591695c2e10c8b7144c83ac598e34193f2425a32cc
 DIST bytes-1.0.1.crate 48142 BLAKE2B 3ffe07c5429d7d2df821c04325b8dc84b343c634b4699e9c08b07181e741c06233a0501d987b95f513be57ac169537bd0812defd118305e0648ef41f6802d19a SHA512 885d3229e51c0deffe06824e81e8a016e3244106e7ed382a721a938cd2e69fcad7f5e757f95cb07ee1be83de04fcf98f9774f8f2e07aaa9a1ff068eaabf2fe87
+DIST bytes-1.1.0.crate 49640 BLAKE2B b3140dd49dc222cd0405e405da9629038eb7d71dd4c22c8d6419ade041dc1118aa46df38f3426a36a44d8e5591c368ae32a89e71850dca7e810bbfff4441c37d SHA512 d34441ea146ccaf55da4d5c645f8ffbd008eeb3204dafd5961771abc85df52751dfd1af3975fb5c91eb83d9a43da4f3589bc3aa07c8d715906d8158f3092af2d
+DIST camino-1.0.7.crate 26602 BLAKE2B d0ab5d5da9036acfe8ee4f68c015c123773529b9c84f0dd365169f33ca7e23eafcb5353bb2f6db02fbced9c075a0dc356c96d02711af1c4a506ce4d1c9f2fe05 SHA512 0c22c9de3740d39d058de25b2c9b221928f11cf9340562412a15948ddfeaddcb6da38ed3f18321c322d2811847d7cb5cc1c78304f67e9702a2056e59da64bf33
 DIST canonical-path-2.0.2.crate 5536 BLAKE2B 63de79c5f5ce832c6c4db05c812a9f2dacd939e73140137ecd20d57d3cf08b4c8ed87e04691681cf4284669a0321f9eee7b7bc01b95e18b25ed229932601404a SHA512 8d7bc999da230d3ebc8b6434c0cb2aced6ff2a77bef7225a060af79b9ab169bbf8720c9efe76e5fc2fb8af82a859b9e79b79e17c3c11bce523b4baafdf522877
-DIST cargo-audit-0.15.0.tar.gz 382119 BLAKE2B c31b76aaeb0f8260639c8ca287f491d093591e51b0edfc96ad46c820df37f7505119cc3d4b13ce4bed6f32d4241068f1c69085cdf53fcfd38e943d1ad537fd39 SHA512 90900b6c8bdb0ffd5f73e3e41be4d698ecc1c2429e7431736531165ac029064c00428aadf9eab84330cff17540db854b41a2fb4f15b1980974ccb8fe1f396e42
 DIST cargo-audit-0.15.2.tar.gz 366602 BLAKE2B 50d3a8c3982028ac17ce3c72a4a8038bbacd954a4958b7950f711f62499824e255f2991c448f3604557f1894d8b24daa6e41848f6952d951d48426a0a9e80bb5 SHA512 0ffb4ee0cac64cfef7a5cdbb62f1eee226a4644990e03414895c6d8f9ca17c9b34f098e1da755a724d4547c41782fa4d37c82e7ee0c943d9c3027e1c192036cd
+DIST cargo-audit-0.17.0.tar.gz 327205 BLAKE2B 1dce9dcc94c75e1df9f8d955c4f86bb08905e18de6eb875f6a4380ed55190874e512b89aa507350ee2d87ca93b05848ec07524168ff34819ce21cb7016b7ff50 SHA512 bff737725e313776048ee04093d58f684af33cdbb0a7c72711418c8db32707ef20f715fde551fff30e93992da5c5f44a0248ff232b79e077e7d69edd46277bca
 DIST cargo-edit-0.7.0.crate 57596 BLAKE2B e5867fc17ea420bc338cf48c99b333837919c8ad70aa1b70b2ca9941481ebfcf4e834f803528328f32075992fde558af3b02f82cf04170c664b30c314f7aaa40 SHA512 7dfb3cff30b2a79f2e72ff25a5fe27ec634af7c8de42a3e18fe25ed432445fbb4db5ae2646854d5f8172eea042f0ad4d34dadc2dfe5d1ea8c295dab0e62c44e0
+DIST cargo-edit-0.9.1.crate 62182 BLAKE2B 1d31a3e85656f4ebf709dfe03d1f18cc11eb7f2f28c35d2534fd749fad94662c1ca9201b61362250858c2c7bfb7f5b0a4e8f631ddd7643f333fdfe71518c2053 SHA512 4ffd76c539ef36dd48dc8b62396449c69d9ae93550431f407f8e1b8165bf4dd9bfd99261d46c65a68a5a3d8acf7e9b6decc83d4456ac55aa9d12e9e63527f011
+DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a3100916b7f7458f9c949b683b39157d3e1ec17d850f16dfb04017b01d7734d41872d48cf9f4e1ea7414439cd7031c2330 SHA512 c716bf3a4e0942160dbf7be114d1621e1fccc23511e7b0a2b99852b99a851910bfcf8640c2d0d0a03d5a324e1a59fb5d4264ca81bca24e3f1a1ca653bdf2956f
 DIST cargo_metadata-0.11.4.crate 16419 BLAKE2B a953ac1a80ec0035521c116fb2e10fd43054c4c09468bf0107c0706b33ba99e235daea9e921890366919796670cb1050fe6ae93b4960d7b3acf086b70479995e SHA512 60b55dd03e5ffdc78c6cfa9a373701844338181853ce6ba4ff64e1261e69c27c9bada331992070eedf0342953fdb3592f3056adac30e9f39ce15d35f2cf50b62
-DIST cc-1.0.68.crate 55936 BLAKE2B 9bbbeda78b8c3aca487e770cddbe11bf4686424bd33d023ad66e1fbdfc8dcbc17fd85c15905e0edbed8745202c01aea13d4f03a7f8f655e5806da152565419aa SHA512 faca9aa91488808f920f1d88422cc8a69790aa6dbd7bd2cc5d08a579d248faafd0fd675e8499e56aef6715398c278db1fa2079511d211d41aa65741de5d5ac8c
+DIST cargo_metadata-0.14.2.crate 17469 BLAKE2B 4e64bff7710c51d95944faac60b4881b5a43d5edd07ef87c8f4b9826e63dd708719cab27542fdf82cfe869d8781c1a6918a050aa0de71086316bd2f480aad947 SHA512 16e6bb3ddcfd4c6d48ba3415780518428f771c393ffe10ce15e1f3c026a6f3bf40ea9f25214049841b1d7d51f2208ed032961a75cb641c5afc52e02cb84d3262
 DIST cc-1.0.69.crate 56044 BLAKE2B adcd10bf4faf6835ae8feb79ce5e7a4895700d9714fc4322dd52e37bdd8db66b849d5e59aceba6ef0edcf9a5c7c0e2bc616de4acd98b71999bd63592c1c69dda SHA512 ba2b84fb61b4097a96f9013f9925b1985263ccd75274186f5d37589444e390ae8d5d1f88c210822a9e9dac2db551c24aee2b12bb61801aef8b31a72b2ac77437
+DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
+DIST chunked_transfer-1.4.0.crate 9238 BLAKE2B b29737023c78041fa1166d56bb5fb7be2e502b06c56b0fe127c1ec2eaaf3ebdbf9bfdc8645d7234dc17703706529406072b90fb06a15df482b1065044d3dd4c4 SHA512 b3891bc1b101677c2ae6bbac19e74f5ad0aee7b499b0a339b78fa0af7150b2ae0b2151d640bd2a7c4d052a12cf935d16e04db3d37d0048ec1d79a9ff01f13389
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
+DIST clap-3.1.18.crate 209664 BLAKE2B 97b499c2909045fe25ed77a22d55f32085e85876e18f00fc23f19fec5e87e1d1a7a9b1c6ac4c44cb6cd4a1fe7647effc9825be0621bd088b17a421ec6e738c0d SHA512 bd06202304e04cdbe12e7532ff9f112e0cd3c8fbab00232149eaf9f296acc308b18d2a7e7926c22f1c39db92a2af140b39eeb7affeb30226d9a9cd73dff41b39
+DIST clap_derive-3.1.18.crate 25521 BLAKE2B 4c46e0793bc945d9ebfd7ba104264a8cd7c92782c24a9116a8cbf92696476adbe6d5059ee0c220bf71c297bd66f976b91ab95ca75d4ba56714a2824ca7e1af7b SHA512 9bf92e45de15bdfe1ca9a1363f1d243b8df1e5e7d957d6240fa351387b362ef91dc9acffea7256c2161ae8472e35ee2cd678c0bee1f9a27771ae9f4f3f71b351
+DIST clap_lex-0.2.0.crate 9581 BLAKE2B 47bef7e0b35c7a934deeb2821f0a552e05eaeeb68bbcdb82a013cd3b74f2cc42736207a394b9be8c46b3d253dac41dc22e96e1e2ccd09cc416743f22cbf78891 SHA512 d4acd8e2b8d1d19214fde1f0f21f0e0a755cb44e326893bc65350d742c2e260bda61f0abce5fdcb08fc5c4c835d0419cb02452d9f6a85cffa2b5dc7c4bc1e962
 DIST color-backtrace-0.3.0.crate 18057 BLAKE2B 0bd1b1bfa365a739f67168f711099ffa6571f5b4850441c14d1be4c7853bb0cdcdf3e7d35bbaa3710a605363e99d10de642dc35b9cce97b93bdb1bee402a856f SHA512 a3adb7ecd9bdf7c988d605d1a70db14f9fe62e6037bc9104477fef92defdec7872c2f2021e2f6ca3bdbde99165ba248e8512c73727e404b712a0220c361da954
+DIST color-eyre-0.6.1.crate 630329 BLAKE2B b7ec6abbddbb819dfc36da13555b30fc6b483351b943900a46063291ee897cb8cb38047bf093afb75a8c93cc37b68f6bf953be083bdecfbd9804b82d3337aebe SHA512 b2ba4d7ffcbad2704d3b85d149277fe191079ded8ffcbcaebf546583b17f6ab522f19eea49023be227f8054fedf7f61b477c928741f84beed05002792a24b868
 DIST combine-4.6.0.crate 131476 BLAKE2B b557f47f5f9b2bc4b205ede55fd3791cc9e4bcf19f37815b2034292fc5090f101510f8ed80bcef3596c875f5fa7a62b468e6599c21b62e340ca1ee30307ad828 SHA512 1cece5ceb47e35bc0afa10a199f600d01326fb3594b6fac81ab3abbdaa3977db148b47a38daf9fdc7abb1bb9873c40ba38a4e1760285b589677d24c079b17983
-DIST comrak-0.10.1.crate 74873 BLAKE2B 0305c59eaf53425420f74193b1e3c345f31b9c1c072d8e3a2ae500b696f1019d0e9ee78979896799d18b5e54b2e9bc9039df9edd22d3f361b25b87b6c5b60095 SHA512 a63efdf82c1f80faddc7ff7daf6756a6a8442a5583c16028f797ae3538d4eb5bbaca488ca6475e14c887bcd1b593463e972c175e5fad8e4ae038155f18a1aba5
+DIST combine-4.6.3.crate 132015 BLAKE2B f15e0781bf64a6c88373ecac53dbbc8b50252078adc405a15b64c0d259a0b69f906c57a569e0f8d0338cb9a12b2cde2ce068330202fec60a7daaafc2049b9e57 SHA512 495f9703efc2b9271dad2fdd2626aa9a1843fd3e10e63d0c8b9e42d4c7e3137a4740aa476c0206ad8dbf2683d0eeafde36f70581bdeb30299fa08e077f9183f3
 DIST comrak-0.12.1.crate 80027 BLAKE2B 5ec90a4d51fc184a670da4e93d40d5843dc908a9745ff5c4a03db9a1c3b413f38ebfab6e9f8c1d58382ddbc75a173570f1295b526b6a7349b2e9749b8ddb5cb7 SHA512 8d33b61fb0c097213372105743b0af4742f08f1bef72522cf0657b95d13a8ac9220bdf65ebd2afecb3e1aacf003d53848c01c1155d94a7e9d0f5ecaee6771cc7
+DIST concolor-control-0.0.7.crate 6314 BLAKE2B 1de3c19cdd66536ba2ce1949fe6ce75961df75407669c0716e0698b0c2135f423d19804af001eb40d78a7fb42cbad142d80df579e761fe7418bf23b68de18c48 SHA512 2f7739d21fb989a369314898fccd32fb6eb5cd7876a1e8770fb5b106e72d104536c4a626b41f7de2f255efbc92dc47d40030b2764f3395e8d11a924b28acdb1a
+DIST concolor-query-0.0.4.crate 3095 BLAKE2B 215e1a03d5136631715da2ea01e6f0c041b9ba58e8b09077d6e6391ee91a504cc02099093f9027da12672d9300359e2873ab418eebd68dc426a31ab781fd4c32 SHA512 1ab671533353028e49af78a113512ca3980a49817660a0c75e0f3d2da64880da4c0659cdc13e96de7474214411f4b2dbacca7b12e05fef0e63fe5fac25508e4e
 DIST core-foundation-0.9.1.crate 25985 BLAKE2B 22e70b7b1cd1f39c4ac287f406dabc549e3ba750ecf17955f129ff83afe67bb4bdee7e7907287eac0c28597df971de27dae77619f44d0368864c08798def1ae2 SHA512 d6dae760082ef9dcfc37d18acfa9a6ad8ee491335d17ee17447c5bccad623564f1e8bdc54460fb260aebe9276ce5ea4d8a389a83b5c7d17193614906c3d2bea9
+DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072
 DIST core-foundation-sys-0.8.2.crate 17461 BLAKE2B bafa6f6af67f55b34c20e50093a5426bed35c159058a97c03d28c99b6f0075305596907291d26b170ee2ce1bf0c74bd51e2c54f11ef021399791129de6cabb57 SHA512 1c66f2012c11185603a0e4c09311d32bc4ffe639ef7626e49bb15006306fbed4c963f2c53d3b853a254b29cda73c393e0236436575d217992268463441ac7348
-DIST crates-index-0.16.7.crate 16150 BLAKE2B e9055edbc8389e3f698f3e577e5d9a26a2e2e1cb92bd57019858eb051e747daf740dec6e07e5343c913d5428af7e4f2814eecbd0eb157823825bb9be1535e938 SHA512 199d5c8915e0c270d2ff222721a72d2af6881937acabe715efc8ed2650c79d7ab4e4fa45c49e3a42fffe9a855712681798b4f05b34babc9bfe5c2e8027d57bb9
+DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
+DIST cpufeatures-0.2.2.crate 10655 BLAKE2B 7e068032f818af691ce1bbeacc1e79af17284cf6d1b9896fd146b2b87ebab7b12e7a9ec93b28f77106856c1d11a565e4a64f8dc60c30b401c08836097f587530 SHA512 a771a86e2fa26033b27d22fe250968cd80cc64031838d1c111ad5c69951d5f29de0cad375965c7c2cbceda2a005dedaf6df15c699041c9d0cf65a1c2033f69c5
 DIST crates-index-0.17.0.crate 16270 BLAKE2B d5c073bb227c94d7a7ba73432bd5a4132999b019f5e61b07a57a60e0bff206f4b0eef727396e7a607de174ca4282d89d80d3c25f9cda1a7de91570cdebdbd22c SHA512 9bd23a12400e01211537f3f7d80c83c08b566a3471d76c2a8242b8553661b9f5e84497d97c5ca0c39e01cdcce6e52fb2bd9998463fff8912027749f528ccad85
+DIST crates-index-0.18.7.crate 18506 BLAKE2B a8772ce9036e21982f750e04279183bced3c2f5940f446cb06166e201e4eac98af3f48e267dfe66c942f633e9a123d8ad357772203a1e1bbbc4d1dddb7b38500 SHA512 1cf1b30b51d9dd46fa8ab68f1dbd37a19286896614227c79f9ab1ffc6abd3962a8a54d4d0521d773d93a47d3b85f9c17c7ca06df8e4e29985db32f275d06dafd
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
+DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
+DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
+DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
+DIST crossbeam-epoch-0.9.8.crate 46012 BLAKE2B 181df06d1a9925ad1b3e2df70f290fc9c75682037d68c4d3727b3e5bc0f92eaf01c2f8ec239b77f524bc4af53d014cb3c4d49dc82922fa9e65baebee68904a6b SHA512 c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624
+DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
 DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
 DIST darling-0.12.4.crate 19031 BLAKE2B 460587ac5f11ce01116da6c07c1bb0c94da24bd5f3003de028ff772af2111ffc3ec4db1fcb4e732763c441dd8c449297c778854f8b40387b311b3d5086263c67 SHA512 12358298bbbe4c18a6b8b1ff838c210806980973f7fa2307af97f0b33df2e3f1bb43dc2b990b5e8bbdd4f8ec97e1785ece556ada8ad6d6957f9dfb37316ab7a6
 DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
@@ -55,61 +88,69 @@ DIST darling_core-0.12.4.crate 49742 BLAKE2B 72f2b7994565f56bf369ee74658da4fcc15
 DIST darling_macro-0.10.2.crate 1919 BLAKE2B 6f07815ff5b333b6c34df08f3aec2e5af5385e60a94bf9d169701be19935d2a9292ec7396905d2caadddba38d3f70bc5e5c3f1167690f045b778b8fc8cb00985 SHA512 43a0e9091fe12ec986e229a73bc41e23b1815fecfe62df8eed74d2ef33f5c329c444f1568d3c966554ff0bb29220146ba8f30d1c2d77ed7dea9adea10dacd152
 DIST darling_macro-0.12.4.crate 1866 BLAKE2B 67832eb0da1abeebfdb1a883ea31bc919589d259e4ae03a8ffd9bbc242907204985f7e3c5f041b52acab41fa8055b19eb6c3ef2e05f63b0c437cd92a974f2cc3 SHA512 324c778f4243b0d34d10998dd1ef7f911fba9392928eb8626c8ce389c599f6fe39791b1558a4480d366bdaea8be78f9d6a4f7ded48a4a020e721bda240804e1f
 DIST derive_builder-0.10.2.crate 29777 BLAKE2B ee35b2093c9fd49a24778972df7e62fa28ff766493f2a6348d7542b347811c5c48a4a4d15b160ae4f62a9ad4826e8ffab17c391b9c67eaad73cac20433958bbe SHA512 1d76ced2c6c566eee5bbe44cb437c863396f989d0f850ec2d269fb90621e8a9445e68062ec1d8eabd0fb3dbc5ccb827bc6d13d74023282f82015f84d926eb221
-DIST derive_builder-0.9.0.crate 38161 BLAKE2B 08bcbf8851ba813627a56e3f93a95f08a938e0cdd4f2a7971961eb5ecbdd3c96f6143214b49d8ae6cf6be166a934208ff7d0f768a3408868cab093872860e7dc SHA512 e56a01ed13420ac024be394883e5cf148f83ea74d2488931216d84cd2e8f00953e2d61f9b81d34f18be40bda055c02614baeaa89d5fbb9d3defe9ed314f2ef95
 DIST derive_builder_core-0.10.2.crate 24691 BLAKE2B 4336ef5879dad9dc442b771644df2067767dc43a105ae99337573e9f53584289c4ae553ca980a1529b0b2d4a5263e74d5c58f087391dd5b32d0a1ae5e8647ece SHA512 4037d4dff2f2ade95135e28f05c0bfd792acd0faf4edb8bcc6f04b4032f222bbe9251910b79735b162101445f5f17264b8e8b9318a30aeb65c9a7ae1b178cc07
-DIST derive_builder_core-0.9.0.crate 18328 BLAKE2B b7a70372bf9300a2957927dc6bf45d64ff923552d2aff463e9811cf295d8bf300f8e3a03c73d08e1f727e91bb0eca2d34e332bd65a1b43506b9d486e559c879a SHA512 432e17868ffbbf6e776ae885eac33617ce06e5f1cb9610e2ced4f17a0d2aa46d3576ec3249f92275379d875cd90dd86ba4de882089ad620fe6497fcd301e4fdf
 DIST derive_builder_macro-0.10.2.crate 6210 BLAKE2B 00de51ccd227cfaf16cf7f35c8144c7be63dca0584afcf528aae862cd15d73d4d59549d3f8dd39990fef43cdf601cdd5232cd8b9d0a925e28c1edc3ec505695b SHA512 36356bf7e2f6c56b0856c1df0c04388d8d0d1f6e5843396276c3cc2b2c39cc649d6cb08f54b91eb0e2fb3dcd30a9dcb29e98f769f840ca725c9e9a62dc3827eb
 DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
+DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
 DIST diligent-date-parser-0.1.2.crate 7903 BLAKE2B 0cdf2a3f8d725344857d90cd4f631309a74cc37f3c36f3fdb66f3f94f7becfef57cdfb7ed5a26b265347c6cb88abbee163148cfbc16e0881a80f29281e29041c SHA512 58074ab48a3c4bf78f0f5aadf83a8274b01e083935f63043f75b75a4c4df8baa4b1a281492e522a2ec8d290d30a9fa11df8c2b800396725f48a2e026f0feff4c
+DIST diligent-date-parser-0.1.3.crate 7859 BLAKE2B 638980bcf48af4c10a4aa2d39e2b7801d9888f06251c9bd844ef5ebb9cab320685b6aee1e0ff799c91d4f9da1bbd23981bbde27e59a3b7889115be60d0596e50 SHA512 11e6108a5881081a131056f392aa9932ab231f5f510cb7cf11ff2d9ae9e00f0168156bb89a63db6d82431311d10a4ed3776327ccafc43b3109a9e0d887dda898
 DIST dirs-3.0.2.crate 12184 BLAKE2B 414fa4734fd9e108dbc887210e71c8be9834c1764ca35af66781a8108af9fc704f4e7d420ffbb2adeb2a14ca5658e53cb5da4b486e093b3de010c542f7ce7c7a SHA512 97dc343d580ecda68aebe87bcbe8c13a00078943771e3f1dc3101d8d450d2ccdd0d74283870eac1d88255a99e887166d42533ba8e70d15b9cdaddb57e3a27c55
+DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b
+DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
 DIST dirs-sys-0.3.6.crate 10626 BLAKE2B 6da8e4a1e51a4e06ab742ce5eb75155ff9b7cbe83f06947a0bfcda711ae1e0dbe51f9a1e1733ba771f2daddb2b8b14e343b9615608c1d9a8fb927b033c161b15 SHA512 79b6bfda14aafa3839365496e1b1926f763d3569e4e138a59f4acae15c38ec9a3bdcaa64293b03b536141c897c2bf68a67d7ae5670d86215080aa313e53d39e5
+DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f
+DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
+DIST dunce-1.0.2.crate 7953 BLAKE2B 5572521dd8b85419561ad0af2abc47f3b60b1142c1966b89f678bcce500a38b88b3986523bb6c29b38205440ed110ad5dda3ec7170c476c5614054b36b691acf SHA512 9d1a5d449985913d1cecf2249f3c14001361faf98a0ffa2cb682b4ee4dbde906302355632033484640373587c78c0345c1c7e267c354018cb070cbc46517ba86
+DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST encoding_rs-0.8.28.crate 1368577 BLAKE2B bc10eff55063286b48590c3100841c7319268cf17e10176aec7adb39f3d2106e80e25d8ca68e5b4e568083be75d596eaff53807385c4e8d1b59d4aed7ed08ca0 SHA512 8b3f7450789e33f1ad9306d152f1bd230e66c7e799de52046acd5b11f903e8c86cbe2f0aa2cfb0f0e60bd64b194250defe05ef2a171b707e129a2324de47a9b0
+DIST encoding_rs-0.8.31.crate 1370113 BLAKE2B aedcc32bafb95c54a034c6ab082d722834c744c33b525b176ad00ca2ede4157de6765f41e52678fb05a8a1271ed234933ac26a1bfb2cf08096420384ba88e0d1 SHA512 a9e582ab63d00bfd17c9f813f886c5908279fe4d23cdd70f79580931f3a0479162b78210a27b113a7bf6fbc4f8d62bbf098ef645d598fe0eaa428639c35cec31
 DIST entities-1.0.1.crate 24795 BLAKE2B a439872225eb6d453684dde8aee707289434c35823c91e588fea3fa5b94eac75f0456ad24f96795f377d26a7bbce475ea755a3425da03f64327bc44f7dc129eb SHA512 12796a00fba3bfdbfeed6984dce0b175630809f92817e620fcadc3c1eeed9fe9a260ee64560d8e1dbcac2297a06091507a1ef19e940bfe55c437477950bb3a0d
 DIST env_proxy-0.4.1.crate 11256 BLAKE2B a8e3e4f8366a9a578da09903c1b1e9ba2c4e37700ec5600814c8a1dbff740a20dd6147bc1fbeed385137ce734477c734ba370fd6a824c64d571da374554370e5 SHA512 333232b0217eab986b4616061b1419e24fa95b55d6f58cbd3e6a8a280b1f8b6587ce5ae30cfad570e7cebb2327352c18b6a8ab27007dd870073308127d2cfe00
 DIST error-chain-0.12.4.crate 29274 BLAKE2B d082bcbce47411477e8b597cfcb76985cc7d6f1696926cb5314f4e84d2c8642939f5263e110aaef56353ec086a21874a8093bcea1d018be81c86ca42c2c30d71 SHA512 c0ee19a0ba2d79ff1843148d0a582045e68466a9dc429e5f3c8a3a75bc1b6e0d6de03ad69fce851bc0297e7db77b2c6817a13c37e1c3d4501ed41db8a454bf79
+DIST eyre-0.6.8.crate 41587 BLAKE2B 3ffaf2e55b55212ef60b440b4ceb9a4500e91d59ecbf7f477ba0b6ae601a73db95956adeef0279483fed6514335826f21c3538efb14ee8c30277cfbb1693b705 SHA512 0a54e2ce9d58e80596ab7d55f0f913fe3d9bad6cdc5f56b9aa4683732e2d409e288a579e89b300e35a822f56017524b2ebbc0e60860b9dd6e479080f7cb14324
 DIST failure-0.1.8.crate 37582 BLAKE2B 007652720edab76efca83ef23a6f29dfec2a8949e88f697a4609257d158d345ebd617577df9cda69a25cae70e02f96479f427ee3059362771a4a1459bc4bd1c9 SHA512 a8762c978c286f921ef9c46dd17f57656739b339656ad237f6fb43062a8b2ad97cb98b977ae04735312d5328894b45c512fe42e33a9bdc4ea898330816b7a884
 DIST failure_derive-0.1.8.crate 4950 BLAKE2B c068f2a122e1137aa8a31e3a3c4c333f1e66f1b93df144f5a07772167f9085241292b85c55adf33851c319a418bac19fd31f4fb22b87ebbbf2814cbc815b77b3 SHA512 3f11adeb616a2d57e1a33ec2a5eb71c79a5df7946a27b74acc7c89a67c5dc6d01222731b37b405e33493570a98c96c7d2c7b8535928d7cf82536bcd9f0df809c
 DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
-DIST fixedbitset-0.2.0.crate 13597 BLAKE2B cfbdb06fefda131509b04cfa780c9e9574ef0acb902479d7ef98f32ab45b18d78cb1cc94fba78bd023267a7f2a081aab29171f81a9e90912d4aad9f5fc17ba3d SHA512 44642b270d52f71637a87e5311f70ac77baa2a377f94254d1bd728b4ff02a3176f3a5d07732c0c4fb9bf303dbeecf327432ae01e2779d966cc13b5fb97cbc28c
+DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
 DIST fixedbitset-0.4.0.crate 15479 BLAKE2B fc099271b243460967aed13d4e4a0f9571bb931dcc87c4027901bd0d3be5170a604e8ef2455cb8d99b211712e8a728b33c71a5696a9a886517bc928ad5da31c7 SHA512 948c19f487be41bdf963853423b0c19d7764e0456f7195594c5a1d7ee33cc003138feb9fc8bb5ae3d999644a7d703c3a3539ac411186442fe0f2bbf85aba8dfd
+DIST fixedbitset-0.4.1.crate 15551 BLAKE2B bcebd833a45215566a565bcc8cc3440c5bacbced810d2658048da7050808b56c13951bacdd3930f85530129a118bdc23c42381206b63265da7d6846085937536 SHA512 8c53515f1a372a2626e83bc6999adaa00be6451f68627a63e0207ce6a8967e9cab6061adde3e33305c700c472be750903eb36b6f5ce071248db461c0af450b33
 DIST flate2-1.0.21.crate 75993 BLAKE2B 023e77990db471c209642ab09a46b1505241e8907d0f97c901770cbfa01177fb6f01877c5d2b3c519ab26ac3437dd36fbaa3a87c665f201abe1d0714eb9a4cb8 SHA512 3711f6479135bc5828aebf7ffd9036776abaac03595af2a034a16c6cccf68278e78291fb8110aadfbea3ecfeab848d6da60f02f40b002710555c3a0e2b1c6b73
+DIST flate2-1.0.23.crate 70440 BLAKE2B 82fd8fca09a429c1a9081b450b1f255c7b7cf62852c6b1fcc8f1252b60b79f4f1e1ee187b41510e8752f4b67a817daf68319ac8df63b682f2736b761ed98fb0a SHA512 01f84f0d4d0c06aa0c807e5ccb418a5675d88d568694f74aabec8ee06c74e6b75c9c28fbeba2a99fe74b00bd29e71b9aa2df0d96da85beec76b3a30b4d044fe9
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST fs-err-2.6.0.crate 14311 BLAKE2B a637cab75430655a1bec0145a0a8ca30413daec111ab7f11a78424dd147f098060c510ea6b9dc82fe4c72969c1635291f1de18f7d6de54194af6cad388f96042 SHA512 ce8234b9b12990bf5d322c537f1bc1dfe2927dc9cd6797eb009a42ffde1379e8194a0320e75ef032deefcbafbea79510982c5ae4c668ad8f8d5a87caba5d16e0
+DIST fs-err-2.7.0.crate 13981 BLAKE2B a86fcfb126bf1a48f81ec98f544510f46e329c0c62b697f8ede62afcbb41115fe71fb5b46e785b5304884219d81fe03d74f0735ec72eeba0a7f0b8108f1ce1cf SHA512 19477563b4a316b8ce528c637c1ab9e17e6d06d15230e83468019cefeb5e66bc4d86a24738f6e10063b1c27ed65ddba6992195be4467ae7f14aa53a0ad6632c0
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST funty-1.1.0.crate 11631 BLAKE2B 37b246ed78132b52461dda9f3c1b52feafac998f6cd0ebc62408b90e5f826def1456ce820adc745aa1ccf07b281fde3df65af84eea561eeaf1ecedaebfab24b7 SHA512 771f42f601a0349a8e9344c8df552491c64af350b18eacc99463e972335d4a4c95416704ebf49e904503fb2d6f78bf201c8cb82fa20bfbf460ab1e7ed9f94a9e
-DIST futures-channel-0.3.15.crate 31867 BLAKE2B 4dfffcba38e26f7805b55e09413e114976e205507f21454eda084ac975034183ca1083f4d9df624bf17c05d98d1e3a84e0b6cfbb99521792d56cd2e1d3dce997 SHA512 d612c1425286eaa1a713e073edfae8ab8fb4e0b7c82ffdade57bc5dd06c54de6de46119b1cd87d7686cd4efbec38228c4a82d250ac693daa39dcfbf365b7ad25
 DIST futures-channel-0.3.16.crate 31765 BLAKE2B eaef9d4daa760dde5811355230659ee5ec1e8ad784fd935667664cb3db65bed30c4e342bbb4ec4687ed2ab299c7e733d30c017055b18e307296dc8e7797cbc5c SHA512 84baf9a5b74693448ba3cdc402957d0882da6ad0becd3588fb61107d0ed9912a6ddfe599ecc4751713c81f4c962cfa283f0b3bf6472ca17383ab7c5ea5821e65
-DIST futures-core-0.3.15.crate 14514 BLAKE2B c24ac1060c981887896b73ddaf85007a8a56c4fe03c6ea731d3e8389294bc7d97cc478d8ba7ff5d0e7a2cb17f54d1c7b2bbb2a2a0646c44fe1f5bff670495cea SHA512 e8c6710882e7328493e7975fecc360f2071ae39d1ea88a04a38e4228c48f9af4c545c6aead868d13689cfe33f4c98c5b5bff2f9cfdb0105368b11ab2d652efb4
 DIST futures-core-0.3.16.crate 14486 BLAKE2B eb6afd63cea682e3b3252e956a213d9a6a7135ee3631eb10482af03e3bd717e1c69b49c6956aa3390cb4c9961a50b33cf7e7a356e6a511d98de9893d93f2f9c3 SHA512 cc3aa3794a0fc6005c88134943552dd426dcdbe0d117a2ab3269fc6b5b7ae637e0441c28f5b25bc544585c8830ceebde252241a0502fe832f64476c4b4774bb4
-DIST futures-io-0.3.15.crate 9058 BLAKE2B ab496ea8852ac74edf96f7c91bf074739bf3972d22c2dfa1ba3138244910e39098c99994679b0f4211ed9e49542523bce2caf7bbe972da6a550dd6169a69df50 SHA512 9e8787d8066636351de2958169d6ad21d02a3b871cb242dd4fef64b97dcfc14397740107f13d1e48c27640b768fada821fb433187b5d0f0a03e7555d15eb5917
 DIST futures-io-0.3.16.crate 9050 BLAKE2B 60bcaca9e006adbc0d97af5cd9a5a7c3b50a94f017a130c21d7132f7f121e1e74f5ab538362afaffe44d4ad1bdb67f89dc8c7fa28ea69ee30dde84019ebe4c70 SHA512 cb9edb5224741f249f1936b3444e6bfd4ea4eee1d3964971d242ae1f80bb191067b1e3f0b36045e3234ea7f35738037c863fec204b952a40f84c5f46026c9ac9
-DIST futures-sink-0.3.15.crate 7672 BLAKE2B 10386b796da43d3c2c18a53ce0e0f0db862ebc45f71bf277e2e0912d2fbe04ffe8411ac1f0f4b530fbcd1e37258df46640db7e68d84c5fe8863508ae530eeff4 SHA512 319a8367c2ad4f9410a3eba4a345ab2d49a896d9b9b2ef2a888918ff0289491283afd17a29e618eb4e064b7c76008e28d5b16f00e888fd5a506b65d5b79a2dc7
 DIST futures-sink-0.3.16.crate 7663 BLAKE2B 355c7372524be71fbd6405f5bbd173765eb191008c725deb790f183eedae194a8b5c09c512a8e4641a903c409c2a903fc6a2095372ee52dc15f9e10527abeb98 SHA512 32d42751026ea88aa169c0e8f69b80aaa4ad582d852492f7056da35859ec3299d4ff57f508a5fa2da18c5931e97c924d88ec72341cdb342ff79f50f7dba1f87a
-DIST futures-task-0.3.15.crate 11811 BLAKE2B 65c6fbbc9f3b2f39765550f673d5e21eb455521db8b9251645b173fdd898bde9ba69f8efa8597e1ffb051e7c8f2749f2141affa5a5c64c92604992410aaba199 SHA512 66529a849c924ac08603f5ade52954bbcfc3e1796f20dd49eb0289d2ad9cab34e31f07e942736b635d6c1903dba299a7d9a36defbd4902c019ca382c4a376040
 DIST futures-task-0.3.16.crate 11712 BLAKE2B 88c095b45590e6b4d645413fdfb82b3be178fbfb44c6e36c31a6e78f97cf4a7f53d896ae57b0e34da4195678a49c68a684b3af2f3182435352884a7562d30426 SHA512 7c95d177e9cca05ca8982886957010c4defa9c5dcd3b425738b68f750515277e27fd331148168e866d55da4b2389aeb8f0a7af0174553914c55095654666b6ec
-DIST futures-util-0.3.15.crate 141962 BLAKE2B f31ef9a97f05807c995aa73d181050a0ab6af4369058f548c9a6ea6f7e055ecfd5e3c6efadccea2c3d39982cda280ca6a6b7f9a404e8c6bf19df64206598b851 SHA512 a89ffe93d277a93e9c825cdeccfe50dd797d9de6360a1ba44748a46bff6238261e60c9eea9659a0c7e13294973c0976595b20b0740c36c1f9204144102e204ca
 DIST futures-util-0.3.16.crate 144642 BLAKE2B 0ce9ebcd85868d6e64622ab498962d8450f7fdb3d15357b77d94409640f6d09803f4ddf6423a118a87231799f0dd495f59ec431e4bd3e823f0decb035f5b43f4 SHA512 21815551e0e22d9fdfbb7ad36daeb3b01bd01c58e85091d0fe08a677141338f68f8754012c9e7b78e031e3baa345927fd05851f20de29fe6155e532bebb19b26
 DIST generational-arena-0.2.8.crate 20899 BLAKE2B 73cccc9e3b836ddd37e7f64b6389c7bec6763ac9c390a5a9b4adc9b35200e7d26d21ba0748fc808aafac52087f552a4c56e8e10ebf8d016507e1781c579f1e73 SHA512 a5e073a8d26aa32b617fb4130d2b9401c3a3d9ff51a2910f2de4de019ddfd2e5077f2489acb40330e640c573139c1c911ce59a36011bd439c011a3af922bdc1d
 DIST generic-array-0.12.4.crate 18212 BLAKE2B 6e7d77c884ea5a2a8a2d34d7d714730709bdf52f0ebbdb232a1ec8403de4b4f431eafedfc3c2d7ea1f8a28a84660fd34b71b09117dee4bb86052912143142734 SHA512 f92002b549aa9db2a80f65c50357c1f0f490a63e104fae7a271e0b16d6c43ec9146cb7f371f00eb1575a1bfc713ded3beb51f9e96ede93f2ce66ebf78ec85cb8
+DIST generic-array-0.14.5.crate 28915 BLAKE2B 0a8c7f20ec91d218fad8a9a87b0700564744ccbdc2f1eb84bc363fd55e86a5ad68c68e446b100752238d45abd7c005f1994bc26e079270d42635c6e296e96f29 SHA512 30c86b24222503245b494c5f88cdf8115ba08c73df55930bb01bafcea22560f4d20e38c348c3896d6e1ef03209cc1571745881b4a77fd28f66b0cc435f5249a2
 DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
-DIST gimli-0.24.0.crate 703534 BLAKE2B a0103b03d3ab369f3dad8d8aee3e36dd8db402b700c5b5b6ecec568e8579dba8f5d9c09c21381ec9de51988d9121873cbdb66f8e1fae7d8643ea1ca73f4ae1b3 SHA512 b4d088b25f177975a1a301b742e38acab5151f510771c4c276d9cfbb27b3c1421c4bc09ad789ecc64a9764ef95ea50c2d4b7a3cf1ed8042270d5652991ea494e
+DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
 DIST gimli-0.25.0.crate 705238 BLAKE2B 61b3da99b6cfa732b35d1fd71eb5bf5003b0caa5464e6da8daeb31486d8066443eeeb693b1e84d49f390a0c33f24fd3c0332aec01986127ffe26f7e770a94614 SHA512 f4e90703b8b7d83c36a63ca7a3d4ee48eec2b0762419780670558c4496ee840489b6a275eb2b635676ba25a010c0e378bae429b54aa4591b9d9868b48e0f0beb
-DIST git2-0.13.20.crate 190365 BLAKE2B c4f3420f19cdfb420576bc8c38dc45d1c7f3b74b5a2d23c85154dec35916d3d588c86aaa50eca52b427e5d044a07ede7cd1445ef1ba53ce08c70ff39f7ac56bc SHA512 2c0a9cf3391f4ea5eaa48c8fcc08a1cf27b877cc4960332bfdbb95620f9b161f720c35f87bf98e3771749a01444bf8e2337e6d8fc1a34962d4b041473115293f
+DIST gimli-0.26.1.crate 716168 BLAKE2B c138e890457e8724295cc8996f8e60f1f4d3eed46c865dc7ff2379c65e8d470080953eee70718867b73524f57d54d4a91b5d5ba74d79bd3da38084a880f3fed6 SHA512 c341354e13a78c4afeb651a0ed651f60d188957216ba51079512531ab1273b1b79c86c57e904b87064015f8e7efe4280d9edd4acf90e25fb29f8813a4c7bf9a9
 DIST git2-0.13.22.crate 191502 BLAKE2B 953bdabb321d5b1a8be52552800baa2f023db5e75b75142b292e78e5bf8f94c844a8892d6c98e9d7f9b903cf385ff05d5bdd2108357544a142444c9a64b4ac6d SHA512 9fd8d775d23095b21058af20b795510b82313261a3e333976d081fdf2dc78f2649c67426c6d2ea20f510401b7a1636fddc82b3ec2f965d604141d9d37c20cfce
+DIST git2-0.14.2.crate 196856 BLAKE2B 09ed89e5eaf632b1bd9c33ff7afff78808599823804668cb6f85925a8d61359300b460db8b34e6562b8289b79b53094df4c184e013a8d4d4b58c510447fd0ec8 SHA512 7e4c0660fb7f48fda3ed73bcd577e2a40eb44005bd1130f9fbc0c515bfd155ec75a2efabdde99661a7c4590e52a749be4342397b79a47bbfe8f4fb8fe160dd22
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST gumdrop-0.7.0.crate 16558 BLAKE2B 1c6ae5fc20365b47b6a3e0179e935270d29c558c986e3b82a3f4201793ac86af04ca268aca222d8711f9b4b4b095fab0709e7b3636d3d93cecd97b9b7778d6e7 SHA512 c4123cb660f367fb46d0a38aa2f9213a05af7371334869f1cc1d84f10c145eced993f7c5c5dcf3ccd1ae716ea900801340f610d2d829addf573f28f9cae1e0bc
 DIST gumdrop-0.8.0.crate 17348 BLAKE2B 032ed4db09818ab5515a20645a8fa4ec8aac60eb3c1e6bc52f155d811cd6f8abe700e8bff1c57666c1053eabd4b46d23f2dfb2f85fd6247a17a460b8efd25966 SHA512 f50879854f5a7cf53e8fdc88f314ed6c8fc9cc3fe2d76fd19ec38d166eb2eb9a72859a23ec6e5fa07cbf5753c6841272faa043ba714ab5a3307280bc64996d7a
+DIST gumdrop-0.8.1.crate 17522 BLAKE2B 62f299718cd4445d736d036276f6f695031d61b52d001d411dc3847b98a8046be4818bc1bfaed94170afa65da52dccb55f049c2f3db917e666063ed69f9820b5 SHA512 167a5cdb73f8edb8c912f9de1bbdbcba24be03a74d449cceef384f46a581cc9f635585fd783427120408e9c6096dfdb0a7722e664186490a315729df708f0299
 DIST gumdrop_derive-0.7.0.crate 11381 BLAKE2B cac3aeba79db7c6ee7f17642021cd6141173af801176198e8da5e2d120a62b220235cd161cd7a6f2f5ef9f1af035b9c8901a1a2853bc525a242cc0183676b614 SHA512 1c9e718dcf6f6d9c297f149aa5baf4e825154a0ea898910f912ef757c59b01024270b0f3d8ab350f67e9a3eaa8e6074bed310081faaa08e890213b01ca742039
 DIST gumdrop_derive-0.8.0.crate 11561 BLAKE2B c8e7d34bd6a93a17905283b81784c8b026f7111b0df7f391b294a5312081ddafb7aa5f3f5fb61efe4fcf28c7eb8ac3b220eb7320bd8680da309c40931586acab SHA512 474c26a511efad19b1c7cca89e084c19b52c9083ae2ca6fc7d175456c35b0a807861cdca1703dfb44b1309370d6711281ccadd71479b5799d80a20d9fc348622
+DIST gumdrop_derive-0.8.1.crate 11657 BLAKE2B 90c23e6ab1dc7bc481a38ed7d8fad32bdf6ab70486e454fd0707c371d214fc5939a9a8b2569ab91e8ead14efd10fac56c18203fb8d98a02d64d1a1000a0941d1 SHA512 8a42c1d0ef8b921b91c1710fbebbe9d3ce109cc9556444e729d781d0ac932043cbb931651b47c502ef63e45ff7453c6660929d8b4d81f85d7fba20efe7be8fe3
 DIST h2-0.2.7.crate 156989 BLAKE2B 2f75a2f82391c994299e01fae5958dc7e21b78e38b8ade83a0c90698f54d232e6f0068bed88b98314e702bff773e8753c600ecf6b638b5bc1c7e692ef636d289 SHA512 6157bcd335d303246478f45b8740dca687f693dbbb462a0ea9560af12d1fe12a9c680c57c1e7ea0b0842137ee66cde827f273e0faa619db3b6180c5587bd0fc9
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
-DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
-DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
+DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc4298dca05d94d5c14c2fc97350de737cb78aa45196b1241aa8f1ccf3a11ca309da5fe0f6a657673412b3 SHA512 33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST home-0.5.3.crate 7890 BLAKE2B ed1cfadae63d1fb0a66f38aa5440dd09a98343e3afadcf1495bf69f3ce813774c9a49776c6b3641001b6007c01e24ffa6d2600c1bab05c4ea3353c74ddae2fd6 SHA512 cb3b7b24db30a8b29f36f90a0d345b2e187f9e76f22203e142a77c8308dcc62e97b5714fb0ed890210b31375cf30d3362b8d740fe189079a6d3a095be50dcb0b
@@ -120,211 +161,278 @@ DIST httpdate-0.3.2.crate 10768 BLAKE2B b435d0a530fcab46496a921a565c3ad8654cb39e
 DIST humansize-1.1.1.crate 9131 BLAKE2B 9a9717af2c61c724f1eb224eb351c7819cbc5a8f7d53e57a1ab37ff12f886095c321099a4d269e48a90475c1243c6366ead7b19e4d5b698cfbe5c9e2357cd562 SHA512 90b25500014d7ff541b6feb496ebb25ffbf0bbdfc3ea80ce3b3a1597d08c2cea9b967c674e261d3c8c3587d3481da8d899cc5e3fb05b22c55f90e178508ebeff
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST humantime-serde-1.0.1.crate 7727 BLAKE2B f1c0fc0fdc53c9b93b082ad511a90f50f173faf0f1c4005fda95394720a1a4a56e3bad0ed2dc9da133663f0f6cb03c7f8fd4a100e779344110f7cf4a18459388 SHA512 1e6b3e391d8943979a08f60766bf5eeefadaf3bbefeb64a72f8823c88c824174025253e30c8a913e954e02b04989352c840454fb45f7d3d5f4b8c1a52e2e904b
+DIST humantime-serde-1.1.1.crate 7886 BLAKE2B 4c66a483276e0cc5f4bd82fd49cfa0ee40c8ceda753919cfb7a8c794d098e9e4e851643fbc42a209d6ab00c5c62d9edc81c3bb1f6da218a09eafc96da9b566f6 SHA512 0bd72554e700f89506d2d1c8191832aed0065ea02aacb99e27139a60c883d3dbabb1fc3d60f499f5aeb20bd155fdcf21dc671aec1ca68d4041bf98ddf324248d
 DIST hyper-0.13.10.crate 141981 BLAKE2B 8cc13ed7579957040f19a81aa2540d4b9d453737b6e277dc65df648530673a536ba009e8b1d61f61da88dd2613d2fd5ba537271b1105eaa528ba2933cd66c9d7 SHA512 cc7c6b00e1864c44a647fcdbe6e59c7a7574169b787778b1074d102a39e092a80802383d93eb4a6d0f7f5da9449c45e5dcd1e6caf6efb946ddebd687d2c2c10a
 DIST hyper-tls-0.4.3.crate 14195 BLAKE2B 9dd7586f873554af044a6ae96858337a083d9ed5f39ccc89391a6fc6ac534a2c01ca5bc750139598329cce8bfca496cb0bcd5c4e13259d3c9014762e2272aac0 SHA512 4b16103a8490d9b39569b589747dbcad60cb5a904cfc1bbd19fd6770bb7a67ea3de0afbe46b3f08f107a8e6ad00bf74e2049d99b5d4d1cd04f1dcec4b0a3c301
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
-DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
+DIST indenter-0.3.3.crate 6587 BLAKE2B dc4a73eb90bf05ec939634d3f1543f57c8b612e44e0fb3b38329ed2b9bdedcaedce84eb3f542f71c726b00c7cd273c3c390f827da170b5ba361cf669de4d1d3f SHA512 6585964939ee84739cdd19576faef467703415777e159ab2ff8b0f2a371fb2cd6c7a83dff4df954e9bea35844a43b72d93131dd4d23d328e9f365950ad831a71
 DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
+DIST indexmap-1.8.1.crate 53220 BLAKE2B 9605405ef6d7559fc5d6fde38cc6810ae49e69b93e0687323f9a4ecee9b513a1cf7c57b8ef625a9095fd36cc7ba6e98410fa11a7a8788c424fb6a0cecfe6b37c SHA512 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b
+DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
 DIST ipnet-2.3.1.crate 24932 BLAKE2B 26be72376dd7f62d3d01cb9d3287f9aa19e7f52e01f3b47ba8dca1734f959683f17506d4ce071072b8f288e7c494b3daba9054770b9f5f9959e9a450b82a0baf SHA512 db74ad4850e61b20b5280d0637a33a0a1dc2e3388bda38efbbdc221c04dfe04d304d57c3704fa68a824e65e8a3bdea2e743b2d0c2d06b1a8710c192cec1b6100
+DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
-DIST jobserver-0.1.22.crate 21175 BLAKE2B dc0f20541fd14aa5c8b161cf36829a36e550ef414215417e25516ef1cf67cc1c7100cbe4ebcf8d2530e3245f8793a3ff11f407a0ec5d96385ecb6618e2de7a20 SHA512 ad3d180bb49fbaf51c9a2f40de0e2082947a0cb5bef95001bcc664e4c98f75a4c32a6c53f5eba90595e415b600aacae54d92c2f613dbeb8af94fa08b6d770d8b
+DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
 DIST jobserver-0.1.23.crate 22758 BLAKE2B 005377202e0e2e0db012c7ba7cbb38cf1ef20158fb1a82281f349f086bca528f7171288e851ac11678f25635694fc9c35724d8f24217e0b84ca0f6bb42177d63 SHA512 86e930fe7fb563a6738102fe85524289ba3a2607026be19c29ad01c1ba18fb4a23589da55cbb12474597d2e3310db3cc448b6d0d1b27335cb0355e6e76e007cf
-DIST js-sys-0.3.51.crate 67124 BLAKE2B 4f4c28c1ea1a490551ff759ccc494536b099fee6d2eaa597f6ef5ab22e7dbcb72ee870df5550205efbee181aea8cf6623abdb6ecc35418eb17ebd2bf3f56877b SHA512 e352238ec085a9381c27fbd849000c8a26d71d947b75ccabecf941612a87e446c45f793eaa152062e7c699cdae74512a016d44ed06f3298b4cc7d32ae5139f5e
+DIST jobserver-0.1.24.crate 21303 BLAKE2B 571e6f18f09d56d8281d2b2d206647666dc6e9ebb0a1fa48f707d3cdf603880b78ac6a2ec2239658a220e70924ed1612dc19ad90fcef883f21972a1df4f67d57 SHA512 0feade0f1f0a458bdbcedafce8fc39f44adeb56772ea94a59f16f038a743f506db1405a7c8deae65a6a5c1695bfb363c19aeea1c82c41c7f4d1101469f32e42e
 DIST js-sys-0.3.52.crate 67616 BLAKE2B 3d55c771d19abfb4afdc61ba22017b169bddf38dd3c25c31a87b3b24e11b91e5143101c0fbe3e9185e22d36736565de4de0e2934ecfe8d32b5fd5d0a5ba00534 SHA512 97f699d7e37eecc6ec854f233b7e820b4f5029ee1bc6f23917331834ba86eb458cde688b45ea417b8a53cb9799ee46f67040a0618e036dea85d77bd02272b3a8
+DIST js-sys-0.3.57.crate 78605 BLAKE2B 260e2fe94a213ea169d9296dc8f5639fe62f47ce69eb69f2ac2f9b1f409c3f2dc1b26fef56cda5cbfbb775a7f85d2b6d866bd4e30cd6041feb337b744e57358f SHA512 797865ba4c40bdd338ea3b980d6f7139b580a12057437319d3427da6c5045455e0612461289ecbd6ed445e8b675369a8ce77ec8ac0383c8a800a7fc84606ac2b
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST kstring-1.0.6.crate 20728 BLAKE2B 28d5fc4553d44658bcc0eb06e79ac08aa3b2e86971e354ea50e51f349d8e5e74edda491c5c3cfadf9111dbcd19ecc42d73a44f7f3fe0590225342f8f4517ff84 SHA512 e1920ab6da39e414e0f89e0728a1993a516d201149a922e58a326c5392891919746891a61847f0c56b67d9ef5d3bc346cb00b2da1325191dff7d9661a5a12ba4
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST lexical-core-0.7.6.crate 494385 BLAKE2B 417644e5e33a70aa4165cba77bad45c540aaf7bb2037a5461c691b646a5470c7ad68a60029ac50f1cf25de3b6928b3f491e9b7ef5cf5a7d3281d83fd33a173f2 SHA512 fcd7e4e073e6440183284f20a6305bbe4aafb5513a20b8ed793439e4b5a5519532a0605f31e42539f3e6236003254812b459a9b9c47b3c449f5c582dd62c3172
-DIST libc-0.2.97.crate 517712 BLAKE2B ad769579a8e89e9e0ea6a08b8fd82b69a3a299721d63b63efcb436b333021c097933565e86f4b66ffcce6a589718bed2aacb36b80a936dd3dda763b9c0c240d7 SHA512 9b94a43d7da1e419900f7a016d5eb958bc42a006e1bb621ab8e2be2167e91f05cee81144c25e81a85c1b1ea2a26ff88980a4cc292fd42db8b09c5c49bf5531ed
+DIST libc-0.2.123.crate 577487 BLAKE2B 57ee1f6ec9e35cb3c48e54a90dc0d9ac0cfccb1e18e0360b5d2a54bfdd9f47f70bead04b02a1419cb1d1ca72ddbaf5cc008f21ddf0d5bd9063dc1c394fc62a58 SHA512 527c89b84d9839a240653fd2e66941f8fdd82f01ed70aa5451073d3480a56e6daf53e3ddc077a9884bfbbbc69510cea672c74c9c818e914d4414cbc7ec0e3f9c
 DIST libc-0.2.99.crate 524997 BLAKE2B 9b78f524c5c5b51a5927c6e72ba24276cfd751a6f75905c6bdff0c8055912edec2caa23d9e5132d58995736f8d4d34e22aaeff63bd07aaa6eeed6d31da967a5d SHA512 91a4ae007c897e0b5fa91ecd742c45271c5d0d63819806dedb65bbab81bb1e3faf4f7332899c694df9135222de23ec12ef463f9a2508b6adcd2c0ac5cc113c9c
-DIST libgit2-sys-0.12.21+1.1.0.crate 1443245 BLAKE2B 794ff535a97d051cd12993f135e61e391e1d8406f8346dc9d1417a1ba433c0e1400f17d7e5bd90674110a3502ba7a38fffac8da008ee350a47061846ed2764f7 SHA512 fd6acaaec704fb2d159cbaf0bd1b81c7afe4d22aecd836b174001b017ed8421507739fd99da968cfb1d46db16a64fe6568f53e872aa5f9a9dd7fb2cb51b02d74
 DIST libgit2-sys-0.12.23+1.2.0.crate 1473458 BLAKE2B 90c74e42f71ab7bc2f2cffeed1179fc331f3d46c5ab0a5f1ad8c4b720e3c2097921cd9e0ceaa661bab4ebb6c75b4b1dcbf8592549b1c72581948e681ab3305b3 SHA512 96a7ed25c1407168c1a2476148f11288d8c606e568f0b5761a7afa04a01cdcff2227db00f19ea0860099bf483214086e652193aa716ef90c3b15cb0f8bb7f5fc
+DIST libgit2-sys-0.13.2+1.4.2.crate 1492799 BLAKE2B 9ac165dff195d4ed18677f9cc9f85e79a219c60c3477880a35340d5bcd0308c7aca4015fa3c213ce56fc20a237c5f1d506ae936335db4eddf06617c6072146ab SHA512 54d7c11d930554dd10b112d878dc7ea473c7d45e74d394e21e99f5d4632741f49aa31746bf2594705d337b5b64e6b877e510938ceb2117837c9a6f685ef8824f
 DIST libssh2-sys-0.2.21.crate 482836 BLAKE2B d92ef8081bd1ffceabf1be840b20722de647b50a0b95832d544afd7f1930dd51620622a9bf3031b37db9b0a1da4a925050bde16c916a8a71b3e79c73f125ea1a SHA512 654dc947e32070cd03fc8e9bc6046e28c9cc401bbc4c914319102a2c7ace7f319dbf0414a51d9812a09c9a88f7fba6b9203286fdc383d0e75f86b6a87fc78faf
+DIST libssh2-sys-0.2.23.crate 493516 BLAKE2B 00c0c1396f3d6723ad750112e7af8c8ac098af7b3d11e3fafbb4dc3b90c0defeb8184e007de3c740bf1111e12a53b71c355d697c4567deb3a30ebe3fee2e0caa SHA512 9617fb1d5826dacce23658b42e3eb3f8427b33db1b5a4424081e148bd90a3f776aa50ef66183c93ae19086d64321fc10b19b1a496c3feb12a669c7313cdf39cf
 DIST libz-sys-1.1.3.crate 1341394 BLAKE2B 24df26f2102fb05231bf1c866ae4bb33aaaa0db7e963f452d29091b870d3cdb80736b8013bd39c028ec84b97d265f005dbd650515f503d04655bf7054ee537b2 SHA512 9ad3ac88cb3c436ba046a55123b7a3c96c56a8ae2a1b85a3eb39339e84441b16c82d35630e9aad1d51db83943f2d08cf0bd45e212b7284c224de451a0f0c30bb
+DIST libz-sys-1.1.5.crate 1494933 BLAKE2B b53e39d2a1f0db29edde3f03cab97e1970f9903222777e2a5c55b265a5873a0fae3927724d592fe754e04861aa999e0b9b22122ee09f836ece8d7a0fcfe20e3f SHA512 51ac64c26df57d91f4b7e089600e283354ebf636d8a50ff530ddb031ad0eb74601aca687a087f9e7f51f2b00187d8daa03ca2999ea48ea274c87ad8c7ba8d9ac
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
 DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
+DIST log-0.4.16.crate 37758 BLAKE2B b9a88c3d75232ba57de8c30d97e6ba056bb1ec128c2c154c52cc8fa47e0617902526fbf1cd526152d79db9236b00c51afca1eef7d9ceaa205177993849d55d4f SHA512 b12dfcd8bec2f44864b8174776d3151ddf1fa1d82bc8a54fb155d5af3b2af959aab4899d72835a3c25cf58d6c41cd7f1b16c2accbdc20a0eba7e8be3d1883ee1
 DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
 DIST matchers-0.0.1.crate 5039 BLAKE2B 29fe248dc3e85b1c7ca5553f5b49dc2a904cbbcc44a2b6a426c0fe9aef56454ad31acddf9f14a447516bd7687107816c3d46b0f9691e96bc7c7b607cd34cae0b SHA512 a5143b4e6f9131582ffe3d77b14ef51a557cf48d794975706a9d51e0d477cbbd2022a2416e940771911cf99076696f9eefa2c866843f0ba7028206f933674c10
-DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
+DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
+DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST mime_guess-2.0.3.crate 27437 BLAKE2B 6f9176749241dc9b8c08eea3285ac1aeb40ab079f8184d93c436c00b205ab754d9c2b5c481774837bd1c4522b33338fb7ecabe88ee2da471478cdc1391d9281c SHA512 b08013ce235e66eaf49a88ab4c5cf4d1f1b95846c1bbdc1a73efea9052058860c7dbe2b028fe1b33c713621862fe9af2ed097558cbf5e08903ee406a44af162d
+DIST mime_guess-2.0.4.crate 26399 BLAKE2B 667f9b8009bac2e1d8b835ae8825afaaa2ea6eddd4cebbf18de8f8fcde9318eacaeeb08066bdd611883bef5f8a53fa2506b57dffff543c3a57316e07b525f7f5 SHA512 acfbbfdc5bd725edde43e4915858b8d016e90a5b483664f0bcd5e8d2b0b3684bf0f6020aea147b5bf429f218a7af8080761cea4c5c04b68fa66fd6a676376908
+DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
+DIST miniz_oxide-0.5.1.crate 52418 BLAKE2B ec1d640a1e8d3f6c518545ae51c4b2e3a2f2d37dc4465c09f7dfd1df181b3c8bbcc6802b9abaab47e58d704e3b0ed0060aea1cd2ce8b7bb64d376817ebe96dcc SHA512 7fd2c28f3afcb993d48452eac55d0d6037f4eab5c05d6d9abbaab76145d5ea9c6163af9b6461f91d4940c91b9b7734a351096a313311c07cc53518559d578c01
 DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c
 DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bcd97be03155c28345c45fb731650eabffd2fe18a633ff947e63561327cfc86560ee86c3fa71ad4d2a3b62 SHA512 e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba
-DIST native-tls-0.2.7.crate 24958 BLAKE2B c06b2abdf77d9ecc7ef6dbb7ea2fb6fbb4e1eb782dfe8b9e44bb2fa799fc9f3800f3d865d2141d04533ec6679d84aa703aaf2a497db6b0f60544da1437e47476 SHA512 f646b45767b0aac208b840989a1fc09198e70cb5277c077ef8247d3f591631bed09c1d36cdf372e68ff3aa7da7c885c2307f8b0dfe2185839e15dd4e7dd8f143
+DIST native-tls-0.2.10.crate 28590 BLAKE2B c2dda4aab348cf0fe436bbece790ceac9d1b5425555aa40d09a5560058a22a931843e905ccf9e8cbbcda87ac7a7a4146b77ba369f6f7d7043598ea0088140feb SHA512 1cc30c3e16e103e49d585d017fb09962798d33dc4186a5dd3a28f224d3645e8301d4f5cab9b667a27dee88a49233b69974b41ee4aec2bb32ae0745e27b92b352
 DIST native-tls-0.2.8.crate 24956 BLAKE2B e5b130b717c04e3d9413d6cf45986b67060f31793e2825585b8e4026e73927340ee9edd5f5f2d6750200bc9eb0a4b8fbabe0a1578d6a8ea17208f2fb28d2a201 SHA512 3648272b1c2f10c3eb9c7121c20a26da149efcf248187522fe07fde9b506a2b687e8bde8e09c0f8f74d19db5b84ea98b19b177c6daf38bf8a0c3ec05907006a7
 DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
 DIST never-0.1.0.crate 2176 BLAKE2B 084ac97a94d0cbb2e6d12553d2a24d5b8fdab7fbe5414628d2becf6566cf5819f1eb00fcb78a57d7293f31b667091162b4139752e8a1c462983ba92d740a9a87 SHA512 58940993cc8abafc1a89e34068777997f5aef493c46c5f3093bac70595a20a2c81b20ee1a0e5f917a90050219cd21b80df81634e4e5929a2ffe2bf1491b41885
 DIST nom-6.1.2.crate 147539 BLAKE2B fbee4797e91662a8c255ff80598fd50f62fbdacb3b734ef6a54ea115e6411ca73002c2766deb88ac8ccb698c481763594472204871e7096613137582afc9740e SHA512 f9a12a6c523c1c3202f3c45a514d02c40c600c835b83a1f94fd8e51ab462fdb89de3b32ad11630813d8e3cf4c8bc76acc620781568dbf2eb12469dcd9d3d0b19
+DIST nom-7.1.1.crate 115818 BLAKE2B 1ec3df3d9a7527f26618a9b6b976ca8ad5176d711dc7e6163dafb1ec214a55345e952439b4c98b2ac371c9a67c7ffdc3213d1081b62b699b36af68207fa8b320 SHA512 1456efdbda4f5b3da6c8580721acf101ed7d779619ee0190c1df103244e405a8ffa0c3889901a2d8beeab0ab84074ed4c7cec5330c7cc2a5a3c30e36a2530be8
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
-DIST object-0.25.3.crate 230711 BLAKE2B aee91423c1e5da1c2221c6fc2048b1764fcced2853e7e2f3d9ce4b86b13fceb4f5f909ffb03981c1131b79fadc1bc7fc5756c7ebecfd4a9af0b4b4442446e378 SHA512 33e6394962a7b566554e4aeb71826e344646a41601ef9e28875582d4fd5b64ac6eb6a99944273dda0d5d2e1401c3ed4be299b3bc7e446cec2638cbd82535dd01
+DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
+DIST num_threads-0.1.5.crate 7109 BLAKE2B b5a1055937a87c3f3b758ad527fce0a14c812b40c3bbda530bfc0e03f43dd3155c17e1eaa210c512a98919da802d9d48fec4e3c8464072fe4d309b9a402d9b61 SHA512 3ad2234945ea20f47efdd8381de2f0f05790163bb1e4b28d9e630a2da4d86c99e596558ed231e2e9d62d84ae85f8f5422dc11c323ba899e37ad1e654e3c4fdd1
 DIST object-0.26.0.crate 237724 BLAKE2B ef550309ed83a55325778d13d84bae1d75fed882b840cbae9780a941a0c3596b58693365933cfeb757a1cdf585d394566cf92e0c9d43418555c30bcc9fd36ba8 SHA512 a050755beb401e56538c7f1acc264b0526b7052fb6325824cba64b7708e5bbeb882651d2f41b44ea589deb8e21c374b39428280c44deac91da83d7834b8fc345
+DIST object-0.27.1.crate 228030 BLAKE2B 48ebfff83ebd0c1bad5f956f79a0f8628f9cdcd75638ecb92f040ed84f625425062c16449ce44b29d9d99c3950554fc1a480046fff922bba30348ac14d68d887 SHA512 3f25b663fdbf9a38090c2b1cdc03ca40bead87fb83f99143e79a272dfa4f2fedc387a50d3412d42a53aab228bbcbc6967fdb5a0c8db0a8a3e3ae9cdcf1061589
+DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
 DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
 DIST onig-6.2.0.crate 30671 BLAKE2B 5b284338aa2860209238312dd2aaeccb630d4614f45e01d06cae7b14766fc9fb2bc490d65fdf68b7e4b2433166a5426e7b4dc6d7d6e0893b5c09c1aa71c2ad26 SHA512 f744cfcc1d6a3ed4e753087e179a1e39040e178e4abbba91bbb8cbde4e2a744bfa5e3dcdb764f3f5109b04ec82a6f4182fdd917dd0bd458ecc477aefa39fd675
+DIST onig-6.3.1.crate 30879 BLAKE2B e371f003ee19bdbb9cf9fa0e5f18ef14841cbae40f66bfbb367401c15b1eb50b3661accc0609a43dce41f8272ffad8a4b41f75ea23267ab8c7cdf4556d67a7cd SHA512 5c487063b669532e31acce0788b690c53a8d95eb628cea970dd335bb721fa99e67bb6c531b0a9a388354b7e1a6e1621cc953e029f1791dde43736a577002d955
 DIST onig_sys-69.7.0.crate 631318 BLAKE2B 3c13902fc1d3c27f809b61535dfdd27c2f96e0cf3c1889ba723d57b9a149534f91e925f52e7534722ecf56095a0a6819c9c787c29dcfec97a63c706ee540d434 SHA512 56be1a8088aceb3348d349fe0b2692eb2fd7810b4aed1c878ec402af848a0bc4563e0721685597ab3d77c037874d00acafcb7b735aa8077d0a36c19f82f13a0d
+DIST onig_sys-69.7.1.crate 631301 BLAKE2B 4c593f3b7a83d32edc92db67d6f2f0460e43bf34611751f8a5941ad3cded459cdd582e9067291d1fa1e2dfc316b276080b99f85f0a98dc9bfcc531af2f289b7e SHA512 5be8c31049ad741fa06247bd22813374f71397481cea22be3d83bed720b512b9cb10d6028072fd92cc09ac0e9ca8fb977ca49fb59d934dd61f84c4634d28ffb3
 DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
+DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST openssl-0.10.35.crate 204462 BLAKE2B fb58a3be883bac3d5aa3e971172a281a80e9e100c51585db3d2828ecfd89d0b3b19edfacba2039056fa3aefb79717e03cd2ecbf932afb1acac2e74e1c29d3551 SHA512 5ebe4626a894ccc6e5c159cef72357654aa1a20dcc863fdab495f10a574b49b0b9d4e85a069b8b9297544ea0d09fd88a976396c3a8e8faaee9d01d79d943126f
+DIST openssl-0.10.38.crate 207436 BLAKE2B e2c999f1f04f7646e765fd0c1b51058136043d84c052812c4fcb0dc3cd3605768a8104d9b3ab9ada3d7d57ac057cc6ee0e7addb6e4f5897cda9236de3402a3ff SHA512 3cdd25b722b036779187a8906c11abefe69ead198204ecb8cd71aab549c910c3992761439336baf82c61dd6eb3258a365fad7eae4e4b7bd1959a979ac6c3faaa
 DIST openssl-probe-0.1.4.crate 7066 BLAKE2B 656434ec1d34466e903e5c69289a277d14623aa7bd8a7c19bea974c7de57fcec9b2b4ed212f37d7f7b90fbf02a486a8ac7f7c318cfb3b3930e54e276103154b9 SHA512 c5d4ffcc6faf009b38dc715ec85fd75b3e3b0c0293041ea26071bb6d19d8d018a43ec166bf79ef1c7a126cf783bd4a7121d5dfcbed36db5ebf0fe4decb198f17
+DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
 DIST openssl-src-111.15.0+1.1.1k.crate 5087962 BLAKE2B 50a7528ca83e30434f14aeddbc83c434c74962faa106c597794a5c5a9d43d4c37de524f657cea9d3c87ca3f605bc59cde0273d64149954526ddffe96bb9c2093 SHA512 0adee57c5a9dc12b7a2c438f838a5d26286f9e885500708a6945a53c96708838071ee7a521e7dd9f18f5de59c5c3e66880ea99f64669daee442766471c8c2898
-DIST openssl-sys-0.9.64.crate 54342 BLAKE2B 3200e94bcf460f7a8c1441ec98189bb09aebeb1b7220f704b47e3f9152b2b4a6081e332fc1a6a409ee5607628b257c4d44a6333215122b6ff6220f66cdc82018 SHA512 3a8f5a1fc11c5c026a90f2eca1f629a72320f390b5a86184137be3a65189b94df678af6f49dab39abb8491d8de63b3460e070b52c7cbdd5331f0cf40c7d6f3c1
+DIST openssl-src-111.18.0+1.1.1n.crate 5100899 BLAKE2B 2f5e44216252b33c07876e7b7627799f882f53e3ec861ab8526a1e1027e179ffd19b55a9a979c898686d6127e2c83210cbffd2c97e9db942af5ef5baa8f9530c SHA512 e82d90e38b8d57be7494221c0aa069fce072ec545ff8956370cdc6d29a53e9c67a994b1ef0113fe0f87431a1666eaf85e45c2803266ec914156577a7480699d7
 DIST openssl-sys-0.9.65.crate 54405 BLAKE2B f0e09accf076653f172199d36bfe0b7547a738f962e9ee8c15563c4d27587aade3e44830022a1787dfc932ae1f162336e3a110a34b1459656631c7ea50e58b75 SHA512 4c14ff5258a35b86e35d352c5702c90e1f70954c8f33d17160694b63305057b97da3ac6846d3e8f8e7293c40f15b76effd1e34fad4be613b8d815b90148406f7
+DIST openssl-sys-0.9.72.crate 56510 BLAKE2B 32a346a5c98fa6de7dda0c592ebbe5144de777ed5fe63b96e5ba1891831c73099e7d01ec2c1a6890150d01a77d909fc18bc961b3fd8ea7c4b85317a79d988e98 SHA512 c1a6a50c4ea30b2bd7da520bc98bbd22a22ebc327d71c12f807f518cdeb10d81117b65df9294ba9391513a60577709723b93e75fc75423e970e9fa552edad32d
+DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
 DIST owning_ref-0.4.1.crate 12658 BLAKE2B 42bda4584b2f017e7b48bfc1fab9aaf59d49b8942eceaff6f6d95e5e1fd456d952693ef70ca1a496c48d3bfbf69604dd47adb97af31fdd803a6119f11503920d SHA512 15ecf5c53a675f7c96f850f54bea5fde63f8cfe22ad5c01941f67695154a39950087bd72bbd9a2f9e76825a3fb8dd1d20ba92335f265f4aa273e1086773b918c
+DIST owo-colors-3.3.0.crate 27287 BLAKE2B 7b557c7bf358797bf259d520f6bde27b9fc1322e5dcea2934e4c71c89e549509f295aee9c8704f32bb6375fc70311a1dbd887426c8a6dca3cfaa4116e35e9359 SHA512 177b23fe7c665da52b489f274d013b3d52cf126af6cf185cd842658ac3dbf1bcbe9a9b341870e3f7ad978270fb78cb302f7e7a28e83be84105e76b6d357234fe
+DIST pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
 DIST pest_derive-2.1.0.crate 14049 BLAKE2B b85c5a625579e9bddf22ceda1ff808e33989d259f07ddfacaf833ee313029e1a8a01f824da915cfd3d57de57394608a9b506589d642be30e8d5e6a3afcac6a9e SHA512 4d554921b35b6c2491f56b859d389e93459552807df6ff989f9913a9314171e5b6eba93cf7e03528973d6025b663cde7b841d38fabd8197c33beddafaf83fbba
 DIST pest_generator-2.1.3.crate 14227 BLAKE2B 2fba3732d71e6036a911e6455d12ec7f4a1a14331b50f762fda1d6dd244269106130b72025d21e684bdadc0b5971c4b19ccf1f113067c26aa5f1ac71c78def8d SHA512 8be05ef3fd59dc4ccb7871388f8e3cb24cbc2f64eacf7a32fb887f1d8911b528ec545fe78bdd7beb03e2c04eb7fc0ad98ac9fce8579f95ea71cc280912f07c3b
 DIST pest_meta-2.1.3.crate 27818 BLAKE2B bd96b36d47e39d6f8cc6f07ab373d1bf8b8f9907afb8b3774f62677c800914f40a0b44531f50b065ae9d11ec77a940da865b5a574d0cb0d2dc51059f718fa826 SHA512 f31492b452b58c632c0c5c3e357ba2b41ae2b5816d0ec432c1a281dfc681c5b5c2ab4f194c1049938e671ac232d85667aab91323e986df4edf6093a4e2d47ac3
-DIST petgraph-0.5.1.crate 147173 BLAKE2B 3b74b2965ecdb37a82439111ad849581254698c8701d8d5bdb050f4a30cce05016511928443cf65dac394dd45584279a933435a77ef3c610a64c73cc5a68ff9a SHA512 c3d5f53b1a0900084b0693a6f3a849bb9b443b1b6fd1ad88bce8beb12ed1b45f2399b68db3366ba15f33c2d5682e052b733dbde76fb1b646b7bb1e660a38d8bd
 DIST petgraph-0.6.0.crate 182063 BLAKE2B da9373f4d671d0694b8924e25efde32eaf29a1dc3e460a971b655461717594a84823da8bf65bae20e7a277057d081397999ae3d8c9ca83404e626e547bfefa2b SHA512 d71e014b25cf6008a35d425794f69b4361de7c5e8b8fb255c35758bf5631f375a5646431ab1cb59f1fceef93762a169d0408301a5baebbd3a0886a60f688e8d0
-DIST pin-project-1.0.7.crate 54847 BLAKE2B d902d2bd9008ffb0f254adbf0fff3c55614abec67db5a5814707f00ce50690e47890c2ab89ac488e12661c59db7692502eb7003cffafb4a57a66959a01f139b4 SHA512 e3903b508abb9a1412d8fe31f04d01c2bf634c770b1d6f697da1ec4eaee023ed95d5488e1fb4f3aca62afe145b52730c40781eb6d52deb55d5f9820503a92f86
 DIST pin-project-1.0.8.crate 54991 BLAKE2B 27ee86530b313e3514950e5f072367875fff4961e0f3ff635acaa3be08e0cf1b60aa96ff782651e25d1aee9abb4351262fad02ce5f90972a5188ca1b8ba30fe8 SHA512 7a838ad361025b22cfd6ef0ae600b100e673b537d499ce8cde9728520eaec11a68edc8c65e3a1532ffe8cc1efad1d7aac7d8e9f82372cc5a18a3deaeea189dbe
-DIST pin-project-internal-1.0.7.crate 27884 BLAKE2B 52ef94e6c2fb44ee36d7d5bcda09fe65dc69386f6df6e4573674c6e796ce506ba672c1421603ca7501a7b3747f7277cd8f4e9c121e4068d5e857232de08cb1be SHA512 14d96d6cc73c7b86151f206383d24e1c7d79d70f586ff59f1bc47fccf271bef4a0561eecf86f7b03cd14520040f80ec00c266df79b2eeb04506582d80cd2ef97
 DIST pin-project-internal-1.0.8.crate 27941 BLAKE2B 74992114d7d582282a92334d2b88f6c50083dcefc1bd62f5cfc588d5255ecbbdd8a2764a4d877051af0258ff9ae37d503e021d27f2a35ca497bfc11a12317ae4 SHA512 9bd11fbb60e3cb99d81eee590b4672d2c2616825e5aa99e01c6b310e5c6651b9e7f6097db0975542746ddf4c455f090f450ec7a588dad4031bb5d09dd91d11cd
 DIST pin-project-lite-0.1.12.crate 16854 BLAKE2B 48ecd648fd7a7694a48144e9e3f05a3e2878e52a5e5ecf2c6cc2cdc556957282bbaa3bb04f6418cbcfb254cceab5a0bca92173cf293db5cfc9c9589ec1597543 SHA512 4285eb45548b1827b54890162c68698e50d3747eba7b4c1c75a8104124846bc745a40d9acce18115bd06993d7d8f11232168e5e6f4159d3d273ff800706e5bc4
-DIST pin-project-lite-0.2.6.crate 25494 BLAKE2B 851a8388c3837d8516d98b561a3ae95b584e7b0e56cb04a300b45e5a97b4c81bde991a9625f42a596244f3f8638c26d6ddf46cdc7697aa24c823e991d0c107db SHA512 21b298896a10c2b21e481f5769a9ce557ec376819681599699f0881769d2dd378bd0bfdf7c43cc16eb521c48c67207e63373622fff84ff26da88703a57461461
 DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8ecdd07f7a047007413ad5daee06ade30ce487e7f921d610f9e0bc7aa036391f6c595493d9b7d95c17e9195f5a2b23441a SHA512 c948201981269f6f54da069470c56c5b9c4c6f52e349dc7970ad828d412facfbb66a09745c0565b4320fbfd1aa7983f3664604f7ade37a30cf25ce253afe8749
+DIST pin-project-lite-0.2.8.crate 27847 BLAKE2B a9f192e644ee443904becb1ff5cc2179c7c9a6aba5b64d2e9998f9b4b8f8e95f5d54b46963910756832d0ab1b55bbc66cf85edc94b0d04e9a8b3f4ecd4719602 SHA512 9ecb86d550f4440e19eb16c6a9a418b5c4ad859ed2449b02f77d4b07b1e3e3e6b6b7ffba44a358958679342eb21222992fe6fdfe6d9bcb7a699a3e5816f1bfa8
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
+DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
 DIST plist-1.2.1.crate 41144 BLAKE2B f9a2960ce8e1f53af482759863e5f9121c0edf6c68c272981b10f20429b60d1351898642b31e27b7dd3445d0f208c54860dc6822fadd946e4f11b48b2fe1c472 SHA512 0e7217e40e16a97637902732c0846c46144c042094f2482fe46890e660e9c41f09f5d57c9606e3374c6d74829f982ead460515a2221f5eb196a49bcb731ea12c
+DIST plist-1.3.1.crate 44772 BLAKE2B 2e2b869b4543d06830b54a873d6d5da572502ff0409aa723a5beda5121b0ea8c8aa3656aa70299ef32532f948ed82ccde05f4bbcc9cec6a7288e7fc79eb27536 SHA512 4cf962af14b4218502eb4aae5507d93c58c4a0b716f923c3f0e53e37225940c5ab6847d7d9ad5004f77dc2dbbd28f73412cc114fd231e515f23a4ade3f969e86
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
-DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
 DIST proc-macro2-1.0.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741
-DIST quick-xml-0.20.0.crate 115509 BLAKE2B 13eba159be4c520bc6551f5b7ee0ec2e182934c7dc97247811a208484f2855fccc8b7d4cac00cced0d1582de21ba29efe584a686afd4fc4b4a03064116e109f1 SHA512 d8cee7d97a5780ea98b8737d83eed1891aca83e8c191539eb4ad299dd7703361bd7bd66ba43f080ad4fdd3d30a54857524c6d6b64415e26c7cd7c8e55f79ecfa
+DIST proc-macro2-1.0.37.crate 41378 BLAKE2B 330ba71c59bb7a6718fe650fc10a37bc690fb0ba4871c198bded83d13a12cdd7b1334a2e2c8fa7a48104b26625c1b07d65b0ecf91f9c2f13b8e898e80baae286 SHA512 cedb3433c6dfff39b404f8939c67e98303bb89a47e2cfb9659eeda1ca3e3d167800dca482374501632ab6d2283105dbd7560a157b48a351b2d3da059f946be55
 DIST quick-xml-0.22.0.crate 132066 BLAKE2B 1c1d71fdaa022e430e6265530f3e40924c13457fe422e4355eedfcb5ebe8c75d0205f73ffea0968d8196d74804d7d0fbf61954852c98831d510af6c45dcf6923 SHA512 15e56fafc84e62b219977c5ab0f07a021bb71216d7cbb673a7ffec4ec6bda36f97d7b7034751b0b7d745df7c17c1a591a281cf2c97aa4fada7327979711ae3dd
+DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST radium-0.5.3.crate 7588 BLAKE2B ce39c4472bfa731745a0b78179e00b83116d729326d7a25dc629278949095ecc24a1eb13d4d39981e95536cad3f3fe2ac77ef9da27b8d462ed720bfc7624fbc5 SHA512 f4af86cddec991b11d86b1d976e212bb19da8d7e5ae1d40ee812391c21d3fc855bdb2770395baf7efcfdb5b2029a99c9038702a28f8c9e925e1b23f03c0e717a
 DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
 DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
+DIST rayon-1.5.2.crate 165456 BLAKE2B 0a08064df966422d32f582f44570504bb405c59f35f20fcd792f4aa980b62fbd8797e8e01f01a9c3ec4f87eb3a1557f485a16ca2191749759beb31f4d704f082 SHA512 3c11bd89692af7e245be2c0b26d96e864a6353eb901706fe6394e3ff8bba13a829609d2a086aa69fbf716ca4286a1977123a950080d673814edf6bd55d29d459
+DIST rayon-core-1.9.2.crate 65221 BLAKE2B 44b1bcf748e0bf19e7341c032eed6ea348f284ff9f834af628baa2484d3b468d6c8c31ed0309e226def441ee7a94e2ad0b9a2adf107493bef1ae27882d93a7ed SHA512 83c17e71e3da636d97ad77b64d988bfaa78addfd0c512f0fc09b1755614dab2a35532a4dcb126fa15da4e62461e59f5683b922a1fb4a5381a629992617d0383f
 DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
-DIST redox_syscall-0.2.9.crate 23533 BLAKE2B edff38a41e57f40f9285d43deaacea32d518f5d87382d535b0349f123569613d50e7b45a70e4013f35632485951967a5157146593811102f3c0a7d9177f07fed SHA512 4f3c9dcb925c57253fa27f6355482d4f984fe31c4f562f2cd22e953c6f1f475e0687003e495167f400f77d2594ffb9a69548454db8086da5913c00643ecd337f
+DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
 DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
+DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST reqwest-0.10.10.crate 127537 BLAKE2B 812f6f3e28f0b7ad3ca0dd5c66f1f1ac9c6de5237978315fbd7cf586a5487e3d3e8e3190842d199ad97043ab5320e53d85e487ddca96ab9116a98808097d1ed7 SHA512 06de1010a618a517741fcf827b2c4297238c86cd3f906be6f7520e57dd4e10bf4e978398bcd90631c4d459c14b2d7218c06b5244b6af1f83610de9c8990c62ae
+DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
 DIST rust-embed-5.9.0.crate 894464 BLAKE2B 5be40fd9c6bbd394fff8fc53dca7e38b91e081f9adbf2288de6e6ccfe6a9212bd19bdb8ae0fa5d962be24c37a917969630344dd13d949ed568258afbdba5c53b SHA512 2cdaf6b622f81e4e1126fe7809a8dc97bf6936b179aff38419ce24171be92eb7f703b04ecd3ed35a93a2af89a06dd2fbe42a80591fc51e699dcbd753f076a6bd
+DIST rust-embed-6.4.0.crate 902426 BLAKE2B 7e53046035b6a9520ad0b41c827cbb443c133231913fde1c95c6206d7808f2d342bed1b37ded4a2a9cd48897b78a4a6d40af23cb3ee81279de56f2f8de3b0455 SHA512 79592330ce929d137751a66cde603134fa551aa2bce6589b8516a790c729127c7fa8edd3815c0334b27bc48455fdcf866f7c8e6451b049013b33dd8af1d1ed4a
 DIST rust-embed-impl-5.9.0.crate 3963 BLAKE2B 8225a379f4c46ef82c4fde0bab34dde56667aeffd7c6cebc97e21bd3a669d67e986e5ae70eab6485b48926a90d1223943b2b244bbaad7b4a43e92a8e052877fe SHA512 dfd2c3ec82872c3e48afa3466215cd075cf59beee08c267f5c5f36b87cd14e674616eed0838f40530a257a7961acb999beeeb939f00d39f093b2a3d0ca25ac67
+DIST rust-embed-impl-6.2.0.crate 4423 BLAKE2B fbccdf57fc8d3c8ebe0ef1e5247a8576b2866ac169ca0ef64a08f2148666f06183e934e8a028c6f26752e787564e1e6e601edc9a5d3e1f94f9d157a9021c5588 SHA512 d5dde1e99f74c6ccdc5f5d2746f37984f9debfbd60cd9cbad1c63eb923562c7412539546dcfc04b0c9bdb550ad29c200c196cc9f7d2fe03a38beaaa6e1e19c37
 DIST rust-embed-utils-5.1.0.crate 2092 BLAKE2B a6118f9a10f6b4ad7fa8e2871f6c6eb61aeec2df40466d24e08598079b3ceb7258a528353b11b7643effc35b1fe91a9f599e8f6a605edb3c91836da47871d4a1 SHA512 8859374e21480133564a98d8dbdf43f5c04f0af205c4568e200eb1c87d437df4c5d73d65b82b5e0af65f02016f82db403140105346f597b3c0b48aae7b34dab3
+DIST rust-embed-utils-7.2.0.crate 3034 BLAKE2B 0109362f2a96ff5da6126ba4cea1c06a50becf873b615f7353cea9f27ab0bbde83f43f569e5f5417825cf75b915952d0702d2ae5934b7db146f4217ea7ada1ca SHA512 b1356cceb8a3609e31a01d7313a3e695ced2c423e7efe91fab4d40c9d2cf68f896f93d794dad03017c09055e3fbfb20929db50d64a0aaed8463b1bea1003e126
 DIST rustc-demangle-0.1.20.crate 23298 BLAKE2B 74479b2724130d67a934176be4b667b9db38603bc093ac547ddcaa9263dedd6e52a5ee690349d75519c173e74a098a20dee234c8fbe14b003cc77109a0efa16b SHA512 edb31174340fc3956eb225c2175a9e8868a8b70f30991531bdbdde77e5924e7a778a7a5ef44ebaca776def262c9045d82c046a83e0ba407431744e1259add001
+DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
+DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
+DIST rustls-0.20.4.crate 256347 BLAKE2B 96989d813691a70066958b5c30554237cf86f25bf06e0ccd098044b4329d26fff19bc5863f8c2390c03813aedc67be5f4da433d82b5a9c6b120efaaedf51dc2c SHA512 897e93f7fd06be64773db0630a06dc440c0f5b43f12d5780523b2419d11bdec62ece3ce12a317badc2ec8cb1536d8bfd82d7c69105196929e7fa5471b29d0462
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
+DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST sct-0.7.0.crate 27502 BLAKE2B 93912044e47473d72d7415e01cbe2545f84d7d087e7a7fb210be7524d44f69daaa58edf487ea6f8e5f06cbe25ec02062b1b55978e7cb4761b8bfd79a32d4fcc7 SHA512 175d2a912e3f35dcb110991a066d7d9b0d47a0febe4e92ab7d92a27c886a7eb9abf203c9080b3e2cbda9bedbc816bd138476363c2a0c7367d3abc7e6bce83046
 DIST secrecy-0.6.0.crate 6607 BLAKE2B e94eec38aeb39f9c877b13aeabf9c93213851a7fcbc2cdbcb452aa1c4c7707baac358f7f24c80f18514fad4fab7f6526a32f04fc3213e0303a08322ece146d8b SHA512 2a049dc400617ddb7a9a24faa27d1c30e7dc713462cf5f26e95ea575ba7bcceb5ca13cbc76b77e927b5035bec8863362793cdb148c360ed9b6c55d6dd0226b3f
+DIST secrecy-0.8.0.crate 11916 BLAKE2B 910d2c27d0adf3758dd6315260512d74e11829c68fd9f81242895cd207b9c8cf48f988e129a6875bb361f945c4c9dcd4975d419ee2f5359b3cf3a3d003138630 SHA512 184da6fe91bfc108514ee726cf3b1ef41a2d8ce54587fa3733041a7e406471f28b7f99f6beb503ef8af07d36ab1c819bb8c59502379032bb933d3524abc88e0c
 DIST security-framework-2.3.1.crate 61581 BLAKE2B cd6baf84a2d93261050e6f4d292fa32b9c1a9f4b397e209f03277dfa9186e031fd641091406f65acad1046a57bc34b66d95f2021456c7dc6321292087b776728 SHA512 732a575f36d1bccefa71ad051e07b636e683a53fc4e78517cf6c7a60cc819492e8a430893b592cffd5383f6cdbdee496722cd5fe274cc7726d668ed1a8d36238
+DIST security-framework-2.6.1.crate 71688 BLAKE2B 45236a76721bde18400aa286263b5dc389db66a02a5b8feb38fc6ca576fca305cdc5f7e7d6984ebef1379209740ebef3180c4598d5117b04394562de5ceb52d8 SHA512 e4690acf5609f52c89cbe0b577c68a22caf0763d8dc781817010e695824dae44dc27f58c9ffec4254a8461e88040892b89f9628d6a71102d06ab5441b84800a4
 DIST security-framework-sys-2.3.0.crate 12561 BLAKE2B 32e385f88bd467795649b68edc18fe498f607095c46831bbbbacf9838daf3b92d773cbd4ca851d269d1afe5e22671a0900234835a679edb013e5afd6b6197022 SHA512 1d7271bf6332acad5e6db7f48047f40133e9923a471ca9236102809dd50efd5a525eba49ed4f0792c0c7e33c3fecb3ee49d79f90bdc6ee889bd7828140755c6d
+DIST security-framework-sys-2.6.1.crate 17717 BLAKE2B 5951228dab98af742825a30584e38aafb096d1580375c960feb1ccce7163c6e42802fba4212f556ea8b8b09b1b40bdeec0bcf4af1d7eb4b05fbd271aa3a4cd01 SHA512 7315c0d67d2e792932cd6634cbb9da5021c8d9a1a1e96b9d92c6718d73be3aafbc5613cb355fa1a3d1860f13c62e829bc220b43ad18d739ea1b5aece0cab470a
 DIST semver-0.10.0.crate 20503 BLAKE2B b27e780828e383a0baa0edf99d36952a847b10ffe174c22d2680ecf5f723354e0ff5253974b07981a6266cd74d373d1993eeb145ce795201bd8e43dd0e15299b SHA512 75e39076a551cd1f4e7c011e79ac762258b7995bb021298cf2fbc7b3bc9e6715ca3c5165429834738f1cfb5ea9fa3daf173ebe1e9e0f04135845c89675c89ad4
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
-DIST semver-1.0.3.crate 28918 BLAKE2B 81a737f6d13d14f9cbab939829d514dc85c14f8e1efac5a3274d6965ca3b7b07d94a5c2faa1a3913cc9b46c4506d988104aea26341e2f903bf5b4be4d8625e1a SHA512 8af01b90d00873587f113b30d750bc5af89ad0e24ca6c2d71d2afd7244023e321effd6aa25b6cbfffaf173ae646ff8a701148e6bfd3a625f9d14e37baec65c19
 DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
+DIST semver-1.0.9.crate 30843 BLAKE2B 52c90056ec744bccbeb4a603b8e138a9b980a063c05462011d3b4cd11c5272c5284d0eec427ffd1e838d73f97a21af70a6c7f8094b6faecd3c18adb1b0be1449 SHA512 23da181209ca26a9e78d8111444c465273cdaac23ef6023b1e9a9a10e2ab9dfb13baf51f8b6f597598bde84c36910e0a45bae4f14555d731a9c9a3e94f37214a
 DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
 DIST serde-1.0.127.crate 75162 BLAKE2B 7472c9328b4398bb25bd71febe9483e6255b309d98d2655babe5d16933c5b92a71cb75df8aec3abaff84082bffdc44a549673d30a3cb68888d17157e58b32be0 SHA512 dc2b9c0a71028853bc05b4bdb3db1e9e753dfc588ebcff5dccc42d05252fe250b797e10b4d574f161fe11747c9740e93a47a2eba2b4ffd6ecf1992dfadbdd2ef
-DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
+DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
 DIST serde_derive-1.0.127.crate 54201 BLAKE2B 207c20d2e276a173a1ae0326be307f3d77937442838a7890db923fea434d6e134a9591a07139f8eabb9981aee74dd092d6e2c0a98f17aa67f069faa3dccec6c8 SHA512 2c346d45bb96867ea5b4a0ca24aa9b0584d83f26578f5a1ec8a51c514d0158d98c7b76408a0ea64e5718567afb6a0cfc5922d3c5588a89b7e19035b13b1a0416
-DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
+DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
 DIST serde_json-1.0.66.crate 115121 BLAKE2B c46c65339ff79138649df206f2ec759945c31ac11bac4807a8d1e76095c1937211b0b4ebf88c69d2d22cbd90ba25643a74cafeb291e815ddeb5c5ca208eec9e6 SHA512 8cbb64a24781a94e9448dd39f9429830fff6fe61be3772c1ca825f7d489ac3c06b189c42730129e281d8f43f7128b3b9cd2308727e625763588bbaf61b54d1d1
+DIST serde_json-1.0.79.crate 144451 BLAKE2B d04f8788d3ef0d4854d73232a4f441c1f3a42934442679a91853c311262ac9a4f554240d0c44c69f2e22cdd225a3e4d4751dc928ee5092b4371c198325fca0b3 SHA512 83987c1a7eddc6adf8ae359c30e2db1fea98edabd6dc49bde840c37a56258fa845612e8ae270a7dca4cfbe9a3532dc55028091e14cdf1dd3b1ceea4bb86a2dd7
 DIST serde_urlencoded-0.7.0.crate 12489 BLAKE2B ef64d92d79b80521ffe90f18534d0a0f20834e692c708e3126d3486b1585aa228e3140be81984256f0adc71c764d5c2bb66b755b9475eebefcff67c952d42372 SHA512 2e49d1113a863a45235e4c5df3de1221398091c33b9eb5a806ea496902090f82d6dcf4f478f897ea54eea44f553fc20aeb2c1c124b81806b0704dd33d5650a13
 DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
+DIST sha2-0.9.9.crate 22247 BLAKE2B 4ac2c92325ad92881f41e777010516870fd001617c2dc1d20495318219167e2622309831ecb9509d7a4b87f936c9e5b2d335bfc1842876a8b2aecedada367421 SHA512 bc267467089ed546edc1caaa7a00f3f769fd1d5deeb655c1968985d284bd32e4fcee4e721cf89c30e8c3cadd2f88ac557b91f90183cab112702c587f753e5877
+DIST sharded-slab-0.1.4.crate 52479 BLAKE2B 766d81761909006ac740cce13e8361734c3c7072cd07c8c8f611f09772e16f11aa93cabdc5273b9446f5da391b26b7e7d619be523488d8b3558c64c18f20d591 SHA512 123a9ddb126d1adf41a30a632604264d66a06bacc497db6373e9dd36164197f8321f2fc826a16247674f0f69d9f6e30aca37810f787693c4a5c2cee8c5887c55
 DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d424c3ccad4244c190a7edb5c6d9f18166d91a90ce2c4e86239b858cb04f36f3cb2ac0f1e64926bbc8377f3745d57 SHA512 f1de4606bb249fca7dea437464ef560aa49839382716b9c940738547a5def28337501d9ba77d96a63ecb956d3c49867d6f4742f14946448a2c9d0b1ecea9ebc9
+DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
 DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
 DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
-DIST slab-0.4.3.crate 15681 BLAKE2B d7e3eb0374de081d1870d2b46c9137e5ec75950a8fec217e3b120e455fe847e9245884990fbff4d01d512ea297c2012cb1a64f9b169264168081f5f7d6b20b39 SHA512 8649f32f26c1354b3281534fa0e062a145b62813c46f9ff5989ae688154221b00ed1b8c044c67a4b78c00a2e3478a8eb9c1c96fb424c24cd6cefd4df875fbb15
 DIST slab-0.4.4.crate 15725 BLAKE2B 54f3d5e4e76aee03d52f25e2927c03c10d89fb7ff62d83ba6f56003daf8a98e63ec220f564107f3282e96bdf3bd525b68e71511ba367db2550d3aed18b4bc59d SHA512 a8232c85d9693c2a417201768a5b2ecd82e3a721fee39ec80e44c769c66f8cb3ddf00a157f376ebe4c168082550ec48e63af23de2da4f30ed343b4e3bd13c3d1
 DIST smallvec-0.6.14.crate 22855 BLAKE2B 5f96c825c57ee6ab80bc13469793dc7ee780cd856e614c6cc0c747e1cd43fd5e27b589652610198e7757252bb6fb25905f616ea82fb9d8a9ffd5c8cd394b4f49 SHA512 4ba563b542922523566efbe0aac9df499c694bea9ba8ba14a74026d516e02f1fa8f542774b8044150a8e27f01a4b1c71c5280b5a82f61d5b45f022ed223f3977
-DIST smartstring-0.2.6.crate 28028 BLAKE2B a93fbe04aec6efdd29e690ef33e8793bcf6636f1f39871e7aa9a5d69396fca842112ee78164d2a1df4e206fee6ee6a2865fb9199070201fababb07e571e7bbb0 SHA512 fdbcd6c4d0481c5c69b0f1a2f8f489f6c75d46449e35db13f4f0a171b119b74e2c93a075502859c5a4a6aeb8bb782946ad92ecbaf7467590910449fba68cc8b7
+DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST smartstring-0.2.9.crate 28634 BLAKE2B 4a57c947d850964f2617f48c5e41fdaaabcc95be3c43303dbbcdb287d1fefef6c10b25d418d7113ce4a8b873df9fdb455ae3ff90e5fcd45173b6be07875221fe SHA512 c780f4c46db385576833e423ba4a9621f6a8e9fd4b09c9872188398d893da0e111cf5be4494eceeb8b0845bef963430a4153304334e4d4d42cc8712c6752f0db
+DIST smartstring-1.0.1.crate 29555 BLAKE2B e6706bff07889a39e40c764c51f0f3271570e2ddeaa2d11c510ffc9a07dc34005b62078abb7dc6f0bec5439f0bfb26d7b20be48a5189f6a468e4977352bcc941 SHA512 18e359d869bf006d49d6981c26a31ed73424c2734d8225c235b5f3c65124e5ca9d5f5bc95f4b190dc65746b73f31e2588bf9f50eb2b30535e5d05ebcd23ad760
 DIST smol_str-0.1.17.crate 11896 BLAKE2B e741251fce444968f82b6c18e9f0a8443dbf2beeabf24215702d3823a5ed2165274f663beec6b271e46437268ce69d1633d3dafae6feb44a8b0c0c729cc58448 SHA512 2e1f816d8d4ac5588dfd3002327f935a9dfbe743eefdd51638c7b2d1af93a12e37dd19fe1cb66fb6b1602acdc4e46d4ebba57b55c1728412f25b5b9029dcd06f
 DIST socket2-0.3.19.crate 33782 BLAKE2B 1ab3c61a439c1594e19c4a14958d0a85b54666532d16eaa9a1e40e586b7707b1c7b5a751fb373f16bcc26510abc25e0321808e721c0b33b7b04416b9f6cbc5bb SHA512 113d902ca0b966bc0bcad71e3b7d715c79cd075d9dd7fc4140a042bac91b3ce692fb0f1fd0216fa3f6286920b4a92e1a4c342d7ae8d1d98ded36e7480ddafec9
+DIST socks-0.3.4.crate 13172 BLAKE2B 02fa5e950aae0ae6fadb11f27c455da2ca3ce5db3b63f27ea720bb748e03652038a599c036941240edba0286b61a35699bef8db07716ada851c1077b0592b7dc SHA512 531ab43f277e2dfc6aaefcb584c5fdf910cba51cc5fee73256ef00dae714ace844251cb53ca090fd3e8258115cebbcf65843476913fadba8535cb44166294eb8
+DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
-DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
 DIST structopt-0.3.22.crate 51665 BLAKE2B 310597cd82596b8a63501d122b20d845d5f9bdef0f3babcc53e9e6f93f9cc11f2aa4702bf2c20cb0b2105b4cda4ca0dcaf79c67454261424c3e5d90da4261a48 SHA512 fcd37107dc6cff85e30345c816ec6ef9bca57f05e9b67d8dce196a94fa18d79d33e953036b394521e76534fd5cc9e4fbbe14588d7cd4ccb01076f4c8ae8f5739
-DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
 DIST structopt-derive-0.4.15.crate 20861 BLAKE2B 3c97e31f8f3c549af548a3c75eef06b50039e513171251162af08eb7a70d900e0fc533d5bc711fed489252e5102e5245d343197eb03161c2d03e4464c6319fed SHA512 a241cd02ee91195548759e6143f4c08eac70466d6e13fc5af59a09c15dec27816cfb766c7f2024d4a678a1a1fc8fe5d78b858b3ac0f53fda914ec9ec1d8abc8d
 DIST subprocess-0.2.7.crate 45387 BLAKE2B 9a6f5a30677516525ef5914d58f519ecfdf5845f0ea2f16b0b7007bb854c8e12bd93fdf1385893d111d7e7630dc4cba2358d72eaa08cfcddba67203873012956 SHA512 feddb600a9d08c0a301d8e29abfa38d1498e40e44e91e14f29cba3f118b19fb203d3ce3ed71bcbd627efe06f6f2943c153090678eb7b5dffa04e2a5db4f09929
-DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
+DIST subprocess-0.2.8.crate 46120 BLAKE2B 582951c673922a7c3f16177803a628c644fd4e292726b960ad5f9174fd63e8b8920302966f21a92ce655eccd48883b6c8cf01f89ee53324d412980c71a043725 SHA512 86cc20b809f90c129aace9d2a009154637f36f0c2b83326f69f89d8db0ca96ed79b5e5e06ba701c610e9ee297142c20f815d0977629a5a275791747ed7603a33
 DIST syn-1.0.74.crate 232974 BLAKE2B fc17dc2645fbe2d1ee409f895732b86cb77dc14837d35d7773e7f9f055e0b56f70be86203f13c549f0b43e1e4e1e777cc5bee2f08a733fe447f907dfaa443da7 SHA512 5aae03a68a4a8c1234d4e9a69cd37b9f6c698e2b635f10a030c0fac22cf00414c2a5e7523e0efe43181bc29c17abe6abc0eab103391259c97ce566713e3349f6
-DIST synstructure-0.12.4.crate 18105 BLAKE2B 8e7efdfa8681da8473903aa22e8cc55abcede012b29a91d65076042c89a21048b44b774ca5c3f788222dd32fa634ac20f58ce241eff610498cac19f659280d29 SHA512 ab3024644719c4afc9c06a4d3c499fd4934c104409d38197a46d62c9ce30414f88b3e7bcdd7f245cfd207489fb54ba41e5cfc1db94b0dd12fb01e9c00c861c47
+DIST syn-1.0.91.crate 235996 BLAKE2B b7b555b2dbfc837417ed69c358338819500f1e8ba11c2183a4d216efe2c2d7eddd165415516d50ffb5413b97452f186263e13299b01bccd6ad6e405f6d2a3f4f SHA512 28fe28a9d4e9ab3610850c1704be6f384e9fff191b1a5e11f9766bdada81a3e7426cbc776bbd63ea6710320c7416a622506d4a8d607d978af506d381658d4bff
 DIST synstructure-0.12.5.crate 18020 BLAKE2B a3ed7e10e13e096df7b624f567de3406b043db4ee7bad6f25d8aa093af4e9f3bbb39e22bb46fb1b5c7c5c31cb65218c79d959eddec8ba32959ee66f422732a1e SHA512 62d5669459a444ff91bcd630ff58fbbbb70cf1a2240c7caf1c4020c1aa8f9010d952172470e41daed75fb3cfe154761ac56675b9ca7a754bc9aa484c3152560b
+DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
 DIST syntect-4.6.0.crate 750938 BLAKE2B 9c53e142093f6d9fb703f4fe3f56db15c0bb7eba92cba9f31e567e9de2bcb129b7b415cbaf692c1e1021b12184bb3b064ed1996654581aab3d5f09e992c0eb5d SHA512 9e320afaf4c2adf41dd7e20c5d95e3063fe8d2774d8deec7e0df3debab050e96a1a5c85d1732c661ee4022dc5bf1abfed2982f13269689b527f35efb2c82beba
 DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
+DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
+DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
+DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
 DIST thiserror-1.0.25.crate 16690 BLAKE2B a03107d70186d46870050ef86cb1f49aa99d91e509bd9ab22ee6cbac28d37176b2bafbadedc237a25d233abf7816cb3d85d88c140f172ede40d309ddaa1223dc SHA512 f408c2722060c6f707b9afcc1d9f3cb175bcf955263c4e643ef7ee935fd68299af835f4ad489ace814a7bcad6dc428eec5df2858453834d0b6154d22a38ba1da
+DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
 DIST thiserror-impl-1.0.25.crate 13364 BLAKE2B 9b0eb7a6fd5f290d7a666de6065edc210ab9ef35960c424258d5039f24433baef7d1228ac2e962e8ef9dcb673979c9d3c09ef3f3d20533fe2ad1500bfcb20015 SHA512 a2d2f39d3c1e5a722d7020672f63fc312dd9f8ed73863971814f1fd12faac4ea5d8546e06b26838d8224b1f91161011f51dda476848b2555153203ee9f7ee3ca
+DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
+DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
-DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
+DIST time-0.3.9.crate 81412 BLAKE2B 018cd6ee08fc16cb91b894f15e20c41dfcea51691551e54b4252af27b6368e42c6c3c86734dcff2f9742d93829b1e0b5186aad77b96bf5aab01796f480385497 SHA512 2dd8c57d2fc232d8a05109f0d41f964fc587345eff0a68c42c2b1690d6da1a4868188df7f03bece12148e7434b973c472fb0c85fa1f840053da3b30cf6c47e80
 DIST tinyvec-1.3.1.crate 42386 BLAKE2B 9fa7dc7c4967bc3ba3f7e5fbef54a7b6fca46f6520aed2482d355b1f6434ac702e073df19034908f214e5c0ffaaa3bdb41c7d394d9f828dbeaa177158ee99ad2 SHA512 ad07998e9bacccf8ce2bcb01fea8008c6514ad73c15c6426453cfdbb432dac7d588d05551b179c83ca062ea02f0853e97e2b9712da0b8dc20ddab4c0efd5afd2
+DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST tokio-0.2.25.crate 413390 BLAKE2B 3fc36579030bac46a733bbb061088eee56e9a172241f74d744de972065507db14202a0533a5d231bbba495404c16b5d6bec0d11ebb11e258ff0273b47b2f7d90 SHA512 19b8d46a81230be0a06d6354c2775b20fe0c108b4c504f5fe798952bf84f8ecfd9fd149ba899ee67a1158e1b0ea9eab49f6249a655eb0ab1cf418c0097b30705
 DIST tokio-tls-0.3.1.crate 22517 BLAKE2B 05be1ca4abb345fc859677bb1b4e49064324ef7858c5bff7301b4a5110e4a6339857f5d85037bbd66b433a3c2439eb3c15edc63648fe04df2da9bfe1c93b8e08 SHA512 46ac00d839415a8dc9d9709967414e3812606a23c2c1e0e9dc9aa6aff70b24afb44e4c5a231d0d857ea8d06d07c254c97a459713122006cf1afbc6d4f7b7b6dd
 DIST tokio-util-0.3.1.crate 27233 BLAKE2B 96e43dd3f6f6209a6436e6ef3a40739f44507312b02a83f0316c7500dd6a59b5a71af005a98818d9b1db0e33aed4a9330e4cf955855925c8a428132762985db2 SHA512 301a5d9a8a9537653e17d3360dc27d41c95aa28bcda3e0815923dca0ac735071b01b9fc8c1d53e826e0cd1e6e5f98cc233f1e9dea906ba06c6b5192608ae7ae8
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
+DIST toml-0.5.9.crate 55667 BLAKE2B f2bbcac136e0182cad9b51f07943610c8700b68afd08fdbb822b47bb79d215e8132376da8ac61fd550e86c353a83b007297b6ac92ef5d503e1b90e746c40c649 SHA512 7151bcafbe2bdb1d2bb91562daebd357c884819af047843f1b4a56bc3812d4153eaf70683d0f9bff51bd1048700920322d64d41da13ebb4cbf34f0f7822d7ce7
+DIST toml_edit-0.13.4.crate 104817 BLAKE2B 7a75d97b84012795dea220c457c713d03420432ea76d5dcef8b597793c6ae5216a1cfa13958f50929fcf2850c907b09a84a1f0103ae1e62020c6747e0996bf2c SHA512 7a1c915eb4e916d976882f64f5956c1a1ac2a1842882fd307b2a6044d644b25058be7c559b276b4632238b1d24418ed79c68ea4d7af0a13a47fef45d4338a328
 DIST toml_edit-0.2.1.crate 46866 BLAKE2B ab023cb351eee64416a13e249dfc06948a90821aabbfb440087229e4e351c7ac5b95745de7158831535e9a9784c3ed4e6881e63e7026e36aa8387c34d7e07f80 SHA512 9b462fe96f43a6e1c4b42f36b1ca57ae0c8541a6a95d36531272e5d6dcc1875a1d860b7aecaf827d1c4db676a2210e275f4ff10b6372be4a2ef9d6a567121b50
 DIST tower-service-0.3.1.crate 6299 BLAKE2B f56562faebe3a933f39f8e2093af65378bd307c59f9695408510ea9ca2230c68228c6726a0a2c7c42943002837dd9d86ce0a1d4b7849ba5c61df28df7632d909 SHA512 d23f9db2d6632f561970b55eaeaac22a20c8b9af18931cd564db193688eb2a2973127b440e175cfd7358f3d0ead53f7a759e34b7b86c293751079af9c2181ba7
 DIST tracing-0.1.26.crate 68583 BLAKE2B dbdeb4081dddb777d52afd1afb043e018e72f99ce6c4fbb16cb14e618da9c794ee594252cdd7a6d4a7c149a8ea86d63f6e4f1d75ad3bd76590d70af107616eac SHA512 19ddccaebb2d3b2230a6ceda5f72af29200ae760e8d411c2073e7338a6ca2231c8b2b14180eabec78dd521ab7b48996966b0419725adf8c67a03d1775ec834be
+DIST tracing-0.1.34.crate 72775 BLAKE2B afdcc78ba29f68f3e87e401a89e4c5944da620890823d56f3d345c2e97a2268c19c342014903aa4a62b8d39b67a5313506563a7be0a555b86cd93aa9db4dbae4 SHA512 d4641f3f239d158547d7c811a80cbd2d1d7df366122dcc678d01844988ef3c5f5db637707e7e91bfb2ea16bef5463d52f8a481d1a9804bac197157453b5877d8
 DIST tracing-attributes-0.1.15.crate 20632 BLAKE2B 77e78d3dde799de16610d35f6d30bf15e03e8724ea80302a661fdd958a25574c7d6620f480669917dc94152bf0dd1237310523d881f4971f4a5e837ff26e0da0 SHA512 750836fab24caa68bbd8f19c953a45d2d1bc7adb9fae65b113b8b9bc1cec97b9f6088b15bea3c1c8c7a106345440037c880485e4e4f4d1e5690ca4841ff135a4
+DIST tracing-attributes-0.1.20.crate 26316 BLAKE2B 33d5d160d4de0d117bc45e33ca76f2dbb0838021bd7b3cee07603ec86e328b27e4fea993becaa9cdda11f4c6fced74575ae9a4a25bba64b26646d72b72942156 SHA512 8ae65a131ba700a03a2e35646a1bdaf043f04b4d5de00f5c58022caf06346b50cd88e1917bcad3a3ad591921fbf2dcef3b49793b8569604eddeea2470627a0c6
 DIST tracing-core-0.1.18.crate 48381 BLAKE2B f175efd5481bbc9e881a36dad6c29eeb4b39400dd117e178d9e7a0e765cfdd3f36abe7e3fc2a537c79c5af544c764a0273a382cae907f5e79b6c140ffd2b9a91 SHA512 a5fddcc04651d05e61c2422d028a399cca260672f7a8e5c072126d9d4e21ef7a38911fca09e32c6da287a0f1cb6d1297d30e0f6fbb951fc190d2a67281a115b7
+DIST tracing-core-0.1.26.crate 53727 BLAKE2B 1e3efbd8e5ad0617ce15ea14eb6365752067f580504a4cc90f1f486ad3eb7e59087c0f332e3e93ae32a2f4c42a42482a9ecbe180f43dcf34a427babd5290fc61 SHA512 b9d44c307d0fee51675bef07ed7f7d2eb8de8a6ffb37256994f3485f7f80e40f1fa9de1663e5360f945270f10d22e42cd9af60193449bd0a0d323895e994bdbb
 DIST tracing-futures-0.2.5.crate 11637 BLAKE2B 2b23233705674cadf5dc8092d3990f375e780de2b9bdfcbfdd5f4bc9bd0f15a14c6bc8e36963bcd332e729b33b90ecd10b2250495e0657eaeb302e666313534e SHA512 8a437a029e18dcac3a3be7a3355a63e75432ff892316c9f2929c7557e3895b1bb5efb59a7588372bd9efc386b5cab54c2b382be99ef8fa643e66ae5656e506bb
 DIST tracing-log-0.1.2.crate 14915 BLAKE2B 72967c7262a8fb2b1b9c693ae19d84424a037e09b9f1b1b94852e39caa0a0ca30c846b2cfcf94b378c9ccd2aab67af2e4809e2e733d22f173cd57a3842a022fa SHA512 c4e146026ea7b27e79c630da9994dfafb90f9bdd581f51cbd5a5f985b0e60b2412937214e0365203148eb91f0a5ef3644e64757dadaa10287a097ad85989b620
 DIST tracing-subscriber-0.1.6.crate 45650 BLAKE2B 7ce100ef147d69a1ead743c57b22a22eafd4fc2afd31e23faaf6d7f7c81466bcaf2ff8425e0f894f4fd1c6489ea54a2f4a0495bf66db06150cd548a074a6a4cf SHA512 77af71bc8a540096a7e7555b6694339693ac6a706ab6a983cedebb15fb251595875fbf0e758629d9aac6b3f30e2dc5e819da6202d4e5c88499dc79b349f5e0e4
+DIST tracing-subscriber-0.3.11.crate 184827 BLAKE2B 83686c5affeb40a84e95c161b121dcdd533b782151896b86752f4d9a922683847dc350482a7436fee23a23cbadbb9522dcb7966993e877fb84fa8e6deda050e2 SHA512 5d45d5108742aece42bfe7d6f6ed71b0bee81c3e3e3a3117489ec5d4d4ee9c23c157077ad5020b74b019d212fb2a46623e93dc57a7f6bc0a1a853981ea097493
 DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3
 DIST twoway-0.2.2.crate 30454 BLAKE2B 3d349c555e0df87b6fe4910611c5759e6ffc5287dc1994ea47c8e17ce0d636f0ba219d73aa68af21a560d926caa4a417ac0d4b6d2d60b6f2832b9849339b77a8 SHA512 dcaa31226ca9c0d67e6eb85fbf97c8089ffae66daacd55cb043677807a76b09c6e4b6533b6c6c9ee06b0a09ac7b9d1c3bbd3ad31cb2d4748f59a784fc489d9f2
 DIST typed-arena-1.7.0.crate 9927 BLAKE2B ff8fd0f87e69634d53b87b070499d3d119d9f153e0f06e27afbd3f96da6918136a83162f4e9374061ddd215845f75844251e3fb079d57266ea8502cf321eaf9e SHA512 506a90a11576e5a4135b46c5c4705db461a8ec1bba980c9ea65e8c4399bcc85898b7f81312acf4bc0b24a29d1b940d8dfe0352ad59985153743948616da5ed8e
 DIST typenum-1.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc255547e8b3f94c966e0f661f9b8a2f4a844661c00ee3c7e01f9fa109ac79c6bf53a064335c317dc9d9f8b0923 SHA512 0cd0b884509a5b4a252bed10309139350fce24b5d4bb887f4c0757ed18cb2481e331d7dc32fc81f4cabeeb5849e89ea5d92ea9815cb2985e5df4a022ac703de1
+DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
 DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
 DIST unchecked-index-0.2.2.crate 8325 BLAKE2B 25c7bbee1d3b90bad05a91131ce1647a48b97e08a745e9cc8b829e1e9c2e1a6b650715ae7747105df07096607fc929ad7b8d54f06e23c662c1750bb4c7e7ca1b SHA512 3634e077fab98284e6e99bbb1fa6691f58d2c39ece67c65c89f8142820f0bb1836553a107f49eec0c72455c47807bd8bc1aba940029a6e27b4b79b9be79b2ca5
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
-DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
 DIST unicode-bidi-0.3.6.crate 33737 BLAKE2B 90cb2d05bcafd32a237b747e290f3dba186d069845e50ffdcd7e62a2ddd73f4e8fc27ad972d86453ff375fab50fd5ec47ac323413e351fb7d4b80f1536519d7f SHA512 a1013539b0da1609d9c37cc1d8359efa93bd88b4ae176d25398e6c44d93b615835a54b184641f00313b14cf46542b1e92278b0dc1bd00dfca0566467b21857e7
+DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
-DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
 DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
+DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST unicode_categories-0.1.1.crate 87298 BLAKE2B f52b83d204b90ce0ec26e0500bc80b0547610f3417616603c4e837fbec0a41a6a715de19f88432f4c15ddb6b2ba55ee75a472fb7e2c888accfc77e1ef1d85fee SHA512 2d15499ee9318ee54910d657339820acfa88183e4f9aa146ac655129d2c4d76d3fd0550b601702ad2ccac4c8647dd2f26528d8003f39181e09b8ef480351a3cb
+DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0
+DIST ureq-2.4.0.crate 91872 BLAKE2B 07a4fc5f4c285931ee31f869e1a0b96a82ac1bf61a779f156f8b0945ed96e6698a6c168498d3e2f0bbb648ccc3357fd17da73861b0b8a42550fc4f7f1f8c31fb SHA512 3d7093e6ac7cbc70f55a095590e9a92eba747421317fd7dbcb8096e36764925a3d1a02665567079f23ba765e63fc085d8b398283cd4941008286d8bf0d134050
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
+DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
-DIST wasm-bindgen-0.2.74.crate 158439 BLAKE2B 28a0be539d0bdec4e23d4c5a613ec0727c00112d1da1948c050d4ce6f5f42a07fce6d1f2fafa7a66ecee9183fee9a7c23845e12eb50d206f760bfc76dad41491 SHA512 21ac04c54be9f3d3f32edbcffcd24cb9401418e0a398a3f00b6d4a0302bb32b7b044b513163a12952b09b9465b07ec7e4c26a83ad88f8ae39ac5fdc9439a1af5
 DIST wasm-bindgen-0.2.75.crate 160048 BLAKE2B 5e0fb4b5093e51d59007d202a4fc30ebfe0d174101a7178412c7cf0c11de1e1dfda2a86ce403f925eda5f286dfcf07d348143108905b912d2c4222f07ef414b9 SHA512 6e44827bddf78f38203f864564e7315744b4ee232a20b62f74551d9c8099005e5289074ca123acdb98f367e6e09ceb694124649d26ca16aa5c4137dd9494df91
-DIST wasm-bindgen-backend-0.2.74.crate 25434 BLAKE2B 211365a4407865646376bc40fbfd9865715b137aadc18f267a9d32be8e0e585d05286f8a40cba20060e3591e3a5afa49f678bac6546cde7ef88c2bde36909724 SHA512 df9fdca6c48ecf1926552c4fe06a5936f7ea0523d62e0c62f104ce5eeae7ced1fa33875e2d3ef43d58a6395f77dd37e4882850443eb1d6aa59f0ec0bcf537cfb
+DIST wasm-bindgen-0.2.80.crate 164576 BLAKE2B ee581f812bdab9dcf23c73ce25afa6aafeffb7b9c70d5a64539487548efb290bfcb94cbe5af6e12b5a5912548ae0fc6cc3168de4a5ab63b3823b6b071d41161c SHA512 928fd6575217909a46f23ea8147caa438efed8eef31d1e0d75610fc380c18d7cf51cb74c7d5c83136d36433fd19bc9256b6566c2624a4008daca1b3e155aacf1
 DIST wasm-bindgen-backend-0.2.75.crate 25521 BLAKE2B 8b4d494cc903e1d37f4b5f0cf0dad2304f35534a15a4381cf511384b090b635f9926647eccb434c148c0fe86f0621e8aaaab3fc38c8c61d2b45363a2c8ddcaaf SHA512 27231ae632b3377f54dba755c7db2334c77f75d2f2d6062fe9be27d19ee071552b8c36f037f5bf5cf383f262a88464a0fb5018fef2c301202c9927e0abd08637
-DIST wasm-bindgen-futures-0.4.24.crate 14759 BLAKE2B 608e230509509508130e955d839cb1cef0b3f4c2ce4b69ec61e6357397b9d476e63b69335510f18289de74d63dd007486b5bb74020b9e79344d4c2bb91db0825 SHA512 a1b2220c7760300fe07937b039eb6dbb86e0110f5600d366a6a365ab74ca7894ff251902a78bf5aa3757cdc55a9de316e24fa26c68bbfda4ecabdc42e273a385
+DIST wasm-bindgen-backend-0.2.80.crate 25741 BLAKE2B bac730f41a17aa963bdb005bcbce76e988b0c163fdf1b117cb3bf838d7186b732f81ce4edc068c6e3d2934802c974e19f1d8588ff71310462a189b3e5b9d4653 SHA512 20c33664f194dbc5998093831d8ed0eae82cfa6c90b8c3b9338c4f32104594a8864c68a51ee3e39fca1eba166b241a9a8e508d5f942791d727deb2decd9056d2
 DIST wasm-bindgen-futures-0.4.25.crate 14772 BLAKE2B 4a2d2831a6aa8b01762956f7b8eec1b7b5802e631cb097ac993da4259a9515a709cb37506d11d5169155a0ca2b96befd7133b2208804c9144cbb56d78672b9f9 SHA512 f0d08a399d2ac2e9c15339807d852e410ed822eb4fbf5647ff6baf6b558ea5bf178d31b5b81e5b341fd135f90d064d73debadaeddaab65c4d9c67e2b2a7da89e
-DIST wasm-bindgen-macro-0.2.74.crate 11536 BLAKE2B 65cd4b6206cc3f8303f89a76628cf54f7e31b31857eac3cc2c377b4a11f7c32548faf6a87f4a821e4ac6f66ca8d36427f4563eac8cc84e2612d5a9438b8df861 SHA512 34c7f3703ee1ee2060ba6ae638bc69193d32ced9e30c40d75bae1431efdd76b4f3adca8f9a72fb7c75f894de42a478556828e1a3854e436427bbd5dc6dc7b838
 DIST wasm-bindgen-macro-0.2.75.crate 11550 BLAKE2B 160805abd3343c43634c2d8cfc2ae9eafdd18be207fbb849caefeef47d6ffad70e436775b86c3432ccb78d994ce81cee97c1b41c29484148d23946392a5dc9fa SHA512 200999b53937df7daae4779ec7aa1b78bb10d399c3ebe7dc8d9806ef697cfe6c4111296623610fb4aea48cf7cfdc6ac2fe66398db781796f8fdad32e4809a4cd
-DIST wasm-bindgen-macro-support-0.2.74.crate 17831 BLAKE2B 29f3828f58b0e8eaae04e1d73bbf0b4cea7b75c1a5ae4348938a5f77d9eb1a1ee13dd137f9750f4c8defa6f2f5444d66b6715bc5052c57a603bf3a94cb05a428 SHA512 feab4a3661a879d5fdef852531e3261060db46f1d80106926bc8a8294a19adb104a9cfb59f3fead693abf3707118084a063906248d3f4c566b43e9aa9c2983b4
+DIST wasm-bindgen-macro-0.2.80.crate 11805 BLAKE2B ce070eac93a0cecac6d2e303f40b9f9784489133da2cf7fabbadd57afdeff5966308481276d4375150f0950fdbee165f466b4b099f0932ce26dd02ce6007af10 SHA512 816922762591e7ccd07d9bab1f089d1d0484c04ca4d8b9060d432fabe4ca28a6b6f0e701129f6d0a3fc341b845115c2dd1bea3bb67493234a73f7cd2bc0c66db
 DIST wasm-bindgen-macro-support-0.2.75.crate 17883 BLAKE2B 007f789084f42f7aee7db984763c0d224ad16b04d134aa2208b53a93911b408a4e95ad51e3f6e010157ee2a4ba8f9e52cffc20f2c47ecc7ffece797814c99b10 SHA512 cb0bb02c7f0bb6ad7de3adff606d18e7eae3f4dfd276abd540de6dbf30d995445347781e681ae6f71a943cc2b7c4da36459f49af32cd1574e5634948ee65421f
-DIST wasm-bindgen-shared-0.2.74.crate 7163 BLAKE2B 076464004d12495342a4b24f1dedc629f0ebb49993fce74271a5e59cd39e9a38ceea9a287716c65c2e61744c829388f7cdd7597a541da22b4f794b8bc3d44094 SHA512 4613c677d04abcabe6132f8f2a5a24f622cb1cb0c084f535e2f97584acba7a0faa12fd0636186b58756a7e4a82f364b04ea73330d7841940917f5e3324d0e60a
+DIST wasm-bindgen-macro-support-0.2.80.crate 17857 BLAKE2B 9f51e4193f64088d95079a105164c75d2397f07846bc8fb29bf7f9dd3747dd7d4d6f3b340cde219fbc3b181199c8f1aaf62317ddd3ce8e7f25f68b2d5ffbd514 SHA512 8d4a68c363dde93d9644f30ab69ef28879e8c354e41e6ed1d1598beeeaba5bb6c8e6769fac5404faf438a90d87fbdaf9bc9b4d082dd7b1986f789d739f7b5108
 DIST wasm-bindgen-shared-0.2.75.crate 7177 BLAKE2B 89da1efd60d9f1a5f99fe216a1ddb56aaa53e75591dbdb11aeb07f350f95dc436e68d7e16c182fa10385b7eb07788fdaa87f374a007d687a473a7049d585f6be SHA512 35c8ef834dc0ffdc245a52d987a543483f4caeee0f2d831e2a48bd7c0dd43bedf02b460323ef0d40a4e7945b351768cc4a07112771f197b93702887b828e9821
-DIST web-sys-0.3.51.crate 651133 BLAKE2B 330aaa7323a516eb840b2a6ff0ee2e076ed70990c04679dca328d5eeae9aac01fb07a4e2852615715f14abe368989f84f159ac72a4c320c01437056dd7dec706 SHA512 fd0e1ec156d88699adc271d092dd1adf4d41cd554b2b49e2c53423eabbc2215b539a435d1b9146dccc40282339d766565ccdedef82febcafca43cb6e1437e5fc
+DIST wasm-bindgen-shared-0.2.80.crate 7204 BLAKE2B dd955b920bb74d96734b58c3143a10182c64ff5d4c1cbcdcba909521b45c0f97422c3aca2894722d96a226884a7c334b06649ca7c1cb2e7b08c2cac5acf53dd5 SHA512 c170759d46e12edd41dcafc908caa887756a811006a178b3bf5ae73f73556d51fa13fc4a0844e28071d21c177a1d98e1e2f6dcac41dc240b972b697d36d74203
 DIST web-sys-0.3.52.crate 663882 BLAKE2B 8e0de45d084c801ca8a1f1a23dc7b5b510c0cd56d3cf2edbda241b4a7124962a750c823ad617a5fb102497751ca916937576356bb6d5c95c8ddb1eb6632a45df SHA512 03f2cc2d0173cc865005026daaf8c596a0df3f7d4da5937f3c6121280a55904180ef052e9663865ee3c74156f32af91a5ecfe146b72abe25ddaa4b05db4653cf
+DIST web-sys-0.3.57.crate 686563 BLAKE2B ddb687a252181a9198bc96da3feaea007ff188641996172293772257cffd748a79f306c24d9eb619c61a5ddcec4bb6e423288a831ff14c7b5ec6b37839b52508 SHA512 144a481ff7562ff5f96145c7db64ecc704863e2fd6c0c9afc87fe87513e5be660fcadec6b1114ed2c86da36ccd97024ce601b843c8768dd8b5c53c71daae9800
+DIST webpki-0.22.0.crate 58663 BLAKE2B 4fff91a8ce3d46a9daa9e39c50755f79574c91faddead2f6c879f6e9bc2189b76c4951cbc36e607e099ab8a870b422e1afcd4bcbecc14e96555c26c8cbefeb84 SHA512 7c2916d47f2232587e3ccaa8fefc8b576addaf84b55166011032e471f91ce54a79d2fca7fcc1144552c254f5baead708fba2b0ce76a1c34286838a8744b0f570
+DIST webpki-roots-0.22.3.crate 242291 BLAKE2B 70509e4fe7e1df706c66dee61200dd73372ed37ad9dd08db81687bfca6d2baffa4a9588054a827cae3c7e55a0aa31de220c5cb205467bc2891188cef1949b776 SHA512 4015b9f98127324efd8219a3a1f3e7f3bc7d67023838fa924a52df8815ff80a5caca351e12219b24be594fe55448ea06b5e040c19b4d14156a115fe5c70c245f
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
@@ -335,10 +443,11 @@ DIST winreg-0.7.0.crate 21225 BLAKE2B 5841db683dc0aa8b92de8ec43100403b029c8d3e54
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 DIST wyz-0.2.0.crate 12926 BLAKE2B dd4de5ec403e57d8362a15efea78e5217164dfd6b22c16458ffff8722e8cd3f28b567a2b9b1bc2774d6c8ba153d37e350929e98b38c82d022f7890052da30e37 SHA512 3a16c3e81d3595ddf1e7816e698eb4d07c7455dec579fd5e97b5d8b77e626cda52f3cdaee71e234e5e500a7ac58b9d1d5f12b17264686f3f225d5e5b0d315de7
 DIST xdg-2.2.0.crate 13387 BLAKE2B f1a5909b6a4544eaf28d1d051e05a6b9b09043060e14e394410778ed175e9f27246afadf3851dec21020c5e2ca81ef4db44a34e58d9229972b2475ff5f40d6c9 SHA512 16342b8396b4a329801a0ce3b9db82c4c767d09339f895d9f000c64b7160df11019b320cda632f99d8d5b9f65c97894b09091ee4e2ccafac0cd671481fa5c61e
-DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
+DIST xdg-2.4.1.crate 14034 BLAKE2B 7fd98ef4e1534d13da125a78cb7425318f1f2f0c7e06a8c8045b2145c1696bf86daf820577aa9757af0deb11951315efd382091b1c73dd3853841388927c2b01 SHA512 23e69abbe79a0977900af37feb9f367a82d0ba4e69fc9421e356a5957920e316379355b1c6eeda1235feb3d028f738c41f520d28665f919e775b20240219e07e
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 DIST zeroize-1.3.0.crate 15913 BLAKE2B 571d96420e85e3d12100dcaff00d4721eae7296465cafce83db81293e801cd5a1f78b19986dc537fab208519a48e6a7df344d8e8a7053b094c1aa5bb90de083b SHA512 352a668a4c491cbd644368eb19f797709a41f3abf9a09028b6c1c4077710d48b74c3018e65112762a31403917f000340a0e57bc095a745e3f99300d6c25ca8bb
-EBUILD cargo-audit-0.15.0.ebuild 5765 BLAKE2B e596496ac348b9e58bc231f4f59ad51b8ad074e0ed23266cc89beb74803be0ac88795b0d71487d73c3e6256815129d6688a84f342cfc5845d905dce17adc9d33 SHA512 487b1d0270b67f5a51ff9e72ce7ebc767b74d63b0e0cb1f0a8b15dd0982033ccc9528d27f7cc243ab3279c93428056f76013e02a358faf75032a7c79fbd407bb
-EBUILD cargo-audit-0.15.2.ebuild 6320 BLAKE2B 7eaad0bbb5b8787f1b605d5c880749a686b70343020b58f81fbf09ed4a78f5f73796575c0681f3bf4b09c23bcf81dec5a9a612c3306af3bdb1abcb3cd529d8f5 SHA512 31b3147bff8b63c018effcb6487c6e865fe595a0a90604b7d2ec570781688efecaf2595d80b714d0505f0d34f221ae331ae0c2aee8e7ba265b6801389dc66f64
+DIST zeroize-1.5.4.crate 17586 BLAKE2B 0bcb58b428adcf743f06a01f431aaba0b483f0e00b70e1f9fd3da37350982a8d4511301fcb0016892264deed10e2efbf3b85becde9d74e91538715db63e231fc SHA512 c581d3ab3e7a1d5803c0d1e0d054aec1f47fa0387625fe9367dce7875c2f015d921f70cadc33ac596c96b87461ddf9fd35c5213b61b705aecaf213635a551445
+EBUILD cargo-audit-0.15.2-r1.ebuild 6325 BLAKE2B 314e0668bddebe8a1d3412219ee9878e03112afa0f3c87b11adc16c6d038726d22d08911a116ce76824ab6166fc0896b72665dc6edcfbf966bbfe7f3c90bc1d4 SHA512 6950b35da1a2fe4b4cf850ddba70269139ba61f7426e050c3571aea7bab0e8e118df01acd36a0f4808409e596324591333d87cedaf822b1700fc84fa427f1aae
+EBUILD cargo-audit-0.17.0.ebuild 5867 BLAKE2B a257156edc625021fca4a9112d8968a9f778623cf1006d0d5d6966d9169c5111c63a8221a2018828e39635548002ba3c2e87ad47ec599af0c02e2a4789432ed3 SHA512 253a8d737027fe9c7f59753212bbf75c69cfe93f6471797867ada88b7ee352a26e13983973a95250fc5daccab29fe85a28b3a0a9625b941200accd5a94cab1b7
 MISC metadata.xml 530 BLAKE2B 327d1671570ea72c3c86ddbfd42d334426621f5f2f91f63684ea51a3f0fa504d61624acd05fa5891c712c2c03672334b5ec366206ee78000390d2aaa4d8da30f SHA512 c8bbccf4d4483c621a5eab0608806a07ff9dc16df57e46e7d90b5eb1537e8654efe729184695d13b75eca3499131a0eb0e41872cad3aae3118ad2164da3cf9db
diff --git a/dev-util/cargo-audit/cargo-audit-0.15.0.ebuild b/dev-util/cargo-audit/cargo-audit-0.15.0.ebuild
deleted file mode 100644
index 4207571cab8f..000000000000
--- a/dev-util/cargo-audit/cargo-audit-0.15.0.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-abscissa_core-0.5.2
-abscissa_derive-0.5.0
-addr2line-0.15.2
-adler-1.0.2
-aho-corasick-0.7.18
-ansi_term-0.11.0
-arrayvec-0.5.2
-askama-0.10.5
-askama_derive-0.10.5
-askama_escape-0.10.1
-askama_shared-0.11.1
-atom_syndication-0.9.1
-atty-0.2.14
-autocfg-1.0.1
-backtrace-0.3.60
-base64-0.13.0
-bitflags-1.2.1
-bitvec-0.19.5
-block-buffer-0.7.3
-block-padding-0.1.5
-bumpalo-3.7.0
-byteorder-1.4.3
-bytes-0.5.6
-bytes-1.0.1
-byte-tools-0.3.1
-canonical-path-2.0.2
-cargo-edit-0.7.0
-cargo_metadata-0.11.4
-cc-1.0.68
-cfg-if-0.1.10
-cfg-if-1.0.0
-chrono-0.4.19
-clap-2.33.3
-color-backtrace-0.3.0
-combine-4.6.0
-comrak-0.10.1
-core-foundation-0.9.1
-core-foundation-sys-0.8.2
-crates-index-0.16.7
-darling-0.10.2
-darling_core-0.10.2
-darling_macro-0.10.2
-derive_builder-0.9.0
-derive_builder_core-0.9.0
-digest-0.8.1
-diligent-date-parser-0.1.2
-dirs-3.0.2
-dirs-sys-0.3.6
-encoding_rs-0.8.28
-entities-1.0.1
-env_proxy-0.4.1
-error-chain-0.12.4
-failure-0.1.8
-failure_derive-0.1.8
-fake-simd-0.1.2
-fixedbitset-0.2.0
-fnv-1.0.7
-foreign-types-0.3.2
-foreign-types-shared-0.1.1
-form_urlencoded-1.0.1
-fs-err-2.6.0
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-funty-1.1.0
-futures-channel-0.3.15
-futures-core-0.3.15
-futures-io-0.3.15
-futures-sink-0.3.15
-futures-task-0.3.15
-futures-util-0.3.15
-generational-arena-0.2.8
-generic-array-0.12.4
-getrandom-0.2.3
-gimli-0.24.0
-git2-0.13.20
-glob-0.3.0
-gumdrop-0.7.0
-gumdrop-0.8.0
-gumdrop_derive-0.7.0
-gumdrop_derive-0.8.0
-h2-0.2.7
-hashbrown-0.9.1
-heck-0.3.3
-hermit-abi-0.1.18
-hex-0.4.3
-home-0.5.3
-http-0.2.4
-httparse-1.4.1
-http-body-0.3.1
-httpdate-0.3.2
-humansize-1.1.1
-humantime-2.1.0
-humantime-serde-1.0.1
-hyper-0.13.10
-hyper-tls-0.4.3
-ident_case-1.0.1
-idna-0.2.3
-indexmap-1.6.2
-iovec-0.1.4
-ipnet-2.3.1
-itoa-0.4.7
-jobserver-0.1.22
-js-sys-0.3.51
-kernel32-sys-0.2.2
-lazy_static-1.4.0
-lexical-core-0.7.6
-libc-0.2.97
-libgit2-sys-0.12.21+1.1.0
-libssh2-sys-0.2.21
-libz-sys-1.1.3
-linked-hash-map-0.5.4
-log-0.4.14
-maplit-1.0.2
-matchers-0.0.1
-matches-0.1.8
-maybe-uninit-2.0.0
-memchr-2.4.0
-mime-0.3.16
-mime_guess-2.0.3
-miniz_oxide-0.4.4
-mio-0.6.23
-miow-0.2.2
-native-tls-0.2.7
-net2-0.2.37
-nom-6.1.2
-num_cpus-1.13.0
-num-integer-0.1.44
-num-traits-0.2.14
-object-0.25.3
-once_cell-1.8.0
-opaque-debug-0.2.3
-openssl-0.10.35
-openssl-probe-0.1.4
-openssl-src-111.15.0+1.1.1k
-openssl-sys-0.9.64
-owning_ref-0.4.1
-percent-encoding-2.1.0
-pest-2.1.3
-pest_derive-2.1.0
-pest_generator-2.1.3
-pest_meta-2.1.3
-petgraph-0.5.1
-pin-project-1.0.7
-pin-project-internal-1.0.7
-pin-project-lite-0.1.12
-pin-project-lite-0.2.6
-pin-utils-0.1.0
-pkg-config-0.3.19
-ppv-lite86-0.2.10
-proc-macro2-1.0.27
-proc-macro-error-1.0.4
-proc-macro-error-attr-1.0.4
-quick-xml-0.20.0
-quote-1.0.9
-radium-0.5.3
-rand-0.8.4
-rand_chacha-0.3.1
-rand_core-0.6.3
-rand_hc-0.3.1
-redox_syscall-0.2.9
-redox_users-0.4.0
-regex-1.5.4
-regex-automata-0.1.10
-regex-syntax-0.6.25
-remove_dir_all-0.5.3
-reqwest-0.10.10
-rustc-demangle-0.1.20
-rust-embed-5.9.0
-rust-embed-impl-5.9.0
-rust-embed-utils-5.1.0
-ryu-1.0.5
-same-file-1.0.6
-schannel-0.1.19
-secrecy-0.6.0
-security-framework-2.3.1
-security-framework-sys-2.3.0
-semver-0.10.0
-semver-0.11.0
-semver-0.9.0
-semver-1.0.3
-semver-parser-0.10.2
-semver-parser-0.7.0
-serde-1.0.126
-serde_derive-1.0.126
-serde_json-1.0.64
-serde_urlencoded-0.7.0
-sha-1-0.8.2
-shell-words-1.0.0
-signal-hook-0.1.17
-signal-hook-registry-1.4.0
-slab-0.4.3
-smallvec-0.6.14
-smartstring-0.2.6
-smol_str-0.1.17
-socket2-0.3.19
-stable_deref_trait-1.2.0
-static_assertions-1.1.0
-strsim-0.8.0
-strsim-0.9.3
-structopt-0.3.21
-structopt-derive-0.4.14
-subprocess-0.2.7
-syn-1.0.73
-synstructure-0.12.4
-tap-1.0.1
-tempfile-3.2.0
-termcolor-1.1.2
-textwrap-0.11.0
-thiserror-1.0.25
-thiserror-impl-1.0.25
-time-0.1.43
-tinyvec-1.2.0
-tinyvec_macros-0.1.0
-tokio-0.2.25
-tokio-tls-0.3.1
-tokio-util-0.3.1
-toml-0.5.8
-toml_edit-0.2.1
-tower-service-0.3.1
-tracing-0.1.26
-tracing-attributes-0.1.15
-tracing-core-0.1.18
-tracing-futures-0.2.5
-tracing-log-0.1.2
-tracing-subscriber-0.1.6
-try-lock-0.2.3
-twoway-0.2.2
-typed-arena-1.7.0
-typenum-1.13.0
-ucd-trie-0.1.3
-unchecked-index-0.2.2
-unicase-2.6.0
-unicode-bidi-0.3.5
-unicode_categories-0.1.1
-unicode-normalization-0.1.19
-unicode-segmentation-1.7.1
-unicode-width-0.1.8
-unicode-xid-0.2.2
-url-2.2.2
-vcpkg-0.2.15
-vec_map-0.8.2
-version_check-0.9.3
-wait-timeout-0.2.0
-walkdir-2.3.2
-want-0.3.0
-wasi-0.10.2+wasi-snapshot-preview1
-wasm-bindgen-0.2.74
-wasm-bindgen-backend-0.2.74
-wasm-bindgen-futures-0.4.24
-wasm-bindgen-macro-0.2.74
-wasm-bindgen-macro-support-0.2.74
-wasm-bindgen-shared-0.2.74
-web-sys-0.3.51
-winapi-0.2.8
-winapi-0.3.9
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.5
-winapi-x86_64-pc-windows-gnu-0.4.0
-winreg-0.7.0
-ws2_32-sys-0.2.1
-wyz-0.2.0
-xdg-2.2.0
-xml-rs-0.8.3
-zeroize-1.3.0
-"
-
-inherit cargo
-
-DESCRIPTION="Audit Cargo.lock for security vulnerabilities"
-HOMEPAGE="https://github.com/rustsec/cargo-audit"
-SRC_URI="https://github.com/RustSec/rustsec/archive/refs/tags/${PN}/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris)"
-
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT MPL-2.0 Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="fix"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	dev-libs/libgit2:=
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/rustsec-${PN}-v${PV}"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-# requires checkout of vuln db/network
-PROPERTIES="test_network"
-RESTRICT="test"
-
-src_configure() {
-	local myfeatures=( $(usev fix) )
-	cargo_src_configure
-}
-
-src_compile() {
-	# normally we can pass --bin cargo-audit
-	# to build single workspace member, but we need to cd
-	# for tests to be discovered properly
-	cd cargo-audit || die
-	cargo_src_compile
-}
-
-src_install() {
-	cargo_src_install --path cargo-audit
-	local DOCS=( cargo-audit/{README.md,audit.toml.example} )
-	einstalldocs
-}
diff --git a/dev-util/cargo-audit/cargo-audit-0.15.2.ebuild b/dev-util/cargo-audit/cargo-audit-0.15.2-r1.ebuild
similarity index 98%
rename from dev-util/cargo-audit/cargo-audit-0.15.2.ebuild
rename to dev-util/cargo-audit/cargo-audit-0.15.2-r1.ebuild
index 4929e9260b9c..3f0cc8a36c16 100644
--- a/dev-util/cargo-audit/cargo-audit-0.15.2.ebuild
+++ b/dev-util/cargo-audit/cargo-audit-0.15.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -300,10 +300,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64"
 IUSE="fix"
 
-RDEPEND="
-	dev-libs/openssl:0=
-	dev-libs/libgit2:=
-"
+RDEPEND="dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/rustsec-${PN}-v${PV}"
@@ -315,7 +312,11 @@ PROPERTIES="test_network"
 RESTRICT="test"
 
 src_configure() {
-	local myfeatures=( $(usev fix) )
+	local myfeatures=(
+		$(usev fix)
+		vendored-libgit2
+	)
+
 	cargo_src_configure
 }
 
diff --git a/dev-util/cargo-audit/cargo-audit-0.17.0.ebuild b/dev-util/cargo-audit/cargo-audit-0.17.0.ebuild
new file mode 100644
index 000000000000..90a39e2e9c48
--- /dev/null
+++ b/dev-util/cargo-audit/cargo-audit-0.17.0.ebuild
@@ -0,0 +1,311 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	abscissa_core-0.6.0
+	abscissa_derive-0.6.0
+	addr2line-0.17.0
+	adler-1.0.2
+	aho-corasick-0.7.18
+	ansi_term-0.12.1
+	anyhow-1.0.56
+	arc-swap-1.5.0
+	askama-0.11.1
+	askama_derive-0.11.2
+	askama_escape-0.10.3
+	askama_shared-0.12.2
+	atom_syndication-0.11.0
+	atty-0.2.14
+	autocfg-1.1.0
+	backtrace-0.3.64
+	base64-0.13.0
+	bincode-1.3.3
+	bitflags-1.3.2
+	block-buffer-0.7.3
+	block-buffer-0.9.0
+	block-padding-0.1.5
+	bumpalo-3.9.1
+	byte-tools-0.3.1
+	byteorder-1.4.3
+	bytes-1.1.0
+	camino-1.0.7
+	canonical-path-2.0.2
+	cargo-edit-0.9.1
+	cargo-platform-0.1.2
+	cargo_metadata-0.14.2
+	cc-1.0.73
+	cfg-if-1.0.0
+	chrono-0.4.19
+	chunked_transfer-1.4.0
+	clap-2.34.0
+	clap-3.1.18
+	clap_derive-3.1.18
+	clap_lex-0.2.0
+	color-eyre-0.6.1
+	combine-4.6.3
+	comrak-0.12.1
+	concolor-control-0.0.7
+	concolor-query-0.0.4
+	core-foundation-0.9.3
+	core-foundation-sys-0.8.3
+	cpufeatures-0.2.2
+	crates-index-0.18.7
+	crc32fast-1.3.2
+	crossbeam-channel-0.5.4
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	darling-0.12.4
+	darling_core-0.12.4
+	darling_macro-0.12.4
+	derive_builder-0.10.2
+	derive_builder_core-0.10.2
+	derive_builder_macro-0.10.2
+	digest-0.8.1
+	digest-0.9.0
+	diligent-date-parser-0.1.3
+	dirs-4.0.0
+	dirs-next-2.0.0
+	dirs-sys-0.3.7
+	dirs-sys-next-0.1.2
+	dunce-1.0.2
+	either-1.6.1
+	encoding_rs-0.8.31
+	entities-1.0.1
+	env_proxy-0.4.1
+	eyre-0.6.8
+	fake-simd-0.1.2
+	fastrand-1.7.0
+	fixedbitset-0.4.1
+	flate2-1.0.23
+	fnv-1.0.7
+	foreign-types-0.3.2
+	foreign-types-shared-0.1.1
+	form_urlencoded-1.0.1
+	fs-err-2.7.0
+	generic-array-0.12.4
+	generic-array-0.14.5
+	getrandom-0.2.6
+	gimli-0.26.1
+	git2-0.14.2
+	gumdrop-0.8.1
+	gumdrop_derive-0.8.1
+	hashbrown-0.11.2
+	heck-0.4.0
+	hermit-abi-0.1.19
+	hex-0.4.3
+	home-0.5.3
+	humansize-1.1.1
+	humantime-2.1.0
+	humantime-serde-1.1.1
+	ident_case-1.0.1
+	idna-0.2.3
+	indenter-0.3.3
+	indexmap-1.8.1
+	instant-0.1.12
+	itertools-0.10.3
+	itoa-1.0.1
+	jobserver-0.1.24
+	js-sys-0.3.57
+	kstring-1.0.6
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	libc-0.2.123
+	libgit2-sys-0.13.2+1.4.2
+	libssh2-sys-0.2.23
+	libz-sys-1.1.5
+	line-wrap-0.1.1
+	linked-hash-map-0.5.4
+	log-0.4.16
+	maplit-1.0.2
+	matchers-0.1.0
+	matches-0.1.9
+	memchr-2.4.1
+	memoffset-0.6.5
+	mime-0.3.16
+	mime_guess-2.0.4
+	minimal-lexical-0.2.1
+	miniz_oxide-0.4.4
+	miniz_oxide-0.5.1
+	native-tls-0.2.10
+	never-0.1.0
+	nom-7.1.1
+	num-integer-0.1.44
+	num-traits-0.2.14
+	num_cpus-1.13.1
+	num_threads-0.1.5
+	object-0.27.1
+	once_cell-1.10.0
+	onig-6.3.1
+	onig_sys-69.7.1
+	opaque-debug-0.2.3
+	opaque-debug-0.3.0
+	openssl-0.10.38
+	openssl-probe-0.1.5
+	openssl-src-111.18.0+1.1.1n
+	openssl-sys-0.9.72
+	os_str_bytes-6.0.0
+	owo-colors-3.3.0
+	pathdiff-0.2.1
+	percent-encoding-2.1.0
+	pest-2.1.3
+	pest_derive-2.1.0
+	pest_generator-2.1.3
+	pest_meta-2.1.3
+	petgraph-0.6.0
+	pin-project-lite-0.2.8
+	pkg-config-0.3.25
+	plist-1.3.1
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.37
+	quick-xml-0.22.0
+	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.5.5
+	regex-automata-0.1.10
+	regex-syntax-0.6.25
+	remove_dir_all-0.5.3
+	ring-0.16.20
+	rust-embed-6.4.0
+	rust-embed-impl-6.2.0
+	rust-embed-utils-7.2.0
+	rustc-demangle-0.1.21
+	rustc-hash-1.1.0
+	rustls-0.20.4
+	ryu-1.0.9
+	safemem-0.3.3
+	same-file-1.0.6
+	schannel-0.1.19
+	scopeguard-1.1.0
+	sct-0.7.0
+	secrecy-0.8.0
+	security-framework-2.6.1
+	security-framework-sys-2.6.1
+	semver-1.0.9
+	serde-1.0.136
+	serde_derive-1.0.136
+	serde_json-1.0.79
+	sha-1-0.8.2
+	sha2-0.9.9
+	sharded-slab-0.1.4
+	shell-words-1.1.0
+	smallvec-1.8.0
+	smartstring-1.0.1
+	socks-0.3.4
+	spin-0.5.2
+	static_assertions-1.1.0
+	strsim-0.8.0
+	strsim-0.10.0
+	subprocess-0.2.8
+	syn-1.0.91
+	synstructure-0.12.6
+	syntect-4.6.0
+	tempfile-3.3.0
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	textwrap-0.11.0
+	textwrap-0.15.0
+	thiserror-1.0.30
+	thiserror-impl-1.0.30
+	thread_local-1.1.4
+	time-0.1.43
+	time-0.3.9
+	tinyvec-1.5.1
+	tinyvec_macros-0.1.0
+	toml-0.5.9
+	toml_edit-0.13.4
+	tracing-0.1.34
+	tracing-attributes-0.1.20
+	tracing-core-0.1.26
+	tracing-log-0.1.2
+	tracing-subscriber-0.3.11
+	twoway-0.2.2
+	typed-arena-1.7.0
+	typenum-1.15.0
+	ucd-trie-0.1.3
+	unchecked-index-0.2.2
+	unicase-2.6.0
+	unicode-bidi-0.3.7
+	unicode-normalization-0.1.19
+	unicode-width-0.1.9
+	unicode-xid-0.2.2
+	unicode_categories-0.1.1
+	untrusted-0.7.1
+	ureq-2.4.0
+	url-2.2.2
+	valuable-0.1.0
+	vcpkg-0.2.15
+	vec_map-0.8.2
+	version_check-0.9.4
+	wait-timeout-0.2.0
+	walkdir-2.3.2
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasm-bindgen-0.2.80
+	wasm-bindgen-backend-0.2.80
+	wasm-bindgen-macro-0.2.80
+	wasm-bindgen-macro-support-0.2.80
+	wasm-bindgen-shared-0.2.80
+	web-sys-0.3.57
+	webpki-0.22.0
+	webpki-roots-0.22.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
+	xdg-2.4.1
+	xml-rs-0.8.4
+	yaml-rust-0.4.5
+	zeroize-1.5.4
+"
+
+inherit cargo
+
+DESCRIPTION="Audit Cargo.lock for security vulnerabilities"
+HOMEPAGE="https://github.com/rustsec/cargo-audit"
+SRC_URI="https://github.com/RustSec/rustsec/archive/refs/tags/${PN}/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="fix"
+
+RDEPEND="dev-libs/openssl:0="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/rustsec-${PN}-v${PV}"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+# requires checkout of vuln db/network
+PROPERTIES="test_network"
+RESTRICT="test"
+
+src_configure() {
+	local myfeatures=(
+		$(usev fix)
+		vendored-libgit2
+	)
+
+	cargo_src_configure
+}
+
+src_compile() {
+	# normally we can pass --bin cargo-audit
+	# to build single workspace member, but we need to cd
+	# for tests to be discovered properly
+	cd cargo-audit || die
+	cargo_src_compile
+}
+
+src_install() {
+	cargo_src_install --path cargo-audit
+	local DOCS=( cargo-audit/{README.md,audit.toml.example} )
+	einstalldocs
+}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 5477b024ef61..91a00a67f908 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -4,5 +4,5 @@ DIST diffoscope-216.tar.gz 2711117 BLAKE2B d4818fc89a511c2387c486a38df0b925a78b4
 EBUILD diffoscope-207.ebuild 3297 BLAKE2B 38b17dc44cf8feccd717f69ae028dbada341c4b0dae653cc00fa4032da7c26a9d9026b5d8d29f6dc6f4cda42ee66ffb0d25f63c6dc253dbd0320e1848d01dfc7 SHA512 b97eb645cf2fcd16d472c265913373247d1b923586955860008ce2325369d10b6616704b88001e6260dc39bf409f2d4b5645ee4efec9c9e81f59731cce67ed74
 EBUILD diffoscope-214-r1.ebuild 3314 BLAKE2B 4249250c8390bc42972a495b2df794abf1818873c7223153758995e56d151e8cd901832f6c755e8f3e5f89663e1ccb4a8f417fb3b9f45e462cf98bc958775367 SHA512 2e53328aae5099f552df69f22bfd458109a3668885feeab4022effdf02686d001140006aa556e5b49f1e7080fe8bf91155d8fb6741c3d484992331d5d6c0432f
 EBUILD diffoscope-214.ebuild 3296 BLAKE2B 0d6f5c5ffa8be6470d622af2cf72181d283ece6bad089459d6ca12847df804b1174e104d74d39c447e632c6be4c182b56de8fb484c41e6afad9cbd0991ea98b9 SHA512 b8d9e8d6fdc0ab77d79d5f78a3718a6cf90c23afda16a37cad7fb70209f936eca1236f7b3058c89d14e36c1ffe645a81cc08963b2c25ec4c78b39320af30db37
-EBUILD diffoscope-216.ebuild 3319 BLAKE2B c4257c1bc58660cc5491ddd947a69c72659b84b105d24b2479df2f1b9be717dd715e8a01534c56fd12683723ec0c951fe056c37f51779a726913b40e7d802184 SHA512 a9437fdc6ff0fa80b839dea95a0102f1032d105b1f4c4f1bcdcfb540f9827af0da070f71a961f64fd6f5fc882618af5171391030c58927b8b440686627f0a33b
+EBUILD diffoscope-216.ebuild 3326 BLAKE2B ef5314ab8e78b5e93dbdd56dae8bb48df59eeefc8d42d918c29ff87189ee5fe2df07879b2abe04893557265417050c39e68b265fd9c21ecc7e546ab4b15fe21b SHA512 3a73dec69cdef67b5cf7439f5263158c37e5a868376c185da25a447305a25da3b992ad2c0f81469ca5e4a182f85c709a5fd899a84162dd55e7154e948d15ee84
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-216.ebuild b/dev-util/diffoscope/diffoscope-216.ebuild
index 02e3933b9367..177ba73b1c19 100644
--- a/dev-util/diffoscope/diffoscope-216.ebuild
+++ b/dev-util/diffoscope/diffoscope-216.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
diff --git a/dev-util/ebuildtester/Manifest b/dev-util/ebuildtester/Manifest
index 594379d1220f..dcb8d4b9ab2f 100644
--- a/dev-util/ebuildtester/Manifest
+++ b/dev-util/ebuildtester/Manifest
@@ -2,7 +2,9 @@ AUX ebuildtester.bash-completion 538 BLAKE2B b56fd67648a73b184c6965c1377066bfded
 DIST ebuildtester-0.1.35.tar.gz 19842 BLAKE2B 3d562718680914a47bb078f38f4351e5b4575ef6d11fa39247d7f06b81868cca0a30ec29ba0e7b14330ef45a117330ad2351f5eea2b75f23cbaba9e37d0441d4 SHA512 c268c621c3b22aefb6945da7169a4049c7bd3f9cc198d43eb733bc144bf1ac46e251235af669d2af5231f5517ef997ffcd28f4bcbb1c945237f6dd2dca502c46
 DIST ebuildtester-0.1.37.tar.gz 20919 BLAKE2B a97ea0de557601aae3faee8c959453179d402450f722872a7de6f544abdc2facaa71558d8b2088fbadf37b829a2991ca717ff5e1790c1e7c48ccfcd619e1737e SHA512 dfa157bb5745854cfd2a7580e5c8650712b796e01831137b90dbea7097f926e7b1eb6718bef8ab70a8e703a65049274cfe52eda9c3635df6b5697ff3403f5ee0
 DIST ebuildtester-41.tar.gz 22320 BLAKE2B dcaa1e35e4ee9dd43e6d9c1d6332d56c711117e98eb59e9bc0e852b6676a5e05bca69d7949f8a2edbd2cef7f6b100cefc866bd8394281ce9aa25b9287c235c8c SHA512 abee45178782f6ec648ebf7f3c2885065866a8f518e396bb1b0fd0b2815141b175c172114fb319ccdfa83f3043ecd44e83871a1a9d9dbea72f6091b3732717c5
+DIST ebuildtester-42.tar.gz 22852 BLAKE2B 0e672c70ed854b3ee459010590da22811ed06e0397d45e51b8ad1a86047aa3fbd61321a7a9bdf1b583c3a66246030bb30dbef4dc8acc1e10bc3b141095e08ff4 SHA512 c2fe0dbca673c51d686cc19954928efb3ab1e82c4d8b8548d272f8fc60a5fffd1898fe33dc26feebc5bc73a71207f5f1615e18036b264e76a09b9dc6d94168fa
 EBUILD ebuildtester-0.1.35.ebuild 784 BLAKE2B d69564f2431feb39ca37e427f1b241476d0dfa21daf67c063635bc0feee720a66f278bf349ec8188c847cbde3214188a80a5de20603f3c1c3083b3481d459870 SHA512 fc93f952d4808c967ea65ba5ccf00fb74ee873c5efb46eeceb829dec50a8bc51d5a8e152c5143d81d6f5381b67b4a75fb941e0036cc7fb0a9059097dfafa8189
 EBUILD ebuildtester-0.1.37.ebuild 772 BLAKE2B 1b93beb016e26f82ee553dccc22d835f3c8d39c3f6154bafbf4fb95c93e42056766214cc918f23acc9d5c91b3a0e152d2c20d783dcf14cfd909a35072feecaab SHA512 f18a82e472928b2c0d91747525f120fb3f533a4987995648320625dc081d2e76cc8aabebeda62f5b065777a5403dad70270e3ead8ebb9cfa557417d006c7ef48
 EBUILD ebuildtester-41.ebuild 858 BLAKE2B 4c33439960b8ff2d0a5fd1093421c8d7a55a7f302845ac81b13d737a6c804c64c83464c06e39394f0bc13e56168ae3cbc694362cd0a5abc91c294ed3fb7cfcd9 SHA512 d3488171cc14c1ceb17421ee3bbf7c1b6c34583b7871a3c336e9eaadcc0f297f31c634a5857b9d7c00e4d6b70b505056ebabcca4a32987f15cd1439cfc4be3be
+EBUILD ebuildtester-42.ebuild 858 BLAKE2B 4c33439960b8ff2d0a5fd1093421c8d7a55a7f302845ac81b13d737a6c804c64c83464c06e39394f0bc13e56168ae3cbc694362cd0a5abc91c294ed3fb7cfcd9 SHA512 d3488171cc14c1ceb17421ee3bbf7c1b6c34583b7871a3c336e9eaadcc0f297f31c634a5857b9d7c00e4d6b70b505056ebabcca4a32987f15cd1439cfc4be3be
 MISC metadata.xml 362 BLAKE2B e177f43c79bd6b0ad08513f5355721ad318d686bc3f3ff595c952605662899cf1fb2fcd8fdf356c1950ddff64ab5d51cf3257034e831f431eb260f55e11a3f06 SHA512 09d7e95819a4d9214f43a2b0d7956b0de93b07baa919ec9eeb66ca439c7553c806250f211addc7a34092794d42ea6a9ac62ecb33baa5a91afe03f824d73ea483
diff --git a/dev-util/ebuildtester/ebuildtester-42.ebuild b/dev-util/ebuildtester/ebuildtester-42.ebuild
new file mode 100644
index 000000000000..4222ddc016f2
--- /dev/null
+++ b/dev-util/ebuildtester/ebuildtester-42.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
+HOMEPAGE="https://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+# SRC_URI="https://github.com/nicolasbock/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-containers/docker
+	sys-fs/fuse
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp "${PN}.bash-completion" "${PN}"
+}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index f6c6a94efcc9..622146d98cea 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,5 +3,5 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913
 DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69
 EBUILD gdbus-codegen-2.72.1.ebuild 2190 BLAKE2B c7f123aea978b73975e8ddc25a38d01c08109d2f0cf85528542370f5f1882fb8406511ccfe075b3e6ce6c5225f7fca30aa62562fcf929e64669236f03ee842d5 SHA512 610d8d0eae0eba5d2bef27b8b2e4d5dffaa00573ac8d1a5e887229b8dac2fdedd806b25b5a9fdef9b751be261d3c9dd9909c7b3018427cbc6ab78d15a3abde00
-EBUILD gdbus-codegen-2.72.2.ebuild 2201 BLAKE2B cf9d3de985f048d31c837bfc32022e410b9c4fd9f3adcc9a18b2b4a404d25bae56718328168cf4c106bfadefc0cbb07e237b7d2f15ea54e04cff6d4be2f3ff1a SHA512 f50c39c3f5d2908f552d7877b83cc887ed9cc8f2418a13213ae9a2c8ff426922ad20f6f2d5f7478d7e21b99213b06df0eca20b6081ecc8505fa24314899f8ebc
+EBUILD gdbus-codegen-2.72.2.ebuild 2200 BLAKE2B 8e7270f3d97e88d88367625b2b606b32ca0515f0b537cba4392c89864fcba9679f18fbd8528ff11f66ab92d2531f8be395e8d098f11bb7e82d2e3bbe4c5e5496 SHA512 a9db38c6bdd546aefbb729afe4200efeb8e8a3e298cdeba1d8ec220840a6190e663cd9d86f2d0b6f323fb2f21385b00ec4cb956199ddae5a2cf7fe12d6b29b59
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild
index 510504f71cc6..7a6e729ff322 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 176d1235c840..93fb9bd3b075 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,5 +1,5 @@
 DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913
 DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69
 EBUILD glib-utils-2.72.1.ebuild 2332 BLAKE2B 7581ffec847cbcee17d538b17b01d97d00138e1fe29b2a43c2918c1e1a574c4b8ac2779974ec418e32a4ebd1c052c7e42a59f5fee3d0664e6cae37c3bf8496dd SHA512 96e4650a3d93ad5152784435bb10ae976e218d3415343a13fdafcc85b4551d5186650994b35017e1cae36d78ad034631d9050ae20f823f3f2309b48b354fc4eb
-EBUILD glib-utils-2.72.2.ebuild 2340 BLAKE2B 76f931baf38bb3e77988477867d576576aef408a629a10b20e5ae6a7fae2b4c8ff8f108d7f4cd23efc1a17c4f8809c537190394fc7cbfb3c3a777d7b9df18fcb SHA512 ad137f2ee9ea091e5ddb4d2ba7455cba82b003d748ffa0ae56cf53e6e443b029f0558b9b7632c4d50ae36a55904dff54cec99bc2d49ee609054fadac9c79f144
+EBUILD glib-utils-2.72.2.ebuild 2339 BLAKE2B cbce8b6c4ec7c21dfaf98d113fbc167aba15485d8a65ba1820b284c7239231e54651b03998da561451e35d572de8dd8334187800ffc949ae516d622803d82642 SHA512 8e39eb4bf965f13457390aca2a51c6a83849ca0e6e5142a54b60d59b6b2850dbb0f8558ad201252f60833ec7b10508fc29a172592c8271570e427a564f8099db
 MISC metadata.xml 333 BLAKE2B 70d0e83f8a0437baadea4b6771019a55d0d6f6a292bcb4263a7d811ec0b63a2ee4838b94371e03d62c4c43678eb7ae542b611166e2aecdea8c5194955ef1cda3 SHA512 0eab24184eba31bfda9752b62211472d6d8607644a2a3c2352a4483bc34975b87252aa5482a76499c5afe30414a75ba5958bd5bbf1bc755850806824e4267031
diff --git a/dev-util/glib-utils/glib-utils-2.72.2.ebuild b/dev-util/glib-utils/glib-utils-2.72.2.ebuild
index c715c1e6fd52..c35f088bae7e 100644
--- a/dev-util/glib-utils/glib-utils-2.72.2.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.72.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-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"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index 34639f325f57..8ca345ba66a8 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,5 +1,7 @@
 DIST gource-0.51.tar.gz 882783 BLAKE2B 86a95a55ef9e1ec50e19a4859163d7cdc2733b7c55a68e4d2db493e4c6587682b900b2c73525131972da4dde9fc4d9fa41ba728bdc56fd46fc6a559cb4d837f0 SHA512 f29326ffb2aa6f645fb941e08e41f0cbf8dd894d5a4d607b782caeb12a24e6446198027060b880e0ad14a36efbed19023620dd8c890cfc0c027fc90ac2d5be24
 DIST gource-0.52.tar.gz 899916 BLAKE2B 84cd4e21402157228f2eaa2c168a7cebf5176e98efe19f04927abc08602e58896a15e6888b5223b977105f2a5b124ed571f30445e6802cf30217e6a91d885520 SHA512 246e8b196f52f4a224e1f81c05ca0970002d15b26e2bb454826c5373bb3a53894abb5c7e6c940a5a540f5e29795093ca7c14dd003708f44df1bbd88faed1433c
+DIST gource-0.53.tar.gz 900932 BLAKE2B 7f2822b11b5eaeb5345ade1326702109dff120d3ef8c523a2425a84b54d357a29cfe23a9c4a253b287d570e74943cb67bb80753c6c698f9f60739735cb41769b SHA512 e4190eb581d9998808d1bb4f18ba5a3ae22bacf643b9a150c7d1607e97fca2eab720592aefdcc6a47f92adb4a8df17db48bb941a67ee3d23a10f300754f473be
 EBUILD gource-0.51.ebuild 1073 BLAKE2B e459bd452df402770251680f9831835dd8985e5cecda52314baa98d42375860ab5385b6193f97555ab44fa8083b4fd9a3549651bc7739c76ce40e8323f4b05df SHA512 9996810d53645f93a3049b1b93679c163f90d240901e07f8d232902e18bb222df0d61c09044fb869fe5cdc5f82ed0242844be487d9f59f2a5c28862b4b09ff0a
 EBUILD gource-0.52.ebuild 1236 BLAKE2B 9c80dd5c8cc45aee5f9e4b675a1382dd4f949dc7239cb509629b4e3f25ba93a9e58bfc5faa10a827de73e076be613dce0d854b8c8131229e7b988c83b2bc4c74 SHA512 e396327244e351e155d5e6fc31332522a4751ffdd88f92aa4f967d84b799fe4366945f366b8cf2df93360f2d579968a867663ef132ef0f914e6b1cc98ea62b7c
+EBUILD gource-0.53.ebuild 1236 BLAKE2B 9c80dd5c8cc45aee5f9e4b675a1382dd4f949dc7239cb509629b4e3f25ba93a9e58bfc5faa10a827de73e076be613dce0d854b8c8131229e7b988c83b2bc4c74 SHA512 e396327244e351e155d5e6fc31332522a4751ffdd88f92aa4f967d84b799fe4366945f366b8cf2df93360f2d579968a867663ef132ef0f914e6b1cc98ea62b7c
 MISC metadata.xml 386 BLAKE2B f163d4c1807ee502bfcb21f1a0f5b22d979259629e54d71fbaf7b54806f58090c78260a7ad8c24fe8349f01fa7502ec4c0b45129a94ac2a4e64b35e6b98032d1 SHA512 67743f4d934bfb15512fadbcfccb95a2a3e29b74d2bfd0fed8e4ff3e0c9779750df190f8dd61ac47397401caad5ce66d6a75ce1269b0d69d93304987740c73c1
diff --git a/dev-util/gource/gource-0.53.ebuild b/dev-util/gource/gource-0.53.ebuild
new file mode 100644
index 000000000000..15e24379c6be
--- /dev/null
+++ b/dev-util/gource/gource-0.53.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A software version control visualization tool"
+HOMEPAGE="https://gource.io/"
+SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.46:=[threads(+)]
+	>=media-libs/glew-1.5:0=
+	>=media-libs/libpng-1.2:0=
+	media-libs/libsdl2[video,opengl,X]
+	media-libs/sdl2-image[jpeg,png]
+	dev-libs/libpcre2:=
+	dev-libs/tinyxml
+	media-libs/libglvnd[X]
+	media-libs/freetype:2
+	virtual/glu:0
+"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/freefont
+"
+DEPEND="${COMMON_DEPEND}
+	>=media-libs/glm-0.9.3
+"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md ChangeLog THANKS )
+
+src_prepare() {
+	default
+
+	sed -e "/data\/gource.1/s/^/#/" -i Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	# fix bug #386525
+	# this enables gource to be compiled against dev-libs/tinyxml[stl]
+	if has_version dev-libs/tinyxml[stl]; then
+		append-cppflags -DTIXML_USE_STL;
+	fi
+
+	econf \
+		--enable-ttf-font-dir=/usr/share/fonts/freefont/ \
+		--with-tinyxml
+}
+
+src_install() {
+	default
+	doman data/gource.1
+}
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index 9a054fd5507e..c87d793809fe 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,3 +1,3 @@
 DIST howdoi-2.0.19.tar.gz 27109 BLAKE2B 32c7ebf177a5a51f9df924440c5767e1a47125e24b821b51b28cfec45a747f7c04265b93aa0a68a85d2f65582617f866483aa77e8c1168903ef9dfdc860535f5 SHA512 e3e074f7b122513486bda0a0f68d31d51a2da2f17efe5c6ae2b5c49f44dd0f80a735d67a33e3d47eea51d83968da19bc294fc74a30f7e30457058ad9919e105a
-EBUILD howdoi-2.0.19.ebuild 713 BLAKE2B ea31ff16bed295547de93824d6704a99753fd0d4e437f7a2467119a8e99213930cf3dbed081e005122dd086ec349334bd6fc204f53a20b9d6598e8d3506551ee SHA512 1e47a861cb0e6324af21845099728edc3fbb247fd3e272c521e61256d0d2f4e7ed1a9623cbfb9f63cd623a04e50594ef601e175296a249b603bdc0e0ddb714d5
+EBUILD howdoi-2.0.19.ebuild 714 BLAKE2B c1f6f015e8441e0d4290fd98f5eba7a479c9a7588607fce2712e619661ed221c84594f9c61a2c1d4502935c167e2aebbfcecf56def82d7fabc516d360a4f9ef4 SHA512 24b87a508d741388ad58bc30374a837d396ef2c97fb57f7823adf7576c1808bc625892afabfff2bc5ed755932241158bb94e51429fda20d94b7f1e85ec3a5db4
 MISC metadata.xml 400 BLAKE2B 2d9c3340fc0121d15e83c1d3f587cf6833bd8fcaa4514c750691391e1190017be1f47cee156c8c4fb84200c54584218c0be84b0a6b3f9779b8ac59d94173ca77 SHA512 5a9f1dfc535a1f92e70776f91383f9c02381d7776de5456f2394fb0540805e0b4cbd39498bedf0544a8e4f70f5d560611de8ed0ff3607d6ddbc4d82624ecf3b0
diff --git a/dev-util/howdoi/howdoi-2.0.19.ebuild b/dev-util/howdoi/howdoi-2.0.19.ebuild
index 31886140b8cd..f472b459747f 100644
--- a/dev-util/howdoi/howdoi-2.0.19.ebuild
+++ b/dev-util/howdoi/howdoi-2.0.19.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS="manual"
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A code search tool"
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index c636a2c70c9d..9d15038f3882 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,12 +1,6 @@
 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
 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.11104.tar.gz 8594329 BLAKE2B 15beca4428816686f29ea14c41c55b4ecd9be094f9dd3c004b6b7a521526205d45f7ccae93f32125b4cde16e863dd5b1d832cadab4bf4500b468900ddcae230e SHA512 9c52cde409168c36ac3744a0cf825f10ce59538eac804721dcb23d72ad7a752e587798b55c4da23edc2b7e0a00376ef29ab39ca485de2ab179f04c5b5bc9a8ad
-DIST intel-graphics-compiler-1.0.11222_p20220518.tar.gz 8809791 BLAKE2B 1b2bb8322e1c6a226ed84f25d05b5a0dd88571240b264b9e29159a77f19c9207be615788502f0f8ce29b751862102319c2f65e3764e650e94a0dab37544cf0b9 SHA512 58ef8040372bcddd6a8401e48be0806efa4b8c42fe4cffe33226d420224c7ec3bfad446195bb6da1803d7d973b07f41e717ce185c79aa9d2c9a759914546b785
-DIST intel-graphics-compiler-1.0.11279_p20220528.tar.gz 8827945 BLAKE2B a8a4788a1e70e45836989a1cf6938bbba26564a4186db10a00f1f1372a1ee289f79a1c8905aa5237bad762f9c67b5339960e80e2e08eb9fe2e7fe0d8e14f1cd8 SHA512 d544cdc3bfb91cd0d585485b569030414291736a1410711c3c678df2cf5f6aa94dafbdcb27282aa75c0d4786291d01208b40fc816caa7ff23ac805940be03068
 DIST intel-graphics-compiler-1.0.11378.tar.gz 8809420 BLAKE2B d503b962193daf3731864739bc0efb753baed3603795e04941d17dcdcaf9e971787ffa877e8295054de41d889a39e2bdbf8119fb7d60110580acea3c24cefc58 SHA512 f3daedfe36badfe07f187b38c9a4da98116533940f4d910fbbd060813aeb1e3ffaa627a72180e66736748830a80cfca4c2a6dc9c8e9507884629e3e55add1cbb
-EBUILD intel-graphics-compiler-1.0.11104.ebuild 2328 BLAKE2B 59d3568c1f2b4c889dc85a955fa3aca373b258bab5b50aeeb27ab2d938e0baeb7ed508c926bb32d601fc3025ca02d7cbfa715cd0525090957449e54326a2ee38 SHA512 3752ddd8e2a49316d98394852e124ab826048d9df2112b054af3bc1118946be3b9885a87d2c7b92f19e82d3df0d7b1c96a85bb00318797e3f252729af5f51644
-EBUILD intel-graphics-compiler-1.0.11222_p20220518.ebuild 2398 BLAKE2B ff97156fb257c05518116c30d9aa4cd9fc54bb4c62bae7381ef255f2f39521466c2e7a1be434e82f156a71f57ebcf46ff4dc0c3de3fd66bf2b84d66b13ac3e87 SHA512 eda59538cbb9488f38cc2f47b2c191fffc71478e63856a2853be040547f2b4ceb1202ee5954267890e9ebefa184ffa8ecfea88033e843f9677f6c40c375a09d2
-EBUILD intel-graphics-compiler-1.0.11279_p20220528.ebuild 2398 BLAKE2B 61fe8263adf6d3ad5c72d1b960160018deeb4ae71f4e3adf88cc827e268d9ef988b1a40aa826d8294ea3c496f6c775322a181cf1fb1b33162e72756747c1f8d7 SHA512 88d96ba21ec4d2d47dd2f8191dcaa7acdc2a2d150d2f2be4b709063cffa7ad15d7d387d1f07d597c3342883a34820769edbfc1ca1dbeb739c59cf9b95b3012c5
-EBUILD intel-graphics-compiler-1.0.11378.ebuild 2329 BLAKE2B 6d7380c87ad9048c156d2c637486716cbc54c76d2aec429cadc85635616e23f0f6be9c0f778da6e2a3a0cf35b168cdceb24c0bb114a0be199b7eb95cee04dbcb SHA512 c7a4a2c7e2927463b610c89bd7cc154595284241e0d28ed29b29d8a003624ee13e26ceed2114fafe0271a57422d444c193751c8391381c2df947947a8cb7d135
+EBUILD intel-graphics-compiler-1.0.11378.ebuild 2328 BLAKE2B 11f86a5068c3aee12e4eb5b2c9dce8a18a0bfc3e3b9d0ce6b1d40461a3f35ca76689e0ebc34587f9351b423ce2d889145c5d506280664eea2f58a74645c0ee29 SHA512 4206f6316d9b8cd34f2c790a94b2c2fc0210d9370f5145ff8a5f80b18209f1c393f6185cc5fa89877e9a51743d601db9d8d3a879d0b2f2ae74f168f3725dda30
 MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11104.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11104.ebuild
deleted file mode 100644
index b6f92ca63f12..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11104.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="12"
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{8..10} )
-
-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"
-
-DEPEND="
-	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
-	dev-util/spirv-tools
-	=sys-devel/lld-${LLVM_MAX_SLOT}*
-	sys-devel/llvm:${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})"
-
-	# See https://github.com/intel/intel-graphics-compiler/issues/212
-	append-ldflags -Wl,-z,undefs
-
-	# 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_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__SPIRV_TOOLS_MODE="Prebuilds"
-		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
-		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
-		-DINSTALL_GENX_IR="ON"
-		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
-		-Wno-dev
-
-		# Compilation with VectorCompiler causes currently a segfault.
-		# See https://github.com/intel/intel-graphics-compiler/issues/236
-		-DIGC_BUILD__VC_ENABLED="OFF"
-		# -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11222_p20220518.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11222_p20220518.ebuild
deleted file mode 100644
index eb49ebf6be84..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11222_p20220518.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-EGIT_COMMIT="1198ba40214dae81d0f65431ae5b786e95e80ab6"
-LLVM_MAX_SLOT="13"
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{8..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/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-DEPEND="
-	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
-	dev-util/spirv-tools
-	=sys-devel/lld-${LLVM_MAX_SLOT}*
-	sys-devel/llvm:${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})"
-
-	# See https://github.com/intel/intel-graphics-compiler/issues/212
-	append-ldflags -Wl,-z,undefs
-
-	# 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_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__SPIRV_TOOLS_MODE="Prebuilds"
-		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
-		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
-		-DINSTALL_GENX_IR="ON"
-		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
-		-Wno-dev
-
-		# Compilation with VectorCompiler causes currently a segfault.
-		# See https://github.com/intel/intel-graphics-compiler/issues/236
-		-DIGC_BUILD__VC_ENABLED="OFF"
-		# -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11279_p20220528.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11279_p20220528.ebuild
deleted file mode 100644
index 867276f64f2d..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11279_p20220528.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-EGIT_COMMIT="28ff9ed04d17b5af2002158d51992cbed06e6a95"
-LLVM_MAX_SLOT="13"
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{8..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/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-DEPEND="
-	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
-	dev-util/spirv-tools
-	=sys-devel/lld-${LLVM_MAX_SLOT}*
-	sys-devel/llvm:${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})"
-
-	# See https://github.com/intel/intel-graphics-compiler/issues/212
-	append-ldflags -Wl,-z,undefs
-
-	# 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_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__SPIRV_TOOLS_MODE="Prebuilds"
-		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
-		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
-		-DINSTALL_GENX_IR="ON"
-		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
-		-Wno-dev
-
-		# Compilation with VectorCompiler causes currently a segfault.
-		# See https://github.com/intel/intel-graphics-compiler/issues/236
-		-DIGC_BUILD__VC_ENABLED="OFF"
-		# -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11378.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11378.ebuild
index e2c149700d8a..64b8ae51c593 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11378.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11378.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug"
 
 DEPEND="
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 2d141b394e1b..34520495e875 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -5,9 +5,11 @@ AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe08687
 DIST jenkins-bin-2.332.3.war 94928325 BLAKE2B 2e93756ad898761fa5a139cff75e68f130dc5a47fbf9f39c5cb0f02848595a29f84a6ba567ad78a248fc658e1811baa8ea89841f1b632aff3974865aacdda64d SHA512 62bc639e7bed7f6cb194781761735dbf07b4e7b38a38b43a798c386e7000d589b3f6202ba8789a685d3b2ac18cb1554b19d4208362b945e4866e8a810be84e57
 DIST jenkins-bin-2.332.4.war 94930441 BLAKE2B 9502d7fd91d0ffc6871ff0613061883bef98442cf69469ef6bd1cc23fb1849d0b8e70aacf27e2807281a575889c34c574a84caae0226c8fd922fea0bdf334485 SHA512 e187804f8ab1454b56e88b89b258ee57e1c4c2069ef33d87e78e2797252498817edbed15208ec3644a77d51d51afebc0c12e226cb24068bb21a415f21d9727bb
 DIST jenkins-bin-2.334.war 94653863 BLAKE2B 83c237384723dac7c850be45b1d61cd3a9fbae91d1286bf1de3613badc311ad57619dddfa1cea935f4a1cb378948c41194a762de44b8b356b00cb744f976586d SHA512 bed2b70efab177f8c56ff3f9eb4af8821038b1b4a3f996772d07233335494cc9a335e97f24182f9467f5363b31c46127a393cfcc48eed52368773836a06b82e0
+DIST jenkins-bin-2.346.1.war 91193351 BLAKE2B 21a0f2ec258498e447a25527e82ad6e7e0b061daaa9647f244930471629de4805755648f6a689598e048e3ffa72879d1dba88a7a4d5ce3fe5bff287f6cd395ca SHA512 63a34dcf66714b6db405a46ca6677693458f49cb61ff413c8c4bcffe6e10eff33ead5dc2e4f3eb3560980c33f1dbd67c3f51655d578ce5cbb19e1ddf871aa545
 DIST jenkins-bin-2.356.war 90781388 BLAKE2B d65e1642a118cfcad66c4585bfe4e30cea8a5e8b598a6ba33b298a158fb2901d0b388aec9087d243648f51067661cccfb610948129f35c40c5c5bba4d3fb89e0 SHA512 2b602cac61101e4f47a23727b682684cec6afac7a867606f5210f5213a78ced0d0b1a2bf10507c26c58e480217a59b906626c80d133504f8d195a6e9e8fed94c
 EBUILD jenkins-bin-2.332.3.ebuild 1101 BLAKE2B c4912482e9f3287818e01d0b7e9d83591822145d69b39fd91439f5cf31043caa3c91b051cb556ea89129de6ab356600640b9701d538ada8145812dc880b9ada4 SHA512 ecbd288fe8594a97ffb716e582997b1e9f296d2e93754dc7975bed8b682153549e8789def16dea9eb713c73c63192fc7639591a59242c9d7b03ccdf09aade84c
 EBUILD jenkins-bin-2.332.4.ebuild 1101 BLAKE2B c4912482e9f3287818e01d0b7e9d83591822145d69b39fd91439f5cf31043caa3c91b051cb556ea89129de6ab356600640b9701d538ada8145812dc880b9ada4 SHA512 ecbd288fe8594a97ffb716e582997b1e9f296d2e93754dc7975bed8b682153549e8789def16dea9eb713c73c63192fc7639591a59242c9d7b03ccdf09aade84c
 EBUILD jenkins-bin-2.334.ebuild 1117 BLAKE2B 2e124af6b9c70ec8c8157f020ca2e3bd4b9e9184400706fdf14230613be6497cb812ce366ef7fb03df827d696273ff045176d6ce1fdd3236afab7c46c83d2858 SHA512 e3f96fade1ca640425bc875b2001fb8477678e89a5321ee673388f1a4f7bbc270a53a7350c0d34273b00a36c00b13c4dd1b67e5d95ef4970e904541a3d16fb49
+EBUILD jenkins-bin-2.346.1.ebuild 1123 BLAKE2B 8a494477de627fa4c185d560621ab910783d11320b0b500cfe738ad5cd3bd6820faed9c8b72345ed60aa9984cbb2e4b6060319bc23c9f38f499413df66994ee8 SHA512 b6280a876876976f3380440e7795ae043262d5315bba75e3531abfcaf629dc657e4e77e7e4a31b3473c34095da0bd8af8aa5bebfbb4cbc9171d3029e85036b75
 EBUILD jenkins-bin-2.356.ebuild 1116 BLAKE2B 645d4d7c3df6e0461fc6ddf2579b3c361fedcceeeff651ad9758d0240d66c70b7d0f83e6c8ca59f07df4094b56001f2d610f6fd607e56fe3de93cdc504270776 SHA512 c905cc7fa57702c542ceb856b5420903412ce035270a0c3aba2d5f2282d5fdce5a9dfe0a8750fda034ae0aba6d2b74912f8694ec2159b17d54185a1da008721e
 MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.346.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.346.1.ebuild
new file mode 100644
index 000000000000..eb0ff122fdeb
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.346.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="lts"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	|| ( virtual/jre:17 virtual/jre:11 )"
+
+S="${WORKDIR}"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kube-linter/Manifest b/dev-util/kube-linter/Manifest
new file mode 100644
index 000000000000..1bc1ed3ba3ed
--- /dev/null
+++ b/dev-util/kube-linter/Manifest
@@ -0,0 +1,4 @@
+DIST kube-linter-0.3.0-deps.tar.xz 141981332 BLAKE2B 52ae84c6769d95384b4cf222152960786d747603234d4807c21c7b1e049f7995248746cea3cdf67e9ff16184c5c9a8655acb23c83141bd086afe2bae87ec723e SHA512 d743cc3a0b8bf90a56d3fbeef3f99ca5c039322136b3085fe75d9dd46b08bf5c456785848fd74c1325faac30e14566dc76dfbb271d9923c26ed2f40c0072e202
+DIST kube-linter-0.3.0.tar.gz 252093 BLAKE2B 7cbd904ad2bd8e5b5496c606a3a640e93235907b3422f3e18d022c0be370fbde1ba19766a24f9d13f194066d471cd5449d6d1cf12f0a05d92233676d82c175eb SHA512 bcd8a28eb52902c0b1e248a43ec9ce96afdced554b7198fd7898853d02a88093f72bed038fcc36373250da68bc362e3a89e52e73a5ebe74267000b89bfdc6e6a
+EBUILD kube-linter-0.3.0.ebuild 590 BLAKE2B a55da7967b4607f925c8471e1ae65c09696909b41e556646920157639d63c76dee8f2bda3651af9fd8451755e85c19ddde03f02af35751806dd9a59971fb54b8 SHA512 e4fa39306a76a442e5df7968d9524189045d768181d0d8e023d568a9d7a5ca5e7db6d73dd0616b7399d2b719c38927f07d892e6904040e92eb74c88eec0a9d63
+MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-util/kube-linter/kube-linter-0.3.0.ebuild b/dev-util/kube-linter/kube-linter-0.3.0.ebuild
new file mode 100644
index 000000000000..45b858d5153a
--- /dev/null
+++ b/dev-util/kube-linter/kube-linter-0.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="kubernetes yaml and helm chart static analysis tool"
+HOMEPAGE="https://kubelinter.io"
+SRC_URI="https://github.com/stackrox/kube-linter/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	emake TAG=${PV} build
+}
+
+src_install() {
+	dobin .gobin/kube-linter
+		dodoc -r config.yaml.example docs/*
+}
+
+src_test() {
+	emake TAG=${PV} test
+}
diff --git a/dev-util/kube-linter/metadata.xml b/dev-util/kube-linter/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/dev-util/kube-linter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/kubeval/Manifest b/dev-util/kubeval/Manifest
new file mode 100644
index 000000000000..3113a8b29d8b
--- /dev/null
+++ b/dev-util/kubeval/Manifest
@@ -0,0 +1,4 @@
+DIST kubeval-0.16.1-deps.tar.xz 103272544 BLAKE2B a34b9618d7543907b51469181f70b493353c480f9d671e5ef1442bb7975fadebd4d250a758504450548902914ab839dce986400ddf855a53f9ac25295c6cef2f SHA512 b96c11a8c1fa4f45611b332f1d8d8f88ee3e2a367f1adfe8cd568410a79f0df00380462e93d9ab59cf2cfafd29226cc83a78e13a842f2e4e3ecea4ae05bce05c
+DIST kubeval-0.16.1.tar.gz 50297 BLAKE2B 8b856e90f295e4394d17b53323cb278329ad6c40f711ffe5ce31dfe5d44cddb75a6ebd2f649992fac1631cd5739c4871802c03ca81ed94f23db4b25bff07685c SHA512 6ed4603d6a754c5d256c68a113c3f53745c118f605f215125cebf9d17e4fef505c4011330abec40ce89be6724f13f093a0ed6b5a1bbda3484dcc303a9208bbc8
+EBUILD kubeval-0.16.1.ebuild 621 BLAKE2B 4092c02968647dcc26c69cbbbc687dccbd8f1f1978e8edabcfb3c5c28954211fcf483207962cff94eb85ddbe8518d5d470c77529004b7f3173c3104cffb89435 SHA512 5d025884726dcda43e14daf3268986f5bf285a43d59d75f32c96171889a2289a3a441ec16b019cbdfe6ff9015e1086847fac1b2c6f0b2349bfb6430d7241e948
+MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-util/kubeval/kubeval-0.16.1.ebuild b/dev-util/kubeval/kubeval-0.16.1.ebuild
new file mode 100644
index 000000000000..4eac1a6a402c
--- /dev/null
+++ b/dev-util/kubeval/kubeval-0.16.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="validate kubernetes YAML or JSON configuration files"
+HOMEPAGE="https://kubeval.com"
+SRC_URI="https://github.com/instrumenta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# tests require the network
+RESTRICT="test"
+
+src_compile() {
+	emake TAG=v${PV} build
+}
+
+src_install() {
+	dobin bin/kubeval
+dodoc -r docs/*
+}
+
+src_test() {
+	emake TAG=v${PV} test
+}
diff --git a/dev-util/kubeval/metadata.xml b/dev-util/kubeval/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/dev-util/kubeval/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 0f5b4c5c707d..d0a872675306 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,5 +1,7 @@
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
@@ -11,5 +13,6 @@ EBUILD lldb-14.0.1.ebuild 2591 BLAKE2B 4d9eb995301668d375f12f4d9d4bf3592fa2222ca
 EBUILD lldb-14.0.3.ebuild 2665 BLAKE2B dd9584bfca30ee8b8c1b563145f256662e4a23ab42b6d44fd394f44d56a46fec5e97c69f6a5789bb720139c4f55b71df2ebf699e26e230df043a4da860e6252b SHA512 d2f848ec5343c4387e220794afa1543a2ad36a969d56460cbb6fd4d5f4984b63ae914df8c5d2d48f110e2b3330714e0ddb417c5d5416aade53caa13d3d1e459c
 EBUILD lldb-14.0.4.ebuild 2662 BLAKE2B 31aedc4fc692cc1439fc06cea20fbc1cd57c718657206f0fd8976ce16eb407b2c1cabff7acf1dfb397f43ebc102e5e2d11f91ea88e15682a53add285626c315c SHA512 770d948906e8112657c1e3f766721a188a5b7927e2da16a51c05d272af16ff9966a0d3f152b5f19a097a8851c8d56eb30a5915e007c4487050bb20a6a607a205
 EBUILD lldb-14.0.5.ebuild 2665 BLAKE2B dd9584bfca30ee8b8c1b563145f256662e4a23ab42b6d44fd394f44d56a46fec5e97c69f6a5789bb720139c4f55b71df2ebf699e26e230df043a4da860e6252b SHA512 d2f848ec5343c4387e220794afa1543a2ad36a969d56460cbb6fd4d5f4984b63ae914df8c5d2d48f110e2b3330714e0ddb417c5d5416aade53caa13d3d1e459c
+EBUILD lldb-14.0.6.ebuild 2665 BLAKE2B dd9584bfca30ee8b8c1b563145f256662e4a23ab42b6d44fd394f44d56a46fec5e97c69f6a5789bb720139c4f55b71df2ebf699e26e230df043a4da860e6252b SHA512 d2f848ec5343c4387e220794afa1543a2ad36a969d56460cbb6fd4d5f4984b63ae914df8c5d2d48f110e2b3330714e0ddb417c5d5416aade53caa13d3d1e459c
 EBUILD lldb-15.0.0.9999.ebuild 2642 BLAKE2B 4a6e9ab20cf171d43de1bc2abe84134fc1c1ac69f89805acd50514201c6525583a2f75d5c77158a613558f6f0375594e10856d465ed02947ed1364898192c7b3 SHA512 9e4a373255635c43141427aa09cc4b4d86be85bb42eeb54c3deabfe1a7c0872b204c5c3e1fe40d5bee2961ed17e453c3fda5dd82a169d2bbb0119614be24117a
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-util/lldb/lldb-14.0.6.ebuild b/dev-util/lldb/lldb-14.0.6.ebuild
new file mode 100644
index 000000000000..aaa455dcfac0
--- /dev/null
+++ b/dev-util/lldb/lldb-14.0.6.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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"
+KEYWORDS="~amd64 ~arm ~arm64 ~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 )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} 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_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-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/${PV%_*}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-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/rbtools/Manifest b/dev-util/rbtools/Manifest
index b40fbe957b08..4e45e5828c38 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -3,5 +3,5 @@ DIST RBTools-3.1.1.tar.gz 317592 BLAKE2B c50e27cf67e2015904e2330208f0d13ec5a799d
 DIST RBTools-3.1.tar.gz 317015 BLAKE2B dccabc93af3a8095f5e166f9e3a31cce52155876cb38675b3dd43b6556024bb9b4ed66291e495ab42b41b09934f136f4eeca7a185fc0fbb2aa2d03e1ef12d656 SHA512 2568aa905dfd119e0b66213e3ae9c8edad5a3337df00228b955006cc85e90c1492e1dc4cccc2695b53f5879103c5d4ee8dba6262112c8781e452dea7633d2c0b
 EBUILD rbtools-2.0.1.ebuild 1250 BLAKE2B 8c939c64d8bcb5ec0d15a27aecbba090f40a1b4d2dd35e2f38863b36b7f95db3ae558f7cff3cb0d74aa5d04eda9c7e93aa000994e4ca60c3d2eb355e1a0059f8 SHA512 447cb645f0715067e6e22817bcb2ffede46ed87f9ed10dca60c6b9375e1738ffcd26295aa404707ecde6eea99a326d2f8ff1379c0d087c06a8f893f19ee40521
 EBUILD rbtools-3.1.1.ebuild 1343 BLAKE2B c181b1237b721a6171ae5c7a7e15e80b46b35001913ab525af3771a4f8cfbb2d2619392cbc241b7d61c66fdbe54c2590cba06ddcea19fd764f9af502e532768b SHA512 a11f9a79171967b884f1a888ef900972632b343fef079ddc6f3046cac4d55b765b525ed6bfc66b22b66abc9beee5bd735f72c8da42e48034d5332f83617057d2
-EBUILD rbtools-3.1.ebuild 1343 BLAKE2B c181b1237b721a6171ae5c7a7e15e80b46b35001913ab525af3771a4f8cfbb2d2619392cbc241b7d61c66fdbe54c2590cba06ddcea19fd764f9af502e532768b SHA512 a11f9a79171967b884f1a888ef900972632b343fef079ddc6f3046cac4d55b765b525ed6bfc66b22b66abc9beee5bd735f72c8da42e48034d5332f83617057d2
+EBUILD rbtools-3.1.ebuild 1348 BLAKE2B 13538dd2b7cf09854daa8ea13148d75476c834ec799d358735144893ce00ebdadc9da9fc4772bec64b7dcbb5930f850b8b9db606a024e7baf45f3938be84efe9 SHA512 077649c23fbc94cfbf294541d064400d0f2e5af453f3d7c17b8710a8c83904e4e15f8a44e6b1dcdeb4979df79898afbac133c8d91358b90367b16e372461f8e9
 MISC metadata.xml 218 BLAKE2B e25e8013045a9887590c6b042f7b200cff82f721b120d495d01d69fa07fe49cbbbb996b77f4f6af08527d5f89194b3fa650c9ffc7c279328652b21709353bece SHA512 ac49327c1e8833a999126e219e7f7b0008fbaee02eabda53f36d0957a264619e5bd695edf6279a932cc49bd4aa48ca22373177afed7ab427cb454c9de53d01b1
diff --git a/dev-util/rbtools/rbtools-3.1.ebuild b/dev-util/rbtools/rbtools-3.1.ebuild
index 2d330d85b678..9fb63ed11ab4 100644
--- a/dev-util/rbtools/rbtools-3.1.ebuild
+++ b/dev-util/rbtools/rbtools-3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(ver_cut 1-2)/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/rpmdevtools/Manifest b/dev-util/rpmdevtools/Manifest
index 412e814adc9f..dc6b7ded3466 100644
--- a/dev-util/rpmdevtools/Manifest
+++ b/dev-util/rpmdevtools/Manifest
@@ -1,3 +1,3 @@
 DIST rpmdevtools-9.5.tar.xz 96724 BLAKE2B a406581be0286a6cb4b611289820f5a2db4306b731b0963881091e27b04b213c155243aeb95eadb41a27ab7a481bf1464d27d31fb52c6b10c3cedb23c1b22d21 SHA512 d2a110e7557eb149113560d64b3ec1ce75e5ee5ee541de3b4ed88f2bf11ef0248c864383bbffb49f8c32920563704da94004a8f9c099ce3610e6168aabfe440a
-EBUILD rpmdevtools-9.5.ebuild 901 BLAKE2B a600d24a8044f1d3809f78088aeb3e7b450408273da64fce6553a943c95df76442e914c5dd2c1f4607d42aceb2575ad9112f5f3357c8e9f30a402627ce13f8a4 SHA512 e9274d019e08beab10145e6c15e3e08de1408c3781671abd093e3f6ed4ebcd0f3820a45f8c70301dc80dbcc257f6c308864222b6fece93bfa68bb31e392549fc
+EBUILD rpmdevtools-9.5.ebuild 897 BLAKE2B b6d61cb92d8aa33b70507225e50081409fbcd9d98687b55021867e3897d65e3657d1c4026f0a14ad17f3a376dd5093aa5855b15916da0a0b590943d8ebc3dbfe SHA512 8ce4a3ab6aa3528f1f1064ac6ef72943e30f584407600791341864b424554c7271901ee5e67e9450103009c30e1cc5b706d7324bd6aa019bdd137d9e097c80d5
 MISC metadata.xml 254 BLAKE2B 27bfad9e03763fd082b0adc7a602dbf9f51b6c6ede654b4fa61e434e9c9452a301259197291dd45bb6d5486e1797fd8c15383c4bf88f3a0a08c116dd9227b5d6 SHA512 a08ace91187b9c474aea7738fedcbb2a65e52a19f004a781376f04f7fa6c4b867e43645764854108ab21410b6675246b00514c4754e8f22732790e6fc6dbc2d6
diff --git a/dev-util/rpmdevtools/rpmdevtools-9.5.ebuild b/dev-util/rpmdevtools/rpmdevtools-9.5.ebuild
index bde4942fd20f..7d2e9bf90046 100644
--- a/dev-util/rpmdevtools/rpmdevtools-9.5.ebuild
+++ b/dev-util/rpmdevtools/rpmdevtools-9.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-single-r1
 
 DESCRIPTION="Collection of rpm packaging related utilities"
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 3a94b2cef5b4..3e8bac0160e5 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/savagewheels/Manifest b/games-arcade/savagewheels/Manifest
index 6ea0385a9f5f..88d2e5307d12 100644
--- a/games-arcade/savagewheels/Manifest
+++ b/games-arcade/savagewheels/Manifest
@@ -1,5 +1,5 @@
 AUX savagewheels.in 1488 BLAKE2B 5676996a1785b8653eaed1d2a606ac0a56fd55361e280517564d93c0aba1984bfbc603232a1225504c99a73bcb422659bf75121af8b7e2421a9b339550344024 SHA512 b13ff4b2739e3f5cb797c9364687c9077852863f9a3a1176fc03e3f9f030293366b177b1a494a8b12ee69ba6ee7aac8589475a5b2246135038ad3138990f2088
 DIST savagewheels-1.6.1.tar.gz 596480 BLAKE2B a1e236418e3e2af1634360c0a6c3e5debf0b429960f4dde0c3ed31a0450c9de73b0b67a833d66523004115ddd61dc32e156fcd64bd783c5cca8c3281e1684639 SHA512 0e535f5f86b1656fa20a2de3dbc9c107f9daacfd37308ca4e2e15df43b177161767a2834c0ed1b9cb93eed0b642092e4f840abf451d2de5082d3c4c721bedc0e
 DIST savagewheels-gamedata-1.4.0.tar.gz 13183072 BLAKE2B 1fdd20cd3bdd5589d17d131d13d1dbe56889f05972c162583a4b9b7cdb3eadea32b7d7a1130f2eb239ec87e1cb3dc6f02d6d15504463b399e12271348106702f SHA512 102214e18edb911b168e41999d239e3070255720f250e8ea640d365b3f7fc4c772cbf322f4558ba6c05fd56d904613c758918e25712e89eb2aca3e948c26fc65
-EBUILD savagewheels-1.6.1-r2.ebuild 1306 BLAKE2B ad0c2c0ffb0e4020562a1a93a99bec154a7f1752e9a823115794185aff02815d569937c775b6c36606fe9e11ce543d61743aa4b200ad942b2efa5c03e52a1b56 SHA512 4acd276d60082eff5bc9cc3db011286bfb4886716fc88fdf70bca524de94e594621e9876d72baa5ee84034a5bd193226936edd6539ad71827a8981e3b6bab84f
-MISC metadata.xml 253 BLAKE2B 17fe1d2424dd150d063ddce2a141bc1738fcda2a13aeb66108fed4dc1f23feea034deac57a4ad5fa035b322b304f000af765e11d5a148a1c9f86e9c7b7f502d4 SHA512 ba63e0faca0953e950fef238cd708afcb31c50a0e6214130dc2ab0a5ae3b3e8d80939b996621eae8694f8559378b4ccb393c46da0426e73fdd32a24f9b452123
+EBUILD savagewheels-1.6.1-r2.ebuild 1309 BLAKE2B a0755aee30bfb5c617c2971c20ff570111d8e53f48ebb797c553621acb8fc6c5e8f92194c5b6b28043bdf535b93025705d60288bf1ba20385bb9e94a6d7324cf SHA512 7efbe46c7fc3fa71bbaed74597eeb2f9da66a775c222aa72e195b6932fea79cb086b17d8a6f17874e37cabe85d83829a44ae3760f5326230e393efd8fa95a391
+MISC metadata.xml 254 BLAKE2B 93ee116a700e6d2a07542ba2190797ccab03d2005e014766ab74782515fc36eb346c1accd703c994110856ab12ca24382629ecbcb5424ba4c9891ec6adc469b8 SHA512 877f0bb036bb1e3a087cf7d4f026589b67af9c3751499dd94e002f0272b38e943df537f120b985dda90439077773fa56cf9f2bf68c0d5e4a51dff54525d251d8
diff --git a/games-arcade/savagewheels/metadata.xml b/games-arcade/savagewheels/metadata.xml
index e0c3da06887f..6cffb58dceda 100644
--- a/games-arcade/savagewheels/metadata.xml
+++ b/games-arcade/savagewheels/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="github">petarov/savagewheels</remote-id>
+		<remote-id type="github">kenamick/savagewheels</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-arcade/savagewheels/savagewheels-1.6.1-r2.ebuild b/games-arcade/savagewheels/savagewheels-1.6.1-r2.ebuild
index d87adf05402a..b52e1e1467e6 100644
--- a/games-arcade/savagewheels/savagewheels-1.6.1-r2.ebuild
+++ b/games-arcade/savagewheels/savagewheels-1.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,13 +6,13 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="2D car crashing game similar to the old classic Destruction Derby"
-HOMEPAGE="https://github.com/petarov/savagewheels"
+HOMEPAGE="https://github.com/kenamick/savagewheels"
 
 GAMEDATA="${PN}-gamedata-1.4.0"
 
 SRC_URI="
-	https://github.com/petarov/savagewheels/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/petarov/savagewheels/releases/download/v1.4/${PN}-gamedata.tar.gz -> ${GAMEDATA}.tar.gz
+	https://github.com/kenamick/savagewheels/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/kenamick/savagewheels/releases/download/v1.4/${PN}-gamedata.tar.gz -> ${GAMEDATA}.tar.gz
 "
 
 LICENSE="MIT"
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index d5a1ee270495..80307d107249 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index e33a4b7c3a87..819b2d41f9e5 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -3,4 +3,4 @@ AUX pcsx2-1.6.0-wx-config.patch 613 BLAKE2B e5ff17ae5bddde776990cace4735883e8869
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b
 EBUILD pcsx2-9999.ebuild 3042 BLAKE2B 1602d87ba0278ed4866b594b256ec41a3171927fb10e565c410ca7e9d827c117ab4daa5294bb6dcb1f11397c58d18d9b0ed60fbadb029facbe51567814c8b190 SHA512 f72b467b484a23b54161fa18f92df6c97c67402adc4252b207c1ac934224d2b34221313c3183fd607265df73488b1fff0b212e79f9583cf0cd0c4a6263003d15
-MISC metadata.xml 533 BLAKE2B 6133475168a5df84979b4ce8a195451abcc28f6cc910b937bc9de5b31f4f149c251602786d05d256a0c863d4a49ba5b47c8bbc957d1f87e5019ea78e8e3a5295 SHA512 9be0d69ebad684eeaad115e7b3e5ab66093e87a48523ef5b0cf6dff30ff5b0be9fdfc93aa755767e55a2e1a74fbc34316242acb24148560ae4a7382586eac1a5
+MISC metadata.xml 647 BLAKE2B 506f329d6430ac9d3646a71ad9d0fc3a41689480c1539381f21c042f584e3b4fa8564a31d4c664220549b8271732039791c63c75ae7b1697c5a07d68e9bd5b58 SHA512 713b4466ba59a4a0cd7d1f08686198fe6a37067c1eedea3f1d72323efa6c9d914f5d7bf2de24ca37b31cc3788a689071b09116539f20fb5c80a23397285a2f12
diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
index 347ab91abc92..0d8f2efac4cd 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/PCSX2/pcsx2/issues</bugs-to>
 		<remote-id type="github">PCSX2/pcsx2</remote-id>
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 76cf8484252e..bc7db4080beb 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/scrap-engine/Manifest b/games-engines/scrap-engine/Manifest
new file mode 100644
index 000000000000..1d4fff9a9eba
--- /dev/null
+++ b/games-engines/scrap-engine/Manifest
@@ -0,0 +1,4 @@
+AUX scrap-engine-tests.patch 365 BLAKE2B 2e412320782d2d5b66935fed5eaceae9b4a59e6b7bd36b8cc5d29b3fa86f002efcd60c1d202f6d2486ecc92e1b06ea619291d0583747524f5afda29a1f02e724 SHA512 d66afa79eb1a433920d6285fe0819fcb87726f3d20949966651f8af8eb99d378f4ddfa022009a98b2324429ae9fef1167922dda8ffc72dc5c03131c5765778e7
+DIST scrap-engine-1.2.0.gh.tar.gz 381529 BLAKE2B a482bc45900a4294be69e22308114fcdaa4a8bcaa22bce96e3436080ca7dbd2a546253ed8d1faefe2fa5c2ec57a2c6b2a63cbd7b42de39d9990968f9b34614d7 SHA512 5d1ec65eed4515e07f3c3a32f0423bcf41d7ba594508391024d22623f27d052464b5a3dc887b0ff6bea6c8f7d7fe54c30373460449b9977f0f95a9e2b1f978da
+EBUILD scrap-engine-1.2.0.ebuild 916 BLAKE2B 163524439aa8160c551c1dc2939247817e8c3bf7586475d7af89436dc1bee021aa4b72d97053ba686ea5d8132965e7f87f2d9de4c0d2051adcd8e87ede62ef77 SHA512 844339bdc412cf6bafc4e5bd1defc4c759cb8ba7d049072d3f6dbfaa24b2603f943daeba8c2b571a15bfd181fc87e59cf504834c1d7409c5108b5431ece03b53
+MISC metadata.xml 392 BLAKE2B cb5d6dc8dacc8ae1f02acdced4ca0a08531451779da2e4d309367657b2a91c7c8eed0fa2faba58c16bd01324132e372516829f0f2a7a9570ce1a7bc7be418612 SHA512 61909625eb2c0923c9d41faf41841e161868277af02e43d5ddae3e75c452f21ce929bbf1059d3919a5c673f5dd0da418e00148f81ce94f0c40945261ccf615bb
diff --git a/games-engines/scrap-engine/files/scrap-engine-tests.patch b/games-engines/scrap-engine/files/scrap-engine-tests.patch
new file mode 100644
index 000000000000..5e7960574094
--- /dev/null
+++ b/games-engines/scrap-engine/files/scrap-engine-tests.patch
@@ -0,0 +1,12 @@
+diff -Naur a/tests/scrap_bench.py b/tests/scrap_bench.py
+--- a/tests/scrap_bench.py	2022-01-05 17:13:26.000000000 +0000
++++ b/tests/scrap_bench.py	2022-06-24 14:33:10.215047579 +0100
+@@ -22,7 +22,7 @@
+     time2 = 0
+
+     b_map.show()
+-    while True:
++    for _ in range(100):
+         time0 = time.time()
+         times += time2
+         for ob in rectangle.obs:
diff --git a/games-engines/scrap-engine/metadata.xml b/games-engines/scrap-engine/metadata.xml
new file mode 100644
index 000000000000..680b374c830b
--- /dev/null
+++ b/games-engines/scrap-engine/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="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lxgr-linux/scrap_engine</remote-id>
+		<remote-id type="pypi">scrap-engine</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-engines/scrap-engine/scrap-engine-1.2.0.ebuild b/games-engines/scrap-engine/scrap-engine-1.2.0.ebuild
new file mode 100644
index 000000000000..05b7700f5b2a
--- /dev/null
+++ b/games-engines/scrap-engine/scrap-engine-1.2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 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 distutils-r1
+
+MY_PN="${PN//-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Terminal-based Python game engine involving objects on a map"
+HOMEPAGE="https://github.com/lxgr-linux/scrap_engine"
+SRC_URI="https://github.com/lxgr-linux/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-tests.patch
+)
+
+DOCS=(
+	README.md
+	docs/DOCS.md
+	pics/example1.jpg
+)
+
+src_prepare() {
+	default
+
+	# PEP 517 needs this metadata.
+	echo "Version: ${PV}" > "${S}"/PKG-INFO || die
+
+	# Adjust doc resource paths.
+	sed -i "s:\.\./pics/::g" docs/DOCS.md || die
+}
+
+python_test() {
+	for TEST in "${S}"/tests/*.py; do
+		"${EPYTHON}" "${TEST}" || die
+	done
+}
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index b3a5bacc9e52..c3ff1f726548 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/duke3d-data/Manifest b/games-fps/duke3d-data/Manifest
index 083971c6c1b6..df9e66373de4 100644
--- a/games-fps/duke3d-data/Manifest
+++ b/games-fps/duke3d-data/Manifest
@@ -1,4 +1,4 @@
 DIST 3dduke13.zip 5924374 BLAKE2B 177329f04defdd2a2ab35a1926a321bbc8de023878ad6bec610669b5578cbe2f38bc0b03a37c0d0d2dcc99acf2b473ddf683b498b971b857b20964bcdbc7d7c8 SHA512 eb92daa88b4e7cfeebe1fb3d2c021e0a4a66262d0d6e76b5e27fe3cedd382e381d23b392a6d9adb42a418b9318e011c2d8adfbdc77d7c5371e61d8c091c7eb65
 DIST gog_duke_nukem_3d_atomic_edition_2.0.0.9.sh 31969896 BLAKE2B 7e93515f8aedaedf6f0dc90faf5e7fef165c000414ae9dc62bad77c78568ecdec1f16b72befe1c80c7c9c8c4bd7fb11f2fd3c36f53aa9ef9d787f8b7215228f3 SHA512 d06f20bc1334172b80e4a75bd3321c3835cd95ac823836899fda8d5f8667ac83471b04a5863646aa953a39fd1cb64eb1818ee668340ede62d0a356ebdcb4065c
-EBUILD duke3d-data-1.0-r5.ebuild 2554 BLAKE2B 1b2c6771b3b5b24d55b90be950f0f295a538a8e3ddab33e3dd32410b3e3c524cf6ce86b72f1b72fa9dcb34014825e9d9bbd8e760a1b19c1b955308a0f8993e9b SHA512 342f82c813053f6f7ab619d6218f770667ee44f40ac6160fbb3d0c0d24b47b17f4b8687b2e241f3cd5826bb68a561a08402ed2db7192bd36188caa235c27d8ee
+EBUILD duke3d-data-1.0-r5.ebuild 2561 BLAKE2B bbda1dd770c315b505cf2561bcf826fe91bb6b3fed5004b317b32b6e15aad0138511e8dddb7ad84951fed6a06e24a624d467fc7f3d35567507785df19dd45e98 SHA512 2a6fe080ba411c2361f558e9517dcc6546b0d9bc0a76b4838c5fabe5eaf7a5b85341a12e7494bdb861024a1caf2e7f88d7edf85e681425595f4567e90b789a31
 MISC metadata.xml 525 BLAKE2B 9ae88a3847f373f1fb7d3000b392f200f5816e927ccd2f0afd8eb7d0f0b61d081760b790c8caf5fa4471620f3f5ff73044300ec48ce551e78159a0de76ffc435 SHA512 f300d73c9632b825012856113467fb3cb346e419200e241e72f8cd57da9e15822ebb1bf81497a603e9232f93abb3648059e0b485db2d201c81bc8ee138e93d26
diff --git a/games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild b/games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild
index 27e3d9014112..bdccbe5b8c9d 100644
--- a/games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild
+++ b/games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ S="${WORKDIR}"
 
 LICENSE="DUKE3D gog? ( GOG-EULA )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="+demo gog"
 REQUIRED_USE="^^ ( cdinstall demo gog )"
 RESTRICT="bindist gog? ( fetch ) mirror"
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 28fea3391404..e15cd18e4f1b 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -1,8 +1,6 @@
-AUX eduke32-20190820.8043-log-to-tmpdir.patch 356 BLAKE2B 9cdb65c0e15270b4970144d57e126bef5c5b468c8142b797717536852c71f5f8183f63c5a6adffd6d411b2972831320d5a4f214e05d54bca67129ab84c3b0608 SHA512 f1ac030d0d9bed2cc4e67d33563dc7d2f34d2cda75835ec875ce0c3957191c7a61b8d9a16a1d040ee7d5ca8e98e8a2660fe9ff1d8047bbd86953425124140512
 AUX eduke32-20190820.8043-search-duke3d-path.patch 485 BLAKE2B 5a21dec8abc4cc13922a306107d968d1ad6341e5a0c62802d3069a6ad9d2378ae8d19ab6018c86b9e9ec9553a053bbbd45a04d9dd32eb5a31bc1dd1afb4aa757 SHA512 2c3fa40564bfd8c99090f46aaa03f0ff38f965a65e6e03c93f5c469dbcb1feb32c0092ff7aa13b15f5a531731045ab2cbeb6ec746ca56197d28439b36f591a96
 AUX eduke32-20200505.8904-gcc10.patch 294 BLAKE2B fe527a1a38b17731322dd5d7c9c1ea16dce86eb2c023966a28e87477c9b25001294fcda456fc2bdbfdfbbefb67991e67f9693db69ef18d8485035546e231e0cf SHA512 a79859e6f167203ee0d09db1740cfd223e0e196f2ed5f65e51830e27c8a7bf284ff9bd20d1527dfc2679a08f1ec2aa92a1e582599e656bd0e655bfda189608c7
 AUX eduke32-20220204.9957-log-to-tmpdir.patch 229 BLAKE2B 7a2529e435363c6950958d0bc88339c0a0d6bc3da39980a2e8649ce878e72afcb67121899034841e69cdb11b6ba61b84961b61199a0dcdec3b5db311c4b24264 SHA512 916bb036f6a7550505f6af89ac8e8974e689ac0789863b98dfc65d2775b3d22776f94d30590ebdcc267f1184ea5ceea1affdc43786bf4d74b25df80c0866c166
-AUX eduke32-20220204.9957-osd-setparameters.patch 320 BLAKE2B 9e8e81443b20848eb111c53419b15368d46ac36e8d8a56325fff833d1628ee9cfcbe07118f522dfdb0038b4d09fed15ca6667e7471a02ff756f8186e8c5e7b89 SHA512 887e6a7cda983dd983b17d1a2d7db3a853eb354d9d61bdb39ea934b93249174016be039acbb60fdc64e4dc73a5aea5b4a1356e994a03561167af3dbc33a63762
 AUX eduke32-bin 268 BLAKE2B 20941b736b5062f237a39d769a28bbbe1442116259bfe8ff5de4e4c5d9ea2a6139a10efcfd687ee681f56a99382e817f9ad00c2eb2da9c0f1e817912b783261e SHA512 f7a472eb7225800f09d22b617aa12d75dca50892a462a128f901f8df1efc3684d324948f553e1fb44a1e9b786aa60279311ee52d1a6d695cdac0b457a8eee937
 AUX voidsw-bin 265 BLAKE2B 61ff722fbf4a161aaf0851d00fe3c4c0ecd9544ef95e9d19df779b52feedbaba3a40c5b094b4ef21360b00e10058fc2773de0971dc4427b9c0e8ca6e135d5890 SHA512 ffeaca39dde274b4eec2cb3d2e59e2503140b3a6fe1451abd57557e3030ecc89425ae98beecf2595920d338b72b582ce40d8439c11b63ac1935cfbf409d9c6e5
 DIST duke3d_hrp-5.4.zip 933440151 BLAKE2B 20749d6e1bdd07d0e5f28ac2f7e3aff60e8638223b934795320046922311533d6ecaefa3923650568aaa4e026927b53087032415d2d343fc4bd179c9e9ddd640 SHA512 fd5aba0a09193ccd49781d3f06a040000a134ad90f099ab7bf10a8abe474c3a742f922f8fa31522b8993828d516bdd0b5ded327e9c4615c2c101fe655d533f4d
@@ -12,10 +10,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20211202-9831-a7ab79e69.tar.xz 19902936 BLAKE2B 9626a23599f0f187ace392abb47212908b991e3970043fa22382b2396f5617f3004e38117d39c4b191c857a5cd2662b5eefb6102390fd88c67fa47631e3cac5c SHA512 ab1cfe3fbbaa65d4e7ad2d9d7d39b8970a8ce4d9531f348770f62edee5d85438d9a382e618c88c637f23e5b5792c905f30fcbb56202ec56a9284e25697dd9b72
-DIST eduke32_src_20220204-9957-6df591a07.tar.xz 20207948 BLAKE2B 2c907520c2ea6545000ca7daaf197cab745b46c14ccd2d199a2d2587a398fbff34b705a985dd898c6f28363daffa75d854efadfa38af15a77173cf762035dc02 SHA512 ca70bb49e8470a2af54857d743418933c98b3af245b3488b840aefb234ba08dc6ff288f9a44594b7e7c612dd9318523cfda5a86c737668c0f6de9eea84e8996f
 DIST eduke32_src_20220422-10033-3927367ba.tar.xz 20777836 BLAKE2B 7c62a831c8daa5ba2f30e4dd80261aad87cb808eca28d0036f116c537de4d14b3fc2ca6fd325379aca21e7a2a6ab01dccce16907e108d932d5d62e3e0228aca5 SHA512 aac039500e9babc85d50d616868abff145ea145b3f53e9512c905acc084e9a193a7e0bbbd18c9976ad8ad306deccf6e23a66686edb06970b4b943a31938f0229
-EBUILD eduke32-20211202.9831.ebuild 5788 BLAKE2B ca8c4b7dad374d72271c13b7e87f0a778491712a0a0f4f2e471d71beafa29cdf61f5215718932496d1a0218828120c06e691ac9eb6d548f34589170e8470a837 SHA512 5883aa4463c841d8786c60d5d809acce155635ed2e21cb7e284102e34d5b3aed7777e387f48f8b6ae732a37945acc11d6eed20b446b9d6ead57bef00aa776c3a
-EBUILD eduke32-20220204.9957.ebuild 5847 BLAKE2B ef16cefa271874c71c94219d90fd8afeb8257eaf38a8797bca3dbb5d6f2fbe92c43a702540f4b4e50d4b54819d92a16f788093f24eb2ca2b05698c398ba0be7b SHA512 d63c1c736431b32770f9e16cd25e4011eb6e3190ddd6739a1c83e768e4adab017e5cf41090c80a3743a127d2f1684d138db9df6dad4d25837ac1f79fc98b674b
-EBUILD eduke32-20220422.10033.ebuild 5788 BLAKE2B 4041ca5bacd246028f316f2eee1a0afe3f6f53cfbb1e1e8fed83753462e815ee400bd5cddadfc05670dff8a44c7ca933cad4904cc0509e1d9b86ed9312376e45 SHA512 6d39ac181c0e8357fa883ee24cf4d6fe202ec9d1e9d5ff228e656262cc0f15090e790c87f7f1d22727924b35330dc87096997672222d438dbbabfb62334644ed
+EBUILD eduke32-20220422.10033.ebuild 5795 BLAKE2B dc357d150bba70b8f67f998dcf6575a734615f04bca237076088f28c2e5f1e89a85d3b20233b413c14499223c72271d305f725a3462d53c955f7905cd61a8ec5 SHA512 9f2412279dad254e49a4282930b908c54a814abf60ae4a475994ea470948a22229a1e9ed40b9df3aad620e2aa68d5d7b9d439610e0c53d10a3e4acfcb09722a1
 MISC metadata.xml 1696 BLAKE2B 76d8cb27f0b64251519778ed51c1497807772d552eef3972312b8971e606087f4d44e4fda17499fea766233c1b7aa25ccf1467e76cc74bf1aee58d8cd21f158c SHA512 46dbbacbdcc05ef6907431f8d6bf1385af78c2d717653026ae565a26db2d0c8f05f242aaa78f4b14791c16c40862dc2e4d9a02892f650e222ee8fb4222603a8d
diff --git a/games-fps/eduke32/eduke32-20211202.9831.ebuild b/games-fps/eduke32/eduke32-20211202.9831.ebuild
deleted file mode 100644
index 5381e50eb485..000000000000
--- a/games-fps/eduke32/eduke32-20211202.9831.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs xdg-utils
-
-EGIT_COMMIT="a7ab79e69"
-MY_BUILD="$(ver_cut 2)"
-MY_DATE="$(ver_cut 1)"
-MY_PV_HRP="5.4"
-MY_PV_OFFENSIVE_XXX="1.33"
-MY_PV_OPL="2.01"
-MY_PV_PSX="1.11"
-MY_PV_SC55="4.02"
-MY_PV_VOXELS="1.21"
-
-DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
-HOMEPAGE="http://www.eduke32.com/"
-SRC_URI="
-	http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
-	https://www.eduke32.com/images/eduke32_classic.png
-	hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
-	offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
-	opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
-	psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
-	sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
-	voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )
-"
-S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}"
-
-LICENSE="BUILDLIC GPL-2 HRP"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp"
-REQUIRED_USE="
-	hrp? ( duke3d !voxels )
-	offensive? ( duke3d )
-	opl? ( duke3d !sc-55 )
-	psx? ( duke3d )
-	sc-55? ( duke3d !opl )
-	voxels? ( !hrp )
-	vpx? ( opengl )
-"
-
-# There are no tests,
-# instead it tries to build a test game, which does not compile
-RESTRICT="bindist test"
-
-RDEPEND="
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libsdl2[alsa,joystick,opengl?,sound,video]
-	media-libs/libvorbis
-	media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis]
-	sys-libs/zlib
-	gtk? ( x11-libs/gtk+:2 )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	png? ( media-libs/libpng:0= )
-	vpx? ( media-libs/libvpx:= )
-	xmp? ( media-libs/exempi:2= )
-"
-
-DEPEND="
-	${RDEPEND}
-	timidity? ( media-sound/timidity++ )
-"
-
-BDEPEND="
-	app-arch/unzip
-	x86? ( dev-lang/nasm )
-"
-
-PDEPEND="duke3d? ( games-fps/duke3d-data )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch"
-	"${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch"
-	"${FILESDIR}/${PN}-20200505.8904-gcc10.patch"
-)
-
-src_unpack() {
-	# Extract only the eduke32 archive
-	unpack ${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
-
-	# Unpack only the documentation
-	if use hrp; then
-		unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
-	fi
-	if use offensive; then
-		unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die
-	fi
-	if use opl; then
-		unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die
-		mv readme.txt opl_readme.txt || die
-	fi
-	if use sc-55; then
-		unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die
-	fi
-	if use voxels; then
-		unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
-	fi
-}
-
-src_compile() {
-	local myemakeopts=(
-		ALLOCACHE_AS_MALLOC=0
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		CLANG=0
-		CPLUSPLUS=1
-		CUSTOMOPT=""
-		DEBUGANYWAY=0
-		F_JUMP_TABLES=""
-		FORCEDEBUG=0
-		HAVE_FLAC=1
-		HAVE_GTK2=$(usex gtk 1 0)
-		HAVE_XMP=$(usex xmp 1 0)
-		LINKED_GTK=$(usex gtk 1 0)
-		LTO=1
-		LUNATIC=0
-		KRANDDEBUG=0
-		MEMMAP=0
-		MIXERTYPE=SDL
-		NETCODE=$(usex server 1 0)
-		NOASM=0
-		OPTLEVEL=0
-		OPTOPT=""
-		PACKAGE_REPOSITORY=1
-		POLYMER=$(usex opengl 1 0)
-		PRETTY_OUTPUT=0
-		PROFILER=0
-		RELEASE=1
-		RENDERTYPE=SDL
-		SDL_TARGET=2
-		SIMPLE_MENU=0
-		STRIP=""
-		TANDALONE=0
-		STARTUP_WINDOW=$(usex gtk 1 0)
-		USE_OPENGL=$(usex opengl 1 0)
-		USE_LIBVPX=$(usex vpx 1 0)
-		USE_LIBPNG=$(usex png 1 0)
-		USE_LUAJIT_2_1=0
-		WITHOUT_GTK=$(usex gtk 0 1)
-	)
-
-	emake "${myemakeopts[@]}"
-
-	use tools && emake utils "${myemakeopts[@]}"
-	use voidsw && emake sw "${myemakeopts[@]}"
-}
-
-src_install() {
-	dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
-	use voidsw && dobin voidsw "${FILESDIR}"/voidsw-bin
-
-	if use tools; then
-		local tools=(
-			arttool
-			bsuite
-			cacheinfo
-			generateicon
-			givedepth
-			ivfrate
-			kextract
-			kgroup
-			kmd2tool
-			makesdlkeytrans
-			map2stl
-			md2tool
-			mkpalette
-			transpal
-			unpackssi
-			wad2art
-			wad2map
-		)
-
-		dobin "${tools[@]}"
-	fi
-
-	keepdir /usr/share/games/eduke32
-	insinto /usr/share/games/eduke32
-
-	use hrp && doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
-	use offensive && doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
-	use opl && doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
-	use psx && doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
-	use sc-55 && doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
-	use sdk && doins -r package/sdk
-	use voxels && doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
-
-	newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
-
-	make_desktop_entry eduke32-bin EDuke32 eduke32 Game
-	make_desktop_entry mapster32 Mapster32 eduke32 Game
-	use voidsw && make_desktop_entry voidsw-bin VoidSW voidsw Game
-
-	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt )
-	use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
-	use offensive && DOCS+=( "${WORKDIR}"/xxx_readme.txt )
-	use opl && DOCS+=( "${WORKDIR}"/opl_readme.txt )
-	use sc-55 && DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
-	use voxels && DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-fps/eduke32/eduke32-20220204.9957.ebuild b/games-fps/eduke32/eduke32-20220204.9957.ebuild
deleted file mode 100644
index 065285a52412..000000000000
--- a/games-fps/eduke32/eduke32-20220204.9957.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop toolchain-funcs xdg-utils
-
-EGIT_COMMIT="6df591a07"
-MY_BUILD="$(ver_cut 2)"
-MY_DATE="$(ver_cut 1)"
-MY_PV_HRP="5.4"
-MY_PV_OFFENSIVE_XXX="1.33"
-MY_PV_OPL="2.01"
-MY_PV_PSX="1.11"
-MY_PV_SC55="4.02"
-MY_PV_VOXELS="1.21"
-
-DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
-HOMEPAGE="http://www.eduke32.com/"
-SRC_URI="
-	http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
-	https://www.eduke32.com/images/eduke32_classic.png
-	hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
-	offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
-	opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
-	psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
-	sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
-	voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )
-"
-S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}"
-
-LICENSE="BUILDLIC GPL-2 HRP"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp"
-REQUIRED_USE="
-	hrp? ( duke3d !voxels )
-	offensive? ( duke3d )
-	opl? ( duke3d !sc-55 )
-	psx? ( duke3d )
-	sc-55? ( duke3d !opl )
-	voxels? ( !hrp )
-	vpx? ( opengl )
-"
-
-# There are no tests,
-# instead it tries to build a test game, which does not compile
-RESTRICT="bindist test"
-
-RDEPEND="
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libsdl2[alsa,joystick,opengl?,sound,video]
-	media-libs/libvorbis
-	media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis]
-	sys-libs/zlib
-	gtk? ( x11-libs/gtk+:2 )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	png? ( media-libs/libpng:0= )
-	vpx? ( media-libs/libvpx:= )
-	xmp? ( media-libs/exempi:2= )
-"
-
-DEPEND="
-	${RDEPEND}
-	timidity? ( media-sound/timidity++ )
-"
-
-BDEPEND="
-	app-arch/unzip
-	x86? ( dev-lang/nasm )
-"
-
-PDEPEND="duke3d? ( games-fps/duke3d-data )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch"
-	"${FILESDIR}/${PN}-20200505.8904-gcc10.patch"
-	"${FILESDIR}/${PN}-20220204.9957-log-to-tmpdir.patch"
-	"${FILESDIR}/${PN}-20220204.9957-osd-setparameters.patch"
-)
-
-src_unpack() {
-	# Extract only the eduke32 archive
-	unpack ${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
-
-	# Unpack only the documentation
-	if use hrp; then
-		unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
-	fi
-	if use offensive; then
-		unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die
-	fi
-	if use opl; then
-		unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die
-		mv readme.txt opl_readme.txt || die
-	fi
-	if use sc-55; then
-		unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die
-	fi
-	if use voxels; then
-		unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
-	fi
-}
-
-src_compile() {
-	local myemakeopts=(
-		ALLOCACHE_AS_MALLOC=0
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		CLANG=0
-		CPLUSPLUS=1
-		CUSTOMOPT=""
-		DEBUGANYWAY=0
-		F_JUMP_TABLES=""
-		FORCEDEBUG=0
-		HAVE_FLAC=1
-		HAVE_GTK2=$(usex gtk 1 0)
-		HAVE_XMP=$(usex xmp 1 0)
-		LINKED_GTK=$(usex gtk 1 0)
-		LTO=1
-		LUNATIC=0
-		KRANDDEBUG=0
-		MEMMAP=0
-		MIXERTYPE=SDL
-		NETCODE=$(usex server 1 0)
-		NOASM=0
-		OPTLEVEL=0
-		OPTOPT=""
-		PACKAGE_REPOSITORY=1
-		POLYMER=$(usex opengl 1 0)
-		PRETTY_OUTPUT=0
-		PROFILER=0
-		RELEASE=1
-		RENDERTYPE=SDL
-		SDL_TARGET=2
-		SIMPLE_MENU=0
-		STRIP=""
-		TANDALONE=0
-		STARTUP_WINDOW=$(usex gtk 1 0)
-		USE_OPENGL=$(usex opengl 1 0)
-		USE_LIBVPX=$(usex vpx 1 0)
-		USE_LIBPNG=$(usex png 1 0)
-		USE_LUAJIT_2_1=0
-		WITHOUT_GTK=$(usex gtk 0 1)
-	)
-
-	emake "${myemakeopts[@]}"
-
-	use tools && emake utils "${myemakeopts[@]}"
-	use voidsw && emake sw "${myemakeopts[@]}"
-}
-
-src_install() {
-	dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
-	use voidsw && dobin voidsw "${FILESDIR}"/voidsw-bin
-
-	if use tools; then
-		local tools=(
-			arttool
-			bsuite
-			cacheinfo
-			generateicon
-			givedepth
-			ivfrate
-			kextract
-			kgroup
-			kmd2tool
-			makesdlkeytrans
-			map2stl
-			md2tool
-			mkpalette
-			transpal
-			unpackssi
-			wad2art
-			wad2map
-		)
-
-		dobin "${tools[@]}"
-	fi
-
-	keepdir /usr/share/games/eduke32
-	insinto /usr/share/games/eduke32
-
-	use hrp && doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
-	use offensive && doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
-	use opl && doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
-	use psx && doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
-	use sc-55 && doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
-	use sdk && doins -r package/sdk
-	use voxels && doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
-
-	newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
-
-	make_desktop_entry eduke32-bin EDuke32 eduke32 Game
-	make_desktop_entry mapster32 Mapster32 eduke32 Game
-	use voidsw && make_desktop_entry voidsw-bin VoidSW voidsw Game
-
-	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt )
-	use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
-	use offensive && DOCS+=( "${WORKDIR}"/xxx_readme.txt )
-	use opl && DOCS+=( "${WORKDIR}"/opl_readme.txt )
-	use sc-55 && DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
-	use voxels && DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-fps/eduke32/eduke32-20220422.10033.ebuild b/games-fps/eduke32/eduke32-20220422.10033.ebuild
index cb1de6ec3bd9..e3608e25cc4c 100644
--- a/games-fps/eduke32/eduke32-20220422.10033.ebuild
+++ b/games-fps/eduke32/eduke32-20220422.10033.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}"
 
 LICENSE="BUILDLIC GPL-2 HRP"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp"
 REQUIRED_USE="
 	hrp? ( duke3d !voxels )
diff --git a/games-fps/eduke32/files/eduke32-20190820.8043-log-to-tmpdir.patch b/games-fps/eduke32/files/eduke32-20190820.8043-log-to-tmpdir.patch
deleted file mode 100644
index 24cec1b00af1..000000000000
--- a/games-fps/eduke32/files/eduke32-20190820.8043-log-to-tmpdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/duke3d/src/game.cpp	2018-05-08 19:32:19.000000000 +0200
-+++ b/source/duke3d/src/game.cpp	2018-05-10 23:46:21.540213019 +0200
-@@ -6234,7 +6234,7 @@
-     }
-     else
- #endif
--    OSD_SetLogFile(APPBASENAME ".log");
-+    OSD_SetLogFile("/tmp/" APPBASENAME ".log");
- 
-     OSD_SetFunctions(GAME_drawosdchar,
-                      GAME_drawosdstr,
diff --git a/games-fps/eduke32/files/eduke32-20220204.9957-osd-setparameters.patch b/games-fps/eduke32/files/eduke32-20220204.9957-osd-setparameters.patch
deleted file mode 100644
index b302ac94afa6..000000000000
--- a/games-fps/eduke32/files/eduke32-20220204.9957-osd-setparameters.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/sw/src/jnstub.cpp
-+++ b/source/sw/src/jnstub.cpp
-@@ -731,7 +731,7 @@
-     //LogUserTime(TRUE);              // Send true because user is logging
-     // in.
- 
--    OSD_SetParameters(0, 0, 0, 4, 2, 4, "^14", "^14", 0);
-+    OSD_SetParameters(0, 0, 0, 4, 2, 4, "^14", "^14", "^14", 0);
- 
-     SW_ExtInit();
- 
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 2cf65aa29049..dcfcbc822f70 100644
Binary files a/games-rpg/Manifest.gz and b/games-rpg/Manifest.gz differ
diff --git a/games-rpg/pokete/Manifest b/games-rpg/pokete/Manifest
new file mode 100644
index 000000000000..64b780df287d
--- /dev/null
+++ b/games-rpg/pokete/Manifest
@@ -0,0 +1,3 @@
+DIST pokete-0.7.3.tar.gz 2619767 BLAKE2B 9958bc7f8062fb6ee860533d88422706fb0993929cd0c78a2023aa11c2c870d3a18a50d55268985e3fcb19a96653b1706e4d744e19fad28d8fafe8ff8a2efabf SHA512 0abc9aa04c55e89b33f84604dac9daf122fee6601c593c74b43aab2c4642a24bb9e860fef6b0afd598c0b25d6c07abc1bda99df702b5df0d1439abe4a7be58f1
+EBUILD pokete-0.7.3.ebuild 1017 BLAKE2B b2b4af00ea77f5aeeb70f0b8d4739d49a4ee3a17149660c02da6c7f36ff8564fb5393eeb7d36ed18157d7b376ff37e4c91f206de7a6d326b7a847c7efb01febd SHA512 834e0d8b4fe12990e8a5676cd94107e5b0c471fa339e85df81e556e225bd960d067135c5411d2dfbfbb2fabc0be7d5ff2b3648ddba7c1fb0c51ee3b4666db7f1
+MISC metadata.xml 336 BLAKE2B cc559f508a3a2b02d36c2a5070aac444dac82783f1697649d11210f5e9119fe27e442ab5c1ae9c0bc5763454ff5e65489f059c70403a8cb60a13309b5dc39e6f SHA512 04c52262f2a73ca0c648fa66b4d88befa6fb92f708c62014a13ebcc12c0f3e2b7c7ec58b7ebd7187b09038fe9548f31b63be4bfd33d04ba6e1a88e8577caca27
diff --git a/games-rpg/pokete/metadata.xml b/games-rpg/pokete/metadata.xml
new file mode 100644
index 000000000000..77596953719e
--- /dev/null
+++ b/games-rpg/pokete/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="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lxgr-linux/pokete</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-rpg/pokete/pokete-0.7.3.ebuild b/games-rpg/pokete/pokete-0.7.3.ebuild
new file mode 100644
index 000000000000..36e9d838617d
--- /dev/null
+++ b/games-rpg/pokete/pokete-0.7.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit desktop python-single-r1 xdg
+
+DESCRIPTION="Terminal-based clone of the game Pokémon"
+HOMEPAGE="https://github.com/lxgr-linux/pokete"
+SRC_URI="https://github.com/lxgr-linux/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=games-engines/scrap-engine-1.2.0[${PYTHON_USEDEP}]
+		!kernel_linux? ( >=dev-python/pynput-1.7.6[${PYTHON_USEDEP}] )
+	')
+"
+
+DIR="/usr/share/${PN}"
+
+src_install() {
+	exeinto "${DIR}"
+	insinto "${DIR}"
+
+	doins -r \
+		mods/ \
+		${PN}_classes/ \
+		${PN}_data/ \
+		${PN}_general_use_fns.py \
+		release.py
+
+	python_fix_shebang ${PN}.py
+	doexe ${PN}.py
+	dosym "${DIR/\/usr/..}"/${PN}.py /usr/bin/${PN}
+
+	doicon -s scalable assets/${PN}.svg
+	make_desktop_entry ${PN} Pokete "" "" Terminal=true
+
+	dodoc *.md
+}
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 2b5dcb1d54fc..651f0fb8ce2a 100644
Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index da1a1fa47809..8a9abae4eeed 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,9 +1,7 @@
 AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
 AUX bedrock-server.initd-r4 1944 BLAKE2B 9870b09a447588ed0dbfe49bdeee928d54e8ea788a50dc834ea761ef8dcbf21696214ff3370f43de3218e202a5ad786b972c77a679a7cd0d2d1ef38f43db67de SHA512 3281e15bf7a4b87cd1b53b755c1695d77f2de0b7ea23ebdedf0bea60013c5d79f563fdbab3de421bfa50c3d2f24e93c39f49525d8157ca9e649d206a1cb80dfd
-DIST bedrock-server-1.18.12.01.zip 67706215 BLAKE2B 8047a014d01fef4e5e438ecfe5886b154fe424599d72e6c3405c8a7663df883e250e20ffa46e0eb6e9df5e867d22e5e193a0e389049cd67d355873cb0e68a798 SHA512 fe0bade92143759b4d0eccd4586a15b62083d95606cd62a7fb1fe5ec1a36496512a4414493c210f09c42b8c117db760236861913bbf6d17bc024cdfb83e5d1e2
-DIST bedrock-server-1.18.33.02.zip 76100826 BLAKE2B bbafb8433c955a1534f3dd57c155790e2a6def9028e212f378133b93eba3c2274eae17ca45413f974cfe657093f5c4ea352d6f02b877614eb8c618e4307a7e1d SHA512 060e0266c66464cbbb563088ac2341ad5e1dce7f2f0dd9fec5fd107739c0b7dc71e6ce271d6895cbed468721eb7d863efc2bb308321b92106d1b600ac5d3fd7e
 DIST bedrock-server-1.19.1.01.zip 72201104 BLAKE2B f8d28d8faaf813fc5b56620cc1439e4e3fe360b428cf6e4c535f04f11dd09a1918956e0ceb196a658b31d2c454e70df031faff6d922d3f857cbc295b55eb7a4b SHA512 45be61437e82a2b88881d50e8635ed9eb6a9fe24ba2cf305f1d397220b6139655bdf5b8f6a063cb5443ba3c6b4f15739623f4ea1cba7ba9e30ea10b21b1a508a
-EBUILD bedrock-server-1.18.12.01-r2.ebuild 1086 BLAKE2B 6febd87ffdf800926bc5232e8b99ac06dc6bc07f9e1ec597e2bef3852b8f422dcebc0d229f6c2e7a6a190475b82227dcc0f860b9b04f53c1fea9cbe6dea5ba43 SHA512 4c8cc6accca6c7ed66737ce01f4f5c5acb583ef2ddd26c1f0563f98bd500f7c3d762cccdef000a4ba70d3ff9783ca5d777e3927ca100e55d0d09984a553e3f6b
-EBUILD bedrock-server-1.18.33.02.ebuild 1087 BLAKE2B 9eaedd798a626d59330e6002c3b85c352825314b4d6f86ef4e8f1cfb06e6585e13731e20e37dd87311f3a00ddfcf28993f767b9e6b5ad043c44e2d0bcbb31bfc SHA512 dbc2691ccb190433c75a1cf5632e2fbeb158b9c8719b496c36134a8bafe53bd27c38701c68d5304994b45e071973143be1dfaa4dd9b007774100f32a03513d1f
-EBUILD bedrock-server-1.19.1.01.ebuild 1087 BLAKE2B 9eaedd798a626d59330e6002c3b85c352825314b4d6f86ef4e8f1cfb06e6585e13731e20e37dd87311f3a00ddfcf28993f767b9e6b5ad043c44e2d0bcbb31bfc SHA512 dbc2691ccb190433c75a1cf5632e2fbeb158b9c8719b496c36134a8bafe53bd27c38701c68d5304994b45e071973143be1dfaa4dd9b007774100f32a03513d1f
+DIST bedrock-server-1.19.2.02.zip 72204228 BLAKE2B 77259b006bdb3227ea45a6ba4a210b72e1adb23f8fe7b08b7e3607abb500e3f45175563c7adddf6f7683ad68618be50ee84418e91e14abba73bb7fccc129e143 SHA512 1f6571e4a5f183ed376c42879e4882acd46bc5b3130a4dcf324bd740843eff24d8c3d7d0d5914c8db2acdf41ada0a912b56f1ac600df97d8664fec47ee1be25c
+EBUILD bedrock-server-1.19.1.01.ebuild 1086 BLAKE2B 6febd87ffdf800926bc5232e8b99ac06dc6bc07f9e1ec597e2bef3852b8f422dcebc0d229f6c2e7a6a190475b82227dcc0f860b9b04f53c1fea9cbe6dea5ba43 SHA512 4c8cc6accca6c7ed66737ce01f4f5c5acb583ef2ddd26c1f0563f98bd500f7c3d762cccdef000a4ba70d3ff9783ca5d777e3927ca100e55d0d09984a553e3f6b
+EBUILD bedrock-server-1.19.2.02.ebuild 1087 BLAKE2B 9eaedd798a626d59330e6002c3b85c352825314b4d6f86ef4e8f1cfb06e6585e13731e20e37dd87311f3a00ddfcf28993f767b9e6b5ad043c44e2d0bcbb31bfc SHA512 dbc2691ccb190433c75a1cf5632e2fbeb158b9c8719b496c36134a8bafe53bd27c38701c68d5304994b45e071973143be1dfaa4dd9b007774100f32a03513d1f
 MISC metadata.xml 676 BLAKE2B ae3d24e16c5da237df029cc571c6f7099c0e292524633990f92a16075a901191b0aade76429014bb02c95d8032b08436d79599eaafa4fea16345e63dd9180b94 SHA512 df3a66bb13e34ed64a3c5a7974a1aa6b5b4d8b9589a4f9bc08ac74a6cf6f7f8886373963b4d5532a3ca86a2ca48bd7a6f58500622741109273e8ec670ca290f7
diff --git a/games-server/bedrock-server/bedrock-server-1.18.12.01-r2.ebuild b/games-server/bedrock-server/bedrock-server-1.18.12.01-r2.ebuild
deleted file mode 100644
index 520bc15c7abd..000000000000
--- a/games-server/bedrock-server/bedrock-server-1.18.12.01-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
-S="${WORKDIR}"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="-* amd64"
-
-RDEPEND="
-	acct-group/bedrock
-	acct-user/bedrock
-	app-misc/dtach
-	dev-libs/openssl:0/1.1
-	sys-libs/zlib
-"
-
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-DOCS=(
-	"bedrock_server_how_to.html"
-	"release-notes.txt"
-)
-
-QA_PREBUILT="opt/bedrock-server/bedrock_server"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	exeinto /opt/bedrock-server
-	doexe bedrock_server
-
-	insinto /opt/bedrock-server
-	doins {allowlist,permissions}.json server.properties
-	doins -r {behavior,resource}_packs definitions structures
-
-	dodir /opt/bin
-	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
-
-	newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server
-	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
-
-	einstalldocs
-}
diff --git a/games-server/bedrock-server/bedrock-server-1.19.1.01.ebuild b/games-server/bedrock-server/bedrock-server-1.19.1.01.ebuild
index 16dd14a8e660..520bc15c7abd 100644
--- a/games-server/bedrock-server/bedrock-server-1.19.1.01.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.19.1.01.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 RDEPEND="
 	acct-group/bedrock
diff --git a/games-server/bedrock-server/bedrock-server-1.18.33.02.ebuild b/games-server/bedrock-server/bedrock-server-1.19.2.02.ebuild
similarity index 100%
rename from games-server/bedrock-server/bedrock-server-1.18.33.02.ebuild
rename to games-server/bedrock-server/bedrock-server-1.19.2.02.ebuild
diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index eee702dce6f3..785e2405c3bf 100644
Binary files a/games-sports/Manifest.gz and b/games-sports/Manifest.gz differ
diff --git a/games-sports/skatebird/Manifest b/games-sports/skatebird/Manifest
index 0af1ff066615..4f25ddcfd95a 100644
--- a/games-sports/skatebird/Manifest
+++ b/games-sports/skatebird/Manifest
@@ -1,3 +1,3 @@
-DIST skatebird-linux.zip 1625530960 BLAKE2B 20fa3d6b3651c2faf4db76d27861b08d971b3f3de682e5893d28f207b870572becdb1fd48d93261d3376202202e6dde9ecd2a50d14d84493568b5ffd6801f3ef SHA512 1deeca9b9f5d3d14b0b632e568f2ec148869c04ba3a0042ad10c007229a6fdaad222cedd29a1e3b388f0287b4763e5a595fed5165b66ee15e6ccadcc1d370fd7
-EBUILD skatebird-12.ebuild 1076 BLAKE2B 999f83a5120c4ad5ab4e99f4e674129bfcfee8ba273ba9219db25f9b7ec64a17b9ef365cb2baee7cf45f5b92cdb44ed3bf2c098f24e2976277dd62248ba09b0e SHA512 cb239a6b9c0597740e0d446b34bd6b4bd8c49282a3402eaf405e3b184d6ecb8a552658c997436a2186c0bf45e6866ce316fc6e82662226b815a5421779e3f095
+DIST skatebird-linux.zip 1701252738 BLAKE2B b28081b528167f09376053600b96de2007c44c0ba8f43485a8e20ca7dc09f635c21ebd32ef69de7d1c3975c0b5ded3ae8aaa427b5c5dbcccdab924f4ce6fbc33 SHA512 0bb7a9b4d215bd7c29ed43cfe7c50d5782961acee1392688d449b38ec9c4e3c74a6509b99ea9d5597d72e27ba09c43e0f6583f2b4673abc37ff7b6000990a29b
+EBUILD skatebird-14.ebuild 1076 BLAKE2B 999f83a5120c4ad5ab4e99f4e674129bfcfee8ba273ba9219db25f9b7ec64a17b9ef365cb2baee7cf45f5b92cdb44ed3bf2c098f24e2976277dd62248ba09b0e SHA512 cb239a6b9c0597740e0d446b34bd6b4bd8c49282a3402eaf405e3b184d6ecb8a552658c997436a2186c0bf45e6866ce316fc6e82662226b815a5421779e3f095
 MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/games-sports/skatebird/skatebird-12.ebuild b/games-sports/skatebird/skatebird-14.ebuild
similarity index 100%
rename from games-sports/skatebird/skatebird-12.ebuild
rename to games-sports/skatebird/skatebird-14.ebuild
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 585f176e8235..d87a13cee30e 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index f1d32f65be4a..b7c01839e77a 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,7 +1,9 @@
 AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9
 AUX 42.0-optional-bluetooth.patch 2032 BLAKE2B 635ba18f5bb5ca0c9f44fe11c2b52652355e1de4647c277524e3f19ef6d57870e75f32b8a2be10eb4e3be4ecf885765b8f0899ab71906f71324795763effa23a SHA512 5fb17c6ffd0486e43b5451747b346e5e9feb3f918f4ef23adc517c43bf61eb5b8850b03022e84848e446de1f0b2145a9dd2b954dde9994e9da176559cd6e48a8
+AUX 42.1-polkit-g_autoptr.patch 1760 BLAKE2B d1d873af81e9b7641f0f2627c4c38cfa281f8ebb50b96af0c8bd6b71ee675d69865565d365e18b8cc09e1345239165cf1eed6bf9c130a68267c133e334a87381 SHA512 0b1bb7e984f9e714d6225c6016299abfe6d9b5b7ff1fb06bfa2f0a88d5191eb2fd3690f0ed1e8b1381440daf2896d17a9ee44c4e42bab68a2cfd004539ac2bfd
 DIST gnome-shell-42.1.tar.xz 1928924 BLAKE2B c8a1aed79a93d713a52ef0161ff9f06c39f7fb9a762086c78505d220e1e8ec43d7a0e376421f912dc91b33da8fd9394c6a233bb2d9d8b361d63ea2ad0406cee6 SHA512 3d27fdbcf5359f631a71b0fa6495fa50e2b43bb2b3c5c0efd740d9a6a88128ae54fe0ba11ea88990ba10ee2fc9f55211d0a21e60beca250bd197535d944d07ed
 DIST gnome-shell-42.2.tar.xz 1928948 BLAKE2B e263acfc9e6929accfb46b65b91b1173cfa4c778405c0852e93b83d78e1bf3a85e3b5c49b73445f604c0fdecb48f294931ab2403806661013bcef3a71b99f911 SHA512 dd77195772e23d8260e55a2db1103fa6dee8945ad168478c293e43e9971698aa191e17f7f5ef46cf46eeaae5051c34f0eb5df134690f7dc5ca98d6ca747e4eb0
+EBUILD gnome-shell-42.1-r3.ebuild 7493 BLAKE2B 46810eb4b6e99f68f99f032fe06a37836d71e061f9a781d0fd5edb184a369006c88ed642894135257bb305d171655a7e93b5e1edb7ab52fa1c2f65fdfa7fcc17 SHA512 8b329972a6cefd8fbae0a95428830e30f38509e248c106f7dbae0c9cb640e4b11e7917a20ec8724cb76e347746c04336ce9f58614e21ce0a507bda4986dbe432
 EBUILD gnome-shell-42.1.ebuild 7353 BLAKE2B 6f9a84055d0e94cd98ee0bee5598f3f827d23969249b8d29ff4f29392699289c0bf23872a6dd74844627df66031b10bdc0157873aa12366fa52a44f437c7a25d SHA512 b274bc62c5869fb8c5dddd42aa93a783fa98f59523d7e5c9342799b14fbcd405650bf5b3b0eee590d8b9ca23869978fe12d1fac63dc4b84be11de4b3912af735
 EBUILD gnome-shell-42.2.ebuild 7415 BLAKE2B c24ed61ad5badba44fde2c241c8051e44a1778bd6db81912c64c2f13c136955fb2a1045140ddede366e28592884f1bb757b6bf2628c553eac0b311dc3abe22a2 SHA512 eaa4d064bdd2f4e9ead120919e51ad7794f60a1cfba23a1c538e89a96098524a363784b96c6ebf0241c9dc322c57299bf0d654a826e813ebd71fdf539d9f05b7
 MISC metadata.xml 1051 BLAKE2B 86f9156deb6546719e6bcd09ad609b2837901743dd390f430521226df6b9e8f54387d2c93411d63d0099261ee0463428fb8854ce2c47463b999827b377807d84 SHA512 f6a3efe242c1726508a56506a7817c3beea3cb17fbe37d2d38403bc6f4f1d11fd366b68b5c9c6ce44f200a21d48da6ccfcf07c9758369481376b5882ea872129
diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
new file mode 100644
index 000000000000..78d3de086260
--- /dev/null
+++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
@@ -0,0 +1,53 @@
+https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
+https://bugs.gentoo.org/844919
+
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Tue, 17 May 2022 15:36:43 +0200
+Subject: [PATCH] build: Do not redefine polkit autocleanup
+
+PolkitAgent recently added autocleanup functions itself, so check
+for their existence at configure time and only define our own when
+they don't exist upstream.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2296>
+--- a/config.h.meson
++++ b/config.h.meson
+@@ -33,3 +33,6 @@
+ 
+ /* Define if fdwalk is available in libc */
+ #mesondefine HAVE_FDWALK
++
++/* Define if polkit defines autocleanup functions */
++#mesondefine HAVE_POLKIT_AUTOCLEANUP
+--- a/meson.build
++++ b/meson.build
+@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
+           cc.has_function('fdwalk')
+ )
+ 
++polkit_has_autocleanup = cc.compiles(
++  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++  #include <polkitagent/polkitagent.h>
++  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
++  dependencies: polkit_dep)
++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
++
+ buildtype = get_option('buildtype')
+ if buildtype != 'plain'
+   all_warnings = [
+--- a/src/shell-polkit-authentication-agent.h
++++ b/src/shell-polkit-authentication-agent.h
+@@ -14,8 +14,10 @@
+ 
+ G_BEGIN_DECLS
+ 
++#ifndef HAVE_POLKIT_AUTOCLEANUP
+ /* Polkit doesn't have g_autoptr support, thus we have to manually set the autoptr function here */
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
++#endif
+ 
+ #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT (shell_polkit_authentication_agent_get_type())
+ 
+GitLab
diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
new file mode 100644
index 000000000000..3bc4781371bb
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+	>=gnome-extra/evolution-data-server-3.33.1:=
+	>=app-crypt/gcr-3.7.5[introspection]
+	>=dev-libs/glib-2.68:2
+	>=dev-libs/gobject-introspection-1.49.1:=
+	>=dev-libs/gjs-1.71.1
+	>=x11-libs/gtk+-3.15.0:3[introspection]
+	>=x11-wm/mutter-42.0:0/10[introspection,test?]
+	>=sys-auth/polkit-0.120_p20220509[introspection]
+	>=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
+	>=x11-libs/startup-notification-0.11
+	>=app-i18n/ibus-1.5.19
+	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+	bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] )
+	>=media-libs/gstreamer-0.11.92:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-video/pipewire-0.3.0:=
+	networkmanager? (
+		>=net-misc/networkmanager-1.10.4:=[introspection]
+		net-libs/libnma[introspection]
+		>=app-crypt/libsecret-0.18
+		dev-libs/dbus-glib )
+	systemd? ( >=sys-apps/systemd-242
+		>=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+	elogind? ( >=sys-auth/elogind-237 )
+
+	app-arch/gnome-autoar
+	dev-libs/json-glib
+
+	>=app-accessibility/at-spi2-atk-2.5.3
+	x11-libs/gdk-pixbuf:2[introspection]
+	dev-libs/libxml2:2
+	x11-libs/libX11
+
+	>=media-sound/pulseaudio-2[glib]
+	>=dev-libs/atk-2[introspection]
+	dev-libs/libical:=
+	>=x11-libs/libXfixes-5.0
+
+	gui-libs/gtk:4[introspection]
+
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	media-libs/mesa[X(+)]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated from inspection of the output of:
+#  for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
+# or
+#  rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
+# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
+# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
+# Each block:
+# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. xdg-utils needed for xdg-open, used by extension tool
+# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
+# 7. IBus is needed for nls integration
+# 8. Optional telepathy chat integration
+# 9. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 10. xdg-desktop-portal-gtk for various integration, e.g. #764632
+# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${DEPEND}
+	>=sys-apps/accountsservice-0.6.14[introspection]
+	app-accessibility/at-spi2-core:2[introspection]
+	app-misc/geoclue[introspection]
+	media-libs/graphene[introspection]
+	>=dev-libs/libgweather-4.0.0:4[introspection]
+	x11-libs/pango[introspection]
+	net-libs/libsoup:2.4[introspection]
+	>=sys-power/upower-0.99:=[introspection]
+	gnome-base/librsvg:2[introspection]
+
+	>=gnome-base/gnome-session-2.91.91
+	>=gnome-base/gnome-settings-daemon-3.8.3
+
+	x11-misc/xdg-utils
+
+	>=x11-themes/adwaita-icon-theme-3.26
+
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
+	telepathy? (
+		>=net-im/telepathy-logger-0.2.4[introspection]
+		>=net-libs/telepathy-glib-0.19[introspection] )
+	media-fonts/cantarell
+
+	|| ( sys-apps/xdg-desktop-portal-gnome <sys-apps/xdg-desktop-portal-gtk-1.14.0 )
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+	>=gnome-base/gdm-3.5[introspection(+)]
+	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
+	browser-extension? ( gnome-extra/chrome-gnome-shell )
+"
+BDEPEND="
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.45.3
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.17
+		app-text/docbook-xml-dtd:4.5 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
+# dev-lang/sassc
+# app-text/asciidoc
+
+PATCHES=(
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	"${FILESDIR}"/42.0-optional-bluetooth.patch
+	# Change favorites defaults, bug #479918
+	"${FILESDIR}"/40.0-defaults.patch
+
+	# Upstream backport, bug #844919
+	"${FILESDIR}"/42.1-polkit-g_autoptr.patch
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	# Hack in correct python shebang
+	sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		-Dextensions_tool=true
+		-Dextensions_app=true
+		$(meson_use gtk-doc gtk_doc)
+		-Dman=true
+		$(meson_use test tests)
+		$(meson_use networkmanager)
+		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
+		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
+		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+		-Dsoup2=true # libslot SLOT needs to match with what libgweather is using
+	)
+	meson_src_configure
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version "media-libs/mesa[llvm]"; then
+		elog "llvmpipe is used as fallback when no 3D acceleration"
+		elog "is available. You will need to enable llvm USE for"
+		elog "media-libs/mesa if you do not have hardware 3D setup."
+	fi
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=563084
+	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
+	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
+		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
+		ewarn "otherwise Gnome will fail to start"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 9f1e71aace02..ec3175823c26 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
deleted file mode 100644
index fd94a3adec69..000000000000
--- a/gnome-extra/gnome-documents/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX fix-build-with-meson-0.61.patch 480 BLAKE2B 88070a5628a4e6416a3870131f7f964188bf2997fa763dbcafc315b4fa44efe8312a9d29ee9dc09b8f7668ffd00beb50c1b37807bd5718ad4a8186d3dd6e727a SHA512 e2c51086c371e469eb274cdf302121609da6ac1b7d4a3300dbdb98a774a699094c9c8d267ca0b1462f6e25a153151155dcd8bf6c5af075ec6a9489f78c3ec386
-DIST gnome-documents-3.34.0.tar.xz 914100 BLAKE2B 5b59931d488a5b3d3b2940852b64b0af3cff71c685d62e07bee5d0e981e9a78bb913db853c0c3f138ea1728d2ff7495b689f1f5509064131ee2a4649e65d527f SHA512 5867b148aaffd02089e4f1148cf0fbce37ba0ed40c7d255f9261cd225757f56b68293d59476ab7c11ebbe310cc7935081b2770e7bc24bdbddb5934da5ea0cf87
-EBUILD gnome-documents-3.34.0-r1.ebuild 1669 BLAKE2B 627a4f39b8060cf4e181ff5f6a69c9d5bcad48ee9a408b7f64353fcac6da5543b73643a7876ca4440698e8bd8f8db573ef60cd3ae59f6f0e130a50a237422f9c SHA512 64ccbfb66db946182d6e33112fbe44b8d3b73abd3a50c72276d3ac581d4f1a0c74053cebf5b45951a5812301bda0288f45329cb7e97dc35238012b55512eff60
-MISC metadata.xml 546 BLAKE2B c847c48f46a7ed40653eb3b2363df0219a8cfd1b876ac7f6cd29290227497cc74c0490a650f03fcc7593ca2fe01d83e3cc122f51e6292b75d31c3afb4bd7f0df SHA512 fa2a5b960480dcf34e48f082ccedcd2d88996573a179c42207a8ccf0aa9961145691142cf354ba4492bf3b358545994c6a25e3ff0d97d62db0621097537ba8b2
diff --git a/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch b/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch
deleted file mode 100644
index 2a3a5cd3d3e3..000000000000
--- a/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/833843
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -56,7 +56,6 @@ foreach app: documents_apps
-   appdata = app + '.appdata.xml'
- 
-   appdata_file = i18n.merge_file(
--    appdata,
-     input: appdata + '.in',
-     output: appdata,
-     po_dir: po_dir,
-@@ -76,7 +75,6 @@ foreach app: documents_apps
-   desktop = app + '.desktop'
- 
-   desktop_file = i18n.merge_file(
--    desktop,
-     type: 'desktop',
-     input: desktop + '.in',
-     output: desktop,
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild
deleted file mode 100644
index 5245d0f95f9d..000000000000
--- a/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="A document manager application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-# cairo-1.14 for cairo_surface_set_device_scale check and usage
-COMMON_DEPEND="
-	>=app-text/evince-3.13.3[introspection]
-	app-misc/tracker:0/2.0
-	>=dev-libs/gjs-1.48.0
-	>=dev-libs/glib-2.39.3:2
-	gnome-base/gnome-desktop:3=[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.22.15:3[introspection]
-	>=net-libs/libsoup-2.41.3:2.4
-	>=net-libs/webkit-gtk-2.6:4[introspection]
-
-	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
-	>=net-libs/gnome-online-accounts-3.2.0[introspection]
-	>=net-libs/libzapojit-0.0.2[introspection]
-
-	>=x11-libs/cairo-1.14
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/pango[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-misc/tracker-miners-2:0
-	net-misc/gnome-online-miners
-	sys-apps/dbus
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/fix-build-with-meson-0.61.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=true #manpage
-		-Dgetting_started=false #inkscape and pdfunite build deps
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-documents/metadata.xml b/gnome-extra/gnome-documents/metadata.xml
deleted file mode 100644
index a45b9ff52292..000000000000
--- a/gnome-extra/gnome-documents/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription lang="en">
-	A simple application to access, organize and share your documents on
-	GNOME. It is meant to be a simple and elegant replacement for using a
-	file manager to deal with documents. Seamless cloud integration is offered
-	through GNOME Online Accounts.
-</longdescription>
-</pkgmetadata>
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 0f9fddb897a6..8c05c4469d24 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/xdg-desktop-portal-wlr/Manifest b/gui-libs/xdg-desktop-portal-wlr/Manifest
index ba08a201ec43..f290cb309929 100644
--- a/gui-libs/xdg-desktop-portal-wlr/Manifest
+++ b/gui-libs/xdg-desktop-portal-wlr/Manifest
@@ -1,6 +1,8 @@
 DIST xdg-desktop-portal-wlr-0.4.0.tar.gz 30776 BLAKE2B c4a6c07f57cc7cf16f16de43571bf9a281e647bcb1216da5a82e9c40d7a8344e78380b08a215a252011c9da8f97294aacc844d999095f4117ea26d17ff9ffec6 SHA512 544dea4601ce8aa8649d15b7c249aa5b0099fa5a6aec1b7a1433439265acede9ac442092da53080c36b372dd0ef5aaa15747b13a56f4a648e1c00ed3c2435e19
 DIST xdg-desktop-portal-wlr-0.5.0.tar.gz 31622 BLAKE2B 9314a1bfd121f25c6f615e1cfaa62d071224b5da9373bb3a954a06aa7ef9527617e34ae29192e25ca9c13c53eb77eb137fbaa1b121c9365397d64845c0cc3e36 SHA512 9ece46f2381e83cac8002a8175a13b0c29c0a2dab49cf11ed5ffa3448f176802b9d324b7e4fe9c15d3fb65087be42299f21a0ef505088e6281787f4067d256ac
+DIST xdg-desktop-portal-wlr-0.6.0.tar.gz 35654 BLAKE2B 1c213e9789db14366639d924d673fd05d94463f7fda8f3afb03f74269162f00e986c157d9741cb6b243d79e04230399b0bbc400f1d1e2bb72c9f53a9d6bc1e15 SHA512 e325c2de2a98ffc4612da3492138843b6c9927e536f52f7a87e794380c099f84ab8d344ee989bf88e71faaad2e5300fc31ac74058cea5040654ac74ce270ee53
 EBUILD xdg-desktop-portal-wlr-0.4.0.ebuild 900 BLAKE2B b5bda77755781ca1f3c63a7043696b4b311923730415940717f04f7a3b83db85d579358aa2ae5c92bdaf0478e89748148f925102440c761ecd2f9f0e7cec21b7 SHA512 fed3ddc8443b8a74bfa707cc2d582fd3eb7a2a0517f09d57dc390c451b8af7bcda349c94cd54cc75ad81b18a8582c9bc0e2b91dedc7d534522aebda8af4939e9
-EBUILD xdg-desktop-portal-wlr-0.5.0.ebuild 1108 BLAKE2B 57babb1ace8edffe35cc13d4a6a8ff912de9ef5f881f76e978ddc4a68fb022a3545f2529a774d6513d8a361de67a46277fbb09e6d7d4cab3685e3705ccd9be49 SHA512 06caeef2e315a1548761dc695b5b4d8a7c3ae9b7e99c9bd4c2af6c7fea190687d9eddd82a7a5cbdf4f9e7c4c970fa44789d954917f4e3ecaa3db2f079b545d6f
+EBUILD xdg-desktop-portal-wlr-0.5.0.ebuild 1106 BLAKE2B 0cc1cead17aecdba3ea3d2e2b0ef296c413ab30e29290f4d9fd137ad401f871ce6d0fa8261e442dd4ec7e1263579499abee45d1f0391c89ac628358fb27d90b9 SHA512 5e550aa1e96fdc5ce13a5907e648e11dd9e1dc205426ab9c43e5c19261cab3b5598d29d3d01c50137c1a1c5d8508443d182116c25e7a8a6fd2118e5b31a37489
+EBUILD xdg-desktop-portal-wlr-0.6.0.ebuild 1108 BLAKE2B 57babb1ace8edffe35cc13d4a6a8ff912de9ef5f881f76e978ddc4a68fb022a3545f2529a774d6513d8a361de67a46277fbb09e6d7d4cab3685e3705ccd9be49 SHA512 06caeef2e315a1548761dc695b5b4d8a7c3ae9b7e99c9bd4c2af6c7fea190687d9eddd82a7a5cbdf4f9e7c4c970fa44789d954917f4e3ecaa3db2f079b545d6f
 EBUILD xdg-desktop-portal-wlr-9999.ebuild 1108 BLAKE2B 57babb1ace8edffe35cc13d4a6a8ff912de9ef5f881f76e978ddc4a68fb022a3545f2529a774d6513d8a361de67a46277fbb09e6d7d4cab3685e3705ccd9be49 SHA512 06caeef2e315a1548761dc695b5b4d8a7c3ae9b7e99c9bd4c2af6c7fea190687d9eddd82a7a5cbdf4f9e7c4c970fa44789d954917f4e3ecaa3db2f079b545d6f
 MISC metadata.xml 348 BLAKE2B e3ba259446a063f5610926cc7ecbd3ab79c7866eadd96b00d9b7121a66ab9377e527a7dbf0d6c5db1a91b379906c55d9ee21d16c5a0f05cf0e714e3da6113066 SHA512 310f32ff7720a0810408ccb1160ffae4482f15e99e631a6e1e722f258333b72229faf8a88e3dd6589a0a9962198ffe5e7c0d36d87acfb71e0d9152dbb9fe1138
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.5.0.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.5.0.ebuild
index ba5baa8919b8..68a380512f92 100644
--- a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.5.0.ebuild
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.5.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/emersion/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.6.0.ebuild b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.6.0.ebuild
new file mode 100644
index 000000000000..ba5baa8919b8
--- /dev/null
+++ b/gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.6.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="xdg-desktop-portal backend for wlroots"
+HOMEPAGE="https://github.com/emersion/xdg-desktop-portal-wlr"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/emersion/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/9999"
+IUSE="elogind systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=media-video/pipewire-0.3.34:=
+	dev-libs/inih
+	dev-libs/wayland
+	|| (
+		systemd? ( >=sys-apps/systemd-237 )
+		elogind? ( >=sys-auth/elogind-237 )
+		sys-libs/basu
+	)
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/xdg-desktop-portal
+"
+BDEPEND="
+	dev-libs/wayland-protocols
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=()
+
+	if use systemd; then
+		emesonargs+=(-Dsd-bus-provider=libsystemd)
+	elif use elogind; then
+		emesonargs+=(-Dsd-bus-provider=libelogind)
+	else
+		emesonargs+=(-Dsd-bus-provider=basu)
+	fi
+	meson_src_configure
+}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index fe8ea5dc5b11..13e026bf1fb1 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index cfec7d6953f6..1e1cd5b8bc93 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdepim-meta-21.12.3.ebuild 2553 BLAKE2B 55832536744126fa8c28dd3289453d5c459c0f5170c456ebdc79a6bef652c198ddd513e3070723af90b89b872391eb1bf5f289536cc4b5f0645d7b270fdbb523 SHA512 b20f7355ef75d5d0bdcc4b1d2782e9cf924112e918db3d9af0253d7218fa55c05c714333c7f18a97c443003445486abe3413e3c5a53cecb274cba5869ccd124a
-EBUILD kdepim-meta-22.04.2.ebuild 2550 BLAKE2B b158e227491d2496cbcfb458a0f03287cea0823342426d871714d8e5d401ebc7a6efa6029e343ba63111701fa6baa2d20d56710337b02ea61f13906d233222dd SHA512 14e701a7334d1ca33f9445a5febd11ff0f35a197c553e6d8f81d65acf8aab76a876cc507fae51d22dd238fd6df8664ece049cd6ad9c9b072931314d87ecbbc30
+EBUILD kdepim-meta-22.04.2.ebuild 2557 BLAKE2B 6b95f909be894509c884eb277dac7f7764cea6066fb8819a87e769a60c5615d8ac2d74e0a48d84fed1dfed8826884b9b17d1f249e99e016e6f3ceef89e3e9a28 SHA512 f498bcaaa6f20f09dd3baf57e2fb0a29a863360c54abe8761cf5de48db90f10147bf6e7fd99f577bf09f154ce807f9cacaa23ffb54d8a9eb1b1741f627fe239f
 MISC metadata.xml 719 BLAKE2B 5738f59b4f5659b529f74f7f35fc8773408b45baf022e0b4e55656e45246e4217e130566dcb8ed0fe8f51d2198802a71cdf81ea7b1740de2bba3f289fb94c949 SHA512 5f9cb7928079b28d9125665f25c90c3bf3acc51d65760ba93ccda918fac56ba399a501fbe8d283d20aba5d83ffb9aa0ee5d7a2ba37e613d5ae7ab680a04cfe1a
diff --git a/kde-apps/kdepim-meta/kdepim-meta-22.04.2.ebuild b/kde-apps/kdepim-meta/kdepim-meta-22.04.2.ebuild
index 05436c19d75a..65d66051a186 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-22.04.2.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-22.04.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/kontact/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="bogofilter clamav spamassassin"
 
 RDEPEND="
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index e9e815ffbe95..2fabaf6f29b6 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 1583f4ab083a..c0dc93957dfe 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -2,7 +2,10 @@ DIST alpine-2.25-chappa-11.patch.gz 172996 BLAKE2B b6fe190d8f95ffa9d851d4760517c
 DIST alpine-2.25-chappa.patch.gz 172963 BLAKE2B 5e306325beb46fd2f716620794894f563b93e116693a1af050ea5f61c203350d2aa72b67d7f66acc748caea6a73bdef85f45324eb01edf8a6035b07f8a50e2bb SHA512 b88ca58e42a72b2b92cf28e4cae492a5ee75d534821046645fcc358833e87287fc707d5bec5c3508942a0ef1ecffe64916f00f1a01e430048384838e5ca40358
 DIST alpine-2.25-ssl.patch 5431 BLAKE2B 0cf2fcb682fbee41aa988ff089c16b75ebd9bee321c1c130d0b5136e5ca521bded7e9a97cd3ade1c86b17e72136264d4405cc36427a347c9bee84ee8a64548d4 SHA512 698d2a3c3b7b588fe3fcfe0291f0aab05c42b5ea80de1f210c1985082651329b80447de4e8057bc7e962fe8ed5175ea8132bad413c02fb1f0cc67c84e9420642
 DIST alpine-2.25.tar.xz 7495372 BLAKE2B ce2587a309c87ba527d51c360ee0d9627453cce6585631f569eb26db04aa6c5cddb7c9599478092447a040c43e9234e78a942fef4b1186d07c608163f96236be SHA512 76c214cf66f4ac7af3de40357ad3a592ff2a119e327e5f6c256125b7865d46b09197435fe6ac8077ab7a498e4821925939f3f902431ca77baa786e149466a193
+DIST alpine-2.26-chappa-5.patch.gz 173031 BLAKE2B 8719d37fde313e190608489e6191d4f0456f8a00ea267712e1c078ab1bbd3a8542bab3cf498faa1482fde386c24bf5335c54c39595ffb7fb019d13e975bf697a SHA512 aa979825367b309d5726055620c6f8f3effff954863e648de25f768ffbc175c3f91c8d1917e89116f35195a5ae266a9dcac51eb7f744f119ad848ddc0d10b8cc
+DIST alpine-2.26.tar.xz 7517628 BLAKE2B fe156974462dd566ac3fbe25cc54a1b2a480b3af46c8356356a97426f3e42495853efdbfeedc6173537dc150d90592c3fd9109e7d37f16738922a4205fd2f9df SHA512 359b5cb30be78a341b76c0475a2d5268b643788f14c9b5b9457af6748034e1d2e70fd7ddf59e5c59ad596a36d8a10afa9c41cbd74241c780b8575d8186168fd2
 EBUILD alpine-2.25-r1.ebuild 2414 BLAKE2B bcf89fadb7d018a705a513706def00ee55eb620ca205ad60f7bffcf8ae2542f574ff7a697c97f82d1ef3173344db96ed8a18fc5084d1fe7f06d342b36074bcd0 SHA512 122a68f1e817e7b67fce9e3c45af3ce060d83d3de12844df594e8d8168c013442092164138c96e57dba16a9fb7946971f8444e33a261ed9b8d327d439466c3b6
 EBUILD alpine-2.25-r2.ebuild 2420 BLAKE2B 3fd46941f808ecc575f0235ce4e831e237f46e27581532db5ebdbb6b1436570351b7dadfc0b7ae2abbb2dc67230d050fceb95d1448f737128585585bb48068c4 SHA512 e22645de4884fd80199d5786fb21a458da6bd06ccaa9f595e7c999d0f2d975cabcb314d6cc4d3976167efccd4824be950bc700371b614d5054a27ba8ab78d835
 EBUILD alpine-2.25-r3.ebuild 2632 BLAKE2B ec11b33aff3c3cef05840d132022d4cd075ab1379ee5535ea50ccf49a5a0320f54dd1f4cdee76bd310250b234a2d36ce74dacc9564188e11eeb793b222b0285d SHA512 24746f9784a055ec8cdf92f51244c6d323910b4d7a3ed71f3799b4ed55811e531060ce683fe3c980b61d13b5a67c3f5ae872bcf5512b3a373c2cb7cc4ce30eef
+EBUILD alpine-2.26.ebuild 2351 BLAKE2B 89d74671cf64a5e17151b237a996e90a5fcb93d0fb6042c3448c07fd203d40a31214b46419c699ad05e72be068d65d264ce971c620198c0602b73ecae72756ad SHA512 8b60d9861f11126d16cb86965f541bf7f695fd813a2fc6365e2fd1da0a09b88bbe036264e12483ad4b4e708e9189efac5c112bf87c4ec974bd3138db2099f894
 MISC metadata.xml 762 BLAKE2B 026faecac5042e19cce6f125f66fd7af22cbd50140abe315a686d1b129f53b939f5325f9bd1956d41b47da146b6f37c597fe91370722f2f4c7af8169cbcb0f66 SHA512 e11cb2d6c0612fc09302485c38d216245adcabde36fb2c6e829b452f10f3adc9037f1461305e2e3cc3e89025560ac3d621b90b94eea152c9c3e0c53a6c6f9512
diff --git a/mail-client/alpine/alpine-2.26.ebuild b/mail-client/alpine/alpine-2.26.ebuild
new file mode 100644
index 000000000000..c06917b3931e
--- /dev/null
+++ b/mail-client/alpine/alpine-2.26.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools optfeature toolchain-funcs
+
+DESCRIPTION="An easy to use text-based based mail and news client"
+HOMEPAGE="https://alpineapp.email/ https://repo.or.cz/alpine.git/"
+CHAPPA_PATCH_NAME="${P}-chappa-5.patch"
+SRC_URI="https://alpineapp.email/alpine/release/src/${P}.tar.xz
+	chappa? ( https://alpineapp.email/alpine/patches/${P}/all.patch.gz -> ${CHAPPA_PATCH_NAME}.gz ) "
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+chappa ipv6 kerberos ldap nls onlyalpine passfile smime ssl threads"
+
+DEPEND="sys-libs/ncurses:=
+	virtual/libcrypt:=
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap:= )
+	ssl? ( dev-libs/openssl:0= )
+"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+"
+
+src_prepare() {
+	default
+	use chappa && eapply "${WORKDIR}/${CHAPPA_PATCH_NAME}"
+	eautoreconf
+	tc-export CC RANLIB AR
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_configure() {
+	myconf=(
+		--without-tcl
+		--with-system-pinerc="${EPREFIX}"/etc/pine.conf
+		--with-system-fixed-pinerc="${EPREFIX}"/etc/pine.conf.fixed
+		$(use_with ldap)
+		$(use_with ssl)
+		$(use_with passfile passfile .pinepwd)
+		$(use_with kerberos krb5)
+		$(use_with threads pthread)
+		$(use_enable nls)
+		$(use_with ipv6)
+		$(use_with smime)
+	)
+
+	if has_version "app-text/hunspell"; then
+		myconf+=( --with-interactive-spellcheck=/usr/bin/hunspell )
+	elif has_version "app-text/aspell"; then
+		myconf+=( --with-interactive-spellcheck=/usr/bin/aspell )
+	fi
+
+	if use ssl; then
+		myconf+=(
+			--with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
+			--with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
+			--with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs
+		)
+	fi
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake -j1 AR="$(tc-getAR)"
+}
+
+src_install() {
+	if use onlyalpine ; then
+		dobin alpine/alpine
+		doman doc/man1/alpine.1
+	else
+		emake -j1 DESTDIR="${D}" install
+		doman doc/man1/*.1
+	fi
+	dodoc NOTICE README*
+	dodoc doc/brochure.txt
+	dodoc -r doc/tech-notes/
+	newdoc "${S}/doc/mailcap.unx" mailcap.unx.sample
+	newdoc "${S}/doc/mime.types" mime.types.sample
+	docompress -x /usr/share/doc/${PF}/mailcap.unx.sample /usr/share/doc/${PF}/mime.types.sample
+}
+
+pkg_postinst() {
+	optfeature "Spell checking" app-text/hunspell app-text/aspell
+}
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index ab3d7871369b..722365e6d170 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,6 +1,7 @@
+AUX mailx-8.1.2-20180807-musl-CCEQ.patch 363 BLAKE2B 087ea642e053bb12a265d6fee14605804666674c10847ff1dcecb35eba9caffbf2d3a5c4c340e187b19362f5ccf9d9b11553f04c5074659a4c363e557e778011 SHA512 c285c25620bfe5ca07fc1d068c40dea1f1a980cce1c4dcd7dd4f6de0d492e9fe8f968ef818c630aa1d95beed269e9b9464a53a5ff1af54cdaf3e0bab92a76d3f
 AUX mailx-8.1.2.20050715-offsetof.patch 1566 BLAKE2B 0878d9f3b639e292e1cfc69676c3e8b3ef68627764828f89fb252c72ac8133162fc4bda234ed1a82487a39306efbead9406b2dc750548deea3fb4c767ddc26c1 SHA512 f6c865cfe32d75d2ce2cf3538822db3c22edc09038ba72f7e25001bfda9b4b2c320e03f91622b316a268cfbdc1f57780ffe199dd8da8c78fbcfe93daf9972aea
 AUX mailx-8.1.2.20180807-fno-common.patch 7481 BLAKE2B e847c7865c2346bfaeae2a32539aae3e5a73452073253af52615f3791285e822bbb96174dfabc97daec576a36d7d9ec7a2e9fc94b7372aea8efa08c363095f5f SHA512 37a5ed4b1b31eecd05d8a05b59aec9f8cba78cda838bd2ce06ed3f6c7a4f1e586223207e9ebdbd2cf952bab1dcbf06466aa61c61bcf0527fd57bc0b018acfe85
 DIST bsd-mailx_8.1.2-0.20180807cvs-1.debian.tar.xz 47916 BLAKE2B 6776dc1705383438e4249269f38a0db963731580ce4df3a2f6fddb112495db3225608b97718cd3916e7bb40b71d0338e6d262416a42b60ba19a6f4a8e1c8627e SHA512 3c99c5be121ecb37f2495b885e2a00290173b16578da100bb7955f86c7e76b8a8cd6bf8f936c1f00b906611e8649c0a6a25089b647d7f5ebcea8c8df3f334e28
 DIST bsd-mailx_8.1.2-0.20180807cvs.orig.tar.xz 79684 BLAKE2B 2846cd752472a193f89f7672d6a61de9759beea5530484c75ae4703335afc22a833226a87141853e4fbb2c951f9818ff35c8b79349b8a7a9a77f7788c6569bab SHA512 7a33d35934b0a98660732259d3132235ed14cd6843e79edd5683b668c3a550b45f0664021af35c219043640c20ce5aa34eaaf6dc275dc7e83aaed44853d008c9
-EBUILD mailx-8.1.2.20180807.ebuild 1301 BLAKE2B afe186ca7cd2e728887d91e6f2c6b891ef79e35837dff291c37e6b8d502115875c01506d4b939d75def45922f987495ad5693223577ef99a7965a55a66e47958 SHA512 517abd9a292ed1b5ddba8d71c66cac1fdae06093821311449918f8f3e4eda946f5229f8d45ec51a12e538e6612adc511e7cca4abcd26ae8f5cf7963a7c0e814a
+EBUILD mailx-8.1.2.20180807.ebuild 1360 BLAKE2B be7fe62221417203c013ef56970765f1692383cdcfc15abb0a9752520033ba8febf96009ba72840493798f465abecfb7fd03421a2ab4a12a63159d6e1c552b68 SHA512 dc329661d7fe5a5f8e41928e07ef8f869b0c57eaafd1ef657c0ae955660fa9f8ccc4432b6929ec6275a47f80d0d5d08fdce0b146235f6e0d1d1838654fed115b
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/mail-client/mailx/files/mailx-8.1.2-20180807-musl-CCEQ.patch b/mail-client/mailx/files/mailx-8.1.2-20180807-musl-CCEQ.patch
new file mode 100644
index 000000000000..d04ddd789e3a
--- /dev/null
+++ b/mail-client/mailx/files/mailx-8.1.2-20180807-musl-CCEQ.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/719512
+
+Tiny definition copied from /usr/include/termios.h.
+--- a/tty.c
++++ b/tty.c
+@@ -57,6 +57,10 @@
+ 	size_t	 cursor;
+ };
+ 
++#ifndef CCEQ
++#define CCEQ(val, c) ((c) == (val) && (val) != _POSIX_VDISABLE)
++#endif
++
+ static void	tty_flush(struct tty *);
+ static int	tty_getc(struct tty *);
+ static int	tty_insert(struct tty *, int, int);
+
diff --git a/mail-client/mailx/mailx-8.1.2.20180807.ebuild b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
index d542d75a55b2..4b3f28a1d294 100644
--- a/mail-client/mailx/mailx-8.1.2.20180807.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
@@ -33,6 +33,7 @@ src_prepare() {
 	eapply "${WORKDIR}/debian/patches"
 	eapply "${FILESDIR}/${PN}-8.1.2.20050715-offsetof.patch"
 	eapply "${FILESDIR}/${PN}-8.1.2.20180807-fno-common.patch"
+	eapply "${FILESDIR}/${PN}-8.1.2-20180807-musl-CCEQ.patch"
 	eapply_user
 }
 
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 93b360a97783..07c59bde0931 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/fira-mono/Manifest b/media-fonts/fira-mono/Manifest
index 387485de56f3..45a83beb613e 100644
--- a/media-fonts/fira-mono/Manifest
+++ b/media-fonts/fira-mono/Manifest
@@ -1,3 +1,3 @@
 DIST Fira-4.202.tar.gz 94581261 BLAKE2B 346e18a115098570a3540345d165018477a071d4ee3d9d305f8de5442bd6341439ebfc58ec364b428ddd1e1833224ce27bd9fdde4e4251173ef271c26d72c237 SHA512 fec770fa038f2aa0654f9382f95aa1266a2655970f4c7755b237af9d1c09f47ce719f8daf3afc39812fc69448b9481ee0e2a1414f1d007ad70b4254c92950ebb
-EBUILD fira-mono-4.202.ebuild 837 BLAKE2B d92543921f1636aa04fcd7d76348ed21970d0ef16dc2566b8754715db7fbfe33407c2bef025f0133cb7e7f6b1199002b8791d5bc8bef52c8108cd8e1b9a34a35 SHA512 bcda24282e4a3eeae293389acda1090fef424fab82e3f2ccc4cabbc8765d73f80f302bcc004f07e8c13f7432695b3e4635fbe50c84d82f102ac7fd6e657d1080
+EBUILD fira-mono-4.202.ebuild 835 BLAKE2B 51d8077ce003aede08d8367d1a7a1cb305eaddd929bd55e478ac2aff0a26a7150d23c80e039073358d8f15faca5911c80d30b8ac645b27fd1a69aef134d9ec04 SHA512 30e60df12fac1801d03bbe67d68bcb883ff06bec67cff97e64e2641777032ae7c13275e5459b4e19109b44ab0a56dbfab12115fe000e25c655af18e4d64a31e4
 MISC metadata.xml 400 BLAKE2B 8b191c0fd0dbda1f7dadee9f6a116d1ce0f6e530eb130bec9dadf0bdda446ab97759b0e7e6de9ccfcd610679065a4e90473688d8d5cf821737c566d8d1fdeab5 SHA512 9bea797fcf82a7dbb03c4f89f06eed257c36e241d2932c60a2d629cca69a168c3b03849bd8c0fc522125d99c7fbb85002d4d281a0036b3c244ac3ca4317dbf01
diff --git a/media-fonts/fira-mono/fira-mono-4.202.ebuild b/media-fonts/fira-mono/fira-mono-4.202.ebuild
index 4e853da795b9..3368b291f3f2 100644
--- a/media-fonts/fira-mono/fira-mono-4.202.ebuild
+++ b/media-fonts/fira-mono/fira-mono-4.202.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mozilla/Fira/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 IUSE="+otf ttf"
 
 REQUIRED_USE="|| ( otf ttf )"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index bf4091f80aaf..3dd2ad5ad20f 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index d84ebc503d9d..9af69375b4b0 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -5,9 +5,11 @@ DIST prusaslicer-2.4.1.tar.gz 55572739 BLAKE2B 8c6030560926e53c780847e7b8a058205
 DIST prusaslicer-2.4.2.tar.gz 47752224 BLAKE2B 27b00b766890f8675246eded75c51a671832a3abf518adf7b825dbe8396cbfd2d4b48f76d646675634af49ddbe4cd48ea8e533d66a131d14bff4e76bdd357545 SHA512 d480c608eadb58b53ee220317a749c0363db580759322ed7a9aebe2ea5c1acc30dbd3bdf9ed9849c23ba5c125ee6f923de6ac01987bf85abf7aeb3f91c2ae23f
 DIST prusaslicer-2.4.2_p20220506.tar.xz 29109336 BLAKE2B c8430b355a3d161c1aa9ab421edf1f291a7898d4fd2831fe924dc2d742bdb611d58d4e9f581c00fc37f18b6c54df2d82ca063091958ccb0859254014972a9477 SHA512 bf525e12fbc5a471fc28ffa048ec8628de892bfc7e65cb708266ef5d05692cf9c0755eae879b8fad0572d6af7368e2c251361941157ab2c9be73cb38c8962f72
 DIST prusaslicer-2.6.0_pre20220601.tar.xz 29096924 BLAKE2B d1bb1733528a817384583c203fa84bd41daee97f24698fd421967838a8c4ec7a8705de39ad065ac1778c7e67289a491c298d063a4a53e5276256a3f230cba43c SHA512 d8581c292f4b6085992046a3063d90b151746690df9d7eea01bf68e72508f1b54e7547c1fcc0dd493712a752dcd158deed037559bd8825fc521e5b6aa5b199f8
+DIST prusaslicer-2.6.0_pre20220620.tar.xz 29309256 BLAKE2B 2b2dda3f1efa05e674574812b50773b0f6c6d0c1dcfa0095deab7b80e62c5ed9f5837bc6141993ed41bcf985c598c11cf2741e17623309dbf8d7612c7af24a50 SHA512 7ad510b1e0db1774500049b76547e73b62976be897d47d118844c996939f843c9c0699c96bdf9569992a4d170a900e302566aa45ec8abee9ee4742104fb5deea
 EBUILD prusaslicer-2.4.0-r2.ebuild 1676 BLAKE2B 596d5acea9300e6245f4d0879175c492f13485f2a6c5108d1b35a3e9b6b65867b6c7fb417c315aaea3f0661fd3e172fbd25fa5098f6612a7bb040af17502a12f SHA512 b7dba08d44dc5a3e835ec1376faf904a8c6f4c1f7b8f9a81979719766e4353305967bf4bb895973b8a258fe032ef4a57f2f7e1b56b3d47154d42ba03daf1b0b0
 EBUILD prusaslicer-2.4.1.ebuild 1684 BLAKE2B 3c3fe39d1dbf883743e9371eeae3d1f2f4ded1d0017e49847540808766dc1f48014842d5c9dff2ae973657aefd1bf61bddf73e69a812152093b8dbb1684b621c SHA512 f370197b41f4f21e2578f43c40bdcd9475544a8636b910ddd9a7597d1a70dced32a0e94b9ad4e5f891f286cb20e35d7ed1c1055ee374b3b18f3c6764d4443421
 EBUILD prusaslicer-2.4.2.ebuild 1684 BLAKE2B 3c3fe39d1dbf883743e9371eeae3d1f2f4ded1d0017e49847540808766dc1f48014842d5c9dff2ae973657aefd1bf61bddf73e69a812152093b8dbb1684b621c SHA512 f370197b41f4f21e2578f43c40bdcd9475544a8636b910ddd9a7597d1a70dced32a0e94b9ad4e5f891f286cb20e35d7ed1c1055ee374b3b18f3c6764d4443421
 EBUILD prusaslicer-2.4.2_p20220506.ebuild 1608 BLAKE2B ca2c8c6174367d3366fafb3955214f0cc9fe3ad3fe59c4debe448d145ca44b2d3a2beb7c1cfa0d6a668349f71ef0a1440ff2be42425661585e88f4a1683bc1e5 SHA512 15180ca71f9ece0782993b9f527fb4742349f40d7fdd3aaed53585e5e0ed806a0dfa799fc8a24472656b6cb3214af0b264b3340125eccc2f2c20d587e1d4aa80
 EBUILD prusaslicer-2.6.0_pre20220601.ebuild 1537 BLAKE2B 72842947eecb87a300542e35df86c5c9797ecdbbaba03647b0dc646df1e5cbec7abd56a1087e7841503890c62d552b34b09c8ba46d9cb2b401078113d194dedf SHA512 847eccb3e407dfd3fbcff16439c07bdb70bacc91aa56e959ef77622be2a621a45b07cbc912a73a77c825e5a086ce784ee6bb73e15676b58c037246fc55eb0c69
+EBUILD prusaslicer-2.6.0_pre20220620.ebuild 1530 BLAKE2B 828a2b4be69a4184e8452940e35d8461fff22e2a449eed7197829982d43b3cc3b12a39203c47646eb516bd73bb3fc97174d138e91c3c1e2b1829c5b1d5f9a7f7 SHA512 7045e344643e61164023a71fba9f529dda6cd557251f34ae3399684126190685a08ecc06124797d62a9e59d3b51ce0c3d66a99234b39ed9b9fd246d15bcdc31e
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620.ebuild b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620.ebuild
new file mode 100644
index 000000000000..a3e72276b58d
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake wxwidgets xdg
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
+SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	>=dev-cpp/tbb-2021.4.0:=
+	>=dev-libs/boost-1.73.0:=[nls,threads(+)]
+	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
+	media-libs/glew:0=
+	media-libs/libpng:0=
+	media-libs/qhull:=
+	sci-libs/libigl
+	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]
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+
+	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
+}
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index 9a6de1037b0d..38294d6a3df0 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -1,6 +1,6 @@
 AUX xsane-0.999-lcms2.patch 11788 BLAKE2B 2a7f40e1d430b74f29c201e850ee5520395a6a6d906323125c084effb9a52720d1a1d38d2a3680986a05787170818011342a7fcde225f4d1f70cdf36c6a9d8a1 SHA512 bdb5f078d7a36702b327b01f8c6d4259d52252968e5d287ce17aed18adb0bb89420049609242ee89048cb8e4012a0dd04ba29fa994570014d3c62b098e33508b
-DIST xsane-0.998-patches-2.tar.xz 54804 BLAKE2B d5eb339f5d5d9eb61d213ca37e31e8b36df03f271f86a0c5f924286b39c9d2f47416512243ff3ad07e2f9d0ac4e3f0a73346ced1ce74ac17dbb0c9aaf6ae3c89 SHA512 973ccac2fe3b6089049c1c5ba3e4cb0db29fdc79de372f8a7b461ee108e5bfc3f4a84997552fc3d3b651bbe9f98d247a5974d90e8949089b2ea52118eab6ad1f
+DIST xsane-0.998-patches-3.tar.xz 54480 BLAKE2B 8c77bf0304e60114fa964e337640b61e7c353a6b6f9ad5bc3c87fd5324440b27e58a45aef7df2f16d5faa63692b9f8b22cca7d5dbf21dd6a1cac8572e668cf65 SHA512 e0a85e536502fef66526f12d7607381d07a2a53953f200b298afd1225f85657dfa3550f37b1ee7827739cb2b00333ab926a146c6424ec2543b691f0945300b68
 DIST xsane-0.999.tar.gz 2950621 BLAKE2B a8490981b7da497934f0334874fb65d2d3f2a7d9153825544672a39780bd8c4bfabee6bda134bd7b37b07947d1f01f283fb7242552b0e6342cab5a70484a5488 SHA512 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed
 DIST xsane-256x256.png 18478 BLAKE2B 5661d68fab2c5f7219f0de9e2c2c811ef5fba6f5472e85d98f6f3a10bb058c1d26597d15c2aa8ab59c52060a62b571aafc2daafcef4bb8edd0445cf875ec0ca3 SHA512 7bd63a701a4776b395689799ad98b7619917a9b40367c980bebaa116e6c5c2bfeffb8b996a8295b07f3483aa689c9040d8a68bb21376af65b1c0e8f69294f2e5
-EBUILD xsane-0.999-r3.ebuild 2230 BLAKE2B 3f551b4c5f4fe40c7c131ccdabcb78af3578c78ccd4d7e2c3b3f0418d1c1c562976725d8caccf005e829ca9e07c3bbb932e674eb7329108191609e5b3d0b28a6 SHA512 c9ffdc873aedb507595b5b3d239101d9690c3a5020f13608d1c66b833a46fa90dd4175ee172ff746ff2df21581841f2d4b55eea045a86bb4822f2c3d4b9e5d4e
+EBUILD xsane-0.999-r4.ebuild 1998 BLAKE2B fee45d3148313c68e97ee82ded7055d4408c195d87655e4d8c10db6d9e25f1726d07bfe128743cf85c8266a38ae126bdb9efbe14411fc60da759c77adea03cbb SHA512 105b2d74e59aef57e35a053d3de8d4cba7ee19c44d077a3e751a93a73024fd5f6ae03a56e2e59ab5abccd6291bbe7468047570e1239c8fa9968bb1864ec8ba4e
 MISC metadata.xml 371 BLAKE2B 2816d22902bed33d3af4bc8df476953a4bfd8e4f08411d2da60af273c966ffe692f155eaaf5cfb8dc79b78d0f82ef117cabdf1e315b051cbe216fe451da98400 SHA512 2def02aa540182ef68f99c7c327b1f6607ff6cb151bb44e232338549da82ef5b60d7096ad6212f4fd6d7aeb93063dca9ca994bec95fcfe0133e674e4ec5b6922
diff --git a/media-gfx/xsane/xsane-0.999-r3.ebuild b/media-gfx/xsane/xsane-0.999-r4.ebuild
similarity index 68%
rename from media-gfx/xsane/xsane-0.999-r3.ebuild
rename to media-gfx/xsane/xsane-0.999-r4.ebuild
index a6324b3b8c28..78d35099cfd2 100644
--- a/media-gfx/xsane/xsane-0.999-r3.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r4.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools desktop epatch strip-linguas toolchain-funcs
+inherit autotools desktop strip-linguas toolchain-funcs
 
 DESCRIPTION="Graphical scanning frontend"
 HOMEPAGE="http://www.xsane.org/"
 SRC_URI="
 	http://www.xsane.org/download/${P}.tar.gz
-	https://dev.gentoo.org/~dilfridge/distfiles/${PN}-0.998-patches-2.tar.xz
+	https://dev.gentoo.org/~soap/distfiles/${PN}-0.998-patches-3.tar.xz
 	https://dev.gentoo.org/~pacho/${PN}/${PN}-256x256.png
 "
 
@@ -22,17 +22,15 @@ RDEPEND="
 	media-gfx/sane-backends
 	x11-libs/gtk+:2
 	x11-misc/xdg-utils
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:= )
+	tiff? ( media-libs/tiff:= )
 	gimp? ( media-gfx/gimp:0/2 )
 	lcms? ( media-libs/lcms:2 )
 "
 PDEPEND="ocr? ( app-text/gocr )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
@@ -40,25 +38,23 @@ src_prepare() {
 	strip-linguas -i po/ #609672
 
 	# Apply multiple fixes from different distributions
-	# Drop included patch and reuse patchset from prior version
-	rm "${WORKDIR}/${PN}-0.998-patches-2"/005-update-param-crash.patch || die
-	epatch "${WORKDIR}/${PN}-0.998-patches-2"/*.patch
+	eapply "${WORKDIR}/${PN}-0.998-patches-3"/
 
 	# Fix compability with libpng15 wrt #377363
 	sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c || die
 
 	# Fix AR calling directly (bug #442606)
 	sed -i -e 's:ar r:$(AR) r:' lib/Makefile.in || die
-	tc-export AR
 
 	# Add support for lcms-2 (from Fedora)
 	eapply "${FILESDIR}/${PN}-0.999-lcms2.patch"
 
-	mv configure.in configure.ac || die
 	AT_M4DIR="m4" eautoreconf
 }
 
 src_configure() {
+	tc-export AR
+
 	econf \
 		--enable-gtk2 \
 		$(use_enable nls) \
@@ -76,15 +72,13 @@ src_install() {
 
 	# link xsane so it is seen as a plugin in gimp
 	if use gimp; then
-		local plugindir
-		local gimptool=( "${EPREFIX}"/usr/bin/gimptool* )
+		local plugindir gimptool=( "${ESYSROOT}"/usr/bin/gimptool* )
 		if [[ ${#gimptool[@]} -gt 0 ]]; then
 			plugindir="$("${gimptool[0]}" --gimpplugindir)/plug-ins"
 		else
 			die "Can't find GIMP plugin directory."
 		fi
-		mkdir -p "${D}${plugindir}" || die
-		ln -s ../../../../bin/xsane "${D}${plugindir}"/xsane || die
+		dosym -r /usr/bin/xsane "${plugindir}"/xsane
 	fi
 
 	newicon "${DISTDIR}/${PN}-256x256.png" "${PN}".png
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c594c5718ea2..cfcab4f67251 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 9710e7c57ffe..a0bb3f161be8 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,23 +1,6 @@
-AUX assimp-5.0.0-disabletest.patch 392 BLAKE2B 1654fb964c738aaa343abd1905616648c85ab0793d3450d4a05358c9463d00655f0a1b7aa5f1444d90e12ce51341b9a52e75fd81090a65607c3a21efcd374360 SHA512 25856886bae9cef071317880d8d677a3241c74c0cf288a5677f3be492d640d6db3ba5de3d53cf3f41f78e12ee9f544bf37de7ba82e98d9f4e3f699e38f053bd4
-AUX assimp-5.0.0-findassimp.patch 744 BLAKE2B b78cbd88d16d58defbe2970d4969cc9296956c70469521dac7fbb90d2e8e478e077c401224739f6a5f343a2f4579c212cedf939dab482c9235e1065fbf37ed6a SHA512 7523363a5fe387cdfe3f927ede667718ae42223ebb615234f1b3c0cd80d17cd3590ac7af27279748685a263522029784b089f34765c9f5a7e98873a3ad62bd2a
-AUX assimp-5.0.0-unzip-of.patch 242 BLAKE2B c977c94d4ef44d9e185738e7f3c2e5bda59ea52e11c5900387f9e590201f4ffff3aa6dc9a60452f8f782ce37a510cb85cecd1f8df8b23b331688b75f69ea3890 SHA512 e8908f0c44afc4969b9fe670de418ae9df592cab47b0c9a67958c37414740c527a7ee1ef6d61de19c926f08bf20663be66dc54fc6e3d9164e6ecf34360dff37b
-AUX assimp-5.0.1-GNUInstallDirs.patch 11844 BLAKE2B f426b1aa400a840bc9c3768d5becd527bd8ec4408158923002a941c0f7a25c5c213f6bc7481ba0263cdf24d8cdfc3f42121191ae3c5d2de1ded90483f31801ae SHA512 1ac1c74dfd971b5a6502d3a6df9e6f069da50a9e00ff1c837616774117adc5ac9b266b772a6be18c8367d07f195dce39ba301dbd7756960cba6853b951b3ce70
-AUX assimp-5.0.1-fix-aiGetLegalStringTest.patch 2919 BLAKE2B 4c5111f11b4d0de92c169d0f50eafddb35582a93a6e4bd56ebab8560aa32f7e486866c449884fadc50d0e9b48c714ec0bd743a585d82b62622363cb99c921a8c SHA512 301827d1f134e4f18fdfd05aa6f83cd0020b4788e840d766a589eec7962e48e6f401d87dc41cd344abb3d08145e326b6e9a16970e46b5bbc67dbdacc3985fe2e
-AUX assimp-5.0.1-fix-unittests.patch 1062 BLAKE2B 3e1e2a236f5f4fc9aa901001a526261569513b221082480bcb366e208489b00df33f7da38245293a17e8aac846ca715a86d10c1a7362137c4afd30f63782fdb0 SHA512 66f52cc5f809eb6987e1c6298730ae6bf89e1d0fb1c7665834448494121f79c1602277ac6eabb69a302171cf1048b54560ade3bc00a8e1adb4fe464bdb71d9de
-AUX assimp-5.0.1-projectversion.patch 686 BLAKE2B 0b521adc80aaa2350a8225c40a2e1a918831e7fbbd3c9e46cb654c94c370d95ac5622f3c95ab161debeee92234548778de494640f88e4d8131f0bf91b76b07c9 SHA512 981d62f20448cc47c732dd4c0bd24ad43c2bb02a9a765ea1da12e834cd50a1675bdbed94d37d1f60c011ba237327be953db89ec1d509dcfeaf30ed480eb9217f
-AUX assimp-5.0.1-versiontest.patch 779 BLAKE2B 7d48c4070917589808a04ba370a682a4b96bf7cb116befee9c8c110fafc17878b7cf8729d6321968670ecedb763a93c237ade4af9f1194e6850b34d4dd6a3be3 SHA512 1b29ba91ecd6d4650e1f44ac7dbbd14e508b85adef78c4396d820567fdabf98d9098ea8f3e2be7368ffeb42b220fe4749d459dfb38edc99be2f09b4aefcb80c3
 AUX assimp-5.2.2-disable-failing-tests.patch 1889 BLAKE2B 7f1f72ca6851dbe07d2493ee81a3c18e7118658b76ad5a41f31626cf0099b8bc7bb2fec83ef64c7ab6feb4fe01994cf106440d7a284d5af66b06b2a5ccb086d9 SHA512 128e420ae01246f46deab243bf09e4a0012935e34d5273792c22538bc9353641203450388c19aa5a7670d0f1a3a40e1d4e31a550711f64c8e2d4d0b0e6b3fba2
 AUX assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch 855 BLAKE2B a6f526719d65b8aeb3c8ec1333973bd273589f7a1bb03a6838331740fd1961d63d121bf07636918dd221ba9af3a32a600c3fed3f0dd3135c7e37655d5bfa1fba SHA512 2103864934bd4a3469b419536da4604839b3b1a1b412612dd5a631f578d7c54538e7c97ca612e28425e5f1dd0ce71c11117165f1cbcb5f3604113ae4be259734
-AUX assimp-5.2.3-drop-Werror-gcc-option.patch 766 BLAKE2B 3e9b4a7fb369752de6a73b72f943c5a5d82b2b57b5e5a4c2c46b43b0a88d5ca7b8cfd36ee50a69389ddfe8e6fec0ac96f4797d7803695cb51585b79f80998f77 SHA512 774abd8d0334605a1d48889036376d16fed683dd0f0f86fcfc39792e97d088383ca7eb49f8df842feedba1d2790b8a86c7d752aab38ca6fcf0f7819cc1a96d73
-AUX assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch 4743 BLAKE2B 93f9bbc8d3bf8d97a3bbcfedabbeaba380055104da8cd776324b6a232ed121242e767de32eeefde6d7a76ddc002397277f7c4edf4fd719dbf17486b21c7b0226 SHA512 dc1767fd121fe3087dc63ee47c87302e2198f97bd8794ef4cbc5815aa5752e00f5ec4450b08553767b2f3c24b2603e444fdedf1edf94efce13c81d1aa988d382
 AUX assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch 5956 BLAKE2B 68efeb940358df092250a30233c137c625e8b50575323d3120e09f393ff71f3d5411f3447693ab952ab9d782df5e542bd74c601f63c27efd494c27ab7fce6791 SHA512 6f5272dde69888417deba00b49b325e58f42bc385633e2be5cf922d75a7b83d8337bccd1f39c60741deb850bd59d1209ab9404fd6ed84472552352d50cde804d
-DIST assimp-5.0.1.tar.gz 46607553 BLAKE2B 7f8cdf2bc602398fbdb675094d135e955716deb8f6469a4b68f7a8c735ecaa3120ee023c5c1f95c5a79c0606ed9a3cb3491c5011e2b409da523b56cd193ebb60 SHA512 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0
-DIST assimp-5.2.2.tar.gz 49600909 BLAKE2B f5f8b5fc43a44c59c95ac3a1f2ce861a5198851ca910ec7688a818550aa0cde787901f7a7beb9f90f7fe731e18f3c31c7350d3b3070f7437153ff9d041f6ffdf SHA512 7f11f3e53bdcd43a81be49ce2ad90d97769ae1c3c6157f57e8a0b2b41c72f394ad1afcdc5f5fa6fbfa1a44233fed4b9a578d5548ec5b9aae2113ef88c2ec843a
-DIST assimp-5.2.3.tar.gz 49606233 BLAKE2B d6904769f1812b875a3b30de9edf35d9ca1774aecefe4d84edaaaa2975be1350de46e259e14b40f7749921c398490e7aea08c30c0ee89a69aedeab8f02a3e863 SHA512 accc1020877b631431bd0bc2de20b530d7e8d234e960904070292a4a08e768c55d1d0cf614c68d38f099fab2d086420c3ffd3f729cb538b169c1275ef0be1eaa
 DIST assimp-5.2.4.tar.gz 49613683 BLAKE2B d99243ce84a76ea237becd0b0982619e8f948ebc75784d8ea35e3800b9ca5084291fa58484433e4f2a7c3cd7ec2869033cf458daf94ee0fc4fe3283592721e73 SHA512 ee988b1806b46c78f97bb5b25237a3f56a7028ed37898fb9b243e379e29e8bfd29e4dffc616566941ed9bdcf502bd30568904ad2ef2ef7d0f63b40daefdc66bf
-DIST assimp-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e
-EBUILD assimp-5.0.1.ebuild 1483 BLAKE2B a0342beeb4a2c258836d8109714887b965c938c8c9503d30a5e7421a0c12a5de7fb7e87a7c75d3770328471aa0308e2461080063c8584a72c7fe8e947b87a6f9 SHA512 f5dd6f5610cb896a25288f9924cd8a52dd0f386934e7c43dec8f8af59ce7d44b21f3a04ded400f2de6679fb83a499b941037dfee9047e526e85a8065b2547b1b
-EBUILD assimp-5.2.2.ebuild 1170 BLAKE2B 0e87a8edaa8e4fe0b9a33d1dd5c95f63e041eafec91d40af902bc39f5be2aff4c998c4cc43b33b585f3b4a6a302a95f6f288599c29979e60a6aeb04c2c283e24 SHA512 dcc9ee9470c6b63f87c20e1ae2f3d75f8cc9e8b28ef25838b2558f932f0e775b3521380a903f3cffbfc1a9137403d2ffec2ff2386c2d74c227a8789ffcf8166d
-EBUILD assimp-5.2.3.ebuild 1404 BLAKE2B b6c7882d2b15060f4ef07eb31133f8bec2241016af23eb5597b3017f8a38905ed601566e4b726e5ac19e5162332836fea784871bfd4c1f07bcd6ce7c920bbf03 SHA512 7e07aa5d4dbd61dd87bfee6c99d3ba01a0709248c68ff861f5fd7fbd6ea2a931250c2d69ee551a71fa6fe9590d789e644180d4def7fc4ee62f78264ca7328007
 EBUILD assimp-5.2.4.ebuild 1331 BLAKE2B dce8a52d03ca05308597797692a8a05747d6fe548f72c26f62d6a81bceec985cb794d783402fea524fb3f0858966c11939d67bbe5cc16bc1e5efbe5befe20236 SHA512 b66147e3bb614a2dcfb59f14e5c1a5dc8526157bed59adc812302d7c69422f3afa1eb8048c0ca9e08a8eda1d80917d0ee0fccd0e472b88a84dcda430d32e2104
 MISC metadata.xml 602 BLAKE2B 37acfeee427b496401cc52d6f424ac33db0d84ebe3052f5d062e52ed0785751f5f693918bbe3388b657329f63b8936c37b7111e88912b376f0db0686320c2b47 SHA512 97813527a76719e99b97c81be7b11b38f5fd31e880a14519973bfa1e32ff08b8010c95ce1e872c2975a446ac567fb69ee2600920b87ead4d17b6584fda29a38a
diff --git a/media-libs/assimp/assimp-5.0.1.ebuild b/media-libs/assimp/assimp-5.0.1.ebuild
deleted file mode 100644
index f7cbcb00f305..000000000000
--- a/media-libs/assimp/assimp-5.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-doc? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-docs-${PV}.pdf )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-IUSE="doc samples test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib[minizip]
-	samples? (
-		media-libs/freeglut
-		virtual/opengl
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.0-disabletest.patch" # bug 659122
-	"${FILESDIR}/${PN}-5.0.0-unzip-of.patch"
-	"${FILESDIR}/${PN}-5.0.0-findassimp.patch"
-	"${FILESDIR}/${P}-GNUInstallDirs.patch" # bug 701912
-	"${FILESDIR}/${P}-projectversion.patch"
-	"${FILESDIR}/${P}-fix-unittests.patch"
-	"${FILESDIR}/${P}-fix-aiGetLegalStringTest.patch"
-	"${FILESDIR}/${P}-versiontest.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DASSIMP_BUILD_STATIC_LIB=OFF
-		-DCMAKE_DEBUG_POSTFIX=""
-		-DASSIMP_BUILD_SAMPLES=$(usex samples)
-		-DASSIMP_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	use doc && dodoc "${DISTDIR}"/${PN}-docs-${PV}.pdf
-
-	insinto /usr/share/cmake/Modules
-	doins cmake-modules/Findassimp.cmake
-}
-
-src_test() {
-	"${BUILD_DIR}/test/unit" || die
-}
diff --git a/media-libs/assimp/assimp-5.2.2.ebuild b/media-libs/assimp/assimp-5.2.2.ebuild
deleted file mode 100644
index b6c80ce8206b..000000000000
--- a/media-libs/assimp/assimp-5.2.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
-IUSE="samples test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib[minizip]
-	samples? (
-		media-libs/freeglut
-		virtual/opengl
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-usage-of-incompatible-minizip-data-structure.patch
-	"${FILESDIR}"/${P}-disable-failing-tests.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DASSIMP_ASAN=OFF
-		-DASSIMP_BUILD_DOCS=OFF
-		-DASSIMP_BUILD_SAMPLES=$(usex samples)
-		-DASSIMP_BUILD_TESTS=$(usex test)
-		-DASSIMP_ERROR_MAX=ON
-		-DASSIMP_INJECT_DEBUG_POSTFIX=OFF
-		-DASSIMP_IGNORE_GIT_HASH=ON
-		-DASSIMP_UBSAN=OFF
-	)
-
-	if use samples; then
-		mycmakeargs+=( -DOpenGL_GL_PREFERENCE="GLVND" )
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}/bin/unit" || die
-}
diff --git a/media-libs/assimp/assimp-5.2.3.ebuild b/media-libs/assimp/assimp-5.2.3.ebuild
deleted file mode 100644
index d74e3f10d1f0..000000000000
--- a/media-libs/assimp/assimp-5.2.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="samples test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib[minizip]
-	samples? (
-		media-libs/freeglut
-		virtual/opengl
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
-	"${FILESDIR}"/${P}-drop-Werror-gcc-option.patch
-	"${FILESDIR}"/${PN}-5.2.2-disable-failing-tests.patch
-)
-
-DOCS=( CodeConventions.md Readme.md )
-
-src_prepare() {
-	if use x86 ; then
-		eapply "${FILESDIR}"/${P}-drop-failing-tests-for-abi_x86_32.patch
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DASSIMP_ASAN=OFF
-		-DASSIMP_BUILD_DOCS=OFF
-		-DASSIMP_BUILD_SAMPLES=$(usex samples)
-		-DASSIMP_BUILD_TESTS=$(usex test)
-		-DASSIMP_ERROR_MAX=ON
-		-DASSIMP_INJECT_DEBUG_POSTFIX=OFF
-		-DASSIMP_IGNORE_GIT_HASH=ON
-		-DASSIMP_UBSAN=OFF
-	)
-
-	if use samples; then
-		mycmakeargs+=( -DOpenGL_GL_PREFERENCE="GLVND" )
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}/bin/unit" || die
-}
diff --git a/media-libs/assimp/files/assimp-5.0.0-disabletest.patch b/media-libs/assimp/files/assimp-5.0.0-disabletest.patch
deleted file mode 100644
index d5343c113668..000000000000
--- a/media-libs/assimp/files/assimp-5.0.0-disabletest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/test/unit/utVersion.cpp	2019-11-18 11:39:09.655298634 +0100
-+++ b/test/unit/utVersion.cpp	2019-11-18 11:39:25.823299035 +0100
-@@ -66,10 +66,6 @@
-     EXPECT_NE( aiGetCompileFlags(), 0U );
- }
- 
--TEST_F( utVersion, aiGetVersionRevisionTest ) {
--    EXPECT_NE( aiGetVersionRevision(), 0U );
--}
--
- TEST_F( utVersion, aiGetBranchNameTest ) {
-     EXPECT_NE( nullptr, aiGetBranchName() );
- }
diff --git a/media-libs/assimp/files/assimp-5.0.0-findassimp.patch b/media-libs/assimp/files/assimp-5.0.0-findassimp.patch
deleted file mode 100644
index 6056f4973c55..000000000000
--- a/media-libs/assimp/files/assimp-5.0.0-findassimp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/cmake-modules/Findassimp.cmake	2019-10-08 08:08:29.025321121 +0200
-+++ b/cmake-modules/Findassimp.cmake	2019-10-08 08:09:47.976323079 +0200
-@@ -54,14 +54,17 @@
- 
- 	find_path(
- 	  assimp_INCLUDE_DIRS
--	  NAMES postprocess.h scene.h version.h config.h cimport.h
-+	  NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h
- 	  PATHS /usr/local/include/
-+	  PATHS /usr/include/
- 	)
- 
- 	find_library(
- 	  assimp_LIBRARIES
- 	  NAMES assimp
- 	  PATHS /usr/local/lib/
-+	  PATHS /usr/lib/
-+	  PATHS /usr/lib64/
- 	)
- 
- 	if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
-@@ -78,4 +81,4 @@
- 	  endif (assimp_FIND_REQUIRED)
- 	endif (assimp_FOUND)
- 	
--endif(WIN32)
-\ Brak znaku nowej linii na końcu pliku
-+endif(WIN32)
diff --git a/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch b/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch
deleted file mode 100644
index e75b47a1af4b..000000000000
--- a/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/contrib/unzip/unzip.h	2019-08-21 21:38:10.991542891 +0200
-+++ b/contrib/unzip/unzip.h	2019-08-21 21:38:24.507543226 +0200
-@@ -45,6 +45,8 @@
- #ifndef _unz_H
- #define _unz_H
- 
-+#define OF _Z_OF
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch b/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch
deleted file mode 100644
index 134edc7d7da1..000000000000
--- a/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From cbf94fd62ff831879d10f99aa7766d391ae8a9b7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Victor=20Matar=C3=A9?= <matare@fh-aachen.de>
-Date: Tue, 31 Mar 2020 21:30:07 +0200
-Subject: [PATCH] use GNUInstallDirs where possible
-
-Emulate the CMAKE_INSTALL_FULL_* variables on non-Unix systems and
-disable redefining FHS-mandated install locations via user-editable
-ASSIMP_*_INSTALL_DIR variables. Instead, if it REALLY proves necessary,
-Unix users can edit the advanced, canonical CMAKE_INSTALL_* variables.
----
- CMakeLists.txt                 | 36 ++++++++++++++++++++++------------
- assimp.pc.in                   |  6 ++----
- assimpTargets-debug.cmake.in   | 20 +++++++++----------
- assimpTargets-release.cmake.in | 18 ++++++++---------
- assimpTargets.cmake.in         | 15 +-------------
- 5 files changed, 45 insertions(+), 50 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dcafb649f5..c23c0df33e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -230,11 +230,6 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M
- SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev)
- SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names")
- 
--IF( UNIX )
--  # Use GNUInstallDirs for Unix predefined directories
--  INCLUDE(GNUInstallDirs)
--ENDIF( UNIX )
--
- # Grouped compiler settings
- IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW)
-   IF(NOT HUNTER_ENABLED)
-@@ -329,14 +324,6 @@ IF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
-   SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin" )
- ENDIF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
- 
--# Cache these to allow the user to override them manually.
--SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING
--  "Path the built library files are installed to." )
--SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING
--  "Path the header files are installed to." )
--SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING
--  "Path the tool executables are installed to." )
--
- get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG)
- 
- IF (INJECT_DEBUG_POSTFIX AND (is_multi_config OR CMAKE_BUILD_TYPE STREQUAL "Debug"))
-@@ -391,6 +378,29 @@ IF(HUNTER_ENABLED)
-   )
- ELSE(HUNTER_ENABLED)
-   # cmake configuration files
-+
-+  IF( UNIX )
-+    # Use GNUInstallDirs for Unix predefined directories
-+    INCLUDE(GNUInstallDirs)
-+
-+    SET( ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
-+    SET( ASSIMP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
-+    SET( ASSIMP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR})
-+  ELSE( UNIX )
-+    # Cache these to allow the user to override them on non-Unix platforms
-+    SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING
-+      "Path the built library files are installed to." )
-+    SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING
-+      "Path the header files are installed to." )
-+    SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING
-+      "Path the tool executables are installed to." )
-+
-+    SET(CMAKE_INSTALL_FULL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_INCLUDE_INSTALL_DIR})
-+    SET(CMAKE_INSTALL_FULL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_LIB_INSTALL_DIR})
-+    SET(CMAKE_INSTALL_FULL_BINDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_BIN_INSTALL_DIR})
-+  ENDIF( UNIX )
-+
-+
-   CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in"         "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE)
-   CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in"         "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE)
-   IF (is_multi_config)
-diff --git a/assimp.pc.in b/assimp.pc.in
-index c659e19f2c..555a3a1d3b 100644
---- a/assimp.pc.in
-+++ b/assimp.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_PREFIX@/
--libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@
--includedir=@CMAKE_INSTALL_PREFIX@/../include/@ASSIMP_INCLUDE_INSTALL_DIR@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: @CMAKE_PROJECT_NAME@
- Description: Import various well-known 3D model formats in an uniform manner.
-diff --git a/assimpTargets-debug.cmake.in b/assimpTargets-debug.cmake.in
-index 1ebe2a6081..f5034c9349 100644
---- a/assimpTargets-debug.cmake.in
-+++ b/assimpTargets-debug.cmake.in
-@@ -42,22 +42,22 @@ if(MSVC)
-     # Import target "assimp::assimp" for configuration "Debug"
-     set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-     set_target_properties(assimp::assimp PROPERTIES
--      IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/${importLibraryName}"
--      IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
-+      IMPORTED_IMPLIB_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}"
-+      IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}"
-     )
-     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
--    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}")
--    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
-+    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}")
-+    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" )
-   else()
-     set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
- 
-     # Import target "assimp::assimp" for configuration "Debug"
-     set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-     set_target_properties(assimp::assimp PROPERTIES
--      IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
-+      IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
-     )
-     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
--    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}")
-+    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}")
-   endif()
- 
- else()
-@@ -66,17 +66,17 @@ else()
-     set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")
-     set_target_properties(assimp::assimp PROPERTIES
-       IMPORTED_SONAME_DEBUG "${sharedLibraryName}"
--      IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
-+      IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}"
-     )
-     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
--    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" )
-+    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
-   else()
-     set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
-     set_target_properties(assimp::assimp PROPERTIES
--      IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
-+      IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
-     )
-     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
--    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" )
-+    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" )
-   endif()
- endif()
- 
-diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in
-index f3db8f12cd..a416e8899b 100644
---- a/assimpTargets-release.cmake.in
-+++ b/assimpTargets-release.cmake.in
-@@ -42,12 +42,12 @@ if(MSVC)
-     # Import target "assimp::assimp" for configuration "Release"
-     set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-     set_target_properties(assimp::assimp PROPERTIES
--      IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${importLibraryName}"
--      IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
-+      IMPORTED_IMPLIB_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}"
-+      IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}"
-     )
-     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
--    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}")
--    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
-+    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}")
-+    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" )
-   else()
-     set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
- 
-@@ -57,7 +57,7 @@ if(MSVC)
-       IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
-     )
-     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
--    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}")
-+    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}")
-   endif()
- 
- else()
-@@ -70,17 +70,17 @@ else()
-     endif()
-     set_target_properties(assimp::assimp PROPERTIES
-       IMPORTED_SONAME_RELEASE "${sharedLibraryName}"
--      IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
-+      IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}"
-     )
-     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
--    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" )
-+    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
-   else()
-     set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
-     set_target_properties(assimp::assimp PROPERTIES
--      IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
-+      IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
-     )
-     list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
--    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" )
-+    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" )
-   endif()
- endif()
- 
-diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in
-index ab1a8d2c7b..ef90c834a6 100644
---- a/assimpTargets.cmake.in
-+++ b/assimpTargets.cmake.in
-@@ -40,16 +40,6 @@ unset(_targetsDefined)
- unset(_targetsNotDefined)
- unset(_expectedTargets)
- 
--
--# Compute the installation prefix relative to this file.
--get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
--get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
--get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
--get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
--if(_IMPORT_PREFIX STREQUAL "/")
--  set(_IMPORT_PREFIX "")
--endif()
--
- # Create imported target assimp::assimp
- if(@BUILD_SHARED_LIBS@)
-   add_library(assimp::assimp SHARED IMPORTED)
-@@ -60,7 +50,7 @@ endif()
- set_target_properties(assimp::assimp PROPERTIES
-   COMPATIBLE_INTERFACE_STRING "assimp_MAJOR_VERSION"
-   INTERFACE_assimp_MAJOR_VERSION "1"
--  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
-+  INTERFACE_INCLUDE_DIRECTORIES "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
-   #INTERFACE_LINK_LIBRARIES "TxtUtils::TxtUtils;MealyMachine::MealyMachine"
- )
- 
-@@ -75,9 +65,6 @@ foreach(f ${CONFIG_FILES})
-   include(${f})
- endforeach()
- 
--# Cleanup temporary variables.
--set(_IMPORT_PREFIX)
--
- # Loop over all imported files and verify that they actually exist
- foreach(target ${_IMPORT_CHECK_TARGETS} )
-   foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
diff --git a/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch b/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch
deleted file mode 100644
index b0db38a0e8a1..000000000000
--- a/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 059ee0e091f1c658c20202a9123bdf90fc7fa307 Mon Sep 17 00:00:00 2001
-From: RichardTea <31507749+RichardTea@users.noreply.github.com>
-Date: Fri, 11 Oct 2019 16:28:14 +0100
-Subject: [PATCH] Update assimp legal and version
-
-Will now report the major and minor versions specified in cmakelists
----
- code/Common/Version.cpp | 14 +++++---------
- test/unit/utVersion.cpp |  2 +-
- 2 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/code/Common/Version.cpp b/code/Common/Version.cpp
-index 868cfb06af..cf1da7d5ba 100644
---- a/code/Common/Version.cpp
-+++ b/code/Common/Version.cpp
-@@ -46,8 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <assimp/scene.h>
- #include "ScenePrivate.h"
- 
--static const unsigned int MajorVersion = 5;
--static const unsigned int MinorVersion = 0;
-+#include "revision.h"
- 
- // --------------------------------------------------------------------------------
- // Legal information string - don't remove this.
-@@ -56,9 +55,9 @@ static const char* LEGAL_INFORMATION =
- "Open Asset Import Library (Assimp).\n"
- "A free C/C++ library to import various 3D file formats into applications\n\n"
- 
--"(c) 2008-2020, assimp team\n"
-+"(c) 2006-2020, assimp team\n"
- "License under the terms and conditions of the 3-clause BSD license\n"
--"https://github.com/assimp/assimp\n"
-+"http://assimp.org\n"
- ;
- 
- // ------------------------------------------------------------------------------------------------
-@@ -70,13 +69,13 @@ ASSIMP_API const char*  aiGetLegalString  ()    {
- // ------------------------------------------------------------------------------------------------
- // Get Assimp minor version
- ASSIMP_API unsigned int aiGetVersionMinor ()    {
--    return MinorVersion;
-+    return VER_MINOR;
- }
- 
- // ------------------------------------------------------------------------------------------------
- // Get Assimp major version
- ASSIMP_API unsigned int aiGetVersionMajor ()    {
--    return MajorVersion;
-+    return VER_MAJOR;
- }
- 
- // ------------------------------------------------------------------------------------------------
-@@ -104,9 +103,6 @@ ASSIMP_API unsigned int aiGetCompileFlags ()    {
-     return flags;
- }
- 
--// include current build revision, which is even updated from time to time -- :-)
--#include "revision.h"
--
- // ------------------------------------------------------------------------------------------------
- ASSIMP_API unsigned int aiGetVersionRevision() {
-     return GitVersion;
-diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
-index 233b2fb0b2..66e832baae 100644
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -48,7 +48,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
-     EXPECT_NE( lv, nullptr );
-     std::string text( lv );
- 
--    size_t pos( text.find( std::string( "2017" ) ) );
-+    size_t pos( text.find( std::string( "2019" ) ) );
-     EXPECT_NE( pos, std::string::npos );
- }
- 
diff --git a/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch b/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch
deleted file mode 100644
index 1b1efa027427..000000000000
--- a/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ecd413c86c031900832028c94c0d55488cf26a0a Mon Sep 17 00:00:00 2001
-From: Kim Kulling <kimkulling@users.noreply.github.com>
-Date: Sun, 6 Oct 2019 20:19:59 +0200
-Subject: [PATCH] Update utVersion.cpp
-
-Fix the unittests as well.
----
- test/unit/utVersion.cpp | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
-index 5cfc91ccdd..233b2fb0b2 100644
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -4,8 +4,6 @@ Open Asset Import Library (assimp)
- 
- Copyright (c) 2006-2019, assimp team
- 
--
--
- All rights reserved.
- 
- Redistribution and use of this software in source and binary forms,
-@@ -55,11 +53,11 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
- }
- 
- TEST_F( utVersion, aiGetVersionMinorTest ) {
--    EXPECT_EQ( aiGetVersionMinor(), 1U );
-+    EXPECT_EQ( aiGetVersionMinor(), 0U );
- }
-     
- TEST_F( utVersion, aiGetVersionMajorTest ) {
--    EXPECT_EQ( aiGetVersionMajor(), 4U );
-+    EXPECT_EQ( aiGetVersionMajor(), 5U );
- }
- 
- TEST_F( utVersion, aiGetCompileFlagsTest ) {
diff --git a/media-libs/assimp/files/assimp-5.0.1-projectversion.patch b/media-libs/assimp/files/assimp-5.0.1-projectversion.patch
deleted file mode 100644
index ed82e1b0b4b0..000000000000
--- a/media-libs/assimp/files/assimp-5.0.1-projectversion.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 13a2f22835cfe4093860de3e3d33782f854a2e58 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lo=C3=AFc?= <loic.fricoteaux@airbus.com>
-Date: Tue, 14 Jan 2020 16:26:24 +0100
-Subject: [PATCH] Fix Assimp patch version to match the last bug fix release
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 23b6f6d618..e14c4aa21f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,7 +51,7 @@ IF(HUNTER_ENABLED)
-   add_definitions(-DASSIMP_USE_HUNTER)
- ENDIF(HUNTER_ENABLED)
- 
--PROJECT( Assimp VERSION 5.0.0 )
-+PROJECT( Assimp VERSION 5.0.1 )
- 
- # All supported options ###############################################
- 
diff --git a/media-libs/assimp/files/assimp-5.0.1-versiontest.patch b/media-libs/assimp/files/assimp-5.0.1-versiontest.patch
deleted file mode 100644
index 8267fc004d61..000000000000
--- a/media-libs/assimp/files/assimp-5.0.1-versiontest.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9aea72f70e3f10f7db903c24a2c19a7fd769e3b8 Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Lortie <marc-antoine.lortie@outlook.com>
-Date: Mon, 20 Jan 2020 09:14:04 -0500
-Subject: [PATCH] Changed date in test aiGetLegalStringTest to the appropriate
- year.
-
----
- test/unit/utVersion.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp
-index ca54620533..aa75a26d85 100644
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -48,7 +48,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) {
-     EXPECT_NE( lv, nullptr );
-     std::string text( lv );
- 
--    size_t pos( text.find( std::string( "2019" ) ) );
-+    size_t pos( text.find( std::string( "2020" ) ) );
-     EXPECT_NE( pos, std::string::npos );
- }
- 
diff --git a/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch b/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch
deleted file mode 100644
index 736757693774..000000000000
--- a/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/840616
-https://github.com/assimp/assimp/issues/4433
-
-From dea8b4d8c533c131bd546c316f8df8af8897ac75 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Mon, 25 Apr 2022 17:39:33 +0200
-Subject: [PATCH] drop -Werror gcc option
-
-Temporary hack to allow building with gcc-12
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/code/CMakeLists.txt
-+++ b/code/CMakeLists.txt
-@@ -1179,8 +1179,6 @@ TARGET_USE_COMMON_OUTPUT_DIRECTORY(assimp)
- # enable warnings as errors ########################################
- IF (MSVC)
-   TARGET_COMPILE_OPTIONS(assimp PRIVATE /WX)
--ELSE()
--  TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)
- ENDIF()
- 
- # adds C_FLAGS required to compile zip.c on old GCC 4.x compiler
--- 
-2.35.1
-
diff --git a/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch b/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch
deleted file mode 100644
index 1de4f661fa55..000000000000
--- a/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-https://bugs.gentoo.org/840767
-https://github.com/assimp/assimp/issues/4438
-
-From f963a15bbbcfa1e3c4bd0c24173f90151e023469 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Thu, 28 Apr 2022 07:59:26 +0200
-Subject: [PATCH] drop failing tests for abi_x86_32
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/test/unit/AssimpAPITest_aiMatrix3x3.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix3x3.cpp
-@@ -68,13 +68,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromMatrix4Test) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromQuaternionTest) {
--    const auto q = random_quat();
--    result_cpp = q.GetMatrix();
--    aiMatrix3FromQuaternion(&result_c, &q);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3AreEqualTest) {
-     result_c = result_cpp = random_mat3();
-     EXPECT_EQ(result_cpp == result_c,
---- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-@@ -78,15 +78,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromMatrix3Test) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromScalingQuaternionPositionTest) {
--    const aiVector3D s = random_vec3();
--    const aiQuaternion q = random_quat();
--    const aiVector3D t = random_vec3();
--    result_cpp = aiMatrix4x4(s, q, t);
--    aiMatrix4FromScalingQuaternionPosition(&result_c, &s, &q, &t);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4AddTest) {
-     const aiMatrix4x4 temp = random_mat4();
-     result_c = result_cpp = random_mat4();
-@@ -135,12 +126,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4InverseTest) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4DeterminantTest) {
--    result_c = result_cpp = random_mat4();
--    EXPECT_EQ(result_cpp.Determinant(),
--        aiMatrix4Determinant(&result_c));
--}
--
- TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4IsIdentityTest) {
-     EXPECT_EQ(result_cpp.IsIdentity(),
-         (bool)aiMatrix4IsIdentity(&result_c));
---- a/test/unit/AssimpAPITest_aiQuaternion.cpp
-+++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
-@@ -54,19 +54,6 @@ protected:
-     aiQuaternion result_c, result_cpp;
- };
- 
--TEST_F(AssimpAPITest_aiQuaternion, aiCreateQuaternionFromMatrixTest) {
--    // Use a predetermined transformation matrix
--    // to prevent running into division by zero.
--    aiMatrix3x3 m, r;
--    aiMatrix3x3::Translation(aiVector2D(14,-25), m);
--    aiMatrix3x3::RotationZ(Math::aiPi<float>() / 4.0f, r);
--    m = m * r;
--
--    result_cpp = aiQuaternion(m);
--    aiCreateQuaternionFromMatrix(&result_c, &m);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromEulerAnglesTest) {
-     const float x(RandPI.next()),
-         y(RandPI.next()),
---- a/test/unit/AssimpAPITest_aiVector2D.cpp
-+++ b/test/unit/AssimpAPITest_aiVector2D.cpp
-@@ -67,28 +67,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2AreEqualEpsilonTest) {
-         (bool)aiVector2AreEqualEpsilon(&result_cpp, &result_c, Epsilon));
- }
- 
--TEST_F(AssimpAPITest_aiVector2D, aiVector2AddTest) {
--    result_c = result_cpp = random_vec2();
--    result_cpp += temp;
--    aiVector2Add(&result_c, &temp);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
--TEST_F(AssimpAPITest_aiVector2D, aiVector2SubtractTest) {
--    result_c = result_cpp = random_vec2();
--    result_cpp -= temp;
--    aiVector2Subtract(&result_c, &temp);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
--TEST_F(AssimpAPITest_aiVector2D, aiVector2ScaleTest) {
--    const float FACTOR = RandNonZero.next();
--    result_c = result_cpp = random_vec2();
--    result_cpp *= FACTOR;
--    aiVector2Scale(&result_c, FACTOR);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) {
-     result_c = result_cpp = random_vec2();
-     result_cpp = result_cpp.SymMul(temp);
-@@ -96,21 +74,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByScalarTest) {
--    const float DIVISOR = RandNonZero.next();
--    result_c = result_cpp = random_vec2();
--    result_cpp /= DIVISOR;
--    aiVector2DivideByScalar(&result_c, DIVISOR);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
--TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByVectorTest) {
--    result_c = result_cpp = random_vec2();
--    result_cpp = result_cpp / temp;
--    aiVector2DivideByVector(&result_c, &temp);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiVector2D, aiVector2LengthTest) {
-     result_c = result_cpp = random_vec2();
-     EXPECT_EQ(result_cpp.Length(), aiVector2Length(&result_c));
--- 
-2.35.1
-
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 2f174f9b6604..6019f70d9ab0 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,3 +1,3 @@
 DIST clutter-1.26.4.tar.xz 5403168 BLAKE2B 642179423cc5f883f1920e90fafc3119fb735d2d7045d120e73b5a82bfec8750101e0cea51f5241f5326b801d5f881ffcc334d565184145e01b019c9350315b5 SHA512 6d43ac09df7671fa2bda74d1231166e8331f3ef1dbe0d167225033b3ddae7377d1062db81b73fc498c2e9f0db467bf4febb7306a6f40c9ef0266dac2a397f43a
-EBUILD clutter-1.26.4.ebuild 2924 BLAKE2B 7dd5effa9dc73a42c023340916f38e1afc7fe05b558cf54d1ed918a53dbf5f809993ede291159f1817ffc46b2ae19874dc7f129268d8c4d14269f83b9baa92b8 SHA512 8aee1c4249d46bd9fdda6f0f69cac057a18fd4c62c28b9abaf3cae2810744624c1406950c251ca50e16742584f85bb13c3b6753ee803157b8b116f54eec24540
+EBUILD clutter-1.26.4-r1.ebuild 2901 BLAKE2B 8df89c8b9fa51eeeeb1d42ab44c8cb8dff67f0da1813285671670a0d7fb4f43be1b523bd8a85df24754dd5a61de4c69d5e17c8a2224cf9c9a50ed29fc1728a1f SHA512 74ff391e11c02e0114fd14a19a00cc6065bea21b417b556e4dc1e49314ffbfdd9eb1878c5fa3474c5ee3015e598ad7aef924c08a024e502fd7603dd56dc12a84
 MISC metadata.xml 405 BLAKE2B 1334c030265f2ef26dd6200dbaa8d747796d806a18817846aae94a103a5885a52b226f3a411617df01b2ac8b711827dd964f4af8df254bd1e7b47868c2db1bed SHA512 4547ab055b744f734592bce54913b2dd9f723484412fd34b92ccfc6cccf07859632b04489d067844305dbf35fbd0b7434bf191d84deab3e678998065bf1a7487
diff --git a/media-libs/clutter/clutter-1.26.4.ebuild b/media-libs/clutter/clutter-1.26.4-r1.ebuild
similarity index 92%
rename from media-libs/clutter/clutter-1.26.4.ebuild
rename to media-libs/clutter/clutter-1.26.4-r1.ebuild
index cf8a1f4f2a18..7501ce0deb16 100644
--- a/media-libs/clutter/clutter-1.26.4.ebuild
+++ b/media-libs/clutter/clutter-1.26.4-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=8
 
 inherit gnome2 virtualx
 
@@ -11,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
 
 LICENSE="LGPL-2.1+ FDL-1.1+"
 SLOT="1.0"
-
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="aqua debug doc egl gtk +introspection test wayland X"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
@@ -19,8 +18,6 @@ REQUIRED_USE="
 	wayland? ( egl )
 "
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
-
 # NOTE: glx flavour uses libdrm + >=mesa-7.3
 # >=libX11-1.3.1 needed for X Generic Event support
 # do not depend on tslib, it does not build and is disabled by default upstream
@@ -49,12 +46,18 @@ RDEPEND="
 		x11-libs/libXext
 		x11-libs/libXdamage
 		>=x11-libs/libXi-1.3
-		>=x11-libs/libXcomposite-0.4 )
+		>=x11-libs/libXcomposite-0.4
+	)
 	wayland? (
 		dev-libs/wayland
-		x11-libs/gdk-pixbuf:2 )
+		x11-libs/gdk-pixbuf:2
+	)
 "
 DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	test? ( x11-libs/gdk-pixbuf )
+"
+BDEPEND="
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
 	>=sys-devel/gettext-0.17
@@ -62,9 +65,8 @@ DEPEND="${RDEPEND}
 	doc? (
 		>=dev-util/gtk-doc-1.20
 		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
-		dev-libs/libxslt )
-	X? ( x11-base/xorg-proto )
-	test? ( x11-libs/gdk-pixbuf )
+		dev-libs/libxslt
+	)
 "
 
 src_prepare() {
@@ -89,8 +91,8 @@ src_configure() {
 		--disable-cex100-backend \
 		--disable-win32-backend \
 		--disable-tslib-input \
+		--enable-debug=$(usex debug yes minimum) \
 		$(use_enable aqua quartz-backend) \
-		$(usex debug --enable-debug=yes --enable-debug=minimum) \
 		$(use_enable doc docs) \
 		$(use_enable egl egl-backend) \
 		$(use_enable egl evdev-input) \
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index ff32de099a97..e0797b9caad1 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,4 +1,4 @@
 AUX cogl-1.22.8-slibtool.patch 835 BLAKE2B d0bc0215d785be2b8fbae5afc23b50dc79adc77bb4a1c8e8dcef0104febfad397ddab94f9afe811b9765cd9c829bab4d5282ae95e5f32aaea3ec4e6c2649a651 SHA512 a0478481712f2481f08bcdd2c0feb87c2c1a45fe0e0e37aa00bdeed54ca5376d0dbeafe8b21d9ea28bb326025ccfaefa956683b779cf19f2bfc8524f7b962c97
 DIST cogl-1.22.8.tar.xz 1742632 BLAKE2B c6230a2223928c5d4e5d87fa6b039c96000fac546e3e57e04e528b571500d350013a4b6e0a2ab6b2133672fec992fff6f9486ab8c83a01cf9790bc94266c75d4 SHA512 702d5b1b22dc34bffaa82c9c57021caf036ee3a13fa7ca24a90cca1ebc0f8b7a86070cc1fe5125757132b02774fa874bb55675c96d1ccbc233fac0e6132da65f
-EBUILD cogl-1.22.8-r1.ebuild 3493 BLAKE2B a1749b36dd318e5bad5044328589112e9e2cd2d5d11c8347bdbd3b22c5f778a2482a811a8114ef4585eff87085969e78f807a504165567824c92d96133fe83ff SHA512 c144d309da57c14c47ea8c15ec8eb9cb531bba95a72043cd36d17769905bc31e60196d5b3b9c1b99c85eb75f1dfa0d5b2f0b7d6237f9c25c3a784f5d9d672a40
+EBUILD cogl-1.22.8-r2.ebuild 3357 BLAKE2B 3ee157a8edfe440b827be1c9b2ef0daeaa18edb423df0042493db5a0ba84d9ac16f565f2782daa3ea32fc53483ad4933cc2fa1fc5ba5e9dffa1d00831553dc8e SHA512 9c6c675be4548204449c3536a0d3c3f1da952c6412ddff9d8141fa4c9144460020cd825c6c1542a659d42da4570d2a5add75c7783e15696b3b00a02e055304ca
 MISC metadata.xml 458 BLAKE2B f10413fbb937bfca31271bfb5e1077125fcab9dc3887224f40d65099c715a5d5a5f40d733749cc096df530c431655c4ecaf94584e0529f9379d7e44482876b9a SHA512 8b332175235249193619499150eb4c714e7ebdb9de9685ca60d8dfdcf73940f36067e5864d0cc328b89abf9a138cd52ac0a77d21d9f9d06a524267199669e32e
diff --git a/media-libs/cogl/cogl-1.22.8-r1.ebuild b/media-libs/cogl/cogl-1.22.8-r2.ebuild
similarity index 88%
rename from media-libs/cogl/cogl-1.22.8-r1.ebuild
rename to media-libs/cogl/cogl-1.22.8-r2.ebuild
index a5e772c9b85e..89cfdd28232c 100644
--- a/media-libs/cogl/cogl-1.22.8-r1.ebuild
+++ b/media-libs/cogl/cogl-1.22.8-r2.ebuild
@@ -1,29 +1,31 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # Temporarily needed for slibtool patch
 # It's upstreamed so should be able to drop in future
 # bug #778041
 GNOME2_EAUTORECONF="yes"
-inherit gnome2 multilib
+inherit gnome2
 
 DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
 HOMEPAGE="https://www.cogl3d.org/"
 
 LICENSE="MIT BSD"
 SLOT="1.0/20" # subslot = .so version
-
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 # doc and profile disable for now due to bugs #484750 and #483332
 IUSE="debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland" # doc profile
 REQUIRED_USE="
 	wayland? ( gles2 )
 	|| ( gles2 opengl )
 "
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+# For some reason GL3 conformance test all fails again...
+RESTRICT="test"
 
-COMMON_DEPEND="
+DEPEND="
 	>=dev-libs/glib-2.32:2
 	x11-libs/cairo:=
 	>=x11-libs/gdk-pixbuf-2:2
@@ -37,30 +39,26 @@ COMMON_DEPEND="
 	gles2? ( media-libs/mesa[gles2] )
 	gstreamer? (
 		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
+		media-libs/gst-plugins-base:1.0
+	)
 	introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
 	kms? (
 		media-libs/mesa[egl(+),gbm(+)]
-		x11-libs/libdrm:= )
+		x11-libs/libdrm:=
+	)
 	pango? ( >=x11-libs/pango-1.20.0[introspection?] )
 	wayland? (
 		>=dev-libs/wayland-1.1.90
-		media-libs/mesa[egl(+),wayland] )
+		media-libs/mesa[egl(+),wayland]
+	)
 "
-# before clutter-1.7, cogl was part of clutter
-RDEPEND="${COMMON_DEPEND}
-	!<media-libs/clutter-1.7
-"
-DEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19
 	virtual/pkgconfig
 "
 
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-# For some reason GL3 conformance test all fails again...
-RESTRICT="test"
-
 PATCHES=(
 	"${FILESDIR}"/${P}-slibtool.patch
 )
@@ -100,7 +98,7 @@ src_configure() {
 		$(use_enable gles2)        \
 		$(use_enable gles2 cogl-gles2) \
 		$(use_enable gles2 xlib-egl-platform) \
-		$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
+		$(usev gles2 --with-default-driver=$(usex opengl gl gles2)) \
 		$(use_enable gstreamer cogl-gst)    \
 		$(use_enable introspection) \
 		$(use_enable kms kms-egl-platform) \
@@ -109,7 +107,6 @@ src_configure() {
 		$(use_enable wayland wayland-egl-platform) \
 		$(use_enable wayland wayland-egl-server) \
 		--disable-profile
-#		$(use_enable profile)
 }
 
 src_install() {
@@ -122,5 +119,5 @@ src_install() {
 	gnome2_src_install
 
 	# Remove silly examples-data directory
-	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
+	rm -rvf "${ED}"/usr/share/cogl/examples-data/ || die
 }
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 6ef740a3d432..67a7606976fc 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,9 +1,9 @@
 AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b
 AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64
 AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292
-DIST intel-gmmlib-22.1.2.tar.gz 813247 BLAKE2B 5d2c632239bbe12779f3aa07744de966501a5182ae415746f9bdf141f1ec9f94fae67df21424effeefbbfe2b5bd58d267687ca7623e7d1e736c92da09135868b SHA512 fa265f8cdb1a0c6ec067073cf5e188c86540709d98d384c61dfb34863f61d93d78cfaadba1b5bfb04bb8808bb1702282f76b57507c2a8946d0291419ac558c53
 DIST intel-gmmlib-22.1.3.tar.gz 813386 BLAKE2B 6946423e3a58bea36ac6ca7619f68a30997910e0041b60e3b6a34ad3d76308cf0af69c46abc4008d19a5cee88e8f423503560598d2006645771f2eb2b224201c SHA512 cbf0164e7604f6214f6e1d3d9a283d385fac0efbd83afad02a76e3090d680ec000b17a257d5e004c296764330888dbd0a3e5bd46a760ac5c5f3e67436a7c9437
-EBUILD gmmlib-22.1.2.ebuild 767 BLAKE2B 76d22a835768e7f4296804a0f99e7939a273ac151b5e4e2fc6ddcc724f85fc8e74462b55a4bb1822095d118d376a0759a56d986e6defa629ea356783545e18b9 SHA512 bc04c984fe8c8823ce45bf50fc3b013932411e069726254d9623e1d509f08c98789415d8905c8d60e917c71920317ab83a551d3e501efcd5f14a06c4acd35902
-EBUILD gmmlib-22.1.3.ebuild 768 BLAKE2B 991d06057e2943fde16416890451fb8fcfd7e779388a3ebeafa06c7536abf657b8d3eb5d2c7d76a66c484bd062109c49d302b8ed46ff77b815c8c271631d9de5 SHA512 a7a26366048b0e5f53598dbaba9e4ecfedda0ba30de8ebf647bb7cffe532d993d4c6371a84270b1c8a4b629c9affdcc072f3968cf0ff5a862ed56a99d256adfd
-EBUILD gmmlib-9999.ebuild 847 BLAKE2B 2d9e1f688b9fe423ed988ca5199dce548db51647063eb047ddeefb064c84f4621d2c9ac7e302755a7b2e81556a0b79ff85fd9cd77b95757b644a7d0cc0b6f7f6 SHA512 d6e6a865ffdfeddf30740cad5c31b2530d5fe60f906d4273b9b7eadccbb992eb25f914a938d2a8066c5f57b1fbb2b3e57c3e357ee8350fd89a1bebd93f8b4f40
+DIST intel-gmmlib-22.1.4.tar.gz 818133 BLAKE2B c1faae09ad38369b12c8dc9d9ac0d0d652f1eb0876e78cedceddaf94afe27114be905512fb3a71f7eb0ebb77544eb7601e96e19359500eb9149fd6e2e2295c1f SHA512 cd31611a53474c2d457f9ce1ce903a184b320d398dc2eba1600f5586108cfa156cde584501ce283d51a8cb13d1917789370d194b6ee3b6a2b5d823d1323b0ef2
+EBUILD gmmlib-22.1.3.ebuild 767 BLAKE2B 76d22a835768e7f4296804a0f99e7939a273ac151b5e4e2fc6ddcc724f85fc8e74462b55a4bb1822095d118d376a0759a56d986e6defa629ea356783545e18b9 SHA512 bc04c984fe8c8823ce45bf50fc3b013932411e069726254d9623e1d509f08c98789415d8905c8d60e917c71920317ab83a551d3e501efcd5f14a06c4acd35902
+EBUILD gmmlib-22.1.4.ebuild 796 BLAKE2B 8dc1b621ba1525c6a3e79016bc678723f0ddb193b3eb35b6bb550e592e53816e71e2df04be8e516574b6385e8156de7e84d93ff58159a0b6e8589651472ec11c SHA512 e667f64a5a0e78ee90e7ce766347da9abeded508f7d908a7c021ff7798c70ef292ca35453bee85c4b0c39917c766f6656fb4a435bbedc4fce580f3ce4694e343
+EBUILD gmmlib-9999.ebuild 875 BLAKE2B 18b5a947cb3620a85cd17bc24d01570888855aee49c8b2acabd88fe36cb363aeb80d15c8d127f1636c1738e2c8e0a4863c56fa9c81696171e3c2ba71f87c7bcf SHA512 7ebdfaaad8f6a1ebdc2c2042ae5f53ef7f12797fab0b2cc6a7d1075d837a8c1d42f01e2c13ba730bfb8a81f56977f827d0c00fa5fdab06f459edb663ca922a5c
 MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159
diff --git a/media-libs/gmmlib/gmmlib-22.1.3.ebuild b/media-libs/gmmlib/gmmlib-22.1.3.ebuild
index f0fd281de976..7d8a6f81eb26 100644
--- a/media-libs/gmmlib/gmmlib-22.1.3.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.1.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/intel/gmmlib"
 SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 S="${WORKDIR}/${PN}-intel-${P}"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="MIT"
 SLOT="0/12.1"
 IUSE="+custom-cflags test"
diff --git a/media-libs/gmmlib/gmmlib-22.1.2.ebuild b/media-libs/gmmlib/gmmlib-22.1.4.ebuild
similarity index 94%
rename from media-libs/gmmlib/gmmlib-22.1.2.ebuild
rename to media-libs/gmmlib/gmmlib-22.1.4.ebuild
index 7d8a6f81eb26..598b7721fb10 100644
--- a/media-libs/gmmlib/gmmlib-22.1.2.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.1.4.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+CMAKE_BUILD_TYPE="Release"
+
 inherit cmake
 
 DESCRIPTION="Intel Graphics Memory Management Library"
@@ -10,7 +12,7 @@ HOMEPAGE="https://github.com/intel/gmmlib"
 SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 S="${WORKDIR}/${PN}-intel-${P}"
 
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 LICENSE="MIT"
 SLOT="0/12.1"
 IUSE="+custom-cflags test"
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index c70f66b3948d..d1d021ad0117 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+CMAKE_BUILD_TYPE="Release"
+
 inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 3788185be328..3829424bb94c 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,6 +1,6 @@
 DIST harfbuzz-4.2.1.tar.gz 29096419 BLAKE2B eb523c2e3c956559e2445bd12719b14c244cfdedd239041afec71a17912e489adb94c0b6fe148c60ae9e908cc3e740752de2a33a255c123ef937debe6008d78b SHA512 de14b673f6bd03d561c45f94e9bda44ee41897a643ab8837493260a83b1eb1f1ca0fe105c1bee241f2ecd6ab869dbccf3ffba8e2c4ee9a3a1fca4e1c6c7ca4f3
 DIST harfbuzz-4.3.0.tar.gz 29200217 BLAKE2B dfe5e3b47e3d89a5ad7c6eaf6d274027a0eb05d1994b922d3124c97270f34353384c0161d8815fb2e379e82c8bdf046843902ba53db38daa4348e99d99255900 SHA512 bccf7cfb06ac18a9a9bf465c30dbfb51d73762a6667b3a069a85f9f597e6d27858e9e39a36cce12e23ec5b002b9e572638bf00c76bdea66545ae67a2bb7915f4
 EBUILD harfbuzz-4.2.1.ebuild 2568 BLAKE2B cd0fd13772b43e47a8c90a5912ed5839c09599766e865e5fd7633a0694b9f379ad4c19c7c4b28af4aebaa839e5eefe45138254b075954427a9b105fa0247a52c SHA512 6d4ab2b384c575df4da788cb4042ce3ea88010d1513d1a84a340881e26efeefec5eb46179758eb06b377bedeba5ad999f69ef9a5e33c0779c4d25394b9d1aaf7
-EBUILD harfbuzz-4.3.0.ebuild 2576 BLAKE2B 3921b398fb8bc79f565017c58c0dfa65b719fd973416a28a58e012decab39367c23145b4ee11a00d563e02c9fdb8ea94e4cbbbf423861902760f7a8446500f28 SHA512 1d922c3524ac2ee0ce98e72c2d333ab575d7971b3cf5a5fa60187e433083fe69d826dc614e9ee9a1f98212a27aa3445f4a06bd294e455cdec73d13bde5e33066
+EBUILD harfbuzz-4.3.0.ebuild 2575 BLAKE2B f7d6be6ce8c117f7f5b4d8f58f9e26c3726c3f5a6603f966895b442d12c7eade67de31f46eb5ed80bd49b9f8de6321420e9253da366e38f76c64bb24c60055c9 SHA512 10b26a5e659e579463ebd4c50fee28c90d47eec099c795c95288d29747393bf6553653f9f07fa5db3582b927cd1108ad8b629d77b3e4166f970fb53795bafba9
 EBUILD harfbuzz-9999.ebuild 2569 BLAKE2B f434eeadafaceda6b51cbf3a47bb1bfdb930950fc5976064744c285708a04f2484d2f2bb85310dd36a177ff3e129c65cd7a09c5417d1cddf699f65c4dc2e22fe SHA512 e62ee2c1623a8a321462ae119aa2485b9e479a66c224961905e2958e9c4cb036a3de399f15ddff9d09619dd6ee8b7d84c295c3d5e15c91af778e04edf969e866
 MISC metadata.xml 818 BLAKE2B 6165990c46a33076cbcb991aa9417b1b1725886c03748d1fbb3f299408d6b56895b66cd723be06f0c72ded731698ca8d16d00cbf7247fafd1291b031aa784cf6 SHA512 141b1399bb3bdb6a5ade1bef685f99e60195edac718b93ec2350ab9e2dad3cc138a3d599c3a2b662a76579309a4f4cff259ef12a194d6a8dfffc4ef74c9102b6
diff --git a/media-libs/harfbuzz/harfbuzz-4.3.0.ebuild b/media-libs/harfbuzz/harfbuzz-4.3.0.ebuild
index 36d9b9aebfcd..09fd173408b3 100644
--- a/media-libs/harfbuzz/harfbuzz-4.3.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-4.3.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	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"
+	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"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/mesa-amber/Manifest b/media-libs/mesa-amber/Manifest
index b2e9ef2664fd..ea28ad045bfd 100644
--- a/media-libs/mesa-amber/Manifest
+++ b/media-libs/mesa-amber/Manifest
@@ -1,5 +1,3 @@
-DIST mesa-21.3.8.tar.xz 16593540 BLAKE2B 89a471af3354ae0cf0597c1b6bcd2aff8074d58c16504154291f86cd9a9701f98883cf1077f60a8f17d24be800691a5bfb7ef4ddb10dfa355181bf87805b660c SHA512 0462c44fa8e358dafd03088411452bc172a365902795b3198df1e6cfbf1d87675ef5b72b572de7f15e5ee87b30ce5b2f217c81ea72b376962f6428c6ff83f2e9
 DIST mesa-21.3.9.tar.xz 16607716 BLAKE2B 79669f9492c505b1729c526adf5a8261737b6088bdf01db654a0dca8ba22600ec985b574edfeee3a28c76e6e0f815782362973876e1d75b58f4417f45df70add SHA512 4cec6f4f50f444fcd327f7c40f8899c2f265e348e121455262b540b1f890a1468bbea59965af0876c548fa97aa0a05a1b23fa6ca7d308bd60328cfdeab757684
-EBUILD mesa-amber-21.3.8.ebuild 5065 BLAKE2B 1e4fce47ce30ea868d9ba0677cac02870bec9cc6b5227430396150fa6a88da78252903cee5ba329b6f1f2832ad9fc02a08f50005db198f88d66229a940a5f46f SHA512 d9a27150b767c0fbb1b0def22a5642c5a840c36f7b1ce2729e2ae429c5a3c170f6d79629a57da1344822f4da2f439950c652caf48fadb998c7483909efb4fd6d
 EBUILD mesa-amber-21.3.9.ebuild 5065 BLAKE2B 87d399d883c134ef9c8092d026a2c33612458cf7c08b4dd62fd1c4591b6ea7c8b1de6e75b0657bbecfd3427e3bcac098ac620e301213efd3195102f0c2a155fe SHA512 f4496def2b22aaf9b60c43643ffd33e04e274bd55eff11a0a5f0028cf5376783f0c2b27e19586a31866ba5250c9d7978ab3922e28b7617d07d87d46ecfb255e7
 MISC metadata.xml 613 BLAKE2B ac069a22588af5a3fe4e3efdfd529f324b08632160b08b05696481639aaf0a927670a7b931c8d348c239ce9a7f185cda7d1c0e8f646989f482f64e1a2a3cb1f7 SHA512 f1d38903835b522f0fd40eeffee5f4eac783f25ce3f1f173baa5f3fd60f4104242753cfc63b54d3d27bb19bb952b83e7cf424b1a83c3085327fcade44b1848f9
diff --git a/media-libs/mesa-amber/mesa-amber-21.3.8.ebuild b/media-libs/mesa-amber/mesa-amber-21.3.8.ebuild
deleted file mode 100644
index 260958124591..000000000000
--- a/media-libs/mesa-amber/mesa-amber-21.3.8.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson-multilib python-any-r1 linux-info
-
-MY_P="${P/-amber}"
-MY_P="${MY_P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="amber"
-RESTRICT="!test? ( test )"
-
-RADEON_CARDS="r100 r200 radeon"
-VIDEO_CARDS="${RADEON_CARDS} i915 i965 intel nouveau"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 debug gles1 +gles2 selinux test valgrind wayland +X
-	+zstd"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
-RDEPEND="
-	!<=media-libs/mesa-21.3.8
-	!media-libs/mesa:amber
-	media-libs/mesa[${MULTILIB_USEDEP}]
-
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_nouveau?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib/libGLX_amber.so.0.0.0
-)"
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	if use video_cards_i965; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	# Intel code
-	dri_driver_enable video_cards_i915 i915
-	dri_driver_enable video_cards_i965 i965
-	if ! use video_cards_i915 && \
-		! use video_cards_i965; then
-		dri_driver_enable video_cards_intel i915 i965
-	fi
-
-	# Nouveau code
-	dri_driver_enable video_cards_nouveau nouveau
-
-	# ATI code
-	dri_driver_enable video_cards_r100 r100
-	dri_driver_enable video_cards_r200 r200
-	if ! use video_cards_r100 && \
-		! use video_cards_r200; then
-		dri_driver_enable video_cards_radeon r100 r200
-	fi
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		-Damber=true
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		-Dglvnd=true
-		-Dosmesa=false
-		-Dllvm=disabled
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=''
-		-Dvulkan-drivers=''
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-multilib_src_install_all() {
-	# These are provided by media-libs/mesa:0
-	local files=(
-		"${ED}"/usr/lib*/libgbm.so*
-		"${ED}"/usr/lib*/libglapi.so*
-		"${ED}"/usr/include
-		"${ED}"/usr/lib*/pkgconfig
-		"${ED}"/usr/share/drirc.d/00-mesa-defaults.conf
-	)
-	rm -r "${files[@]}" || die
-
-	# Move i915_dri.so -> i915c_dri.so to not conflict with media-libs/mesa:0.
-	for dridir in "${ED}"/usr/lib*/dri; do
-		if [[ -e ${dridir}/i915_dri.so ]]; then
-			mv ${dridir}/i915{,c}_dri.so || die
-		fi
-	done
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 005c35d2cb8f..d5fc7779914a 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,16 +1,6 @@
-DIST mesa-21.3.8.tar.xz 16593540 BLAKE2B 89a471af3354ae0cf0597c1b6bcd2aff8074d58c16504154291f86cd9a9701f98883cf1077f60a8f17d24be800691a5bfb7ef4ddb10dfa355181bf87805b660c SHA512 0462c44fa8e358dafd03088411452bc172a365902795b3198df1e6cfbf1d87675ef5b72b572de7f15e5ee87b30ce5b2f217c81ea72b376962f6428c6ff83f2e9
-DIST mesa-22.0.3.tar.xz 15711916 BLAKE2B 2ecf9bc2293861e93abcc66cd5df6651a9eb7e533573273063df76ef01d0a39d6097c7a49ec682439bd6f4f0dfd55cd8e61051a731405759174c55b91dbd7725 SHA512 3982cd2fadca5349b2513885ed734c2422e3f2dced85f471f245b120ffaf018acafcd929dc5ec317f2c568bb5f619f5a3475d3a92495f766a2eefb225efcac14
-DIST mesa-22.0.4.tar.xz 15747320 BLAKE2B 22a3e5168a763e2095c2ec75556981c6da459b4ba14dc110beb15c714ea2d500d09db56b5c56f153c0b5fae1fd8d48c8dc84aa14bcb3ffc6d20a1a7cc76af446 SHA512 afecaf97fdf824e9004f3a50ea17f42edf810d682f383082ef87449a883263d4c5c8ae03558052960a63336451797101e198977553dedc09dbbc8fdb4815f526
 DIST mesa-22.0.5.tar.xz 15777136 BLAKE2B 9622193bebea643a973e4ffa94b86aef1b2a9de0bc8d4c2d79ee07de3555353ae65d22237ae461f739dfe302647232847b9e044e7d4f3846c2c51e0c3be68839 SHA512 c73a4c3bfb41fef68e2ec1ccfd3df0a5af019c1e862af27d9bca27487dd4352dafeccd0dc0c3f15fadc54048573b9634261e4e969ae958c4f9fa88114131e910
-DIST mesa-22.1.0.tar.xz 15934484 BLAKE2B d4e3956f4a100bc54919ac7c8aeadb6d99fdd349b3a669b40967f14997f383c7ade6da957390f628e8dc521e8afde6ee67e7d9620099676c9889253630b9f8f0 SHA512 a2a6f6f37d1e63aa5537a2bbdfd8634fafebf7e223099deb0fd96749d6d1880ea692231fe12eb06ade78a5eb483d11d6f9ef746e94fe3fd58b4381d469afa934
-DIST mesa-22.1.1.tar.xz 15959680 BLAKE2B 135ca4b51511350ecd53cb0ff993ffe488c1c02e940265ebb7bd5a20aab57fd8a2b34e8ac5ede99f0f7b63a9cb485fc1dfe59dd1c17367994287df67c7149676 SHA512 4d4ad8b0e9bd0584635153af809bfbc5dc61e1f6994ae2719a3298b5a6e26dee96d28d151483e258a793313d19c54ca365a58a0849b5238964ae48941f423ae4
 DIST mesa-22.1.2.tar.xz 15992280 BLAKE2B bb2929e6c7dd0384b8e58b2a0ab6f91eabec9b29b77349868ea737c2c8b8c0e33febb9836c6259601caa3ba4c6ab67f2c4df4d2677cdfab359bbce53d8df316f SHA512 2bcce3dcb6f151de7717153a0745c1c754dec7e63dae6923a2123d2149562f13ef8faaa0f15e54c434e80b0562932a8cf8be007d181777c82ccf7a1b1bb621cc
-EBUILD mesa-21.3.8.ebuild 15208 BLAKE2B e383920612d00be64c1f03c445c0e02ebe59fdd03aad6dd6df2d7498f9168ae292e9356ff109bb1c9843b0ecd3c1dfef4b213d54a2b84104779a5759bb410169 SHA512 fe018844f36039c46d1d7a0f85c7756d7b90ea43aa60acb0ae6e728455998e4120ed410ce184161d89cd2e7467166d483d03cf0bd5b31033f4971d53f6cc168b
-EBUILD mesa-22.0.3.ebuild 12024 BLAKE2B dbffe1250962d55123bef63c064dbe63f4536a5cdd01cc027138b42b74dd5e04fec81232030def77fadb7a2cc3f8ae590c83768e33169244732159f628648728 SHA512 29844cb6178bc140ae037323c43167689c92ddfa6b74b534171230537297e2f50cbb5d27d1c2b726ad8e6ef298d54873fd4be8cf4ee4c28a847dab569fb8fa97
-EBUILD mesa-22.0.4.ebuild 12032 BLAKE2B 8acd4c2e43d2ca6cf80e7488062e2c49139b4a1b780b92d3df16ef80a69e5af6983fa0adbf32687b7794caf7cfe8f6285dcd4fa76950f7abd9e8fdad6adf1071 SHA512 3506d673f24a5303b3a306e399b17c81ef84570b79754f60b7b8741352fdd6375b745d34ca0d86af12368fc664a4074d6cf92c8d29a585f124f2e3aaf3883a6a
-EBUILD mesa-22.0.5.ebuild 12065 BLAKE2B db67fcbc1fdf2372e74e626acbcbeec83b8b7f2cf353bac3f8f534c03babbb7dee566390e51e9ae8d8697144d21ba67f5ab04c43eae5868f2dbd515babb0a81d SHA512 897e5738aff09224df309cd9a453bef3496bca91f4899fe00956fe2c75c53c862286da23bbe489a5a7e34a10afbbf8a0d89e09903ce61a45146f59704b17b421
-EBUILD mesa-22.1.0.ebuild 12079 BLAKE2B ef06ee48009df2890208ede0f404e69df0592fa889c7de6ba392d3ea5405ce2f56f80a7d74891f78c72a2902f7ba27d30a90d9cdd4595b31955a8b0b9678355f SHA512 66bd17f3913468b6e6b9dcc5e3010ab5b19a81eb97d6633e5aef220a6a4964a0c3c1cc29acd28c727f3a4bfd8d784a87df975a404ad81b5f67b5fcea9e8a2323
-EBUILD mesa-22.1.1.ebuild 12083 BLAKE2B 0098256a7a32c52540258dcc1d531a701ad531891d2f6f4ca2f4cf0c1cdc364c4a8fb6487a6b8f0b6efe46d6fd06ff951e194ae4d64ab0b51d58140d95d1ac93 SHA512 b1f9f47fc0cf720a7be0193c7c11e0ec63dd3408aa284690ced9b58761c94520961b2bcb2b00ec0cf7e2b0d66b0d41b77b886069fd605ab08cfc0cee8ed6c3a9
+EBUILD mesa-22.0.5.ebuild 12064 BLAKE2B 51531f4eda83c55fc660e0e0af4ecd56dd27f3a63e4e9edd682c2b59dba3fc9b5d807ba83e58ba72027238c39a8230746aaa8e274181998233b76e0059d6a7b4 SHA512 e07146df6d58f19f336dd9f791d1216394c9ceec2a8d91c78c9948af5071e13bea02c856b8c1f6237595530b471b01640a1abfccbfc658edd7675e2578efca12
 EBUILD mesa-22.1.2.ebuild 12083 BLAKE2B 0098256a7a32c52540258dcc1d531a701ad531891d2f6f4ca2f4cf0c1cdc364c4a8fb6487a6b8f0b6efe46d6fd06ff951e194ae4d64ab0b51d58140d95d1ac93 SHA512 b1f9f47fc0cf720a7be0193c7c11e0ec63dd3408aa284690ced9b58761c94520961b2bcb2b00ec0cf7e2b0d66b0d41b77b886069fd605ab08cfc0cee8ed6c3a9
 EBUILD mesa-9999.ebuild 12192 BLAKE2B f7ab540bfcced9776a26c8ed0e313106f766c923c514e7db78f26ade09594480ea5528093736f95b0d5c03137cdde9963b11947f7a7973205c168e7e68ac6500 SHA512 8fcf0c89f6e9dc99e9de9f09f45338c5f14fdc6f516fbe20727fcd77030b5efd99d60c9ad4465410cf4da27f068c6805637c010309df89221ec409093406bb39
-MISC metadata.xml 1950 BLAKE2B c6d41161e75c88313936009bb7ecc137a22fe7b4c177ca9453f30b5b9e06945e92d11d1c6886a4811dd8772af0ba71b5d4287440f6c9306735129a95d7429b7b SHA512 6073cd6191c9044214bb76297aeb59fce73746b3b382500cbae4ef28f77d9c7cb9383a20ad49503d218f8207dc3c43438de1ba684d40d96469bccc689950c330
+MISC metadata.xml 1638 BLAKE2B 693f9dccb9933167cf5910541eff88b872bed49915574ffdf1776e430ef1e42f2a5a4aef5767a65927250a5e884c444fdf1340665a1f88105c1337ae8677dd59 SHA512 e304809d792e03ff480bd00f83358a6e33ad688cf45dd41fd5526a080bce6316148d838fc8d880f776501fb56524798a7e8a0a3b28105402ae3151ce7dda1909
diff --git a/media-libs/mesa/mesa-21.3.8.ebuild b/media-libs/mesa/mesa-21.3.8.ebuild
deleted file mode 100644
index 3175801c7230..000000000000
--- a/media-libs/mesa/mesa-21.3.8.ebuild
+++ /dev/null
@@ -1,561 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	osmesa? ( gallium )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	wayland? ( egl gbm )
-	video_cards_crocus? ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_iris?   ( gallium )
-	video_cards_lima?   ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_panfrost? ( gallium )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_v3d? ( gallium )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-		sys-devel/llvm:11[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	gallium? (
-		llvm? (
-			opencl? (
-				video_cards_r600? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${CLANG_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${CLANG_DEPSTR}
-						)
-					)
-				)
-			)
-			!opencl? (
-				video_cards_r600? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-				!video_cards_r600? (
-					video_cards_radeonsi? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeonsi? (
-						video_cards_radeon? (
-							${LLVM_DEPSTR_AMDGPU}
-						)
-					)
-				)
-				!video_cards_r600? (
-					!video_cards_radeon? (
-						!video_cards_radeonsi? (
-							${LLVM_DEPSTR}
-						)
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use X || use egl; then
-		emesonargs+=(-Dglvnd=true)
-	else
-		emesonargs+=(-Dglvnd=false)
-	fi
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_feature llvm)
-			$(meson_feature lm-sensors lmsensors)
-			$(meson_feature unwind libunwind)
-		)
-
-		if use video_cards_iris ||
-		   use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=disabled)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_feature xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=disabled)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_v3d ||
-		   use video_cards_vc4 ||
-		   use video_cards_vivante; then
-			gallium_enable -- kmsro
-		fi
-
-		gallium_enable -- swrast
-		gallium_enable video_cards_lima lima
-		gallium_enable video_cards_panfrost panfrost
-		gallium_enable video_cards_v3d v3d
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable zink zink
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_crocus crocus
-		gallium_enable video_cards_iris iris
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_iris intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		-Damber=false
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		$(meson_feature egl)
-		$(meson_feature gbm)
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		$(meson_use video_cards_crocus prefer-crocus)
-		$(meson_use video_cards_iris prefer-iris)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-22.0.3.ebuild b/media-libs/mesa/mesa-22.0.3.ebuild
deleted file mode 100644
index 1352b26375e0..000000000000
--- a/media-libs/mesa/mesa-22.0.3.ebuild
+++ /dev/null
@@ -1,462 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_radeonsi?   ( llvm )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.109"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-				>=virtual/opencl-3[${MULTILIB_USEDEP}]
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.24 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, intel, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_intel ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature xvmc gallium-xvmc))
-	else
-		emesonargs+=(-Dgallium-xvmc=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_lima ||
-	   use video_cards_panfrost ||
-	   use video_cards_v3d ||
-	   use video_cards_vc4 ||
-	   use video_cards_vivante; then
-		gallium_enable -- kmsro
-	fi
-
-	gallium_enable -- swrast
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	# opencl stuff
-	emesonargs+=(
-		-Dgallium-opencl="$(usex opencl icd disabled)"
-	)
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-22.0.4.ebuild b/media-libs/mesa/mesa-22.0.4.ebuild
deleted file mode 100644
index 2ceff3869cbc..000000000000
--- a/media-libs/mesa/mesa-22.0.4.ebuild
+++ /dev/null
@@ -1,462 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_radeonsi?   ( llvm )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.109"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-				>=virtual/opencl-3[${MULTILIB_USEDEP}]
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="13"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.24 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, intel, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_intel ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature xvmc gallium-xvmc))
-	else
-		emesonargs+=(-Dgallium-xvmc=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_lima ||
-	   use video_cards_panfrost ||
-	   use video_cards_v3d ||
-	   use video_cards_vc4 ||
-	   use video_cards_vivante; then
-		gallium_enable -- kmsro
-	fi
-
-	gallium_enable -- swrast
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	# opencl stuff
-	emesonargs+=(
-		-Dgallium-opencl="$(usex opencl icd disabled)"
-	)
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-22.0.5.ebuild b/media-libs/mesa/mesa-22.0.5.ebuild
index b4aeb1895344..00c1f7f492c3 100644
--- a/media-libs/mesa/mesa-22.0.5.ebuild
+++ b/media-libs/mesa/mesa-22.0.5.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-22.1.0.ebuild b/media-libs/mesa/mesa-22.1.0.ebuild
deleted file mode 100644
index 47832d49429b..000000000000
--- a/media-libs/mesa/mesa-22.1.0.ebuild
+++ /dev/null
@@ -1,463 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_radeonsi?   ( llvm )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-				>=virtual/opencl-3[${MULTILIB_USEDEP}]
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="14"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:14[${MULTILIB_USEDEP}]
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.24 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, intel, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_intel ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature xvmc gallium-xvmc))
-	else
-		emesonargs+=(-Dgallium-xvmc=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_lima ||
-	   use video_cards_panfrost ||
-	   use video_cards_v3d ||
-	   use video_cards_vc4 ||
-	   use video_cards_vivante; then
-		gallium_enable -- kmsro
-	fi
-
-	gallium_enable -- swrast
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	# opencl stuff
-	emesonargs+=(
-		-Dgallium-opencl="$(usex opencl icd disabled)"
-	)
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-22.1.1.ebuild b/media-libs/mesa/mesa-22.1.1.ebuild
deleted file mode 100644
index b0927a3c4385..000000000000
--- a/media-libs/mesa/mesa-22.1.1.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_radeonsi?   ( llvm )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-				>=virtual/opencl-3[${MULTILIB_USEDEP}]
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	vaapi? (
-		>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="14"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:14[${MULTILIB_USEDEP}]
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.24 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, intel, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_intel ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature xvmc gallium-xvmc))
-	else
-		emesonargs+=(-Dgallium-xvmc=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_lima ||
-	   use video_cards_panfrost ||
-	   use video_cards_v3d ||
-	   use video_cards_vc4 ||
-	   use video_cards_vivante; then
-		gallium_enable -- kmsro
-	fi
-
-	gallium_enable -- swrast
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	# opencl stuff
-	emesonargs+=(
-		-Dgallium-opencl="$(usex opencl icd disabled)"
-	)
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index ccfa51c3b7c0..8dda3be269f3 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -6,11 +6,7 @@
 		<name>X11</name>
 	</maintainer>
 	<use>
-		<flag name="classic">Build drivers based on the classic architecture.</flag>
 		<flag name="d3d9">Enable Direct 3D9 API through Nine state tracker. Can be used together with patched wine.</flag>
-		<flag name="egl">Enable EGL support.</flag>
-		<flag name="gallium">Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
-		<flag name="gbm">Enable the Graphics Buffer Manager for EGL on KMS.</flag>
 		<flag name="gles1">Enable GLESv1 support.</flag>
 		<flag name="gles2">Enable GLESv2 support.</flag>
 		<flag name="llvm">Enable LLVM backend for Gallium3D.</flag>
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 406152181cce..6001a7d93f4a 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,3 +1,5 @@
 DIST openal-soft-1.22.0.tar.bz2 606420 BLAKE2B c244c28a253168a6651230d31608449b885d3519d07bf66669befb51a5618c2cab6166496f69230969ff38982eb2c82e1e467a741376a2af38dfe59687143411 SHA512 1e3df371d126e19e369dd01e3c5e95d6a32b664adf54ee37836d51ca7bc829f275d945388d8a40a3ac92c1151380bd68bbab4f8a08f59ea67dd1bd9b9a1d0cbd
+DIST openal-soft-1.22.1.tar.bz2 606062 BLAKE2B a7f18ab35fc67488b31b62ed7049e70b22dadfdf9db1f0d8132bb5391be144611d82ea938692761909edd38ca3b3b9828b4f5a9eb8730c0a7673c346a18321c6 SHA512 1685890c358319a74a9fd1bd0333354d13194287697aa63d149323b98fc56837d574d7c74d2f54e0fdf5671c6effe5909fec54060e471a294d14dc82ba1dc38a
 EBUILD openal-1.22.0.ebuild 2532 BLAKE2B 4efd84cd8a6ce4ff69adbf489893e82faba8cf726db6ca59b5c0f54b31fb9645c7ae24bc900bf360a0eeb3e172f798d47c563e0d6175caec21768bfed3217cfa SHA512 8943431a04600991e73205091ca7a22fb109260bb3cb3ed6184943a09062dfba9d157587c30a5f1973a16fc27b5fd560a54e0609c15e54169c1da5dc1049f96d
+EBUILD openal-1.22.1.ebuild 2499 BLAKE2B 1571bec69559727de6c5fd20a6330dd9d0a6b4ef2cedabb27ad7848af17e3dabc80217374ce5865d2d933fc14cf421e4d25994a2abd534bdb9b77411fb84c591 SHA512 d0c8d11f8cabe3ede9105a7de5328f40db97e92d6b7f92daa9b99cac999c63ef6d1378f5351f6dc26f5887562d2ce13a272ec89861314cad270d531f4fc63ca3
 MISC metadata.xml 438 BLAKE2B 27d299451c7845881fb3167a7147ddd0efa55af8bcc1e7b69cebbb8b27d9f66282962e0ebc7392fe48c1dec5ec287203a0407fd3ae4aa272cd4c112d446af1c7 SHA512 4733496e5f7aeb692f6218cc7a9ed3b44636746c44a7b8e9e86ac0395c0586c761fa877e49976abd6ae5cceae94265e1d0a7c3b25cb892c73268bfd1a76b82ba
diff --git a/media-libs/openal/openal-1.22.1.ebuild b/media-libs/openal/openal-1.22.1.ebuild
new file mode 100644
index 000000000000..3e5f3a6b9593
--- /dev/null
+++ b/media-libs/openal/openal-1.22.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+MY_P="${PN}-soft-${PV}"
+
+DESCRIPTION="A software implementation of the OpenAL 3D audio API"
+HOMEPAGE="https://www.openal-soft.org/"
+SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
+
+# See https://github.com/kcat/openal-soft/blob/e0097c18b82d5da37248c4823fde48b6e0002cdd/BSD-3Clause
+# Some components are under BSD
+LICENSE="LGPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="
+	alsa coreaudio debug jack oss portaudio pulseaudio sdl sndio qt5
+	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
+	cpu_flags_arm_neon
+"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
+
+src_configure() {
+	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
+	my_configure() {
+		local mycmakeargs=(
+			-DALSOFT_REQUIRE_ALSA=$(usex alsa)
+			-DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
+			-DALSOFT_REQUIRE_JACK=$(usex jack)
+			-DALSOFT_REQUIRE_OSS=$(usex oss)
+			-DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
+			-DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
+			-DALSOFT_REQUIRE_SDL2=$(usex sdl)
+			# See bug #809314 for getting both options for sndio
+			-DALSOFT_{BACKEND,REQUIRE}_SNDIO=$(usex sndio)
+			-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
+			-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
+			-DALSOFT_EXAMPLES=OFF
+		)
+
+		# Avoid unused variable warnings, bug #738240
+		if use amd64 || use x86 ; then
+			mycmakeargs+=(
+				-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
+				-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
+				-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+			)
+		fi
+
+		if use arm || use arm64 ; then
+			mycmakeargs+=(
+				-DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon)
+			)
+		fi
+
+		cmake_src_configure
+	}
+
+	multilib_parallel_foreach_abi my_configure
+}
diff --git a/media-libs/sbc/Manifest b/media-libs/sbc/Manifest
index a2dd02f3ebb8..0ec715694992 100644
--- a/media-libs/sbc/Manifest
+++ b/media-libs/sbc/Manifest
@@ -1,4 +1,6 @@
 AUX sbc-1.5-ifdef-builtin.patch 871 BLAKE2B a63b5d5ce0e00723d8492a83e403d926eb16091b8eaf9c426cc24444a041949a6747fe134020261131f0681448111d2558b85391308157c828a96ea1b046c7d1 SHA512 bc1116ff941c88418e79bb35e1f08828d637e4d2d3192c1e808b1d5adc02e1942f968f49805365cb7a34817f119e24d8d9c3baf2133c77b91ba79a3e4446d249
 DIST sbc-1.5.tar.xz 264472 BLAKE2B 421a4cb5ab0e282255f8bdb810384e0a4d6d66835869489c22d51d2a0cabd7ef834bef3756ff887b9d9166dcfe88f4d661c26cb804e2868fb6106cc4886f9dcc SHA512 0243586188acede595317f2afbfdb41be5850d2a6133c374edbe5cbcf59a2a0fd4570d0b8f2d13ce9637ce48b2f1910c3e4ab1c0354dbf273ee67b09db8c4915
+DIST sbc-2.0.tar.xz 270888 BLAKE2B d6dd20499871a4c217833c98a2f134ed828438ec4e5aa2073c8b9fc96da5c9ffc2d32e7a56697186731ac540ab58ff0c52559aff575feb8f2da30172badd4921 SHA512 600e86aa492ca1af512ec8e568a08fe526cf2f6eb7306bb0fbdd9a844d03a2a5dedb5f986725aa2c66fe3fe43a7ba45d111e9666eb8912ff3e3a36b948adbc61
 EBUILD sbc-1.5.ebuild 887 BLAKE2B ca83eaca32006094585e5bbc89ee72a74721c027b5445233bee854fa46068816a9532c0956f41e967e0becbc27868e185c2c7761370740583fa3b16b1171dd51 SHA512 55ec0c9ab32d0171d4ca510b28147a79dfb5c192398f346d76bdc948777d4c685adbd5d6de180bc5e1b0d4f0411d442190c4772bdf1e15a5f02a4ae255e5ed00
+EBUILD sbc-2.0.ebuild 899 BLAKE2B 00a7967ce5674448dea52aa9c918bec026ca20ab49c86470944eafee713373ac7f3bfb31d89b849f253aae569fb66e39f042745b4012779d3955a44db6d04343 SHA512 bd8a85705f9e6a78ecc64132d0f28934cf8474c6110a79968bf1da5bf9ec268e08ebda2ea2f075d3cbb4cbcb7a81dbf2d7777d9c4aa6a6991b1f76b8355ceeb8
 MISC metadata.xml 357 BLAKE2B 17cc13819b617829b6bc8f8cad8a1ab04dffe094121b3d30849afee817c5c1c65ff9520c314a8a30a82316e0ef2f7dfecf99316d4f12f87f9a1032bf9b7bd84d SHA512 8eee906c78aa8619015de225ade4753afcd086a9ac9fd282c3db1b1a62744af84ec0effd13a45a727e1e2c03fbbbabd37d0aabfb6efaab6bfe491c46fdbe1346
diff --git a/media-libs/sbc/sbc-2.0.ebuild b/media-libs/sbc/sbc-2.0.ebuild
new file mode 100644
index 000000000000..89a9642e9996
--- /dev/null
+++ b/media-libs/sbc/sbc-2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Audio codec to connect bluetooth HQ audio devices as headphones or loudspeakers"
+HOMEPAGE="https://git.kernel.org/?p=bluetooth/sbc.git"
+SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="static-libs"
+
+# --enable-tester is building src/sbctester but the tarball is missing required
+# .wav file to execute it
+RESTRICT="test"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-1.5-ifdef-builtin.patch" )
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		--disable-tester
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index 3a54bd3b891c..7a5e2391cb04 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -1,4 +1,6 @@
 AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d41823ca073fb6b8edc1d35dee7b90ec79d52ef08affb0a1cb88b577e0fa3bc62844ded3c4e3235c268e31a0121a6 SHA512 71e6934f104d12bfb7bfb19812ff868dc22a323e2fbd7a480c270650a14842dd03e53e11853e7ddaa9469239a538d0bf09469770fd30f23601406011fe626ffd
 DIST speex-1.2.0.tar.gz 1047080 BLAKE2B 928e044e1195d4d977497cd1275a07323df233ee85e3ec188f362720f96303c2fc2002c1147c2ac93ca03570ff98428d983eb7d00439c9cdbe131041d9aa2697 SHA512 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
+DIST speex-1.2.1.tar.gz 1043278 BLAKE2B 60afa7eb9ff87ebb1b69e2716b7fa6727b49f6c06ed6eb6fe81236c65dc4128769618dd1f4df31af56a00e9b766c4050c1b3e415c8f972d64d1fb9e7a537a650 SHA512 52e00300df82e1c7fb527b245af02b99a1f37faef74d004b7cd981052f1aa22a412cb18f5c7a5618df4c958f727c97eb7385beec99d68548d5b02e76192d4e0a
 EBUILD speex-1.2.0-r2.ebuild 1657 BLAKE2B 7407dcd29594f92febda5106ad352eb9b7999df220cc5463652ca649e4904fdeefb3920c17da533d22f16599423a40d9ec1e6ad7177f8fcaca5c5e4dd0a27bcd SHA512 f2c068f11364b821dcdaf3b512e398c6688bee064bee51ead40477c2fbe495bb95527d3e1163b1b7f9a0494e0c9752f1a5b6b7d33a870d3eb8aa69f606ade064
+EBUILD speex-1.2.1.ebuild 1671 BLAKE2B 7a34be8862f89118d8ff0c030a2980da08452d837d14cabaa07a12c53c123edbce49b05f8900176f2d7d17c50556aa170a530c53285728e7e46e879676889eef SHA512 c4717d18a665322f8589e88b1a1bb95e299638a4e13469c970d5366d9412ac680934b4d9fbb3c6deb0b537ea58112abe9477174c02f76c6887bd08c4bbd9f293
 MISC metadata.xml 496 BLAKE2B 596366a2be9ae01438cc46b116d3a280c1498270c1f06ce64f76a38e84f068f210d87bb87a447b3f4cbb7d3783c2d8d60ade5e487e5900ee04b98de70272b6b5 SHA512 bf5453fc3eeeaa740965f864e5d8f13aa969b6111b47ee1f2d382158457c996e9979fadb08ba6c3ea96257c2ad8b954fbb1ece0f8b7b70b4bb4f12c9aa1cf84b
diff --git a/media-libs/speex/speex-1.2.1.ebuild b/media-libs/speex/speex-1.2.1.ebuild
new file mode 100644
index 000000000000..c8a727c5743d
--- /dev/null
+++ b/media-libs/speex/speex-1.2.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal
+
+MY_P=${P/_}
+MY_P=${MY_P/_p/.}
+
+DESCRIPTION="Audio compression format designed for speech"
+HOMEPAGE="https://www.speex.org/"
+SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+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="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils +vbr"
+
+RDEPEND="
+	utils? (
+		media-libs/libogg:=
+		media-libs/speexdsp[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.2.0-configure.patch )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+		libspeex/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-lfs-flags
+
+	local FIXED_ARG="--disable-fixed-point"
+	local ARM4_ARG="--disable-arm4-asm"
+	local ARM5_ARG="--disable-arm5e-asm"
+
+	if use arm && ! use cpu_flags_arm_v6; then
+		FIXED_ARG="--enable-fixed-point"
+
+		if use cpu_flags_arm_v5; then
+			ARM5_ARG="--enable-arm5e-asm"
+		elif use cpu_flags_arm_v4; then
+			ARM4_ARG="--enable-arm4-asm"
+		fi
+	fi
+
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable vbr) \
+		$(use_with utils speexdsp) \
+		$(use_enable utils binaries) \
+		${FIXED_ARG} ${ARM4_ARG} ${ARM5_ARG}
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index f71428ee205d..b97017f155b7 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -1,4 +1,6 @@
 AUX speexdsp-1.2.0-configure.patch 1092 BLAKE2B a4629cb00d1920133db30cf1cbdaade58fe69176515c75f140f9ae9060d3111f8d88b65ce67f3bd6c7d86f60db25d15997182865e6a528a8e20603f3edb6544c SHA512 0c6f1b8ae83e98c8899649e3f108ccaad89286db317e5c3f19bd0d78f71839b92b10125ba09b640453d299b3343bfaec128ae72daff72f37f95cbf38652980dd
 DIST speexdsp-1.2.0.tar.gz 919621 BLAKE2B 70c7d07f4b23abbb70cfb212a6541288c71f57fffd5fe22ddd94901a7d01fa403a69b7884e3a4a2267ffd45a7e053b1ae7c7fd662e57053a06d4a7efb7889610 SHA512 e357cd5377415ea66c862302c7cf8bf6a10063cacd903f0846478975b87974cf5bdf00e2c6759d8f4f453c4c869cf284e9dc948a84a83d7b2ab96bd5405c05ec
+DIST speexdsp-1.2.1.tar.gz 922584 BLAKE2B 9105967eaee3ea8fcba2df1739d92a520407e086d3f4645763d8c7f26adff4f6c46b653e873b3e5ca04fce2ee5f765f8f7a242172d7cc4873fe15c3295a5913b SHA512 41b5f37b48db5cb8c5a0f6437a4a8266d2627a5b7c1088de8549fe0bf0bb3105b7df8024fe207eef194096e0726ea73e2b53e0a4293d8db8e133baa0f8a3bad3
 EBUILD speexdsp-1.2.0.ebuild 1390 BLAKE2B d28752619e08468a02d6948c27aad632a7cde38fc837a8ff5c5fb3f061f126ff7ffa6c0c2d8c27cca73cbf419e07fa66364e6271c2b004f4b0bd6cf0542f50c6 SHA512 80b71a1871eda2e0d3bd1545730728155ee709af052b5feafd669ea648d418c84be21f060457b3ef6684ab0ee935acb7e3cf1f5988476e33de8e83c6cec5c897
+EBUILD speexdsp-1.2.1.ebuild 1349 BLAKE2B 2ed22ec5b0de8b7d7c75fce621914eee2e17204b71f5f1d0f9aec2959883b11ae95a0a9dc1664e842edb6c06cb24ea5122b46eba30802e36a739486d0e6a6e4a SHA512 cb49970463727168b2d45e7094ce463d57024d460a0a721628cb74a2181d74b243d94c255e06260ffbd8e40b441908e616f3d6896151f286520b961962a4eb7a
 MISC metadata.xml 343 BLAKE2B 374a2c5ab50a02673ee9929021f54bb82b932188b88a36cc023cf263647299ebb0a279c2cc723e2c3d4f27dba635b6090a1c7675ba3792bc4a22706a5c97406f SHA512 d0c180268fe692dd8d97debafc8495e0837459ad2845993aa22c675d3777a4aa64d15fba1d2e4674a81a324ee52c1bda751d2c4a5a1547cd56ab5bc0375da8c3
diff --git a/media-libs/speexdsp/speexdsp-1.2.1.ebuild b/media-libs/speexdsp/speexdsp-1.2.1.ebuild
new file mode 100644
index 000000000000..032d3178895f
--- /dev/null
+++ b/media-libs/speexdsp/speexdsp-1.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal
+
+MY_P=${P/_}
+MY_P=${MY_P/_p/.}
+
+DESCRIPTION="Audio compression format designed for speech -- DSP"
+HOMEPAGE="https://www.speex.org/"
+SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+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="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.0-configure.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+		libspeexdsp/Makefile.am || die
+
+	eautoreconf
+
+	append-lfs-flags
+}
+
+multilib_src_configure() {
+	# Can also be configured with one of:
+	# --enable-fixed-point             (no floating point)
+	# --with-fft=proprietary-intel-mkl (mkl)
+	# --with-fft=gpl-fftw3             (fftw)
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_arm_neon neon)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index edac59df3449..7a1e11f04bfa 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/vamp-aubio-plugins/Manifest b/media-plugins/vamp-aubio-plugins/Manifest
index 150ff914201b..6c07721e2443 100644
--- a/media-plugins/vamp-aubio-plugins/Manifest
+++ b/media-plugins/vamp-aubio-plugins/Manifest
@@ -1,4 +1,5 @@
 DIST vamp-aubio-plugins-0.5.1.tar.bz2 234156 BLAKE2B 99b064a2d2372a6c42e1251ac5d29d0cc607543b4e651c3b006106bad888c9ab22fcc2a907acde135d7e663187388a52c2513f8845501908318ff9d1c0b5df9b SHA512 ebbd8466ec3907d55e24824d7a725586df38212994f1398b75974dfac8e282dd8b2cb2a9381ad7e3da1a130b77936f109b36909b23591cc58ff176d6eb22625e
 DIST waf-2.0.20 104725 BLAKE2B c9467b5205f596cd1b5d4b6ccb97806e9fa1f4d4eb9109d378a0978179ab49a029926cb86876ca2088878378f88eb292d899840b4a072e62fc6542b93bc2d894 SHA512 72de1c5a78eb353da4b4a6ea4fbf52d232ed6dd08e972872744e3727b952f813f44e47f0b47106bd6f05ce7fa137c4685ac313fb0b0d70e5fc85dc34918e66f0
 EBUILD vamp-aubio-plugins-0.5.1-r1.ebuild 826 BLAKE2B 3c5191fbb29b400bacbb6c40edf2859d35cbbe102386ad99b890f4d416f33b2a8ec5ddf9565649b389fd68f0ffca5bdf5d84b128ad6d87cd30cf53011c6c34aa SHA512 18143852d7e24b4759e1b61c56857d3e3dd2617e16acf352d6315c411e6255bd37bfd31dc789d3f10b1e1bbab1e46023e37017c339e41c74cb5b507b9e8d4d59
+EBUILD vamp-aubio-plugins-0.5.1-r2.ebuild 820 BLAKE2B 1ce8521c068c8b1e9834cf1eb1cd3599d7ac1bf8231bf4a3b6b714035039fc144bd4b1e2abfa48a33dcb5a0e68b1fb7872d6f4b3fdb645d1b80bca6ff821ba31 SHA512 7c387ef887c35b885fea83672b9e4b7f1d791d6d415cdc9a50d63023d23de894c713ce2f68e7ec77ffca3cdce9b834c4f5374d8af10a6abb2362bd7637a5fa3f
 MISC metadata.xml 334 BLAKE2B d904d322833f47e53941fda75965e482e966ac307e36ecdb25c978a606ac67637eab921f4bcfab88f6158973862a5fa4135faaaf079be0bda417625288251df3 SHA512 79e29b069ce335b9c9504fcc2638eae16a24427552cb5203c77d5fb0aa07a9a3f49a3842994b92b656d502e8899c9b8e54ff7e1de3a3e5d818837d27042747ad
diff --git a/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r2.ebuild b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r2.ebuild
new file mode 100644
index 000000000000..a0f66b81af30
--- /dev/null
+++ b/media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils
+
+WAF_PV='2.0.20'
+
+DESCRIPTION="Onset detection, pitch tracking, note tracking and tempo tracking plugins"
+HOMEPAGE="https://www.vamp-plugins.org/"
+SRC_URI="https://aubio.org/pub/vamp-aubio-plugins/${P}.tar.bz2
+	https://waf.io/waf-${WAF_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+# bug #748057, configure script only allows amd64/x86
+KEYWORDS="-* ~amd64 -x86"
+IUSE=""
+
+DEPEND="media-libs/aubio
+	media-libs/vamp-plugin-sdk
+	=sci-libs/fftw-3*"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	${PYTHON_DEPS}"
+
+src_prepare() {
+	rm -r "${S}"/waflib && cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die 'Failed to update waf'
+	default
+}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 9133f6eafc9e..6bcacbf7dd54 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index 9ec7a22ba94d..c2587c6905b6 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,10 +1,4 @@
 AUX flrig-1.4.4-musl.patch 618 BLAKE2B e03367cea46747325ab98a9a9b2a7bb2b977e21e430d648e4ad2c8dd95665fc78d98b0d3fd3253953c9e714f5edc80031f5a236435e5b4ff5472e700809086fa SHA512 9d46857614b82053f64153ecf17e2d5ce89c419972d233d17ae5d237b0e7a2fa0756602adbf80bfc9a990978fbff5fbaeb56f186904490499055684a980e3d86
-DIST flrig-1.4.2.tar.gz 918730 BLAKE2B 85c2ac351e833b19dab0e36899df58665c86ac397035e8eabad29bb38018a0d2c822ca73b721f2db938a1f7cf2cd2b3a6878f605d5d65f01608563f3f4a0d89e SHA512 094f50a427cabc5c596a4315e7182ea4040218467f06fac456a0fe8923726f30cf3220379033024449066b4379a3877d48449971afe3f4b46b4307f9a64c3ff8
-DIST flrig-1.4.3.tar.gz 944556 BLAKE2B dcdb4a4306e3558e189094ec6f231ccae406f75d256bcb942aeee4ff67641e846fd99c73c263f98e2ed3a3074c6a4e473934186749c3dfc0b84d7d24e178c541 SHA512 93a5f3caeedcaed7de4988183d182872d4c3d22e670e2cd6b9aeb9cc969a09729a2765e1c7c93be72931f8948a0aeda7a75611f7dbc4b4d4adefe936a4006dca
-DIST flrig-1.4.4.tar.gz 978339 BLAKE2B 2cd285cd0ab8053ba1d6db7b7c44ca6298b910fb93b349196272b2c0e45123758d24b403f7173e38995da4e0c87d6c47eb4f59e4f61f070ef9188a196a2c4347 SHA512 81593529d27c9e4c1912f9dc64195972838eb4d784a0c1c3e5d0c31eada654b34ea6981e180756963a1fe876df0ff1064d991d22cee0c0b1696b09b9a5dbc2e2
 DIST flrig-1.4.5.tar.gz 995774 BLAKE2B 7853c38521c880cd0b1622dae339f6e5120ca9679e7f661e9b0aacc9b3bb12708c3c9a8b1204db0ebe69358bf0dd0daa0a5989163cc304b43c6906cc1872da4d SHA512 f4bd283900975f59b82208e21d9258b25901ed893e339cfc80eb27ce464439eb9df7b04af855a2c87b73cc477d327f965fd48d89589539bdf0da907078f765d3
-EBUILD flrig-1.4.2.ebuild 476 BLAKE2B 8665ccf1ef91f3f25912d4af906aeb74a579a5c865ce52f392f34f9ecaf14309a2d936ab6f3916b02e50fa8ea5d92d1171c9de3ef0cb7fb80491d02eec96cd99 SHA512 aec358712976dcaceada364545bcd9306cc5b3441db9100a71dae0d8d5f3a09e1e69b855a79524722840b3090c40c6fc000aa03fc0ba399a8cbc84dfebb0bc32
-EBUILD flrig-1.4.3.ebuild 476 BLAKE2B 8665ccf1ef91f3f25912d4af906aeb74a579a5c865ce52f392f34f9ecaf14309a2d936ab6f3916b02e50fa8ea5d92d1171c9de3ef0cb7fb80491d02eec96cd99 SHA512 aec358712976dcaceada364545bcd9306cc5b3441db9100a71dae0d8d5f3a09e1e69b855a79524722840b3090c40c6fc000aa03fc0ba399a8cbc84dfebb0bc32
-EBUILD flrig-1.4.4.ebuild 582 BLAKE2B b09dfce22f77aa2d6d5a6438c17ef42e0bddb9789c32abf5adf457af92008637f3ccc2d567aa4b4ebb4961cfcad3362619c69f0408f347f97259a32a6c1fec77 SHA512 f3a0722ae497b9d4c28d35ff26b77294de34cd131b01ee2a5118023638996b4f93e5de661fe4b2bd5b11c1a0938ea47918a0b26cb57ca8888e932ec85ec94816
 EBUILD flrig-1.4.5.ebuild 580 BLAKE2B 736959be898c2c019f981b73efeb1959855e77dc69b7be94d78010395e7b863140744df973509a677f3753c484e652246ff603ff5eaeade68f71f3d639334d5b SHA512 ae7ad3a79af61d473426a6f28a6677ed42c7563584cc8c95a575d7a799beabdf83f64363be6b7bcd133b8d80a9835bc27c96b0b377dd0fafdc9b734666013fd3
 MISC metadata.xml 326 BLAKE2B fb57e943fa61222b3967939ff95da7bb17aae2651e55d960a9c405e6d5965843ed0ec9e6fadd0df1f41602c0f3c90c78c6ca2ab12ea72b515484f7c2ec34ec68 SHA512 e48dc185e9eaa074ed92d1ed27920e41b72760cd3e878fd40583efdca0a6997598a7d82221a33c7987fb19dea090f92eee070b9e89ea452ddce028d88db7bf9c
diff --git a/media-radio/flrig/flrig-1.4.2.ebuild b/media-radio/flrig/flrig-1.4.2.ebuild
deleted file mode 100644
index bee49b2172f4..000000000000
--- a/media-radio/flrig/flrig-1.4.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-DOCS=(AUTHORS ChangeLog README)
-
-RDEPEND="x11-libs/libX11
-	x11-libs/fltk:1
-	x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
diff --git a/media-radio/flrig/flrig-1.4.3.ebuild b/media-radio/flrig/flrig-1.4.3.ebuild
deleted file mode 100644
index bee49b2172f4..000000000000
--- a/media-radio/flrig/flrig-1.4.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-DOCS=(AUTHORS ChangeLog README)
-
-RDEPEND="x11-libs/libX11
-	x11-libs/fltk:1
-	x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
diff --git a/media-radio/flrig/flrig-1.4.4.ebuild b/media-radio/flrig/flrig-1.4.4.ebuild
deleted file mode 100644
index fa8591685185..000000000000
--- a/media-radio/flrig/flrig-1.4.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-DOCS=(AUTHORS ChangeLog README)
-
-RDEPEND="x11-libs/libX11
-	x11-libs/fltk:1
-	x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.4-musl.patch" )
-
-src_prepare() {
-	eapply ${PATCHES[@]}
-	eapply_user
-}
diff --git a/media-radio/gpredict/Manifest b/media-radio/gpredict/Manifest
index ae8002ed80ae..9791ee336e86 100644
--- a/media-radio/gpredict/Manifest
+++ b/media-radio/gpredict/Manifest
@@ -2,5 +2,4 @@ AUX gpredict-2.2.1-fno-common.patch 334 BLAKE2B f822b1685c3e5c96a1810c62fb501879
 AUX gpredict-2.3-doc.patch 473 BLAKE2B ed1a1a742ca972a53cd2ac35723f5b02eb212f8d6bf4049eef4ae78afbaa50067f8777c0c5614456251e68050e38d4f64f840a3b886024a0d9869f1a163e74de SHA512 af5d9cff76ba3cadea43c664bfa5d3292d1e02765b36776c26346c6a89b146162ca67c1a90c0fb6388a3ccca2cdbd0dedeb2d71e109e8435980aaabbce80fac1
 DIST gpredict-2.3.tar.gz 7742902 BLAKE2B 1ff567871838b062c59ab0076330a354afee082506044f5ce2ae1c7553e7f3462770f7134d13e3b603f7966476d13b365dd3575cc6c7e32d23865ba29b602cc9 SHA512 d7434aff482c943951a79cb607c91f118cfbde8209b4b370d0d2147766244fab2839b5c712864c2c521635f31c484ef2bfd3c771371e946f5a3561801ab474b5
 EBUILD gpredict-2.3-r1.ebuild 775 BLAKE2B 0d0630069b8558064977a49a99143c35c7741468396bfe474466fdd0794919ff6de99fb250643b3c9272a016d757e1f6153c96e87af7737638b9400492f3a99d SHA512 de6e03f029dc4744b252ecb208af01189b839e0621217c1fc23cbe69ba6d54a7681dde159e7b24c28d1062eaa89d607443044665c3253af431fd07b7c035a7ea
-EBUILD gpredict-2.3.ebuild 812 BLAKE2B 3c4265ab4f1c824ea19941c554e2d5eca1ab7a55842e92f38ee0a15a8253cbc22f60ee8f33c60645d1837b8a897720ce4a2334eb1ff6a9f45f8fc354c7055b83 SHA512 ca0d609e84a3055847fdae6b9c35bf64beb9a4732d300f9cf16d1ddae5581366a7fc4a8597e496cd7e3f44b2b351a10b84e871fdbea95e95f3510401e82f70de
 MISC metadata.xml 328 BLAKE2B b4b0687c3d8f2e47cca383f78a620fa997398ceb9cbb01bc10c872d971bb277fee6831b95768f9ef8ccbf86beb120e97f344cfc2ebe2077b9a33fa90db9471e7 SHA512 ca3a9ce7b68a7dcfedd0dd0a64c8c1e34cc07133c4822864b3f55f51356ea615edfca7954414fcdd8607be0e1b9a105797450b0f661d2c16fc773b1e45fa7a71
diff --git a/media-radio/gpredict/gpredict-2.3.ebuild b/media-radio/gpredict/gpredict-2.3.ebuild
deleted file mode 100644
index 0b284758603f..000000000000
--- a/media-radio/gpredict/gpredict-2.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Real-time satellite tracking and orbit prediction application"
-HOMEPAGE="http://gpredict.oz9aec.net"
-SRC_URI="https://github.com/csete/gpredict/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gdk-pixbuf[jpeg]
-	x11-libs/gtk+:3
-	x11-libs/goocanvas:2.0
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	eapply_user
-	# remove wrong doc location
-	eapply "${FILESDIR}/${P}-doc.patch"
-	eapply "${FILESDIR}/${PN}-2.2.1-fno-common.patch"
-
-	sed -i -e "s+./configure +# ./configure +g" autogen.sh || die
-
-	./autogen.sh
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index e78e39880d91..9be27540b0bb 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index cec414cc8c8e..934854ee86c2 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,8 +1,6 @@
 AUX cadence-0.9.1-fix-clang.patch 424 BLAKE2B 181975de4d015393cfe9406e3e94c3d984a342b9d3d80aa0caa2151ec3825430a9f1210f3c2f3b104a8d90f83f27483b3a4b8bec10ae5107a2846fb629d57695 SHA512 544eb77db3715a9c2990375aaf77515896ba43f67dbb1572428444a1386ed5aa0cdebd6e24fb3f6f20b8ebc0dfd6982709f39178c39759dce1cfe381116db719
 AUX cadence-0.9.1-fix-qt5.15.patch 1251 BLAKE2B 45b85382b8c4507ddf38e9f3f75b89b019ae85348da624730abf93c44bd3031db52387c4ce2937a63a74920e9c8106bd51426764fc29e235b64a6f5df1a37a6c SHA512 fee8febc697da57e049d5cad14a205ba1edd576051d7200abcbabac3cb8133c96dc70a620f2bb6130900cc475cd70c9db34f32b1c8cffca30c6fe23afcb37713
-DIST cadence-0.9.1.tar.gz 2202272 BLAKE2B 0f96a3eadc90540ef455e3b9c9abe1b8dc0d912936642c77e52a3704367f06e870b4cbe0bee78482436b9b099063c66b0b04007e8905b7eaf213d6b2f9aa08d1 SHA512 daa9df947f0198522172451ec3d2a0e138de5245d4fa849c89ae17fc141388467bdb2e5b1ed191d1db372f4d1c02a8f1c32458c20b893d413af8fdce72ee9219
 DIST cadence-0.9.2.tar.gz 2202164 BLAKE2B a5422e4d74618e2e45d9c6f275393a6e918783fc37d60a54142725aa54e691435c41f76dd0346fae7684c452988b07a18d817902abd917dbceaff5fb4aaa6c47 SHA512 d8a1b52c361e3e18a193d1c283bb69abe18ce667b554fc53cb9b752d92747269145144ae512895ffbb5df76efe8671cfc0782f29e59d0d7cd3d97c97240bdecf
-EBUILD cadence-0.9.1-r2.ebuild 2462 BLAKE2B 65b72e898f71865095e2080665a2a96db5df31173659e154ac62e4a097f02e15699aec981c1747ecc15d34fcd727cccac9a11b32d42642b89dcf0a7d476d48ed SHA512 5a92d5643031174c91d1344bfd52eee0574ca85ac8dafd8e7516ec98138845c36c771497d7463a9c3154751820fba4c2b0cd9258352ff275ea3cf634c043e232
-EBUILD cadence-0.9.2.ebuild 2435 BLAKE2B 69f1d663fd990ff5bc56233d40178674711e769c29962723706b2dacfc0761a59d1af76b771639fb9a5c6e0bc5797166b117349797d164f355507a8883405320 SHA512 77f12ae78c79de7d3ada83208c1b069ec2d0161a38a0f3d06ff0eb8a793a29f5b86a84147da1940cc2d854b4ebbde8944e55ce4504df5c668f16be7ed7797207
+EBUILD cadence-0.9.2.ebuild 2434 BLAKE2B 0ae7d58942830a368ec7102708adad2bf729b24b0b737a298528d878de91af3323aba5a604d9c6be68d7fc71cd2b9609cd75f945f91bb8146335fd2941292606 SHA512 2c11f655b1c4a36058446490f1fdb72f4e6e651f59adf0b5dc5085ee1115cf9d47fbcb530a8c9eec50c1cd896955ddbc4234d7c4ea773c38c6894e3cc3fe7237
 EBUILD cadence-9999.ebuild 2435 BLAKE2B 69f1d663fd990ff5bc56233d40178674711e769c29962723706b2dacfc0761a59d1af76b771639fb9a5c6e0bc5797166b117349797d164f355507a8883405320 SHA512 77f12ae78c79de7d3ada83208c1b069ec2d0161a38a0f3d06ff0eb8a793a29f5b86a84147da1940cc2d854b4ebbde8944e55ce4504df5c668f16be7ed7797207
 MISC metadata.xml 480 BLAKE2B 249a8627c9afd2ce1bbb84e967b30cd1226c5cc8a27fa6ad354effe873a0d9d05a6704782bf9226698c3bfeb3f4cfcee5e6f055d19bcca8767518cfa526a2df0 SHA512 b44afd279ba116b4c1111b9503d35ef44611f693cea1a69abd6510d6f2381e0500ef7c243bb49657d80da403e6a641a7573f25fb5cccccf4774569426671e6b2
diff --git a/media-sound/cadence/cadence-0.9.1-r2.ebuild b/media-sound/cadence/cadence-0.9.1-r2.ebuild
deleted file mode 100644
index a6a6a44e2de5..000000000000
--- a/media-sound/cadence/cadence-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit python-single-r1 xdg desktop
-
-DESCRIPTION="Collection of tools useful for audio production"
-HOMEPAGE="https://kxstudio.linuxaudio.org/Applications:Cadence"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/falkTX/Cadence.git"
-else
-	SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64"
-	S="${WORKDIR}/Cadence-${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="a2jmidid pulseaudio opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
-	')
-	media-sound/jack_capture
-	virtual/jack
-	a2jmidid? ( media-sound/a2jmidid[dbus] )
-	pulseaudio? ( || ( media-sound/pulseaudio-daemon[jack] <media-sound/pulseaudio-15.99.1[daemon(+),jack] ) )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-clang.patch
-	"${FILESDIR}"/${P}-fix-qt5.15.patch
-)
-
-src_prepare() {
-	sed -i -e "s/python3/${EPYTHON}/" \
-		data/cadence \
-		data/cadence-aloop-daemon \
-		data/cadence-jacksettings \
-		data/cadence-logs \
-		data/cadence-render \
-		data/cadence-session-start \
-		data/catarina \
-		data/catia \
-		data/claudia \
-		data/claudia-launcher || die "sed failed"
-
-	default
-}
-
-src_compile() {
-	myemakeargs=(PREFIX="${EPREFIX}/usr"
-		SKIP_STRIPPING=true
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install
-
-	python_fix_shebang "${ED}"
-
-	# Clean up stuff that shouldn't be installed
-	rm -rf "${ED}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject
-	rm -rf "${ED}"/etc/xdg/autostart/cadence-session-start.desktop
-	rm -rf "${ED}"/usr/share/applications/*.desktop
-
-	if use !pulseaudio; then
-		rm -rf "${ED}"/usr/bin/cadence-pulse2{jack,loopback}
-		rm -rf "${ED}"/usr/share/cadence/pulse2{jack, loopback}
-	fi
-	# Depend on ladish which is not in the tree
-	rm -rf "${ED}"/usr/bin/claudia{,-launcher}
-	rm -rf "${ED}"/usr/share/cadence/icons/claudia-hicolor/
-
-	# Replace desktop entries with QA issues with these
-	make_desktop_entry cadence Cadence cadence "AudioVideo;AudioVideoEditing;Qt"
-	make_desktop_entry catia Catia catia "AudioVideo;AudioVideoEditing;Qt"
-	make_desktop_entry catarina Catarina catarina "AudioVideo;AudioVideoEditing;Qt"
-}
diff --git a/media-sound/cadence/cadence-0.9.2.ebuild b/media-sound/cadence/cadence-0.9.2.ebuild
index 826035d06617..9d733c2e63b2 100644
--- a/media-sound/cadence/cadence-0.9.2.ebuild
+++ b/media-sound/cadence/cadence-0.9.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/falkTX/Cadence.git"
 else
 	SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	S="${WORKDIR}/Cadence-${PV}"
 fi
 
diff --git a/media-sound/denonavr-cli/Manifest b/media-sound/denonavr-cli/Manifest
index 1f6056e37b66..4b75a48d6a94 100644
--- a/media-sound/denonavr-cli/Manifest
+++ b/media-sound/denonavr-cli/Manifest
@@ -1,5 +1,5 @@
-DIST denonavr-cli-1.gh.tar.gz 3508 BLAKE2B e26ce26062f64f67630f07098c2d0bc4045a8f5f04ae8216b8dc7df25e0f80c1df8fb67c9992382d08e273c543f51956bc17d9ac160daf47d3756fbc7e1941cb SHA512 4f37689f3ab29ad199c183ef0c5ea8c83e8418993d6640acfacfa354382e5a97fcfa42e2ba0865c22037585216581ef6141ce39fd4fd2f296c6e4e62b97b6b84
 DIST denonavr-cli-2.gh.tar.gz 4102 BLAKE2B 1f17a642cd546d3a9fb77ee9d24a6c7c1622e8c0d6fd6f4d04ac1daa4b491908e3bc18efce4e827fbf6936b91929e68d32efe0c91aec260069817d6c0708eb9f SHA512 04354f5fdf46e179a82df3d539329fd6f00312c3d87fc78ecc40c85223c468c6bfc93092e835351857a1ca4fa149c5f209aa6a2d96caf518332dd7dc4aba334d
-EBUILD denonavr-cli-1.ebuild 523 BLAKE2B 2a0aff7b38146e4d5eeae2a3d43d2266735a8c1e7b6978f39600d977c619203d3afabaecdefa4869eb382fb8c620630bf064afc85632e02922d9c4fe847f0748 SHA512 662fcd9822e3cab792ed6e81b193957b2c56578d4b8922e3ecfb4c18bd6fe8a4a1c7526e644978d4814bbd25503ab923aaf53ae2c41d40dba17c8387c59fedc1
+DIST denonavr-cli-3.gh.tar.gz 7508 BLAKE2B 4084cbc87363858cb0132847b88c486795332ae28d1c24efb46c22a8985711aa18dfe6b2634f6457ea3108789bb4812ffba17a50edb429fb64a29ca90bbeedaa SHA512 f2bdf442fd3bec788d9ac684d93314da6c7750d946fc563ceb71a52ef1663e1fe06c62653d4e5ff69625749f1eefacc41c92ebcfdf0f6ff7fdf7c7b703d7408d
 EBUILD denonavr-cli-2.ebuild 523 BLAKE2B 2a0aff7b38146e4d5eeae2a3d43d2266735a8c1e7b6978f39600d977c619203d3afabaecdefa4869eb382fb8c620630bf064afc85632e02922d9c4fe847f0748 SHA512 662fcd9822e3cab792ed6e81b193957b2c56578d4b8922e3ecfb4c18bd6fe8a4a1c7526e644978d4814bbd25503ab923aaf53ae2c41d40dba17c8387c59fedc1
+EBUILD denonavr-cli-3.ebuild 624 BLAKE2B 97d5cd4e13452613b3a6dc7f9fb72ad1e6fcdc6e8569411b959fba41a963ecc598ee1912f10ce7ea8add1ee9bbbb0253b2b9160ca4b8031fc5cf88024b4d8fad SHA512 bde28b27dad579c690f45cbd478d90d30058b274e719e35c67829a054e61d85f7c95b45c2b00a89af100921f05cfa16f11130cc19116b389e0a1cffe756a8cec
 MISC metadata.xml 382 BLAKE2B 11113efd49c8648c73018cc7e3ad8633c8a975c12e360d5299685e91ecb09384e76ca2d9af21b6773437872f0346f3c9481bd3d42921d0c3a0d729596d9c7d2d SHA512 42dbf2c0a482d005c93d221e2b7b265e5c0cfec9a92b809f8cbe503162589f36eda48a3dfd3f55fb8fb8360217c1b1a60bb316c76d191117a74e086f23c81137
diff --git a/media-sound/denonavr-cli/denonavr-cli-1.ebuild b/media-sound/denonavr-cli/denonavr-cli-3.ebuild
similarity index 83%
rename from media-sound/denonavr-cli/denonavr-cli-1.ebuild
rename to media-sound/denonavr-cli/denonavr-cli-3.ebuild
index 32f23f00f481..a5e29f2af9bc 100644
--- a/media-sound/denonavr-cli/denonavr-cli-1.ebuild
+++ b/media-sound/denonavr-cli/denonavr-cli-3.ebuild
@@ -25,3 +25,10 @@ KEYWORDS="~amd64"
 RDEPEND="
 	dev-python/denonavr[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
index e752df8abea0..516b0d533ac9 100644
--- a/media-sound/jalv/Manifest
+++ b/media-sound/jalv/Manifest
@@ -1,4 +1,4 @@
 AUX jalv-1.6.6-suil-always.patch 410 BLAKE2B 7aee87986df386383990e2fc1c012592c95793a3ed7d80faa98c1946130d591eca283db62954bd6c8419cb0b57ef600ece58886dc5c33be7eb0d0addc8b09d81 SHA512 534cc589ddf8f40f32c9c5febc71a6707bc546a6277f5fa556f65f2fff20f053851063449723708460279d22efb45b505f8bbc5e5316781164ed33993847bfb8
 DIST jalv-1.6.6.tar.bz2 356622 BLAKE2B 92e93a48cb0a244cdd3fa9264fe6faaaf9580fe035bb4af1358ecdfc6558766e75ff905592dc6ad43202b3b052331346c8b5e864bf88d2efdcfc6edb427fc715 SHA512 8bb77848a890326c8b39d4d6aea65a86c3cf44d7cb3474f20b0279d5f3a1935b955beb2905d315b304926c856029d5180d1e72f89b736e60def9eeab6e2b0f7c
-EBUILD jalv-1.6.6.ebuild 1220 BLAKE2B fd07f3e2a675afc446532077147f4324025eae70720396c132e209def4d5c1f183105b4affda28a06cd62ff9a70ff0b0aec37445b1a7569ca8c8ce5c8212786d SHA512 0ac8b2e49cdbb4814462f02c989bd3fc6e87f4b6970ecec113a3c2e40d5308d82e5e812ce0322acb4746006443111aad91734f8b3b3b955b8bafb7df1e255c86
+EBUILD jalv-1.6.6.ebuild 1225 BLAKE2B 41279164b25dc1780af6293e57dfd64623faf3bcfac22a408520a4bf01c40c10a0be1ffe8e885ff1d04aa12aadc8114939dc39f6f67784e48342c4ae4601e8a8 SHA512 e7a983d04024155d965aed445c469dd84232ddca921be0809928205e68ee5496d9fe0ca8150ea206cd25fca0ecc7e9f577ccf7fdea217e1cbfed425f46f66e40
 MISC metadata.xml 1052 BLAKE2B 31fa13d83562029a188556d91133d432f899d515f28f9f3254d17412b74ba2f123ba3cbdce0602a2cc8d16f887d74622928d462729fcdb7082380e78bf39cb37 SHA512 353e23ebb530a497d1fb70f3906326d02f10a0c5127c99133397ce575977f4e029fdad7933d3414edfdb585357061f4be6d218c1c9a1cac3ced2bf69f1fb35b3
diff --git a/media-sound/jalv/jalv-1.6.6.ebuild b/media-sound/jalv/jalv-1.6.6.ebuild
index 42870c71a5f1..4e6f6c0e6aa8 100644
--- a/media-sound/jalv/jalv-1.6.6.ebuild
+++ b/media-sound/jalv/jalv-1.6.6.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..11} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 qmake-utils waf-utils
 
 DESCRIPTION="Simple but fully featured LV2 host for Jack"
-HOMEPAGE="http://drobilla.net/software/jalv/"
+HOMEPAGE="https://drobilla.net/software/jalv.html"
 SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
index 28048b4ab6d5..7985559562b1 100644
--- a/media-sound/lash/Manifest
+++ b/media-sound/lash/Manifest
@@ -5,4 +5,5 @@ AUX lash-0.5.4-swig_version_comparison.patch 1225 BLAKE2B 92f9fe4ae053dc454f8434
 AUX lash-0.5.4-underlinking.patch 660 BLAKE2B 6f3ca7580a588493610869ae8f2ff58f1c53b8e593e45c8613b1a15e7b97521f01372b493d3f627d878a8f0f6a349460da6fcc1eb48cb2b7e18e283acdc3a81b SHA512 118bccb0da55f0e7808424696143b00784afb18cdf982fdef837bdafa1dea6b55ed912762a964e210c2f0ba4a3bd1469249cad957428cca87da6bd0514751d66
 DIST lash-0.5.4.tar.gz 623469 BLAKE2B 463931a9fcacf806631746c69ccb2e2b795b8983e796835abce6036ed98571c41253fb8236a33c0a8bd1b5d3a910229d4e95f99257c1d82c64495201c64c6414 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c
 EBUILD lash-0.5.4-r4.ebuild 2587 BLAKE2B c88135133e9c6401c309e936611b909c901e912485d1af5b946ff2af54f1e8c2911936dc927a0a96889f213a79033bc502e1d1c016961490672e21aa6f37b738 SHA512 74f9459771d9275fccc8f883d141e9c72bc5a652db3713ca89651748ab59cd8410d13eaafe59d8e7ddc67b855383c7f92adc8e0bb012ed3fd8986e5347f46c3f
+EBUILD lash-0.5.4-r5.ebuild 2594 BLAKE2B b416be7a0686583241b55214f64bd304c5bc84fe55f6c6b50c20b96463e35c9e6f2cb7ec9c754314b879e4d088b869d60932473dbbc061a5983250927d14df63 SHA512 6a68adb9b0262966499185704e448949c7798e9c7b85ae4c66e150180ea3a11219c511e2d84f1a6deaee8312c9d96479c0bd991eb2797922ee3a100bae5f626c
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/lash/lash-0.5.4-r5.ebuild b/media-sound/lash/lash-0.5.4-r5.ebuild
new file mode 100644
index 000000000000..ef267b70ea16
--- /dev/null
+++ b/media-sound/lash/lash-0.5.4-r5.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..11} )
+
+inherit autotools multilib-minimal python-single-r1
+
+DESCRIPTION="LASH Audio Session Handler"
+HOMEPAGE="http://www.nongnu.org/lash/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="alsa debug gtk python static-libs" # doc
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/libxml2
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	gtk? ( x11-libs/gtk+:2 )
+	python? ( ${PYTHON_DEPS} )
+	|| ( sys-libs/readline dev-libs/libedit )
+"
+DEPEND="
+	${RDEPEND}
+	python? ( dev-lang/swig )
+"
+# doc? ( >=app-text/texi2html-5 )
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+HTML_DOCS=( docs/lash-manual-html-one-page/lash-manual.html )
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc2.8.patch
+	"${FILESDIR}"/${P}-swig_version_comparison.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-strcmp.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/texi2html/s:-number:&-sections:' \
+		docs/Makefile.am || die #422045
+
+	default
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+multilib_src_configure() {
+	# 'no' could be '$(usex doc)' but we use the pregenerated lash-manual.html
+	export ac_cv_prog_lash_texi2html=no #422045
+
+	# --enable-pylash would disable it
+	local myconf=()
+	if ! multilib_is_native_abi || ! use python; then
+		myconf+=( --disable-pylash )
+	fi
+
+	if ! multilib_is_native_abi; then
+		# disable remaining configure checks
+		myconf+=(
+			JACK_CFLAGS=' '
+			JACK_LIBS=' '
+			XML2_CFLAGS=' '
+			XML2_LIBS=' '
+
+			vl_cv_lib_readline=no
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable alsa alsa-midi) \
+		$(multilib_native_use_enable gtk gtk2) \
+		$(multilib_native_use_enable debug) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -C liblash
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		# headers
+		emake -C lash DESTDIR="${D}" install
+		# library
+		emake -C liblash DESTDIR="${D}" install
+		# pkg-config
+		emake DESTDIR="${D}" install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+	use python && python_optimize
+}
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 55556c7fe586..217696ef6fda 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -11,5 +11,5 @@ EBUILD lilypond-2.22.0-r1.ebuild 3259 BLAKE2B f3bc95cf64354299ad77cb0da56c462582
 EBUILD lilypond-2.22.1-r1.ebuild 3290 BLAKE2B d51b27c68230683b98804d4174c9cecb6a50df32bb1b26b01831c5ae35872ec3b7e0cec63bb1399e74ffd4b0e94904138a71b13416ac10f1d5f6cfca438988b7 SHA512 68629733fdd9410c5e23ca51c1daf1f8edb5558c68d1d42bd90a76725392c2342aeac825628a3f1eb8a0c8bd7e0273148750e752b17f0d1618d67df3fa024b1a
 EBUILD lilypond-2.23.0-r1.ebuild 3169 BLAKE2B 15e747e6e410eed769cd5d883f2361995c5e58feae7103ec5fa65720729325596508896c79a5878fae36e985f38852efbaf07c9985caaf1799bfe5c4432280da SHA512 50ff4c48395c6ef77a9ac731b2bf8d4329dc6bbdcf1b5be9356ddfd56adbe3481c6e655186bd524154368d47f06d7577c280ca5e04ea80f3a966aea43591b5eb
 EBUILD lilypond-2.23.2-r1.ebuild 3184 BLAKE2B 8f320fc9784a793a5bce35904aa2cb09b3965e60d0df4a061456011bea591764e31df6d2d19f81f8e8e3bb44aa8c1c3fcb1b2739ad38c9220ea28db7619322cb SHA512 15b9624f641514a8925526f9a010fc9160fe41eb8162dd4b66488dc9e03235b4d68b346312a527c941e058c2e9577ac9b1eb38617f7f6a17c1d1f37f77d79961
-EBUILD lilypond-9999.ebuild 3184 BLAKE2B 8f320fc9784a793a5bce35904aa2cb09b3965e60d0df4a061456011bea591764e31df6d2d19f81f8e8e3bb44aa8c1c3fcb1b2739ad38c9220ea28db7619322cb SHA512 15b9624f641514a8925526f9a010fc9160fe41eb8162dd4b66488dc9e03235b4d68b346312a527c941e058c2e9577ac9b1eb38617f7f6a17c1d1f37f77d79961
+EBUILD lilypond-9999.ebuild 3176 BLAKE2B 60af582a48928bc117ced6bcd05afd27148e79ff1e3f234d8dd2555f92a960840047487f40b053511da7545c2933536a1495638439b2e2f476d737e0a504ff80 SHA512 fbde53e8d8ddfeb09bbd6f0586c404fc18545e97b60042083879bfadc48f3bdb6e9934874b6aa74be5112c2b3eb215952d1d0ec27a8cf65aecbfbe0cd8f4900d
 MISC metadata.xml 527 BLAKE2B b110a46a24ff9f9f8b93e28a17c40ff7d0674e9162e7804b476e9568fc4ddd1afd9c7386a129e9b2c3adf2010221e463cf0a32c720edda7fa31feb8ce806f5d0 SHA512 1f5cb81806c3155895a5a3a2b773c3ebbbfb35d7cafdb37b96961a46f6db11762a25444a868af975183b386bcc8dd8bf665e082a65d1c8423b224ea3185b31cd
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 267d1a8af4de..4690f0a0f45f 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
@@ -62,7 +62,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.22.1-free_font.patch
 )
 
-DOCS=( DEDICATION HACKING README.md ROADMAP )
+DOCS=( DEDICATION README.md ROADMAP )
 
 src_prepare() {
 	default
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 493d5d87db92..3fe9c11bc4d0 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -3,6 +3,7 @@ AUX mixxx-2.3.0-docs.patch 626 BLAKE2B 73eca9849d69112edd254bd28329b360c31434eb1
 AUX mixxx-2.3.1-benchmark_compile_fix.patch 220 BLAKE2B 28c5a7fe5e6e465bd7d9445e741d366341fadcb8d142961cf25d6b57aabcc453f74cbb0d3f63b01df5e65e7151a9e59545c50b52e732234ae6a734eb171cef82 SHA512 d301a87760a0162a9e09e08dd544183219776c61d2810d75c37d39a9ac9fcf8a329681e53ca922864ccafeb98231cbeea565db2196e56bf62417a09b40bae4b8
 AUX mixxx-9999-docs.patch 469 BLAKE2B 6daf15a450b79fb85deb9a218c5762e26bc3a88e92f96fc73575ac64eb9731945e3fc95d63e3f4b391f07263dc2ec56820ca486725971cf35ee223afd30dede9 SHA512 76d18e26ccdfb0bfda9bb7563a5012e567b2546dee8014da9070a8654d93fd548475293ae9cbd1914407727b146738e6ba5647229acc41b43f1405cd8efe5d80
 DIST mixxx-2.3.2.tar.gz 40138947 BLAKE2B 9ec1d871d3051f081152f07fdafd6c5e2bb41224e723dc260afe27755fdcd87befd2cb5ecaa2d0fb6d7ee9fb1b97c12db4b8d0a29e695a3ff1a7fb51b94ebfa4 SHA512 81282d6c587914157b9ef4a7ca2f0e886cb97a847e215e2b0496671938d392e3fc8f941071577bc69db517e677dcd96b72e4b53d6fd42d2224c8a4e62d2acbcd
+DIST mixxx-2.3.3.tar.gz 41011867 BLAKE2B 1b3d863341afbdce86c61c4689494a334a689d02aaf5a700aa74d3291843f028d77ef7d62e545d05377ffb1f9a5077529c3a77a2b4a5e8ce20823728a8fe8d80 SHA512 6bd3809802f2f66af7d840db6ce006d7e46a824cf460ea9ae1bcff81f17483debd2ef47fd68d0da82671afaf01b6c3bc2522e02b41d992e08bc98f4d3d68120f
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 0572da067016d6fd1a0e955cfa9daad319e633357532bad1143333a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c SHA512 965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
 DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76 SHA512 648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068
 DIST mixxx-manual-2.3-de.pdf 34069018 BLAKE2B bdcc970d37e43c2f1244aa1f03bc07287581711e534419caada3aabbc585e3006ec489e752142b5b50e526646d3d5431e0ec5924b9d6b31a92de4e7cc7efcc86 SHA512 fbbf27c4b898f856e61301bd1f26a3523bb97c133d96c8d94f1267c15ef63aa03313c18ebec62d4380c423c3896067ed1cedccbc775e5abc6d14e1baf8b668fc
@@ -26,7 +27,8 @@ DIST mixxx-manual-2.3-sr.pdf 34079603 BLAKE2B 83ed178b8b095928138c853b5300176316
 DIST mixxx-manual-2.3-tr.pdf 34062405 BLAKE2B 69b5f76b4e74aa0d48636ae3914a6f40e0104d509f76c0569f99348d17131926a564d7e43a73d34036c5a94be4b61a37645e7933b1dea2513c6d72d5d25334fc SHA512 b05f297f3000767e2a8a2319e56f0db73981418943a96d0822f4f3f51f29bbb5667cc0b487ef328f1d6d115013af705371668ef3081321b6980ea95834a40895
 DIST mixxx-manual-2.3-zh-CN.pdf 34165133 BLAKE2B 58e717082ace6824532392a282cd1452c279410c547fabc333b6adccaf47fb8e4bbac0c612f9679c8d85317e9b706e5fe10b7c1fc11a4325a14c5b3faafdda46 SHA512 995fb6c9bf1f729eaa08cd5b2003f21c76274f8f3046bd85b771cb86c429fa65cc50f0f4a36396e654a4378125157777b2f0f04a9343b20aa3aef76281395aec
 DIST mixxx-manual-2.3-zh-TW.pdf 34135938 BLAKE2B b5747b2156d686bb84166beb2c1552e0d998f3c402793444631c1f146c93fd8f6addb5fc34c0f59b16b2866994b8f64ee5670ab26c683d51b0c36d3f247dcf70 SHA512 55a5c3d5064c021f73a48dab5fb93094bc0f9220a1790518b043a21900dc6792a2fc01ee5c6def6338a3df09bcbb7441e1c8b2f23aac2aad2b2a5974babb8a9f
-EBUILD mixxx-2.3.2.ebuild 3761 BLAKE2B 062257f4adbc0198a597f98df5f9b171d076a5b2488d9f62ea68253cf4fb9b0e9be1a96b4371be22ee32c14fdeccdd424bd934076fe52f9f5ef54f3d0f7953d5 SHA512 5835012a8d904379886f0bc6c5cfbbf7e6c0e1ac1d42a9d65c826109aa74110a16bd2b4084ef9a882cbd3d50c80395f4e4a516af99d34825b8bca58dddbd4c5a
-EBUILD mixxx-2.3.9999.ebuild 3669 BLAKE2B ab37bd307fd31eb48915654fcddf740800e74c8f8f04a2b4ac9f7a0129201a471fae61edb0816b23093e3ed3c74cef281b78cb382f7b473471c2c280ac057f7b SHA512 8a38cfb4093a5455fd04a3ef56540bde82d4a64c65c80dc27a240a677c6c7ca6833a901c5a1f4cca1b2cf37b2c47007f4bd93e509df4eeae5027142ad0172ae3
-EBUILD mixxx-9999.ebuild 2740 BLAKE2B 1fc346b62b137915adf3b992ffdddbc1c3ed9eec8b8e854e2f8894b00616c6bade501b856fc40b5061909499209be642b7e0dbd90dbe83ca9a6018dc5d63acb5 SHA512 1f07442ea9b628b1e7dfce44735b570db611725fefdc4d9015e01923050dae3dfd95fb4d34d24ea91e42ac71b8750fc425f6f00ee6a991445755369048ad2e26
+EBUILD mixxx-2.3.2.ebuild 3859 BLAKE2B f16bb13d68f53b6d5bfb32a6d70a554e1cdf8319ba1b119bb6cefc9f21af6e0c6e6557d334231eaf76161fab76e125121f6c4ad6425479a7df4b319944dfa990 SHA512 3636ffdb17755ddfd2da4fae0165dfa2c975bec20dbe91b8881b5cee6866ac682bd60be1bbbb1aec3b11a09bac6ff2b50a51a83c764529a3668a8728165c731f
+EBUILD mixxx-2.3.3.ebuild 3861 BLAKE2B b49f181045c3948cd797fda52bcc34bb1d33775fe43734a1a5fbb0974f9835647647933631deb54be6be2b94dde7e0ea631dba985ddd192578cc4b2273fe8aef SHA512 812c286953d568315ee25467fd7a20495867fa953e32d0d44f81a2d343da0fbe05f52fd8a906a5d5f0900a4dbfff3b7b17d4b34f8d4eb0a6b0d0ee74e46fcaeb
+EBUILD mixxx-2.3.9999.ebuild 3767 BLAKE2B 9d4019cfb3ed76d1aa389d36f3280094a6cd6096b6a68bf7403a63821c1ae2a5372060861dd73089ea8e8956d82b63ff0ffd3cf7b81cbde491bfa3252a934111 SHA512 0d6b5a23a461b397039ae539aa85f28354c1489b5bde9b0d47a489644f2a40610044c45da264144567855f4276c96afe2f2daed2bfe9959f7bcef7f2d543e881
+EBUILD mixxx-9999.ebuild 2838 BLAKE2B 7b3371f5562b4c546547eb7aa0ad038045d19239d6e39bb9ac57498badc53ae6eb94f3dd1e48727412d27ba4b699e6b704c871761169aa609d75ecabb7430354 SHA512 46fb3746bbe94aa837654304c86651b8b27f9bee806ad292ba7957ca4c07efffe3d6aab40ce513b2b25e2bcf31a3afd18ec7550875c0e5fab2ba5794c2d24467
 MISC metadata.xml 903 BLAKE2B 1fd2e01da4d96a257d0ba595e67005e5233503f54ea17c81f65d105a61dc42f84df601cc112ff0a5e99393cbc53a0130b890d96a47cc2b88b59cbe7b9779654d SHA512 7e9dfd69240a57efbdaceb4dcfe71549d7a8c2edba5c81f956407e101cb62a0c51cf231e1e68c029783340189139309dde4fa3e995a231856ea094df09288cd8
diff --git a/media-sound/mixxx/mixxx-2.3.2.ebuild b/media-sound/mixxx/mixxx-2.3.2.ebuild
index 11a3b2cd1187..8261053464b3 100644
--- a/media-sound/mixxx/mixxx-2.3.2.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.2.ebuild
@@ -155,3 +155,13 @@ src_install() {
 		fi
 	done
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	udev_reload
+}
diff --git a/media-sound/mixxx/mixxx-2.3.3.ebuild b/media-sound/mixxx/mixxx-2.3.3.ebuild
new file mode 100644
index 000000000000..527500bba678
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.3.3.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg udev
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	if [[ "${PV}" == ?.?.9999 ]] ; then
+		EGIT_BRANCH=${PV%.9999}
+	fi
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack"
+
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:0=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libebur128
+	media-libs/libid3tag:=
+	media-libs/libogg
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	media-libs/libvorbis
+	media-libs/portaudio[alsa]
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	media-sound/lame
+	sci-libs/fftw:3.0=
+	sys-power/upower
+	virtual/glu
+	virtual/libusb:1
+	virtual/opengl
+	virtual/udev
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	hid? ( dev-libs/hidapi )
+	keyfinder? ( media-libs/libkeyfinder )
+	lv2? ( media-libs/lilv )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	qtkeychain? ( dev-libs/qtkeychain )
+	wavpack? ( media-sound/wavpack )
+	"
+	# libshout-idjc-2.4.6 is required. Please check and re-add once it's
+	# available in ::gentoo
+	# Meanwhile we're using the bundled libshout-idjc. See bug #775443
+	#shout? ( >=media-libs/libshout-idjc-2.4.6 )
+
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
+BDEPEND="virtual/pkgconfig
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0-docs.patch
+	"${FILESDIR}"/${PN}-2.3.0-cmake.patch
+	"${FILESDIR}"/${PN}-2.3.1-benchmark_compile_fix.patch
+)
+
+PLOCALES="
+	ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN zh-TW
+"
+
+mixxx_set_globals() {
+	local lang
+	local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/$(ver_cut 1-2)"
+	for lang in ${PLOCALES} ; do
+		SRC_URI+=" l10n_${lang}? ( ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-${lang/ja/ja-JP}.pdf )"
+		IUSE+=" l10n_${lang/ en/ +en}"
+	done
+	SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-en.pdf"
+}
+mixxx_set_globals
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Not available on Linux yet and requires additional deps
+		-DBATTERY="off"
+		-DBROADCAST="$(usex shout on off)"
+		-DCCACHE_SUPPORT="off"
+		-DFAAD="$(usex aac on off)"
+		-DFFMPEG="$(usex ffmpeg on off)"
+		-DHID="$(usex hid on off)"
+		-DINSTALL_USER_UDEV_RULES=OFF
+		-DKEYFINDER="$(usex keyfinder on off)"
+		-DLILV="$(usex lv2 on off)"
+		-DMAD="$(usex mp3 on off)"
+		-DMODPLUG="$(usex modplug on off)"
+		-DOPTIMIZE="off"
+		-DOPUS="$(usex opus on off)"
+		-DQTKEYCHAIN="$(usex qtkeychain on off)"
+		-DVINYLCONTROL="on"
+		-DWAVPACK="$(usex wavpack on off)"
+	)
+
+	if [[ "${PV}" == 9999 ]] ; then
+		mycmakeargs+=(
+			-DENGINEPRIME="OFF"
+
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
+	dodoc README.md CHANGELOG.md
+	local locale
+	for locale in ${PLOCALES} ; do
+		if use l10n_${locale} ; then
+			dodoc "${DISTDIR}"/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf
+		fi
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	udev_reload
+}
diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild
index 8d7a94aca60b..ef33c268c4fe 100644
--- a/media-sound/mixxx/mixxx-2.3.9999.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg udev
 
@@ -153,3 +153,13 @@ src_install() {
 		fi
 	done
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	udev_reload
+}
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 8b5963df7ac6..3b37660dc9e1 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg udev
 
@@ -129,3 +129,13 @@ src_install() {
 		dodoc README Mixxx-Manual.pdf
 	fi
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	udev_reload
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	udev_reload
+}
diff --git a/media-sound/patchage/Manifest b/media-sound/patchage/Manifest
index 32dcb9937202..d1b6fb518070 100644
--- a/media-sound/patchage/Manifest
+++ b/media-sound/patchage/Manifest
@@ -1,6 +1,3 @@
-AUX patchage-1.0.4-fix-compilation.patch 1561 BLAKE2B 53f1fe7f55170de0d9e4261dbac98c1bd0d964fdd5644bf4d431b76758829f2bb183a84644f714813a03d666a4630e3b38bf1a171c7534d3bc5487ca8566ebe7 SHA512 00d4bf65a9ba73fdce5690f23ef80c84c02b532dd607025ddf28f19b5cb8e81c2d661e61b6b1ea31e2783c72ee1650f1befe01df1b52c0413d9f02438bce253b
-DIST patchage-1.0.4.tar.bz2 661824 BLAKE2B 3e56b7513e19e0acb1ef524ba7d7754699abdb6a968547f7a545c8651f23a33c209b9728dae01d839022ec380185a1673ff58733c1553007a6a3b7c889aa7f03 SHA512 665d81ca16c1052f71c3037d2ad8f9a6120b09a323999468484dda1b4c4b567c36728ebe38c54152406b63a4107f04764d0dede52302bc7a7b124e82132749fb
 DIST patchage-1.0.6.tar.bz2 664841 BLAKE2B 72d0de6d12e07ec160f4c59c51f138e1220a1b8994bdab90f56dd715bf16b6f561836d184ec5d5077de3bc7bb5c6778ea2b7bcbf0b33230be662f2b729eac568 SHA512 b7aedcb07da0c81842929833ab93a0b20c08e465bf05ebb4e47670d295c0d4d0d50f0f74001d9264c2c23ef08d3881232e7622ecf101d1d53ffcae2f8c0f31d3
-EBUILD patchage-1.0.4.ebuild 951 BLAKE2B a224d38a2bad4119fb798bb823537d82410a8ecbe76a047d26d4d24ee6f10555db9be4359426a58cea963e9a54791aafd3d78c7ff7a3f033932d5f490159c746 SHA512 1770a22ccb29e87f00c9b2f6ffc1b08d76ea5067a27793bf56bc8bf0ad8dc30526295754a426e184a2d53ef5f53a45f2c6d1cb1a1cd4365dc4134f763ab22363
 EBUILD patchage-1.0.6.ebuild 918 BLAKE2B 4455184ad29ce50c102d6f13705bfbec72424db030301ed5f4d8d87fb97596ee5dd926b76848bfc2dc36524243f99cd603db43667c9f8318515f4688bc149830 SHA512 8127a176c9a09d8697297cfa46d9fab895b0cdf5f72af3d1c9d18824cb3e062c4bf7ef222483e4a964cdc42656c6303c68b68ca8183ccbe1ce4427402582828c
 MISC metadata.xml 427 BLAKE2B a77d10e847d1ceb32b0ba9ba22a723df471d751c6ecd7ddc849f13fea71c451b9a0c7959687ba09efd23ca7dd6ffd7a77e00abd69021f5ecfeacde0680fa0814 SHA512 3ed9c62eb59dad36bd4477bcdbb95eeff21fcf8ac8c989814d24e288e58b7032452acbce472a191c8151551071b86274fdb935ae6ef5cb916a4b22510ec96789
diff --git a/media-sound/patchage/files/patchage-1.0.4-fix-compilation.patch b/media-sound/patchage/files/patchage-1.0.4-fix-compilation.patch
deleted file mode 100644
index aace519e630d..000000000000
--- a/media-sound/patchage/files/patchage-1.0.4-fix-compilation.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp
-index 23c12f2..f49a522 100644
---- a/src/JackDbusDriver.cpp
-+++ b/src/JackDbusDriver.cpp
-@@ -24,6 +24,7 @@
- #include "SignalDirection.hpp"
- #include "make_jack_driver.hpp"
- #include "warnings.hpp"
-+#include "AudioDriver.hpp"
- 
- PATCHAGE_DISABLE_FMT_WARNINGS
- #include <fmt/core.h>
-@@ -61,7 +62,7 @@ namespace {
- class JackDriver : public AudioDriver
- {
- public:
--  explicit JackDriver(ILog& log, EventSink emit_event);
-+  explicit JackDriver(ILog& log, Driver::EventSink emit_event);
- 
-   JackDriver(const JackDriver&) = delete;
-   JackDriver& operator=(const JackDriver&) = delete;
-@@ -75,7 +76,7 @@ public:
-   void attach(bool launch_daemon) override;
-   void detach() override;
-   bool is_attached() const override;
--  void refresh(const EventSink& sink) override;
-+  void refresh(const Driver::EventSink& sink) override;
-   bool connect(const PortID& tail_id, const PortID& head_id) override;
-   bool disconnect(const PortID& tail_id, const PortID& head_id) override;
- 
-@@ -129,7 +130,7 @@ private:
-   dbus_uint64_t _graph_version;
- };
- 
--JackDriver::JackDriver(ILog& log, EventSink emit_event)
-+JackDriver::JackDriver(ILog& log, Driver::EventSink emit_event)
-   : AudioDriver{std::move(emit_event)}
-   , _log(log)
-   , _dbus_error()
-@@ -584,7 +585,7 @@ JackDriver::is_attached() const
- }
- 
- void
--JackDriver::refresh(const EventSink& sink)
-+JackDriver::refresh(const Driver::EventSink& sink)
- {
-   DBusMessage*    reply_ptr              = nullptr;
-   DBusMessageIter iter                   = {};
diff --git a/media-sound/patchage/patchage-1.0.4.ebuild b/media-sound/patchage/patchage-1.0.4.ebuild
deleted file mode 100644
index b9a415d93c20..000000000000
--- a/media-sound/patchage/patchage-1.0.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-inherit waf-utils python-any-r1 xdg
-
-DESCRIPTION="Modular patch bay for JACK-based audio and MIDI systems"
-HOMEPAGE="http://drobilla.net/software/patchage"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug jack-dbus"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/boost
-	virtual/pkgconfig
-"
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	media-libs/ganv
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	jack-dbus? (
-		dev-libs/dbus-glib
-		sys-apps/dbus
-	)"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-compilation.patch"
-)
-
-src_configure() {
-	waf-utils_src_configure \
-		$(use debug && echo "--debug") \
-		$(use alsa || echo "--no-alsa") \
-		$(use jack-dbus && echo "--jack-dbus")
-}
diff --git a/media-sound/sooperlooper/Manifest b/media-sound/sooperlooper/Manifest
index c7ad0315daed..7e3482d14a37 100644
--- a/media-sound/sooperlooper/Manifest
+++ b/media-sound/sooperlooper/Manifest
@@ -1,4 +1,4 @@
 DIST sooperlooper-1.6.5-m4.tar.bz2 1463 BLAKE2B b02010f5aae113078d167b65a8ab232673eac622ae6595d23f4759fafa05aeb503ea30ace950b3e9cb4d85abe92af7eda13e4c5a3199630c83f2761c812bc9f7 SHA512 01b4405dcd91e617c8dafb9fcfab99507d0a9637d9b0eec84276c348968e31159b68ce5c8b7f900ab8a830f2b5c91b798146d5272d006a2b866f149e485f228d
 DIST sooperlooper-1.7.4.tar.gz 857069 BLAKE2B 0e7f13195a73ec9e41deaf93443c612bd2e44a3133dcc5685a3da497bfdc2acb24c5de33ea853c79e3c1a13c552d19f06370d96fe8fd17569c6e94541d035f5f SHA512 f2921346759ad3821c43cc75d77e3a5b3a5433e03204048580e36cd2cddb08bd2447e509e01e01fcce4585a1759a913fd01fd098a50d9bcdb30f8dde6cc509c2
 EBUILD sooperlooper-1.7.4.ebuild 1330 BLAKE2B cbf211a937dbc3d4e11a276c61c18438a2c1dc61ebaf366bc4ce53d88827454d8494f459c220c5d33496fa2a5d9047ef8a9c2982e4141c23f881217cc4e34064 SHA512 c366b1f0ff061b4460d18ea4a7f386f909bb358073fad346ebd6c1f8e6d2afc2ff472066a7b84d456cd9c3895293454dc6873f8ea52d3e77027e93a8bc3a33df
-MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
+MISC metadata.xml 337 BLAKE2B b93bb5a5de4848fa69ba5ccade6c4464edd6f15c45e0490735f8dbd0aa227da70f47f7c335a2b4a1592db387c93a8e7f677c399ab37055404635016a6cf3bb5d SHA512 610383ba6ffd7b37a2ef859640e0a0096c85aa9f9c68eb376b22a865998ea364ef28c61fe4b47a9d9d6c3cdbeb575be727b399059be81b27e58a5d2053259b73
diff --git a/media-sound/sooperlooper/metadata.xml b/media-sound/sooperlooper/metadata.xml
index b69a849fd57e..180951d3dba1 100644
--- a/media-sound/sooperlooper/metadata.xml
+++ b/media-sound/sooperlooper/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">essej/sooperlooper</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 784a2ecba5a1..1d281b95dda2 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -6,6 +6,9 @@ AUX ts3server.ini-r2 721 BLAKE2B 8427ffb88e2856b0807fe3c3ed2411039fe330f65322cca
 AUX ts3server_mariadb.ini.sample-r2 762 BLAKE2B c70d4c7e375a9ab43ca9c1c4cadea9843009e7004f38734f7f2d8da3e3e86d83a2301d713b6bffee4e14ad04ef08c05bdae5e7daec4a8678ef3b9b5348824d2b SHA512 c2a4468288251e39e4061363016f6146aceae4c7f19c0e962341748ada5127e0b80380c75d217b1a2d1716c6e53c669aed34d75258b22f32c7f0ffb50b759288
 AUX ts3server_postgresql.ini.sample 768 BLAKE2B a8a8e9255012dda70d2096c793c44f22978cab1e2a632f3abbb81f288d9d8716e76727c6edde33146ff4e7dc08da43c7996565c8c05a27ca4f17e1bb02f095d3 SHA512 293917b6310d456e51fc72cf967cb2a0f99ec38b7a62550f2358d1996841d1aa15c0169945884a10799fb72f9831d9d12d4f2a535d1480f8fbaa6b23c9f4cf21
 DIST teamspeak3-server_linux_amd64-3.13.6.tar.bz2 9948972 BLAKE2B 397e96751e6688b5579ff7828e4998e3b26183b0b10980e89748d51207428059e7d8cfa6f2f6fb961b77f735f61e1ba00ac13a077c76b5d22a7b2abb28d67e48 SHA512 dc007cdc924fd284da4a206cf615816b53c2f03ccb2573a29aa2bce6874e09ce5764a3953f8e84de8a3cc02aee306b1505d8c7edf8d48713bbf5f172c3be3422
+DIST teamspeak3-server_linux_amd64-3.13.7.tar.bz2 9968877 BLAKE2B 7c2f200b1e3a3184005aab213acc681326e16a776f529dbdac900f5b9a6ee9d91883d1aabfe4526e52e9a706a4856366291f061efc6eff581216d7450746322d SHA512 cd026e0c51d8269bd6965f9f274ff6478d4e179d23ee1b00f93a887997985b97afcb7eda05e34150d6fe0610f2715a61989a7f3ca05994067e71b9d3171e2962
 DIST teamspeak3-server_linux_x86-3.13.6.tar.bz2 9785491 BLAKE2B f0d196a72e9a4283006c4dfd9a1d86e96a3b435d8bf14dfca178ea0240e94b88bcf3b9e20b6c99638e04019065fa79d28ac2d9ad452e306c4c27966e32464c69 SHA512 ef124964590c106bacd3bc98847a5e8f64fbbf69ccb2a216f9af6548f5f2d200c0bd307d283f48cb08c254fddb92fe03f6cff2c3c87e7ca593edf3023b053bee
+DIST teamspeak3-server_linux_x86-3.13.7.tar.bz2 9820644 BLAKE2B 37789bfe4c544b8eeb28a34d1fae933e2d2a11b23e85a6de66ac4c9772a061860803a3a767227d787efd90f7aa031b3ca77b229acca554aebd69f1f78b28128c SHA512 04278359a03cb9f8bc6db48b54976020da6a44629f17b503378bf0ffe554da838193ba590ab895e97c96e026aa87d96a3e167a009710adc4b9b03193d496201d
 EBUILD teamspeak-server-3.13.6-r1.ebuild 3510 BLAKE2B 1cc38840e47143772fe861213a2600cc1c2d0cf49573f33dd17709a0cac406d495b2ee3b20b21d726d12b16fd1c8e90d43a50f7bf7d716b0a286a15531bc23bd SHA512 923e0a4e1f22b74d4a9f0f7d5abd430b046086c8cb129c7ff1e754781d7b20ace30836a7913b95ffc6890ff5317d4021f0d182edf7494bff8d3ea37a790188b2
+EBUILD teamspeak-server-3.13.7.ebuild 3512 BLAKE2B 3d6f944642de423c000c62f1e6881b35d4d1df2512c0588a78f25d177301bceece967f32dc63ef9a4b0a31bccdcb53d8227b40f5ad4c38f3da12453130faa075 SHA512 2e83ca71bee8e8959f877fac3fc13adba2c8e72524e53946a913e8638b0bbe0fc17c8ed817d301240d5c2015efb9f8471a5968029206729557cfc67fd7ccdd09
 MISC metadata.xml 704 BLAKE2B 68e04b7596542e2549233e228e8db2bf5943c2b859133b55a41800ef7048730e5298ee5cc5d034e8ec2f4187230f1bf470c2195d2c88b451faaf4ae0b6f53128 SHA512 f517abc5ee9903df810da51cd0fa86fd8c4b9bfcae05816d6d2596e645a59a1596007da5634ce33d3cb7efcf252b238dc197da0dc992b06654b17f12a1f5b239
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.13.7.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.13.7.ebuild
new file mode 100644
index 000000000000..9ecdd00b61b5
--- /dev/null
+++ b/media-sound/teamspeak-server/teamspeak-server-3.13.7.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="A server software for hosting quality voice communication via the internet"
+HOMEPAGE="https://www.teamspeak.com/"
+SRC_URI="
+	amd64? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
+	x86? ( https://files.teamspeak-services.com/releases/server/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc mysql postgres tsdns"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/teamspeak
+	acct-user/teamspeak
+	postgres? ( dev-db/postgresql )
+"
+
+QA_PREBUILT="
+	opt/teamspeak3-server/libmariadb.so.2
+	opt/teamspeak3-server/libts3db_mariadb.so
+	opt/teamspeak3-server/libts3db_postgresql.so
+	opt/teamspeak3-server/libts3db_sqlite3.so
+	opt/teamspeak3-server/libts3_ssh.so
+	opt/teamspeak3-server/ts3server
+	opt/teamspeak3-server/tsdnsserver
+"
+
+src_unpack() {
+	default
+
+	mv teamspeak3-server_linux_$(usex amd64 amd64 x86) "${P}" || die
+}
+
+src_install() {
+	diropts -o teamspeak -g teamspeak
+	keepdir /opt/teamspeak3-server /var/log/teamspeak3-server
+
+	diropts
+	keepdir /etc/teamspeak3-server
+
+	touch "${ED}"/opt/teamspeak3-server/.ts3server_license_accepted || die
+
+	exeinto /opt/teamspeak3-server
+	doexe ts3server
+
+	dodir /opt/bin
+	dosym ../teamspeak3-server/ts3server /opt/bin/ts3server
+
+	exeinto /opt/teamspeak3-server
+	doexe libts3db_sqlite3.so libts3_ssh.so
+
+	insinto /opt/teamspeak3-server/serverquerydocs
+	doins -r serverquerydocs/.
+
+	insinto /opt/teamspeak3-server/sql
+	doins sql/*.sql
+	doins -r sql/create_sqlite
+
+	insinto /etc/teamspeak3-server
+	newins "${FILESDIR}"/ts3server.ini-r2 ts3server.ini
+
+	dodoc CHANGELOG
+	docinto ts3server
+	dodoc doc/*.{md,txt}
+
+	newinitd "${FILESDIR}"/teamspeak.initd-r1 teamspeak3-server
+	systemd_newunit "${FILESDIR}"/teamspeak.service teamspeak3-server.service
+
+	newenvd - 99teamspeak3-server <<- EOF
+		CONFIG_PROTECT="/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini /etc/teamspeak3-server/tsdns_settings.ini"
+	EOF
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/serverquery/.
+	fi
+
+	if use mysql; then
+		insinto /etc/teamspeak3-server
+		newins "${FILESDIR}"/ts3server_mariadb.ini.sample-r2 ts3server_mariadb.ini.sample
+		doins "${FILESDIR}"/ts3db_mariadb.ini.sample
+
+		exeinto /opt/teamspeak3-server
+		doexe libts3db_mariadb.so
+		doexe redist/libmariadb.so.2
+
+		insinto /opt/teamspeak3-server/sql
+		doins -r sql/create_mariadb
+		doins -r sql/updates_and_fixes
+	fi
+
+	if use postgres; then
+		insinto /etc/teamspeak3-server
+		doins "${FILESDIR}"/ts3server_postgresql.ini.sample
+		doins "${FILESDIR}"/ts3db_postgresql.ini.sample
+
+		exeinto /opt/teamspeak3-server
+		doexe libts3db_postgresql.so
+
+		insinto /opt/teamspeak3-server/sql
+		doins -r sql/create_postgresql
+		doins -r sql/updates_and_fixes
+	fi
+
+	if use tsdns; then
+		exeinto /opt/teamspeak3-server
+		doexe tsdns/tsdnsserver
+		dodir /opt/bin
+		dosym ../teamspeak3-server/tsdnsserver /opt/bin/tsdnsserver
+
+		insinto /etc/teamspeak3-server
+		doins tsdns/tsdns_settings.ini.sample
+
+		docinto tsdns
+		dodoc tsdns/{README,USAGE}
+	fi
+}
+
+pkg_postinst() {
+	elog "If you have a license,"
+	elog "put it in /opt/teamspeak3-server named as licensekey.dat."
+	elog "Please note, that the license must be writeable by the teamspeak user,"
+	elog "as it will be automatically updated every six months."
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 3159135473b5..9018a78a79e4 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 4e18c9f2c1dd..23669e13a1d3 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 23 Jun 2022 07:09:34 +0000
+Sat, 25 Jun 2022 16:39:36 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index de4d69e0ccd4..170944b9caf8 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-06-23T07:09:37Z
+TIMESTAMP 2022-06-25T16:39:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmK0EbFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmK3OktfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBEVg//R/+8W70cjFn2rkb6O4uaPYmXd17gz1sxBtE0u5Zr+aRkdqgxnqr1Uj/e
-1xwj9kl2OVPlkOIC437TA8VDsk9SN5UNJRmNfzrNXU7GjVDWA/KUgZI+hXBIp2LN
-pRtW+VwyWJtHcnlVv5ReNu73v/5LBPm4I5q0dmeESatfFdvkqqVVmU6OEAB/EF5N
-FYWUxM4TZq9aTJE1xXrV2PCo+qziKanYnsS6mJnoRGjtzXLH0ECEx1tnwNzIXanD
-kA0Gt2gB6e3/fNAX9/AkHRTOTCdVk6lTzsRJJOJxWhAWL4PgD0eryphjTDDsVA1H
-g4fLQGF/napA5ELAXAEs+q3MaNV3eUSbIlLOwAvlk0V1iOplVDudmoLrXrggU8TF
-iELEe0LcqLunpd1mE25U9nOsKq6qElWUZatRJYeItMtMJHniOyvAFaiAa72vaTRW
-ibxAp/pw9BZKZqst2SWZh5WTgmG8AGaiSYY1tQ+v+DeolfWY91C7pfG+0zmob1XP
-GRSUY6sVXLLAs+f5DBFBFCVn+GPHB3+QQ2WTf4v0jSl7gDJd7+BzlHsMdJAtKYZe
-P9kFKmkccH7IfJZFPXfnF1pRXdptkvTVi44g+f4sOl61uUhZIZ7LrCxKwflMRhK8
-tjsgzNbE6vqbe7nRG+zD6tvJzfPelKeXpb2yjWw3iBHCEc5vxEs=
-=OCnd
+klCaLRAAjiMct0lh7ue0fcEbyUBBXp+krpF4M5wy5ru4ssFxtEC2ETKCxvSieHg9
+MFqgGoplxVJmVPw5X5ijWJJcBF5/E0HjM47RS6HFbukXMid5slFxc6kD+e0QoVzr
+2Qt8t1/myai4WMO8C0NptX00KazoCg6tKxORN+fOsPnfBfkh9Ai+hAJO1pscPSJG
+zKxfKX5Md3GltRMfpiPYeCEX1VYkyQCCjrD8SV157Pbc/jRujwMIRasr78llymif
+SRf0D6ZcbnGX4r4z0EEA3xgNfvHXopfEECjL2MuW7z+1l1/jaB6rDZd/f2LLxMeS
+asjm5izTl5vNe5TUmcFrt7spsNoWy/pxpi2zPsMqCZ5Rfwh8dUPe9bXts7KWg86S
++7apntPR7wjM0wmaoBR5rJUlDORCF/nQQ2YZ2p/oHSsVwdVK3XxazmybpZ7MScbG
+XKXOd8abI2cfAf6AHv2DGjgkekJWfpLKrFvggI39oyDC/t3s2hIf6Sla/A1+rAs/
+SPcU/1Ly/kSBpfroYiE0JglGN2O75t87WVizPuln8lDH1p+u/zctFwqN+pK6w/UD
+ad49mceC0YloCzUzv51KXHo+dEqRkJZn5h4MaFJ+2y9/1tp2ZQoVZhjrOCNNu2rV
+4g4QIpgZU+dg6bmJj9+Is0arbx+kL6UVxSkr67a8EhBICG9rXWc=
+=hEP5
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4e18c9f2c1dd..23669e13a1d3 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 23 Jun 2022 07:09:34 +0000
+Sat, 25 Jun 2022 16:39:36 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 150cc12cde72..1ef3d4592256 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 8266009fd1b2..e7c510bcd78d 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-r1 b/metadata/md5-cache/app-accessibility/speech-tools-2.5.0-r1
new file mode 100644
index 000000000000..e93208da4b1d
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/speech-tools-2.5.0-r1
@@ -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 >=sys-devel/libtool-2.4
+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=http://www.cstr.ed.ac.uk/projects/speech_tools/
+INHERIT=autotools 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	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=52ae52cd93370a0f78621d903e396c9e
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 63a6306ae8a0..92e5255672ba 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/apache-tools-2.4.54 b/metadata/md5-cache/app-admin/apache-tools-2.4.54
index a0f26c7e32eb..0b9f5f3bd436 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.54
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.54
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://httpd.apache.org/
 INHERIT=toolchain-funcs
 IUSE=ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre virtual/libcrypt:= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.54.tar.bz2
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6093b18268681d5dcce338ae5e920c3e
+_md5_=8a0e5507eada9f2c12b03532478d2bc0
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.15 b/metadata/md5-cache/app-admin/awscli-1.25.15
new file mode 100644
index 000000000000..bbdc2f07cae9
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.15
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+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_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.25.15.tar.gz -> aws-cli-1.25.15.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a47ec3f6b9c6b798cadd95af86a98247
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.16 b/metadata/md5-cache/app-admin/awscli-1.25.16
new file mode 100644
index 000000000000..76c518d20fc4
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.16
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+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_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.25.16.tar.gz -> aws-cli-1.25.16.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a47ec3f6b9c6b798cadd95af86a98247
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.17 b/metadata/md5-cache/app-admin/awscli-1.25.17
new file mode 100644
index 000000000000..d69298ee2a59
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.17
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+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_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.25.17.tar.gz -> aws-cli-1.25.17.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a47ec3f6b9c6b798cadd95af86a98247
diff --git a/metadata/md5-cache/app-admin/consul-template-0.29.1 b/metadata/md5-cache/app-admin/consul-template-0.29.1
new file mode 100644
index 000000000000..43a5da43fc24
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-template-0.29.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=acct-group/consul-template acct-user/consul-template
+DESCRIPTION=Generic template rendering and notifications with Consul
+EAPI=7
+HOMEPAGE=https://github.com/hashicorp/consul-template
+INHERIT=go-module systemd
+KEYWORDS=~amd64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2
+RDEPEND=acct-group/consul-template acct-user/consul-template
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul-template/archive/refs/tags/v0.29.1.tar.gz -> consul-template-0.29.1.tar.gz https://dev.gentoo.org/~zmedico/dist/consul-template-0.29.1-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=9765149f446d9b92f64855290893a3fb
diff --git a/metadata/md5-cache/app-admin/entr-5.2 b/metadata/md5-cache/app-admin/entr-5.2
new file mode 100644
index 000000000000..5be77b0a3007
--- /dev/null
+++ b/metadata/md5-cache/app-admin/entr-5.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure test
+DESCRIPTION=Run arbitrary commands when files change
+EAPI=8
+HOMEPAGE=https://eradman.com/entrproject/ https://github.com/eradman/entr
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=ISC
+SLOT=0
+SRC_URI=https://eradman.com/entrproject/code/entr-5.2.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=2f92141d3cca22d13a94c8a495def773
diff --git a/metadata/md5-cache/app-admin/rasdaemon-0.6.7-r1 b/metadata/md5-cache/app-admin/rasdaemon-0.6.7-r1
index 849ae17681c8..1bb6a34bbd65 100644
--- a/metadata/md5-cache/app-admin/rasdaemon-0.6.7-r1
+++ b/metadata/md5-cache/app-admin/rasdaemon-0.6.7-r1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://www.infradead.org/~mchehab/rasdaemon/
 INHERIT=autotools flag-o-matic linux-info systemd
 IUSE=sqlite
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=sys-devel/gettext sys-apps/dmidecode sqlite? ( dev-db/sqlite dev-perl/DBD-SQLite ) elibc_musl? ( sys-libs/argp-standalone )
 SLOT=0
 SRC_URI=http://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.6.7.tar.bz2
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=df8927d0a97818cf3648ba7f251f33ee
+_md5_=ddcb9d3af0b168c7362fd8864223b323
diff --git a/metadata/md5-cache/app-admin/selint-1.1.0 b/metadata/md5-cache/app-admin/selint-1.1.0
deleted file mode 100644
index 8282953bef90..000000000000
--- a/metadata/md5-cache/app-admin/selint-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/confuse:= dev-libs/uthash test? ( dev-libs/check )
-DESCRIPTION=Policy Analysis Tools for SELinux
-EAPI=7
-HOMEPAGE=https://github.com/TresysTechnology/selint/wiki
-INHERIT=toolchain-funcs
-IUSE=test
-KEYWORDS=amd64 ~arm x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/confuse:= dev-libs/uthash
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/TresysTechnology/selint/releases/download/v1.1.0/selint-1.1.0.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7138f0ad661832f2e43e60a05eb50e12
diff --git a/metadata/md5-cache/app-admin/selint-1.2.0 b/metadata/md5-cache/app-admin/selint-1.2.0
index a70170465089..a9dedc78c3b5 100644
--- a/metadata/md5-cache/app-admin/selint-1.2.0
+++ b/metadata/md5-cache/app-admin/selint-1.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/confuse:= dev-libs/uthash test? ( dev-libs/check )
+DEPEND=dev-libs/confuse:= dev-libs/uthash elibc_musl? ( sys-libs/fts-standalone ) test? ( dev-libs/check )
 DESCRIPTION=Static code analysis of refpolicy style SELinux policy
 EAPI=7
 HOMEPAGE=https://github.com/TresysTechnology/selint/wiki
-INHERIT=toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=test
 KEYWORDS=amd64 ~arm x86
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/confuse:= dev-libs/uthash
+RDEPEND=dev-libs/confuse:= dev-libs/uthash elibc_musl? ( sys-libs/fts-standalone )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TresysTechnology/selint/releases/download/v1.2.0/selint-1.2.0.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4ce934bc0b494836bb0d6960ee3ea7d9
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=f22d8c6fd3057adf035246eabbb44bd4
diff --git a/metadata/md5-cache/app-admin/selint-1.2.1 b/metadata/md5-cache/app-admin/selint-1.2.1
index 22cbd5a34a8e..3c2c99041e2d 100644
--- a/metadata/md5-cache/app-admin/selint-1.2.1
+++ b/metadata/md5-cache/app-admin/selint-1.2.1
@@ -1,13 +1,15 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/confuse:= dev-libs/uthash test? ( dev-libs/check )
+DEPEND=dev-libs/confuse:= dev-libs/uthash elibc_musl? ( sys-libs/fts-standalone ) test? ( dev-libs/check )
 DESCRIPTION=Static code analysis of refpolicy style SELinux policy
 EAPI=8
 HOMEPAGE=https://github.com/TresysTechnology/selint/wiki
+INHERIT=flag-o-matic
 IUSE=test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/confuse:= dev-libs/uthash
+RDEPEND=dev-libs/confuse:= dev-libs/uthash elibc_musl? ( sys-libs/fts-standalone )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TresysTechnology/selint/releases/download/v1.2.1/selint-1.2.1.tar.gz
-_md5_=4766c88deb78c80a4b98c53f775a803e
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=ee14742e8cc44df0bdef0d0c89381f96
diff --git a/metadata/md5-cache/app-admin/selint-9999 b/metadata/md5-cache/app-admin/selint-9999
index 583e1fd753b8..28dfa8b70694 100644
--- a/metadata/md5-cache/app-admin/selint-9999
+++ b/metadata/md5-cache/app-admin/selint-9999
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure prepare unpack
-DEPEND=dev-libs/confuse:= dev-libs/uthash test? ( dev-libs/check )
+DEPEND=dev-libs/confuse:= dev-libs/uthash elibc_musl? ( sys-libs/fts-standalone ) test? ( dev-libs/check )
 DESCRIPTION=Static code analysis of refpolicy style SELinux policy
 EAPI=8
 HOMEPAGE=https://github.com/TresysTechnology/selint/wiki
-INHERIT=autotools git-r3
+INHERIT=flag-o-matic autotools git-r3
 IUSE=test
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-libs/confuse:= dev-libs/uthash
+RDEPEND=dev-libs/confuse:= dev-libs/uthash elibc_musl? ( sys-libs/fts-standalone )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4766c88deb78c80a4b98c53f775a803e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=ee14742e8cc44df0bdef0d0c89381f96
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 1f6d63fffc38..ad3fd5f590aa 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/geekbench-5.4.4 b/metadata/md5-cache/app-benchmarks/geekbench-5.4.4
deleted file mode 100644
index 57af790025f7..000000000000
--- a/metadata/md5-cache/app-benchmarks/geekbench-5.4.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch postinst
-DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
-EAPI=8
-HOMEPAGE=https://www.geekbench.com/
-KEYWORDS=-* amd64
-LICENSE=geekbench
-RESTRICT=bindist mirror
-SLOT=5
-SRC_URI=https://cdn.geekbench.com/Geekbench-5.4.4-Linux.tar.gz
-_md5_=3592a4fbff27f693fe37b62445f36970
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-5.4.5 b/metadata/md5-cache/app-benchmarks/geekbench-5.4.5
index 69743792d2f7..9c5d5db010d9 100644
--- a/metadata/md5-cache/app-benchmarks/geekbench-5.4.5
+++ b/metadata/md5-cache/app-benchmarks/geekbench-5.4.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=install nofetch postinst
 DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
 EAPI=8
 HOMEPAGE=https://www.geekbench.com/
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=geekbench
 RESTRICT=bindist mirror
 SLOT=5
 SRC_URI=https://cdn.geekbench.com/Geekbench-5.4.5-Linux.tar.gz
-_md5_=41f00b65ff4bd1a169845fe7352e296b
+_md5_=3592a4fbff27f693fe37b62445f36970
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.14.01 b/metadata/md5-cache/app-benchmarks/stress-ng-0.14.02
similarity index 95%
rename from metadata/md5-cache/app-benchmarks/stress-ng-0.14.01
rename to metadata/md5-cache/app-benchmarks/stress-ng-0.14.02
index 4e1813b4ae96..7edfce056144 100644
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.14.01
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.14.02
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~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.14.01.tar.gz -> stress-ng-0.14.01.tar.gz
+SRC_URI=https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V0.14.02.tar.gz -> stress-ng-0.14.02.tar.gz
 _eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=4afdce1cf98d0a10b48dc443ef968ab8
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 06abcbe4dde5..41ba6bca49e5 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/libu2f-host-1.1.10-r1 b/metadata/md5-cache/app-crypt/libu2f-host-1.1.10-r1
new file mode 100644
index 000000000000..43997a69c227
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/libu2f-host-1.1.10-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=dev-libs/hidapi dev-libs/json-c:=
+DESCRIPTION=Yubico Universal 2nd Factor (U2F) Host C Library
+EAPI=8
+HOMEPAGE=https://developers.yubico.com/libu2f-host/
+INHERIT=linux-info udev
+IUSE=systemd
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-libs/hidapi dev-libs/json-c:= !systemd? ( acct-group/plugdev ) systemd? ( sys-apps/systemd[acl] )
+SLOT=0
+SRC_URI=https://developers.yubico.com/libu2f-host/Releases/libu2f-host-1.1.10.tar.xz
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=a9c4c68da1118366800cd8e2525314b8
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 33c8fb51711c..146146bac761 100644
Binary files a/metadata/md5-cache/app-dicts/Manifest.gz and b/metadata/md5-cache/app-dicts/Manifest.gz differ
diff --git a/metadata/md5-cache/app-dicts/aspell-da-4.0 b/metadata/md5-cache/app-dicts/aspell-da-4.0
new file mode 100644
index 000000000000..2c261e40b85c
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-da-4.0
@@ -0,0 +1,14 @@
+BDEPEND=sys-apps/which
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Danish) language dictionary
+EAPI=8
+HOMEPAGE=https://github.com/mortenivar/aspell-da
+INHERIT=aspell-dict-r1
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=https://github.com/mortenivar/aspell-da/archive/refs/tags/4.0.tar.gz -> aspell-da-4.0.tar.gz
+_eclasses_=aspell-dict-r1	dc35762817047596da90d52917261158
+_md5_=57a57dc154090fb7641f4468e943d56d
diff --git a/metadata/md5-cache/app-dicts/aspell-pl-6.0.20220601.0 b/metadata/md5-cache/app-dicts/aspell-pl-6.0.20220601.0
new file mode 100644
index 000000000000..e029473a684b
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/aspell-pl-6.0.20220601.0
@@ -0,0 +1,14 @@
+BDEPEND=sys-apps/which
+DEFINED_PHASES=configure install
+DEPEND=app-text/aspell
+DESCRIPTION=Aspell (Polish) language dictionary
+EAPI=8
+HOMEPAGE=https://sjp.pl/slownik/en/
+INHERIT=aspell-dict-r1
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0 CC-BY-4.0 GPL-2 LGPL-2.1 MPL-1.1
+RDEPEND=app-text/aspell
+SLOT=0
+SRC_URI=https://sjp.pl/slownik/ort/sjp-aspell6-pl-6.0_20220601-0.tar.bz2
+_eclasses_=aspell-dict-r1	dc35762817047596da90d52917261158
+_md5_=94fc0203ba71b57df31c46492fbaf9d4
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index f0530833ddeb..4db85c265214 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/demap-1.4.0 b/metadata/md5-cache/app-emacs/demap-1.4.0
new file mode 100644
index 000000000000..8b9f22e0d58c
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/demap-1.4.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-editors/emacs-25.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Detachable minimap for Emacs
+EAPI=8
+HOMEPAGE=https://gitlab.com/sawyerjgardner/demap.el/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-25.1:*
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.com/sawyerjgardner/demap.el/-/archive/v1.4.0/demap.el-v1.4.0.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=72ec36995aa05867826089897d926995
diff --git a/metadata/md5-cache/app-emacs/dts-mode-1.0 b/metadata/md5-cache/app-emacs/dts-mode-1.0
new file mode 100644
index 000000000000..5c03047831fd
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/dts-mode-1.0
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Emacs major mode for devicetree sources
+EAPI=8
+HOMEPAGE=https://github.com/bgamari/dts-mode https://elpa.gnu.org/packages/dts-mode.html
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://elpa.gnu.org/packages/dts-mode-1.0.tar
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=d480fafa9b3c8296ffe97488f8fe59e3
diff --git a/metadata/md5-cache/app-emacs/ebib-2.38 b/metadata/md5-cache/app-emacs/ebib-2.38
new file mode 100644
index 000000000000..822b88ba1aa9
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/ebib-2.38
@@ -0,0 +1,15 @@
+BDEPEND=app-emacs/parsebib test? ( app-emacs/ert-runner app-emacs/with-simulated-input ) >=app-editors/emacs-26.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=BibTeX database manager for Emacs
+EAPI=8
+HOMEPAGE=https://joostkremers.github.io/ebib/ https://github.com/joostkremers/ebib/
+INHERIT=elisp
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-emacs/parsebib >=app-editors/emacs-26.1:*
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/joostkremers/ebib/archive/2.38.tar.gz -> ebib-2.38.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=62295e9969c0872a831b0b2264eb78ec
diff --git a/metadata/md5-cache/app-emacs/lsp-mode-8.0.0_p20220620 b/metadata/md5-cache/app-emacs/lsp-mode-8.0.0_p20220620
new file mode 100644
index 000000000000..377d731d1aa1
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/lsp-mode-8.0.0_p20220620
@@ -0,0 +1,15 @@
+BDEPEND=>=app-emacs/dash-2.18.0 >=app-emacs/f-0.20.0 app-emacs/ht app-emacs/lv app-emacs/markdown-mode app-emacs/spinner test? ( app-emacs/deferred app-emacs/ecukes app-emacs/el-mock app-emacs/ert-runner app-emacs/espuds app-emacs/flycheck app-emacs/undercover ) >=app-editors/emacs-26.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Emacs client/library for the Language Server Protocol
+EAPI=8
+HOMEPAGE=https://emacs-lsp.github.io/lsp-mode/
+INHERIT=elisp
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=>=app-emacs/dash-2.18.0 >=app-emacs/f-0.20.0 app-emacs/ht app-emacs/lv app-emacs/markdown-mode app-emacs/spinner >=app-editors/emacs-26.1:*
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/emacs-lsp/lsp-mode/archive/9957623d93b13fabaca8ba35b85da8fcceaeef69.tar.gz -> lsp-mode-8.0.0_p20220620.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=725dfdeccb17b8c8a512863c4985186d
diff --git a/metadata/md5-cache/app-emacs/web-mode-17.2.1 b/metadata/md5-cache/app-emacs/web-mode-17.2.1
new file mode 100644
index 000000000000..874ac549c60d
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/web-mode-17.2.1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Web template editing mode for Emacs
+EAPI=8
+HOMEPAGE=https://web-mode.org/ https://github.com/fxbois/web-mode/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://github.com/fxbois/web-mode/archive/v17.2.1.tar.gz -> web-mode-17.2.1.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=32d4d9188e0444d438872a1a88db9c5b
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index bf9000ddec3d..8bc87b3ef6a6 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/glean-1.19.0 b/metadata/md5-cache/app-emulation/glean-1.19.0
index f3363367c397..8af78b711660 100644
--- a/metadata/md5-cache/app-emulation/glean-1.19.0
+++ b/metadata/md5-cache/app-emulation/glean-1.19.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://opendev.org/opendev/glean
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/g/glean/glean-1.19.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a7f0e459e46219a98648d98d013ca8e2
+_md5_=e32e3979458a427861638b1d8ec6b8bc
diff --git a/metadata/md5-cache/dev-python/cjkwrap-2.2-r1 b/metadata/md5-cache/app-emulation/glean-1.23.0
similarity index 55%
rename from metadata/md5-cache/dev-python/cjkwrap-2.2-r1
rename to metadata/md5-cache/app-emulation/glean-1.23.0
index 0bfdf20c5950..a16403f5e5a4 100644
--- a/metadata/md5-cache/dev-python/cjkwrap-2.2-r1
+++ b/metadata/md5-cache/app-emulation/glean-1.23.0
@@ -1,15 +1,16 @@
 BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for wrapping and filling UTF-8 CJK text
+DEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=Simple program to write static config from config-drive
 EAPI=7
-HOMEPAGE=https://f.gallai.re/cjkwrap https://gitlab.com/fgallaire/cjkwrap
+HOMEPAGE=https://opendev.org/opendev/glean
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=LGPL-3+
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-SRC_URI=https://github.com/fgallaire/cjkwrap/archive/v2.2.tar.gz -> cjkwrap-2.2.tar.gz
+SRC_URI=mirror://pypi/g/glean/glean-1.23.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=63fe8cf66c8c545741696844dcc1ec83
+_md5_=a7f0e459e46219a98648d98d013ca8e2
diff --git a/metadata/md5-cache/app-emulation/libvirt-8.4.0 b/metadata/md5-cache/app-emulation/libvirt-8.4.0
index a70e2b31931a..b032dbf7e864 100644
--- a/metadata/md5-cache/app-emulation/libvirt-8.4.0
+++ b/metadata/md5-cache/app-emulation/libvirt-8.4.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
 INHERIT=meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
 IUSE=apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.7:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) virtual/tmpfiles
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/8.4.0
 SRC_URI=https://libvirt.org/sources/libvirt-8.4.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-8.4.0.tar.xz.asc )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=e09a0af33617187180f7c7fa2912e060
+_md5_=920efaed583db869b4ed9c65f3f60bb7
diff --git a/metadata/md5-cache/app-emulation/spice-vdagent-0.22.1 b/metadata/md5-cache/app-emulation/spice-vdagent-0.22.1
index f0234db9e00e..a176eac17803 100644
--- a/metadata/md5-cache/app-emulation/spice-vdagent-0.22.1
+++ b/metadata/md5-cache/app-emulation/spice-vdagent-0.22.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.spice-space.org/
 INHERIT=linux-info tmpfiles udev
 IUSE=gtk selinux systemd
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 >=app-emulation/spice-protocol-0.14.0 media-libs/alsa-lib sys-apps/dbus x11-libs/libdrm >=x11-libs/libpciaccess-0.10 x11-libs/libXfixes x11-libs/libXrandr x11-libs/libX11 x11-libs/libXinerama gtk? ( x11-libs/gtk+:3 ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-vdagent ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/releases/spice-vdagent-0.22.1.tar.bz2
 _eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=a17d6558134ea045905fc9be49a7c807
+_md5_=c648f7e6c343b1a759370b3d77a0ecff
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 4614a744d2fe..fd7e1f477a70 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-java-0.5.0 b/metadata/md5-cache/app-eselect/eselect-java-0.5.0
new file mode 100644
index 000000000000..3d78690406c3
--- /dev/null
+++ b/metadata/md5-cache/app-eselect/eselect-java-0.5.0
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=postinst prepare
+DESCRIPTION=A set of eselect modules for Java
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
+INHERIT=autotools
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-admin/eselect
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/eselect-java.git/snapshot/eselect-java-0.5.0.tar.bz2
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=2367d911c0c2a90eb398aad0b8e971ba
diff --git a/metadata/md5-cache/app-eselect/eselect-rust-20210703 b/metadata/md5-cache/app-eselect/eselect-rust-20210703
index 6a8fbd7af78b..e2e12b2bc9ba 100644
--- a/metadata/md5-cache/app-eselect/eselect-rust-20210703
+++ b/metadata/md5-cache/app-eselect/eselect-rust-20210703
@@ -4,10 +4,10 @@ DESCRIPTION=Eselect module for management of multiple Rust versions
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-rust.git
 INHERIT=autotools
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/eselect-rust.git/snapshot/eselect-rust-20210703.tar.bz2
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=42f3e08b3099ac9ffa334f97efb11e17
+_md5_=826eaa80c4463aa076fa007c0270f78e
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 7b1659d65673..653538342dce 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.13 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.13
deleted file mode 100644
index 53d9cd73ac34..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) app-i18n/anthy python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Japanese Anthy engine for IBus
-EAPI=7
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-INHERIT=autotools gnome2-utils python-single-r1 xdg
-IUSE=nls python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) app-i18n/anthy python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/ibus/ibus-anthy/archive/1.5.13/ibus-anthy-1.5.13.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3ce60e190a5bd988d2b70102661827fc
diff --git a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.14 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.14
index 9671ad15f863..8e5cec5c8388 100644
--- a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.14
+++ b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.14
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ibus/ibus/wiki
 INHERIT=autotools gnome2-utils python-single-r1 xdg
 IUSE=nls python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) app-i18n/anthy python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) nls? ( virtual/libintl )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus-anthy/archive/1.5.14/ibus-anthy-1.5.14.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dad1f0bad5bb7afe13d87572ed1ee302
+_md5_=83200b5ca624a4b292a808618d449e7a
diff --git a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.12.1 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.12.1
new file mode 100644
index 000000000000..3fb4f612fd19
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.12.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-db/sqlite:3 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst postrm prepare setup
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-i18n/libpinyin-2.2.1:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) boost? ( dev-libs/boost:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencc? ( app-i18n/opencc:= )
+DESCRIPTION=Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus
+EAPI=8
+HOMEPAGE=https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/
+INHERIT=autotools gnome2-utils lua-single python-single-r1
+IUSE=boost lua opencc lua_single_target_lua5-1 lua_single_target_lua5-3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-i18n/libpinyin-2.2.1:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) boost? ( dev-libs/boost:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) opencc? ( app-i18n/opencc:= )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
+SLOT=0
+SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.12.1.tar.gz -> ibus-libpinyin-1.12.1.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=67e501ee1a4d3546d68737160915a90f
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.3 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.5
similarity index 98%
rename from metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.3
rename to metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.5
index ca3df298f684..d411b1cb159d 100644
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.3
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.5
@@ -12,6 +12,6 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sql
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.16.3/ibus-typing-booster-2.16.3.tar.gz
+SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.16.5/ibus-typing-booster-2.16.5.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=00e7e2ac0d8312474428fb542606f864
diff --git a/metadata/md5-cache/app-i18n/libpinyin-2.6.2 b/metadata/md5-cache/app-i18n/libpinyin-2.6.2
new file mode 100644
index 000000000000..5ba178b7fbd8
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/libpinyin-2.6.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=dev-libs/glib:2 sys-libs/db:=
+DESCRIPTION=Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao
+EAPI=8
+HOMEPAGE=https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/
+INHERIT=autotools
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 sys-libs/db:=
+SLOT=0/13
+SRC_URI=https://github.com/libpinyin/libpinyin/archive/2.6.2.tar.gz -> libpinyin-2.6.2.tar.gz mirror://sourceforge/libpinyin/models/model19.text.tar.gz -> libpinyin-model19.text.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=279cbc37b89c69ed783b3dd5fe3d8a47
diff --git a/metadata/md5-cache/app-i18n/opencc-1.0.5 b/metadata/md5-cache/app-i18n/opencc-1.0.5
deleted file mode 100644
index 73c32eb4d378..000000000000
--- a/metadata/md5-cache/app-i18n/opencc-1.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=Library for conversion between Traditional and Simplified Chinese characters
-EAPI=7
-HOMEPAGE=https://github.com/BYVoid/OpenCC
-INHERIT=cmake python-any-r1
-IUSE=doc test
-KEYWORDS=amd64 arm64 ~hppa ppc ppc64 sparc x86
-LICENSE=Apache-2.0 BSD-2 MIT test? ( BSD )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/BYVoid/OpenCC/archive/ver.1.0.5.tar.gz -> opencc-1.0.5.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9cc30f935c5cf573ed6309232a396515
diff --git a/metadata/md5-cache/app-i18n/opencc-1.1.2 b/metadata/md5-cache/app-i18n/opencc-1.1.2
deleted file mode 100644
index 0da959165323..000000000000
--- a/metadata/md5-cache/app-i18n/opencc-1.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/tclap dev-libs/darts dev-libs/marisa:0= dev-libs/rapidjson test? ( dev-cpp/gtest !hppa? ( !sparc? ( dev-cpp/benchmark ) ) )
-DESCRIPTION=Library for conversion between Traditional and Simplified Chinese characters
-EAPI=8
-HOMEPAGE=https://github.com/BYVoid/OpenCC
-INHERIT=cmake python-any-r1
-IUSE=doc test
-KEYWORDS=amd64 arm64 ~hppa ppc ppc64 ~riscv sparc x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/marisa:0=
-RESTRICT=!test? ( test )
-SLOT=0/1.1
-SRC_URI=https://github.com/BYVoid/OpenCC/archive/ver.1.1.2.tar.gz -> opencc-1.1.2.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e87933022372b2791cc882482d742f6d
diff --git a/metadata/md5-cache/app-i18n/pyzy-0.1.0-r3 b/metadata/md5-cache/app-i18n/pyzy-0.1.0-r3
index 00dfb635a69b..24b91cc34ae0 100644
--- a/metadata/md5-cache/app-i18n/pyzy-0.1.0-r3
+++ b/metadata/md5-cache/app-i18n/pyzy-0.1.0-r3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) sys-devel/autoconf-archive doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) sys-devel/autoconf-archive doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup
 DEPEND=dev-db/sqlite:3 dev-libs/glib:2 sys-apps/util-linux boost? ( dev-libs/boost ) opencc? ( app-i18n/opencc:= )
 DESCRIPTION=The Chinese PinYin and Bopomofo conversion library
@@ -12,4 +12,4 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 sys-apps/util-linux boost? ( dev-libs/bo
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dlan/distfiles/pyzy-0.1.0.tar.xz https://dev.gentoo.org/~dlan/distfiles/pyzy-0.1.0-patches.tar.xz https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pyzy/pyzy-database-1.0.0.tar.bz2
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=951123d11a0f6f522a9995525b7652b3
+_md5_=c5c7550994dab6ff041b6e9ade0737c9
diff --git a/metadata/md5-cache/app-i18n/yaskkserv2-0.1.3 b/metadata/md5-cache/app-i18n/yaskkserv2-0.1.3
new file mode 100644
index 000000000000..580371d35f42
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/yaskkserv2-0.1.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-emacs/ddskk app-i18n/yaskkserv ) >=virtual/rust-1.53 virtual/pkgconfig
+DEFINED_PHASES=compile configure install preinst prepare test unpack
+DEPEND=dev-libs/openssl:0=
+DESCRIPTION=Yet Another SKK server
+EAPI=8
+HOMEPAGE=https://github.com/wachikun/yaskkserv2
+INHERIT=cargo systemd
+IUSE=test debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Apache-2.0 MIT )
+RDEPEND=dev-libs/openssl:0= app-i18n/skk-jisyo
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/wachikun/yaskkserv2/archive/0.1.3.tar.gz -> yaskkserv2-0.1.3.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.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.37/download -> backtrace-0.3.37.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.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.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/boxfnonce/0.1.1/download -> boxfnonce-0.1.1.crate https://crates.io/api/v1/crates/bumpalo/3.10.0/download -> bumpalo-3.10.0.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/c2-chacha/0.2.2/download -> c2-chacha-0.2.2.crate https://crates.io/api/v1/crates/cc/1.0.45/download -> cc-1.0.45.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.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.2.4/download -> clap-3.2.4.crate https://crates.io/api/v1/crates/clap_lex/0.2.2/download -> clap_lex-0.2.2.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.2/download -> cpufeatures-0.2.2.crate https://crates.io/api/v1/crates/crypto-common/0.1.3/download -> crypto-common-0.1.3.crate https://crates.io/api/v1/crates/daemonize/0.4.1/download -> daemonize-0.4.1.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/encoding_rs/0.8.20/download -> encoding_rs-0.8.20.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/error-chain/0.11.0/download -> error-chain-0.11.0.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.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.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/futures-channel/0.3.21/download -> futures-channel-0.3.21.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.crate https://crates.io/api/v1/crates/futures-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/getrandom/0.1.12/download -> getrandom-0.1.12.crate https://crates.io/api/v1/crates/h2/0.3.13/download -> h2-0.3.13.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.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/http/0.2.8/download -> http-0.2.8.crate https://crates.io/api/v1/crates/http-body/0.4.5/download -> http-body-0.4.5.crate https://crates.io/api/v1/crates/httparse/1.7.1/download -> httparse-1.7.1.crate https://crates.io/api/v1/crates/httpdate/1.0.2/download -> httpdate-1.0.2.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/hyper/0.14.19/download -> hyper-0.14.19.crate https://crates.io/api/v1/crates/hyper-tls/0.5.0/download -> hyper-tls-0.5.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.8.2/download -> indexmap-1.8.2.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/ipnet/2.5.0/download -> ipnet-2.5.0.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/itoa/1.0.2/download -> itoa-1.0.2.crate https://crates.io/api/v1/crates/js-sys/0.3.58/download -> js-sys-0.3.58.crate https://crates.io/api/v1/crates/json/0.12.4/download -> json-0.12.4.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/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mio/0.8.3/download -> mio-0.8.3.crate https://crates.io/api/v1/crates/native-tls/0.2.10/download -> native-tls-0.2.10.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/once_cell/1.12.0/download -> once_cell-1.12.0.crate https://crates.io/api/v1/crates/openssl/0.10.40/download -> openssl-0.10.40.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-sys/0.9.74/download -> openssl-sys-0.9.74.crate https://crates.io/api/v1/crates/os_str_bytes/6.1.0/download -> os_str_bytes-6.1.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.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.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.5/download -> ppv-lite86-0.2.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rand/0.7.2/download -> rand-0.7.2.crate https://crates.io/api/v1/crates/rand_chacha/0.2.1/download -> rand_chacha-0.2.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.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/regex/1.5.6/download -> regex-1.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.26/download -> regex-syntax-0.6.26.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/reqwest/0.11.11/download -> reqwest-0.11.11.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/security-framework/2.6.1/download -> security-framework-2.6.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/serde/1.0.137/download -> serde-1.0.137.crate https://crates.io/api/v1/crates/serde_derive/1.0.137/download -> serde_derive-1.0.137.crate https://crates.io/api/v1/crates/serde_json/1.0.40/download -> serde_json-1.0.40.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.1/download -> serde_urlencoded-0.7.1.crate https://crates.io/api/v1/crates/sha1/0.10.1/download -> sha1-0.10.1.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/0.6.10/download -> smallvec-0.6.10.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.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.96/download -> syn-1.0.96.crate https://crates.io/api/v1/crates/syslog/4.0.1/download -> syslog-4.0.1.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.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.31/download -> thiserror-1.0.31.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.31/download -> thiserror-impl-1.0.31.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/tokio/1.19.2/download -> tokio-1.19.2.crate https://crates.io/api/v1/crates/tokio-native-tls/0.3.0/download -> tokio-native-tls-0.3.0.crate https://crates.io/api/v1/crates/tokio-util/0.7.3/download -> tokio-util-0.7.3.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.35/download -> tracing-0.1.35.crate https://crates.io/api/v1/crates/tracing-core/0.1.27/download -> tracing-core-0.1.27.crate https://crates.io/api/v1/crates/try-lock/0.2.2/download -> try-lock-0.2.2.crate https://crates.io/api/v1/crates/twoway/0.2.2/download -> twoway-0.2.2.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unchecked-index/0.2.2/download -> unchecked-index-0.2.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-ident/1.0.1/download -> unicode-ident-1.0.1.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.8/download -> unicode-normalization-0.1.8.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.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/want/0.3.0/download -> want-0.3.0.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/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.81/download -> wasm-bindgen-0.2.81.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.81/download -> wasm-bindgen-backend-0.2.81.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.31/download -> wasm-bindgen-futures-0.4.31.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.81/download -> wasm-bindgen-macro-0.2.81.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.81/download -> wasm-bindgen-macro-support-0.2.81.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.81/download -> wasm-bindgen-shared-0.2.81.crate https://crates.io/api/v1/crates/web-sys/0.3.58/download -> web-sys-0.3.58.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.36.1/download -> windows-sys-0.36.1.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_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.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_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.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/winreg/0.10.1/download -> winreg-0.10.1.crate test? ( https://dev.gentoo.org/~hattya/distfiles/yaskkserv2-testdata-202110.tar.xz )
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=48f1a556abf105767405eaeab579f3bc
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index cfb3d894668b..7b6a39ad1a63 100644
Binary files a/metadata/md5-cache/app-metrics/Manifest.gz and b/metadata/md5-cache/app-metrics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-metrics/collectd-5.12.0-r7 b/metadata/md5-cache/app-metrics/collectd-5.12.0-r7
index 29770a403163..3aec99375450 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.12.0-r7
+++ b/metadata/md5-cache/app-metrics/collectd-5.12.0-r7
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=acct-group/collectd acct-user/collectd dev-libs/libgcrypt:= dev-libs/libltdl:0= sys-libs/libcap perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_capabilities? ( dev-libs/jansson net-libs/libmicrohttpd:= ) collectd_plugins_connectivity? ( dev-libs/yajl:= net-libs/libmnl ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_gpu_nvidia? ( dev-util/nvidia-cuda-toolkit ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( 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 ) ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp:= ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient[sdk] ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_procevent? ( dev-libs/yajl:= ) collectd_plugins_python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm-sensors:= ) collectd_plugins_sigrok? ( >=sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_slurm? ( sys-cluster/slurm ) collectd_plugins_smart? ( dev-libs/libatasmart:0= ) collectd_plugins_snmp? ( net-analyzer/net-snmp:= ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp:= ) collectd_plugins_sysevent? ( dev-libs/yajl:= ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_write_stackdriver? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) collectd_plugins_java? ( >=virtual/jdk-1.8 ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=acct-group/collectd acct-user/collectd dev-libs/libgcrypt:= dev-libs/libltdl:0= sys-libs/libcap perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_capabilities? ( dev-libs/jansson net-libs/libmicrohttpd:= ) collectd_plugins_connectivity? ( dev-libs/yajl:= net-libs/libmnl ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_gpu_nvidia? ( dev-util/nvidia-cuda-toolkit ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( 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 ) ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp:= ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient[sdk] ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_procevent? ( dev-libs/yajl:= ) collectd_plugins_python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm-sensors:= ) collectd_plugins_sigrok? ( >=sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_slurm? ( sys-cluster/slurm ) collectd_plugins_smart? ( dev-libs/libatasmart:0= ) collectd_plugins_snmp? ( net-analyzer/net-snmp:= ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp:= ) collectd_plugins_sysevent? ( dev-libs/yajl:= ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_write_stackdriver? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) collectd_plugins_java? ( >=virtual/jdk-1.8 ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Collects system statistics and provides mechanisms to store the values
 EAPI=7
 HOMEPAGE=https://collectd.org/
-INHERIT=autotools fcaps flag-o-matic java-pkg-opt-2 linux-info lua-single multilib perl-functions python-single-r1 systemd tmpfiles udev
-IUSE=contrib debug java perl selinux static-libs udev xfs collectd_plugins_aggregation collectd_plugins_amqp collectd_plugins_apache collectd_plugins_apcups collectd_plugins_ascent collectd_plugins_battery collectd_plugins_bind collectd_plugins_buddyinfo collectd_plugins_capabilities collectd_plugins_ceph collectd_plugins_cgroups collectd_plugins_check_uptime collectd_plugins_chrony collectd_plugins_connectivity collectd_plugins_conntrack collectd_plugins_contextswitch collectd_plugins_cpu collectd_plugins_cpufreq collectd_plugins_cpusleep collectd_plugins_csv collectd_plugins_curl collectd_plugins_curl_json collectd_plugins_curl_xml collectd_plugins_dbi collectd_plugins_df collectd_plugins_disk collectd_plugins_dns collectd_plugins_drbd collectd_plugins_email collectd_plugins_entropy collectd_plugins_ethstat collectd_plugins_exec collectd_plugins_fhcount collectd_plugins_filecount collectd_plugins_fscache collectd_plugins_gmond collectd_plugins_gps collectd_plugins_gpu_nvidia collectd_plugins_hddtemp collectd_plugins_hugepages collectd_plugins_interface collectd_plugins_ipc collectd_plugins_ipmi collectd_plugins_iptables collectd_plugins_ipvs collectd_plugins_irq collectd_plugins_java collectd_plugins_lua collectd_plugins_load collectd_plugins_logfile collectd_plugins_logparser collectd_plugins_log_logstash collectd_plugins_madwifi collectd_plugins_match_empty_counter collectd_plugins_match_hashed collectd_plugins_match_regex collectd_plugins_match_timediff collectd_plugins_match_value collectd_plugins_mbmon collectd_plugins_mcelog collectd_plugins_md collectd_plugins_memcachec collectd_plugins_memcached collectd_plugins_memory collectd_plugins_modbus collectd_plugins_mqtt collectd_plugins_multimeter collectd_plugins_mysql collectd_plugins_netlink collectd_plugins_network collectd_plugins_network collectd_plugins_nfs collectd_plugins_nginx collectd_plugins_notify_desktop collectd_plugins_notify_email collectd_plugins_notify_nagios collectd_plugins_ntpd collectd_plugins_numa collectd_plugins_nut collectd_plugins_olsrd collectd_plugins_onewire collectd_plugins_openldap collectd_plugins_openvpn collectd_plugins_oracle collectd_plugins_ovs_events collectd_plugins_ovs_stats collectd_plugins_pcie_errors collectd_plugins_perl collectd_plugins_ping collectd_plugins_postgresql collectd_plugins_powerdns collectd_plugins_procevent collectd_plugins_processes collectd_plugins_protocols collectd_plugins_python collectd_plugins_redis collectd_plugins_routeros collectd_plugins_rrdcached collectd_plugins_rrdtool collectd_plugins_sensors collectd_plugins_serial collectd_plugins_sigrok collectd_plugins_slurm collectd_plugins_smart collectd_plugins_snmp collectd_plugins_snmp_agent collectd_plugins_statsd collectd_plugins_swap collectd_plugins_synproxy collectd_plugins_sysevent collectd_plugins_syslog collectd_plugins_table collectd_plugins_tail collectd_plugins_tail_csv collectd_plugins_target_notification collectd_plugins_target_replace collectd_plugins_target_scale collectd_plugins_target_set collectd_plugins_tcpconns collectd_plugins_teamspeak2 collectd_plugins_ted collectd_plugins_thermal collectd_plugins_threshold collectd_plugins_turbostat collectd_plugins_ubi collectd_plugins_unixsock collectd_plugins_uptime collectd_plugins_users collectd_plugins_uuid collectd_plugins_varnish collectd_plugins_virt collectd_plugins_vmem collectd_plugins_vserver collectd_plugins_wireless collectd_plugins_write_graphite collectd_plugins_write_http collectd_plugins_write_influxdb_udp collectd_plugins_write_kafka collectd_plugins_write_log collectd_plugins_write_mongodb collectd_plugins_write_prometheus collectd_plugins_write_redis collectd_plugins_write_sensu collectd_plugins_write_stackdriver collectd_plugins_write_syslog collectd_plugins_write_tsdb collectd_plugins_xencpu collectd_plugins_zfs_arc collectd_plugins_zookeeper +filecaps collectd_plugins_java lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm x86
+INHERIT=autotools fcaps java-pkg-opt-2 linux-info lua-single perl-functions python-single-r1 systemd tmpfiles udev
+IUSE=contrib debug java perl selinux static-libs udev xfs collectd_plugins_aggregation collectd_plugins_amqp collectd_plugins_apache collectd_plugins_apcups collectd_plugins_ascent collectd_plugins_battery collectd_plugins_bind collectd_plugins_buddyinfo collectd_plugins_capabilities collectd_plugins_ceph collectd_plugins_cgroups collectd_plugins_check_uptime collectd_plugins_chrony collectd_plugins_connectivity collectd_plugins_conntrack collectd_plugins_contextswitch collectd_plugins_cpu collectd_plugins_cpufreq collectd_plugins_cpusleep collectd_plugins_csv collectd_plugins_curl collectd_plugins_curl_json collectd_plugins_curl_xml collectd_plugins_dbi collectd_plugins_df collectd_plugins_disk collectd_plugins_dns collectd_plugins_drbd collectd_plugins_email collectd_plugins_entropy collectd_plugins_ethstat collectd_plugins_exec collectd_plugins_fhcount collectd_plugins_filecount collectd_plugins_fscache collectd_plugins_gmond collectd_plugins_gps collectd_plugins_gpu_nvidia collectd_plugins_hddtemp collectd_plugins_hugepages collectd_plugins_interface collectd_plugins_ipc collectd_plugins_ipmi collectd_plugins_iptables collectd_plugins_ipvs collectd_plugins_irq collectd_plugins_java collectd_plugins_lua collectd_plugins_load collectd_plugins_logfile collectd_plugins_logparser collectd_plugins_log_logstash collectd_plugins_madwifi collectd_plugins_match_empty_counter collectd_plugins_match_hashed collectd_plugins_match_regex collectd_plugins_match_timediff collectd_plugins_match_value collectd_plugins_mbmon collectd_plugins_mcelog collectd_plugins_md collectd_plugins_memcachec collectd_plugins_memcached collectd_plugins_memory collectd_plugins_modbus collectd_plugins_mqtt collectd_plugins_multimeter collectd_plugins_mysql collectd_plugins_netlink collectd_plugins_network collectd_plugins_network collectd_plugins_nfs collectd_plugins_nginx collectd_plugins_notify_desktop collectd_plugins_notify_email collectd_plugins_notify_nagios collectd_plugins_ntpd collectd_plugins_numa collectd_plugins_nut collectd_plugins_olsrd collectd_plugins_onewire collectd_plugins_openldap collectd_plugins_openvpn collectd_plugins_oracle collectd_plugins_ovs_events collectd_plugins_ovs_stats collectd_plugins_pcie_errors collectd_plugins_perl collectd_plugins_ping collectd_plugins_postgresql collectd_plugins_powerdns collectd_plugins_procevent collectd_plugins_processes collectd_plugins_protocols collectd_plugins_python collectd_plugins_redis collectd_plugins_routeros collectd_plugins_rrdcached collectd_plugins_rrdtool collectd_plugins_sensors collectd_plugins_serial collectd_plugins_sigrok collectd_plugins_slurm collectd_plugins_smart collectd_plugins_snmp collectd_plugins_snmp_agent collectd_plugins_statsd collectd_plugins_swap collectd_plugins_synproxy collectd_plugins_sysevent collectd_plugins_syslog collectd_plugins_table collectd_plugins_tail collectd_plugins_tail_csv collectd_plugins_target_notification collectd_plugins_target_replace collectd_plugins_target_scale collectd_plugins_target_set collectd_plugins_tcpconns collectd_plugins_teamspeak2 collectd_plugins_ted collectd_plugins_thermal collectd_plugins_threshold collectd_plugins_turbostat collectd_plugins_ubi collectd_plugins_unixsock collectd_plugins_uptime collectd_plugins_users collectd_plugins_uuid collectd_plugins_varnish collectd_plugins_virt collectd_plugins_vmem collectd_plugins_vserver collectd_plugins_wireless collectd_plugins_write_graphite collectd_plugins_write_http collectd_plugins_write_influxdb_udp collectd_plugins_write_kafka collectd_plugins_write_log collectd_plugins_write_mongodb collectd_plugins_write_prometheus collectd_plugins_write_redis collectd_plugins_write_sensu collectd_plugins_write_stackdriver collectd_plugins_write_syslog collectd_plugins_write_tsdb collectd_plugins_xencpu collectd_plugins_zfs_arc collectd_plugins_zookeeper +filecaps collectd_plugins_java lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha amd64 arm ~arm64 x86
 LICENSE=MIT GPL-2 GPL-2+ GPL-3 GPL-3+
-RDEPEND=acct-group/collectd acct-user/collectd dev-libs/libgcrypt:= dev-libs/libltdl:0= sys-libs/libcap perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_capabilities? ( dev-libs/jansson net-libs/libmicrohttpd:= ) collectd_plugins_connectivity? ( dev-libs/yajl:= net-libs/libmnl ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_gpu_nvidia? ( dev-util/nvidia-cuda-toolkit ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( 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 ) ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp:= ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient[sdk] ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_procevent? ( dev-libs/yajl:= ) collectd_plugins_python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm-sensors:= ) collectd_plugins_sigrok? ( >=sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_slurm? ( sys-cluster/slurm ) collectd_plugins_smart? ( dev-libs/libatasmart:0= ) collectd_plugins_snmp? ( net-analyzer/net-snmp:= ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp:= ) collectd_plugins_sysevent? ( dev-libs/yajl:= ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_write_stackdriver? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) collectd_plugins_java? ( >=virtual/jre-1.8 ) collectd_plugins_syslog? ( virtual/logger ) selinux? ( sec-policy/selinux-collectd ) filecaps? ( sys-libs/libcap ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=collectd_plugins_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) collectd_plugins_python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) collectd_plugins_smart? ( udev ) contrib? ( perl )
+RDEPEND=acct-group/collectd acct-user/collectd dev-libs/libgcrypt:= dev-libs/libltdl:0= sys-libs/libcap perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_capabilities? ( dev-libs/jansson net-libs/libmicrohttpd:= ) collectd_plugins_connectivity? ( dev-libs/yajl:= net-libs/libmnl ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_gpu_nvidia? ( dev-util/nvidia-cuda-toolkit ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( 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 ) ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp:= ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient[sdk] ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_procevent? ( dev-libs/yajl:= ) collectd_plugins_python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm-sensors:= ) collectd_plugins_sigrok? ( >=sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_slurm? ( sys-cluster/slurm ) collectd_plugins_smart? ( dev-libs/libatasmart:0= ) collectd_plugins_snmp? ( net-analyzer/net-snmp:= ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp:= ) collectd_plugins_sysevent? ( dev-libs/yajl:= ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_write_stackdriver? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) collectd_plugins_java? ( >=virtual/jre-1.8 ) collectd_plugins_syslog? ( virtual/logger ) selinux? ( sec-policy/selinux-collectd ) filecaps? ( sys-libs/libcap ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=collectd_plugins_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) collectd_plugins_python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) collectd_plugins_smart? ( udev ) contrib? ( perl )
 SLOT=0
 SRC_URI=https://github.com/collectd/collectd/releases/download/collectd-5.12.0/collectd-5.12.0.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=03b6178bb21ba493e2f6a50b20127c9a
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	babe6282ea5c195981bd302af1adaf3a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=97d463d70bb2b1ec210716cc9e750b2a
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index cc497257d43d..ad701a6c8344 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/nnn-1.9 b/metadata/md5-cache/app-misc/nnn-1.9
deleted file mode 100644
index 72b2fad1ba17..000000000000
--- a/metadata/md5-cache/app-misc/nnn-1.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=6
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v1.9.tar.gz -> nnn-1.9.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b3f5b68cfc7acedbb795fad330f5e665
diff --git a/metadata/md5-cache/app-misc/nnn-2.0 b/metadata/md5-cache/app-misc/nnn-2.0
deleted file mode 100644
index 6923b0477393..000000000000
--- a/metadata/md5-cache/app-misc/nnn-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=6
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v2.0.tar.gz -> nnn-2.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=83137f648942ab677594675fc8f9a77f
diff --git a/metadata/md5-cache/app-misc/nnn-2.1 b/metadata/md5-cache/app-misc/nnn-2.1
deleted file mode 100644
index 14c5c6b684a8..000000000000
--- a/metadata/md5-cache/app-misc/nnn-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=6
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v2.1.tar.gz -> nnn-2.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=83137f648942ab677594675fc8f9a77f
diff --git a/metadata/md5-cache/app-misc/nnn-2.2 b/metadata/md5-cache/app-misc/nnn-2.2
deleted file mode 100644
index cad623be7845..000000000000
--- a/metadata/md5-cache/app-misc/nnn-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=6
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v2.2.tar.gz -> nnn-2.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=efb49088ec0b492ce62ab66731225973
diff --git a/metadata/md5-cache/app-misc/nnn-2.3 b/metadata/md5-cache/app-misc/nnn-2.3
deleted file mode 100644
index 5831db122f5e..000000000000
--- a/metadata/md5-cache/app-misc/nnn-2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=6
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v2.3.tar.gz -> nnn-2.3.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=efb49088ec0b492ce62ab66731225973
diff --git a/metadata/md5-cache/app-misc/nnn-2.4 b/metadata/md5-cache/app-misc/nnn-2.4
deleted file mode 100644
index d2af111c2d1d..000000000000
--- a/metadata/md5-cache/app-misc/nnn-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=6
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v2.4.tar.gz -> nnn-2.4.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=efb49088ec0b492ce62ab66731225973
diff --git a/metadata/md5-cache/app-misc/nnn-2.5 b/metadata/md5-cache/app-misc/nnn-2.5
deleted file mode 100644
index 8449c6dfcf7a..000000000000
--- a/metadata/md5-cache/app-misc/nnn-2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=6
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v2.5.tar.gz -> nnn-2.5.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=efb49088ec0b492ce62ab66731225973
diff --git a/metadata/md5-cache/app-misc/nnn-2.6 b/metadata/md5-cache/app-misc/nnn-2.6
deleted file mode 100644
index 84d250ed149a..000000000000
--- a/metadata/md5-cache/app-misc/nnn-2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=6
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v2.6.tar.gz -> nnn-2.6.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7a825e94446649dc45e2f6f13d26a10b
diff --git a/metadata/md5-cache/app-misc/nnn-2.7 b/metadata/md5-cache/app-misc/nnn-2.7
deleted file mode 100644
index ce8b72362205..000000000000
--- a/metadata/md5-cache/app-misc/nnn-2.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=7
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v2.7.tar.gz -> nnn-2.7.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=946e81596509aa411cbe0121fd3ccb47
diff --git a/metadata/md5-cache/app-misc/nnn-2.8.1 b/metadata/md5-cache/app-misc/nnn-2.8.1
deleted file mode 100644
index 7898be91abb9..000000000000
--- a/metadata/md5-cache/app-misc/nnn-2.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=7
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v2.8.1.tar.gz -> nnn-2.8.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=946e81596509aa411cbe0121fd3ccb47
diff --git a/metadata/md5-cache/app-misc/nnn-2.9 b/metadata/md5-cache/app-misc/nnn-2.9
deleted file mode 100644
index 1f4e1f5c4e18..000000000000
--- a/metadata/md5-cache/app-misc/nnn-2.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=7
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v2.9.tar.gz -> nnn-2.9.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=07e36a4ae30cbdf0f4c0ca8d80365a31
diff --git a/metadata/md5-cache/app-misc/nnn-3.0 b/metadata/md5-cache/app-misc/nnn-3.0
deleted file mode 100644
index a4036ad434c0..000000000000
--- a/metadata/md5-cache/app-misc/nnn-3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=7
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v3.0.tar.gz -> nnn-3.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=07e36a4ae30cbdf0f4c0ca8d80365a31
diff --git a/metadata/md5-cache/app-misc/nnn-3.1 b/metadata/md5-cache/app-misc/nnn-3.1
deleted file mode 100644
index 20b99f148f96..000000000000
--- a/metadata/md5-cache/app-misc/nnn-3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=7
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v3.1.tar.gz -> nnn-3.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=07e36a4ae30cbdf0f4c0ca8d80365a31
diff --git a/metadata/md5-cache/app-misc/nnn-3.2 b/metadata/md5-cache/app-misc/nnn-3.2
deleted file mode 100644
index d30594e0d4db..000000000000
--- a/metadata/md5-cache/app-misc/nnn-3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=7
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v3.2.tar.gz -> nnn-3.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=07e36a4ae30cbdf0f4c0ca8d80365a31
diff --git a/metadata/md5-cache/app-misc/nnn-3.3 b/metadata/md5-cache/app-misc/nnn-3.3
deleted file mode 100644
index 010959d08d18..000000000000
--- a/metadata/md5-cache/app-misc/nnn-3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=7
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v3.3.tar.gz -> nnn-3.3.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=07e36a4ae30cbdf0f4c0ca8d80365a31
diff --git a/metadata/md5-cache/app-misc/nnn-3.4 b/metadata/md5-cache/app-misc/nnn-3.4
deleted file mode 100644
index af0315acf605..000000000000
--- a/metadata/md5-cache/app-misc/nnn-3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=7
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v3.4.tar.gz -> nnn-3.4.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4d7dcf6468a65837f757c8c321780b82
diff --git a/metadata/md5-cache/app-misc/nnn-3.5 b/metadata/md5-cache/app-misc/nnn-3.5
deleted file mode 100644
index 19daefb8d0d4..000000000000
--- a/metadata/md5-cache/app-misc/nnn-3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=7
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v3.5.tar.gz -> nnn-3.5.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4d7dcf6468a65837f757c8c321780b82
diff --git a/metadata/md5-cache/app-misc/nnn-3.6 b/metadata/md5-cache/app-misc/nnn-3.6
deleted file mode 100644
index 69455ae2608d..000000000000
--- a/metadata/md5-cache/app-misc/nnn-3.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-DESCRIPTION=The missing terminal file browser for X
-EAPI=7
-HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs xdg-utils
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/jarun/nnn/archive/v3.6.tar.gz -> nnn-3.6.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ee266a867eedde45de4916df83818a20
diff --git a/metadata/md5-cache/app-misc/nnn-4.5 b/metadata/md5-cache/app-misc/nnn-4.5
index e73120937964..5ce27b0b98f7 100644
--- a/metadata/md5-cache/app-misc/nnn-4.5
+++ b/metadata/md5-cache/app-misc/nnn-4.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install postinst postrm prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
+DEPEND=sys-libs/ncurses:= sys-libs/readline:= elibc_musl? ( sys-libs/fts-standalone )
 DESCRIPTION=The missing terminal file browser for X
 EAPI=8
 HOMEPAGE=https://github.com/jarun/nnn
-INHERIT=bash-completion-r1 toolchain-funcs xdg-utils
+INHERIT=bash-completion-r1 flag-o-matic toolchain-funcs xdg-utils
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
+RDEPEND=sys-libs/ncurses:= sys-libs/readline:= elibc_musl? ( sys-libs/fts-standalone )
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v4.5.tar.gz -> nnn-4.5.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8fa9cfde078f7f20be73d6a02b5ebe73
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=013e57ca87ca31ad5860d62e4f7e5b0c
diff --git a/metadata/md5-cache/app-misc/pdfpc-4.5.0-r1 b/metadata/md5-cache/app-misc/pdfpc-4.5.0-r1
new file mode 100644
index 000000000000..d0c3635ebf4d
--- /dev/null
+++ b/metadata/md5-cache/app-misc/pdfpc-4.5.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/discount app-text/poppler:=[cairo] dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8= gnome-base/librsvg net-libs/webkit-gtk:4= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-gtk:1.0= media-plugins/gst-plugins-cairo:1.0= )
+DESCRIPTION=Presenter console with multi-monitor support for PDF files
+EAPI=8
+HOMEPAGE=https://pdfpc.github.io https://github.com/pdfpc/pdfpc
+INHERIT=cmake vala
+IUSE=+gstreamer
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-text/discount app-text/poppler:=[cairo] dev-libs/glib:2 dev-libs/json-glib dev-libs/libgee:0.8= gnome-base/librsvg net-libs/webkit-gtk:4= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-gtk:1.0= media-plugins/gst-plugins-cairo:1.0= )
+SLOT=0
+SRC_URI=https://github.com/pdfpc/pdfpc/archive/v4.5.0.tar.gz -> pdfpc-4.5.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e99107f4d81617512dc119c3c99218ed
diff --git a/metadata/md5-cache/app-misc/scrub-2.6.1 b/metadata/md5-cache/app-misc/scrub-2.6.1
index ebda44153459..842b62deb74a 100644
--- a/metadata/md5-cache/app-misc/scrub-2.6.1
+++ b/metadata/md5-cache/app-misc/scrub-2.6.1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Overwrite files with iterative patterns
 EAPI=6
 HOMEPAGE=https://github.com/chaos/scrub
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/chaos/scrub/releases/download/2.6.1/scrub-2.6.1.tar.gz
-_md5_=0e4e078f0efd853b948187d4078fe63d
+_md5_=8c1e64b2f737adf04360c76b2a2a3ec7
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 112caa75ff44..24011237b0c2 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/kalendar-22.04.2 b/metadata/md5-cache/app-office/kalendar-22.04.2
index a65b400e7430..ffb610e2c466 100644
--- a/metadata/md5-cache/app-office/kalendar-22.04.2
+++ b/metadata/md5-cache/app-office/kalendar-22.04.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://apps.kde.org/kalendar/
 INHERIT=ecm kde.org
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 ) CC0-1.0
 RDEPEND=>=dev-qt/qtdbus-5.15.3:5 >=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtquickcontrols2-5.15.3:5 >=dev-qt/qtsvg-5.15.3:5 >=kde-apps/akonadi-22.04.2:5 >=kde-apps/akonadi-contacts-22.04.2:5 >=kde-apps/calendarsupport-22.04.2:5 >=kde-apps/eventviews-22.04.2:5 >=kde-frameworks/kcalendarcore-5.92.0:5 >=kde-frameworks/kconfigwidgets-5.92.0:5 >=kde-frameworks/kcontacts-5.92.0:5 >=kde-frameworks/kcoreaddons-5.92.0:5 >=kde-frameworks/kdbusaddons-5.92.0:5 >=kde-frameworks/ki18n-5.92.0:5 >=kde-frameworks/kiconthemes-5.92.0:5 >=kde-frameworks/kirigami-5.92.0:5 >=kde-frameworks/kitemmodels-5.92.0:5 >=kde-frameworks/kwindowsystem-5.92.0:5 >=kde-frameworks/kxmlgui-5.92.0:5 >=dev-qt/qtlocation-5.15.3:5 >=kde-apps/kdepim-runtime-22.04.2:5 >=kde-frameworks/qqc2-desktop-style-5.92.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/22.04.2/src/kalendar-22.04.2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=db87fc918df3f7921d67faf2a2f913ea
+_md5_=9317cc83c059bceaacff81beaab867d9
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index b78b85c380ed..8c2aab438aa1 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/gpyutils-0.6.1 b/metadata/md5-cache/app-portage/gpyutils-0.6.1
deleted file mode 100644
index 9cdf4b3cbe62..000000000000
--- a/metadata/md5-cache/app-portage/gpyutils-0.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Utitilies for maintaining Python packages
-EAPI=8
-HOMEPAGE=https://github.com/mgorny/gpyutils/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/gpyutils/archive/v0.6.1.tar.gz -> gpyutils-0.6.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9558d862cd3726691b810829304eae01
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.7.1 b/metadata/md5-cache/app-portage/gpyutils-0.7.1
deleted file mode 100644
index 8b5001000bcb..000000000000
--- a/metadata/md5-cache/app-portage/gpyutils-0.7.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Utitilies for maintaining Python packages
-EAPI=8
-HOMEPAGE=https://github.com/mgorny/gpyutils/ https://pypi.org/project/gpyutils/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mgorny/gpyutils/archive/v0.7.1.tar.gz -> gpyutils-0.7.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1ab600cdecbbaa64365af0003a457ebf
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.8.1 b/metadata/md5-cache/app-portage/gpyutils-0.8.1
deleted file mode 100644
index d4ae8501c45e..000000000000
--- a/metadata/md5-cache/app-portage/gpyutils-0.8.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Utitilies for maintaining Python packages
-EAPI=8
-HOMEPAGE=https://github.com/mgorny/gpyutils/ https://pypi.org/project/gpyutils/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mgorny/gpyutils/archive/v0.8.1.tar.gz -> gpyutils-0.8.1.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4cc7f25554763b7be337dc44881cb6f4
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.8.2 b/metadata/md5-cache/app-portage/gpyutils-0.8.2
index 7773952ec178..3421f5d02d3d 100644
--- a/metadata/md5-cache/app-portage/gpyutils-0.8.2
+++ b/metadata/md5-cache/app-portage/gpyutils-0.8.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mgorny/gpyutils/ https://pypi.org/project/gpyutils/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gpyutils/archive/v0.8.2.tar.gz -> gpyutils-0.8.2.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4cc7f25554763b7be337dc44881cb6f4
+_md5_=7c57fbf1b71561df7cc24c69ece6b180
diff --git a/metadata/md5-cache/app-portage/iwdevtools-0.11.0 b/metadata/md5-cache/app-portage/iwdevtools-0.11.0
new file mode 100644
index 000000000000..13aae13a6380
--- /dev/null
+++ b/metadata/md5-cache/app-portage/iwdevtools-0.11.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/help2man || ( sys-apps/util-linux app-misc/getopt ) test? ( app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt ) ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DESCRIPTION=Small tools to aid with Gentoo development, primarily intended for QA
+EAPI=8
+HOMEPAGE=https://github.com/ionenwks/iwdevtools
+INHERIT=meson optfeature
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ionenwks/iwdevtools/archive/refs/tags/v0.11.0.tar.gz -> iwdevtools-0.11.0.tar.gz
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6ea27f0f1d53b37e54db550a05725d64
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.3.0 b/metadata/md5-cache/app-portage/mirrorselect-2.3.0
new file mode 100644
index 000000000000..b7efc5231c82
--- /dev/null
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.3.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
+INHERIT=distutils-r1 prefix
+IUSE=ipv6 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)?] >=dev-python/ssl-fetch-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.3.0.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b72f6bce0052d0e214da98577787e2c7
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 3fc25ce43a1a..d0bca9bab2f8 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/starship-1.6.3 b/metadata/md5-cache/app-shells/starship-1.6.3
index add14e77e226..344fbe204016 100644
--- a/metadata/md5-cache/app-shells/starship-1.6.3
+++ b/metadata/md5-cache/app-shells/starship-1.6.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://starship.rs/
 INHERIT=cargo
 IUSE=debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=|| ( Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT ) || ( Apache-2.0 BSD-2 MIT ) || ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0 MIT ZLIB ) || ( MIT Unlicense ) Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 ZLIB WTFPL-2
 RDEPEND=>=dev-libs/libgit2-1.2.0:=
 SLOT=0
 SRC_URI=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.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.56/download -> anyhow-1.0.56.crate https://crates.io/api/v1/crates/async-broadcast/0.3.4/download -> async-broadcast-0.3.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-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-recursion/0.3.2/download -> async-recursion-0.3.2.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/async-trait/0.1.53/download -> async-trait-0.1.53.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/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.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-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/byte-unit/4.0.14/download -> byte-unit-4.0.14.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.1.0/download -> bytes-1.1.0.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/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.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/chrono/0.4.19/download -> chrono-0.4.19.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_derive/3.1.7/download -> clap_derive-3.1.7.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/combine/4.6.3/download -> combine-4.6.3.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.22/download -> const_format-0.2.22.crate https://crates.io/api/v1/crates/const_format_proc_macros/0.2.22/download -> const_format_proc_macros-0.2.22.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-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/cpufeatures/0.2.2/download -> cpufeatures-0.2.2.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/crypto-common/0.1.3/download -> crypto-common-0.1.3.crate https://crates.io/api/v1/crates/deelevate/0.2.0/download -> deelevate-0.2.0.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.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/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/dlv-list/0.3.0/download -> dlv-list-0.3.0.crate https://crates.io/api/v1/crates/downcast/0.11.0/download -> downcast-0.11.0.crate https://crates.io/api/v1/crates/dunce/1.0.2/download -> dunce-1.0.2.crate https://crates.io/api/v1/crates/dyn-clone/1.0.4/download -> dyn-clone-1.0.4.crate https://crates.io/api/v1/crates/easy-parallel/3.2.0/download -> easy-parallel-3.2.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/enumflags2/0.7.4/download -> enumflags2-0.7.4.crate https://crates.io/api/v1/crates/enumflags2_derive/0.7.4/download -> enumflags2_derive-0.7.4.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/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.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/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fragile/1.2.0/download -> fragile-1.2.0.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.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-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/generic-array/0.12.4/download -> generic-array-0.12.4.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/gethostname/0.2.3/download -> gethostname-0.2.3.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.6/download -> getrandom-0.2.6.crate https://crates.io/api/v1/crates/git2/0.14.2/download -> git2-0.14.2.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashbrown/0.12.0/download -> hashbrown-0.12.0.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.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/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indexmap/1.8.1/download -> indexmap-1.8.1.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/is_debug/1.0.1/download -> is_debug-1.0.1.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.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.121/download -> libc-0.2.121.crate https://crates.io/api/v1/crates/libgit2-sys/0.13.2+1.4.2/download -> libgit2-sys-0.13.2+1.4.2.crate https://crates.io/api/v1/crates/libz-sys/1.1.5/download -> libz-sys-1.1.5.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/local_ipaddress/0.1.3/download -> local_ipaddress-0.1.3.crate https://crates.io/api/v1/crates/log/0.4.16/download -> log-0.4.16.crate https://crates.io/api/v1/crates/mac-notification-sys/0.5.0/download -> mac-notification-sys-0.5.0.crate https://crates.io/api/v1/crates/mach/0.3.2/download -> mach-0.3.2.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memmem/0.1.1/download -> memmem-0.1.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.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/mockall/0.11.0/download -> mockall-0.11.0.crate https://crates.io/api/v1/crates/mockall_derive/0.11.0/download -> mockall_derive-0.11.0.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.24.1/download -> nix-0.24.1.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.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/notify-rust/4.5.8/download -> notify-rust-4.5.8.crate https://crates.io/api/v1/crates/num-derive/0.3.3/download -> num-derive-0.3.3.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-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/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.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/open/2.1.1/download -> open-2.1.1.crate https://crates.io/api/v1/crates/ordered-float/2.10.0/download -> ordered-float-2.10.0.crate https://crates.io/api/v1/crates/ordered-multimap/0.4.3/download -> ordered-multimap-0.4.3.crate https://crates.io/api/v1/crates/ordered-stream/0.0.1/download -> ordered-stream-0.0.1.crate https://crates.io/api/v1/crates/os_info/3.2.0/download -> os_info-3.2.0.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/path-slash/0.1.4/download -> path-slash-0.1.4.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/pathsearch/0.2.0/download -> pathsearch-0.2.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pest_derive/2.1.0/download -> pest_derive-2.1.0.crate https://crates.io/api/v1/crates/pest_generator/2.1.3/download -> pest_generator-2.1.3.crate https://crates.io/api/v1/crates/pest_meta/2.1.3/download -> pest_meta-2.1.3.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.8/download -> pin-project-lite-0.2.8.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.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.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-macro-crate/1.1.3/download -> proc-macro-crate-1.1.3.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-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/process_control/3.4.0/download -> process_control-3.4.0.crate https://crates.io/api/v1/crates/quick-xml/0.22.0/download -> quick-xml-0.22.0.crate https://crates.io/api/v1/crates/quote/1.0.17/download -> quote-1.0.17.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.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.2.2/download -> rand_chacha-0.2.2.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.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.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.5.5/download -> regex-1.5.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-ini/0.18.0/download -> rust-ini-0.18.0.crate https://crates.io/api/v1/crates/ryu/1.0.9/download -> ryu-1.0.9.crate https://crates.io/api/v1/crates/schemars/0.8.8/download -> schemars-0.8.8.crate https://crates.io/api/v1/crates/schemars_derive/0.8.8/download -> schemars_derive-0.8.8.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver/1.0.7/download -> semver-1.0.7.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/serde_derive/1.0.136/download -> serde_derive-1.0.136.crate https://crates.io/api/v1/crates/serde_derive_internals/0.25.0/download -> serde_derive_internals-0.25.0.crate https://crates.io/api/v1/crates/serde_json/1.0.79/download -> serde_json-1.0.79.crate https://crates.io/api/v1/crates/serde_repr/0.1.7/download -> serde_repr-0.1.7.crate https://crates.io/api/v1/crates/sha-1/0.8.2/download -> sha-1-0.8.2.crate https://crates.io/api/v1/crates/sha-1/0.10.0/download -> sha-1-0.10.0.crate https://crates.io/api/v1/crates/sha1/0.6.1/download -> sha1-0.6.1.crate https://crates.io/api/v1/crates/sha1_smol/1.0.0/download -> sha1_smol-1.0.0.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/shadow-rs/0.11.0/download -> shadow-rs-0.11.0.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.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/signal-hook/0.1.17/download -> signal-hook-0.1.17.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/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/slab/0.4.5/download -> slab-0.4.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/1.6.3/download -> starship-1.6.3.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.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strum/0.22.0/download -> strum-0.22.0.crate https://crates.io/api/v1/crates/strum_macros/0.22.0/download -> strum_macros-0.22.0.crate https://crates.io/api/v1/crates/syn/1.0.90/download -> syn-1.0.90.crate https://crates.io/api/v1/crates/sys-info/0.9.1/download -> sys-info-0.9.1.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.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/terminfo/0.7.3/download -> terminfo-0.7.3.crate https://crates.io/api/v1/crates/termios/0.3.3/download -> termios-0.3.3.crate https://crates.io/api/v1/crates/termtree/0.2.4/download -> termtree-0.2.4.crate https://crates.io/api/v1/crates/termwiz/0.15.0/download -> termwiz-0.15.0.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.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/time/0.3.9/download -> time-0.3.9.crate https://crates.io/api/v1/crates/tinyvec/1.5.1/download -> tinyvec-1.5.1.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.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/toml_edit/0.14.2/download -> toml_edit-0.14.2.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.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.7/download -> unicode-bidi-0.3.7.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.9.0/download -> unicode-segmentation-1.9.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.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/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/urlencoding/2.1.0/download -> urlencoding-2.1.0.crate https://crates.io/api/v1/crates/utf8-width/0.1.6/download -> utf8-width-0.1.6.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.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/vtparse/0.6.1/download -> vtparse-0.6.1.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/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.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/which/4.2.5/download -> which-4.2.5.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.24.0/download -> windows-0.24.0.crate https://crates.io/api/v1/crates/windows/0.35.0/download -> windows-0.35.0.crate https://crates.io/api/v1/crates/windows-sys/0.35.0/download -> windows-sys-0.35.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.35.0/download -> windows_aarch64_msvc-0.35.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.24.0/download -> windows_i686_gnu-0.24.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.35.0/download -> windows_i686_gnu-0.35.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.24.0/download -> windows_i686_msvc-0.24.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.35.0/download -> windows_i686_msvc-0.35.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.24.0/download -> windows_x86_64_gnu-0.24.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.35.0/download -> windows_x86_64_gnu-0.35.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.24.0/download -> windows_x86_64_msvc-0.24.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.35.0/download -> windows_x86_64_msvc-0.35.0.crate https://crates.io/api/v1/crates/winres/0.1.12/download -> winres-0.1.12.crate https://crates.io/api/v1/crates/winrt-notification/0.5.1/download -> winrt-notification-0.5.1.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate https://crates.io/api/v1/crates/zbus/2.1.1/download -> zbus-2.1.1.crate https://crates.io/api/v1/crates/zbus_macros/2.1.1/download -> zbus_macros-2.1.1.crate https://crates.io/api/v1/crates/zbus_names/2.1.0/download -> zbus_names-2.1.0.crate https://crates.io/api/v1/crates/zvariant/3.1.2/download -> zvariant-3.1.2.crate https://crates.io/api/v1/crates/zvariant_derive/3.1.2/download -> zvariant_derive-3.1.2.crate
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e2ca9e7426b8b2494cb3ac3882fe1cd4
+_md5_=55f9253cfe8e9ae701a7c1c68dd551b4
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index ab870a57e4b7..b5f2d7125b9f 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/docbook-xsl-stylesheets-1.79.1-r2 b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r3
similarity index 91%
rename from metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2
rename to metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r3
index f1a2a1733c21..9b976ea62be6 100644
--- a/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2
+++ b/metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r3
@@ -1,7 +1,8 @@
 DEFINED_PHASES=compile install postinst postrm prepare test
 DESCRIPTION=XSL Stylesheets for Docbook
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/docbook/wiki/wiki
+INHERIT=ruby-single
 IUSE=ruby
 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=BSD
@@ -10,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/docbook/docbook-xsl-1.79.1.tar.bz2
 _eclasses_=ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed
-_md5_=46b26ed8b839a590e22ce5270f0b35fd
+_md5_=2522e9adab211c4c296583761b23ea4b
diff --git a/metadata/md5-cache/app-text/psutils-1.17-r4 b/metadata/md5-cache/app-text/psutils-1.17-r5
similarity index 100%
rename from metadata/md5-cache/app-text/psutils-1.17-r4
rename to metadata/md5-cache/app-text/psutils-1.17-r5
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 2c208f15f48d..081d9adfef20 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/vspec-1.9.2 b/metadata/md5-cache/app-vim/vspec-1.9.2
index 8a8d630d4637..2bedcb2f52db 100644
--- a/metadata/md5-cache/app-vim/vspec-1.9.2
+++ b/metadata/md5-cache/app-vim/vspec-1.9.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3012 https://github.com/kana/vim-vspec
 INHERIT=edo vim-plugin
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=MIT
 RDEPEND=dev-lang/perl:* || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kana/vim-vspec/archive/refs/tags/v1.9.2.tar.gz -> vspec-1.9.2.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=69409445a5b45eda7a51890964a4c351
+_md5_=af3d93525adbc636fd5ee2a71da6a688
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 25389778c3cd..49c1ff17b565 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/sqldeveloper-4.2.0.17.089.1709 b/metadata/md5-cache/dev-db/sqldeveloper-4.2.0.17.089.1709
deleted file mode 100644
index 45d13e083094..000000000000
--- a/metadata/md5-cache/dev-db/sqldeveloper-4.2.0.17.089.1709
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install nofetch postinst preinst prepare setup
-DEPEND=app-arch/unzip mssql? ( dev-java/jtds:1.3 ) mysql? ( dev-java/jdbc-mysql:0 ) sybase? ( dev-java/jtds:1.3 ) >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Oracle SQL Developer is a graphical tool for database development
-EAPI=5
-HOMEPAGE=http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html
-INHERIT=eutils java-pkg-2
-IUSE=mssql mysql sybase
-KEYWORDS=amd64 x86
-LICENSE=OTN
-RDEPEND=>=virtual/jdk-1.8 app-arch/unzip mssql? ( dev-java/jtds:1.3 ) mysql? ( dev-java/jdbc-mysql:0 ) sybase? ( dev-java/jtds:1.3 ) >=dev-java/java-config-2.2.0-r3
-RESTRICT=fetch
-SLOT=0
-SRC_URI=sqldeveloper-4.2.0.17.089.1709-no-jre.zip
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=62e69452ebacd659086fcb2a1602925a
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 11432f592d87..193f1e742679 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/platformio-5.2.5-r1 b/metadata/md5-cache/dev-embedded/platformio-5.2.5-r2
similarity index 99%
rename from metadata/md5-cache/dev-embedded/platformio-5.2.5-r1
rename to metadata/md5-cache/dev-embedded/platformio-5.2.5-r2
index 108270ed114d..e7b060ac6b49 100644
--- a/metadata/md5-cache/dev-embedded/platformio-5.2.5-r1
+++ b/metadata/md5-cache/dev-embedded/platformio-5.2.5-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/platformio/platformio-core/archive/refs/tags/v5.2.5.tar.gz -> platformio-5.2.5.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=6c60bf5934a9e05bb375269058cb6193
+_md5_=0f009fd283be4ded28068c3c57e1f45c
diff --git a/metadata/md5-cache/dev-embedded/platformio-6.0.2 b/metadata/md5-cache/dev-embedded/platformio-6.0.2
new file mode 100644
index 000000000000..f0aaeca1453a
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/platformio-6.0.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_single_target_python3_8? ( dev-python/jsondiff[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/jsondiff[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/jsondiff[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( <dev-python/aiofiles-0.9[python_targets_python3_8(-)] dev-python/ajsonrpc[python_targets_python3_8(-)] <dev-python/bottle-0.13[python_targets_python3_8(-)] >=dev-python/click-8[python_targets_python3_8(-)] <dev-python/click-9[python_targets_python3_8(-)] dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pyserial-3[python_targets_python3_8(-)] <dev-python/pyserial-4[python_targets_python3_8(-)] >=dev-python/requests-2.4[python_targets_python3_8(-)] <dev-python/requests-3[python_targets_python3_8(-)] >=dev-python/semantic_version-2.9[python_targets_python3_8(-)] <dev-python/semantic_version-3[python_targets_python3_8(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_8(-)] <dev-python/tabulate-1[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] >=dev-python/pyelftools-0.25[python_targets_python3_8(-)] <dev-python/pyelftools-1[python_targets_python3_8(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_8(-)] =dev-python/starlette-0.18*[python_targets_python3_8(-)] =dev-python/uvicorn-0.17*[python_targets_python3_8(-)] dev-python/wsproto[python_targets_python3_8(-)] >=dev-python/zeroconf-0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/aiofiles-0.9[python_targets_python3_9(-)] dev-python/ajsonrpc[python_targets_python3_9(-)] <dev-python/bottle-0.13[python_targets_python3_9(-)] >=dev-python/click-8[python_targets_python3_9(-)] <dev-python/click-9[python_targets_python3_9(-)] dev-python/colorama[python_targets_python3_9(-)] >=dev-python/pyserial-3[python_targets_python3_9(-)] <dev-python/pyserial-4[python_targets_python3_9(-)] >=dev-python/requests-2.4[python_targets_python3_9(-)] <dev-python/requests-3[python_targets_python3_9(-)] >=dev-python/semantic_version-2.9[python_targets_python3_9(-)] <dev-python/semantic_version-3[python_targets_python3_9(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_9(-)] <dev-python/tabulate-1[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] >=dev-python/pyelftools-0.25[python_targets_python3_9(-)] <dev-python/pyelftools-1[python_targets_python3_9(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_9(-)] =dev-python/starlette-0.18*[python_targets_python3_9(-)] =dev-python/uvicorn-0.17*[python_targets_python3_9(-)] dev-python/wsproto[python_targets_python3_9(-)] >=dev-python/zeroconf-0.37[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/aiofiles-0.9[python_targets_python3_10(-)] dev-python/ajsonrpc[python_targets_python3_10(-)] <dev-python/bottle-0.13[python_targets_python3_10(-)] >=dev-python/click-8[python_targets_python3_10(-)] <dev-python/click-9[python_targets_python3_10(-)] dev-python/colorama[python_targets_python3_10(-)] >=dev-python/pyserial-3[python_targets_python3_10(-)] <dev-python/pyserial-4[python_targets_python3_10(-)] >=dev-python/requests-2.4[python_targets_python3_10(-)] <dev-python/requests-3[python_targets_python3_10(-)] >=dev-python/semantic_version-2.9[python_targets_python3_10(-)] <dev-python/semantic_version-3[python_targets_python3_10(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_10(-)] <dev-python/tabulate-1[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] >=dev-python/pyelftools-0.25[python_targets_python3_10(-)] <dev-python/pyelftools-1[python_targets_python3_10(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_10(-)] =dev-python/starlette-0.18*[python_targets_python3_10(-)] =dev-python/uvicorn-0.17*[python_targets_python3_10(-)] dev-python/wsproto[python_targets_python3_10(-)] >=dev-python/zeroconf-0.37[python_targets_python3_10(-)] ) virtual/udev python_single_target_python3_8? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.0.1[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( >=dev-python/gpep517-3[python_targets_python3_8(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-3[python_targets_python3_9(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-3[python_targets_python3_10(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/udev
+DESCRIPTION=An open source ecosystem for IoT development
+EAPI=8
+HOMEPAGE=https://platformio.org/
+INHERIT=distutils-r1 udev
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_single_target_python3_8? ( <dev-python/aiofiles-0.9[python_targets_python3_8(-)] dev-python/ajsonrpc[python_targets_python3_8(-)] <dev-python/bottle-0.13[python_targets_python3_8(-)] >=dev-python/click-8[python_targets_python3_8(-)] <dev-python/click-9[python_targets_python3_8(-)] dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pyserial-3[python_targets_python3_8(-)] <dev-python/pyserial-4[python_targets_python3_8(-)] >=dev-python/requests-2.4[python_targets_python3_8(-)] <dev-python/requests-3[python_targets_python3_8(-)] >=dev-python/semantic_version-2.9[python_targets_python3_8(-)] <dev-python/semantic_version-3[python_targets_python3_8(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_8(-)] <dev-python/tabulate-1[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] >=dev-python/pyelftools-0.25[python_targets_python3_8(-)] <dev-python/pyelftools-1[python_targets_python3_8(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_8(-)] =dev-python/starlette-0.18*[python_targets_python3_8(-)] =dev-python/uvicorn-0.17*[python_targets_python3_8(-)] dev-python/wsproto[python_targets_python3_8(-)] >=dev-python/zeroconf-0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/aiofiles-0.9[python_targets_python3_9(-)] dev-python/ajsonrpc[python_targets_python3_9(-)] <dev-python/bottle-0.13[python_targets_python3_9(-)] >=dev-python/click-8[python_targets_python3_9(-)] <dev-python/click-9[python_targets_python3_9(-)] dev-python/colorama[python_targets_python3_9(-)] >=dev-python/pyserial-3[python_targets_python3_9(-)] <dev-python/pyserial-4[python_targets_python3_9(-)] >=dev-python/requests-2.4[python_targets_python3_9(-)] <dev-python/requests-3[python_targets_python3_9(-)] >=dev-python/semantic_version-2.9[python_targets_python3_9(-)] <dev-python/semantic_version-3[python_targets_python3_9(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_9(-)] <dev-python/tabulate-1[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] >=dev-python/pyelftools-0.25[python_targets_python3_9(-)] <dev-python/pyelftools-1[python_targets_python3_9(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_9(-)] =dev-python/starlette-0.18*[python_targets_python3_9(-)] =dev-python/uvicorn-0.17*[python_targets_python3_9(-)] dev-python/wsproto[python_targets_python3_9(-)] >=dev-python/zeroconf-0.37[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/aiofiles-0.9[python_targets_python3_10(-)] dev-python/ajsonrpc[python_targets_python3_10(-)] <dev-python/bottle-0.13[python_targets_python3_10(-)] >=dev-python/click-8[python_targets_python3_10(-)] <dev-python/click-9[python_targets_python3_10(-)] dev-python/colorama[python_targets_python3_10(-)] >=dev-python/pyserial-3[python_targets_python3_10(-)] <dev-python/pyserial-4[python_targets_python3_10(-)] >=dev-python/requests-2.4[python_targets_python3_10(-)] <dev-python/requests-3[python_targets_python3_10(-)] >=dev-python/semantic_version-2.9[python_targets_python3_10(-)] <dev-python/semantic_version-3[python_targets_python3_10(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_10(-)] <dev-python/tabulate-1[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] >=dev-python/pyelftools-0.25[python_targets_python3_10(-)] <dev-python/pyelftools-1[python_targets_python3_10(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_10(-)] =dev-python/starlette-0.18*[python_targets_python3_10(-)] =dev-python/uvicorn-0.17*[python_targets_python3_10(-)] dev-python/wsproto[python_targets_python3_10(-)] >=dev-python/zeroconf-0.37[python_targets_python3_10(-)] ) virtual/udev python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/platformio/platformio-core/archive/refs/tags/v6.0.2.tar.gz -> platformio-6.0.2.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=aef242b2e58d9362dc3000e7cd81dc26
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 19340f273daa..b5d41dcbb9c0 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/jackson-annotations-2.13.3 b/metadata/md5-cache/dev-java/jackson-annotations-2.13.3
index 9a1645f027a3..6a50c11c7339 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.13.3
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.13.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-annotations
 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://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.13.3.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	cfb5f6911bb70204c94ceafd0372c716
-_md5_=1ced179b3836593898b15803941452af
+_md5_=777525351e16e0aa9d7199de58b8d61f
diff --git a/metadata/md5-cache/dev-java/jackson-core-2.13.3 b/metadata/md5-cache/dev-java/jackson-core-2.13.3
index 68a82f14ed92..6864dbce9e2d 100644
--- a/metadata/md5-cache/dev-java/jackson-core-2.13.3
+++ b/metadata/md5-cache/dev-java/jackson-core-2.13.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-core
 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=0
 SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.13.3.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	cfb5f6911bb70204c94ceafd0372c716
-_md5_=3e0b8a9025490b86395374797d7a234c
+_md5_=151a771ba6a88f23f28939543905adb7
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.13.3 b/metadata/md5-cache/dev-java/jackson-databind-2.13.3
index bf29a255ace0..221abf33d12f 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.13.3
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.13.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-databind
 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/jackson-annotations-2.13.3:2 ~dev-java/jackson-core-2.13.3:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.13.3.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	cfb5f6911bb70204c94ceafd0372c716
-_md5_=ef202a40fe5348c22d5e9521bed0c335
+_md5_=359d07897d0278e84e294a346f5075d9
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.3 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.3
index aa60c638ec75..944f2347111e 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.3
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-dataformat-xml
 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/jackson-annotations-2.13.3:2 ~dev-java/jackson-core-2.13.3:0 ~dev-java/jackson-databind-2.13.3:0 >=dev-java/stax2-api-4.2.1-r1:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.13.3.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	cfb5f6911bb70204c94ceafd0372c716
-_md5_=fdb695e16cac5ce1ebd4ab4efa7349e3
+_md5_=b26ee0c2d382ff78a9dbabec7ed2e0f3
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.3 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.3
index 6f48d2eba351..652a6479f8a8 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.3
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-dataformats-text
 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/jackson-core-2.13.3:0 ~dev-java/jackson-databind-2.13.3:0 dev-java/snakeyaml:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-dataformats-text/archive/jackson-dataformats-text-2.13.3.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	cfb5f6911bb70204c94ceafd0372c716
-_md5_=cbb5cc10cee29f572e5fb96eed81ad06
+_md5_=1ccff617f6612b7d5a9de69638327938
diff --git a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3 b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3
index 5813ee819135..0ab19bd1242d 100644
--- a/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3
+++ b/metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/FasterXML/jackson-modules-base
 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/jackson-annotations-2.13.3:2 ~dev-java/jackson-core-2.13.3:0 ~dev-java/jackson-databind-2.13.3:0 dev-java/jakarta-activation:1 dev-java/jaxb-api:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/jackson-modules-base/archive/jackson-modules-base-2.13.3.tar.gz -> jackson-module-jakarta-xmlbind-2.13.3.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	cfb5f6911bb70204c94ceafd0372c716
-_md5_=7096f8d36f7301cc109ffccdf3d96419
+_md5_=323c22bc93f690f63dabba52831bcc15
diff --git a/metadata/md5-cache/dev-java/janino-3.1.6 b/metadata/md5-cache/dev-java/janino-3.1.6
deleted file mode 100644
index 21ca2b019407..000000000000
--- a/metadata/md5-cache/dev-java/janino-3.1.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=An embedded compiler for run-time compilation purposes
-EAPI=8
-HOMEPAGE=https://janino-compiler.github.io/janino/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://codeload.github.com/janino-compiler/janino/tar.gz/v3.1.6 -> janino-3.1.6.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	cfb5f6911bb70204c94ceafd0372c716
-_md5_=4119fc7b2fa774828a032b4f157191c4
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 4ad34e24b54a..58600403e17f 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/ammonite-repl-bin-2.5.3 b/metadata/md5-cache/dev-lang/ammonite-repl-bin-2.5.3
deleted file mode 100644
index cfe8f8beb276..000000000000
--- a/metadata/md5-cache/dev-lang/ammonite-repl-bin-2.5.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Scala language-based scripting and REPL
-EAPI=8
-HOMEPAGE=https://ammonite.io/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8:*
-SLOT=0
-SRC_URI=https://github.com/com-lihaoyi/Ammonite/releases/download/2.5.3/2.13-2.5.3 -> ammonite-repl-bin-2.5.3
-_md5_=dd8d1e5a82f27e61aebcb402e92e926a
diff --git a/metadata/md5-cache/dev-lang/ammonite-repl-bin-2.5.4 b/metadata/md5-cache/dev-lang/ammonite-repl-bin-2.5.4
index b12e5ff332c4..32da166435f2 100644
--- a/metadata/md5-cache/dev-lang/ammonite-repl-bin-2.5.4
+++ b/metadata/md5-cache/dev-lang/ammonite-repl-bin-2.5.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Scala language-based scripting and REPL
 EAPI=8
 HOMEPAGE=https://ammonite.io/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:*
 SLOT=0
 SRC_URI=https://github.com/com-lihaoyi/Ammonite/releases/download/2.5.4/2.13-2.5.4 -> ammonite-repl-bin-2.5.4
-_md5_=87cd3375bf2a2fe0358d4f4df9834b0d
+_md5_=dd8d1e5a82f27e61aebcb402e92e926a
diff --git a/metadata/md5-cache/dev-lang/execline-2.8.3.0 b/metadata/md5-cache/dev-lang/execline-2.8.3.0-r1
similarity index 75%
rename from metadata/md5-cache/dev-lang/execline-2.8.3.0
rename to metadata/md5-cache/dev-lang/execline-2.8.3.0-r1
index 0ab4884a7236..4cdc252cdfe9 100644
--- a/metadata/md5-cache/dev-lang/execline-2.8.3.0
+++ b/metadata/md5-cache/dev-lang/execline-2.8.3.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/skalibs-2.11.2.0:=[static-libs?]
+DEPEND=>=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?]
 DESCRIPTION=A non-interactive scripting language
 EAPI=8
 HOMEPAGE=https://www.skarnet.org/software/execline/
@@ -7,9 +7,9 @@ INHERIT=toolchain-funcs
 IUSE=static static-libs
 KEYWORDS=amd64 ~arm x86
 LICENSE=ISC
-RDEPEND=>=dev-libs/skalibs-2.11.2.0:=[static-libs?]
+RDEPEND=>=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?]
 REQUIRED_USE=static? ( static-libs )
 SLOT=0/2.8
 SRC_URI=https://www.skarnet.org/software/execline/execline-2.8.3.0.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=048da23b3508130bfe8dfa35bfd653a1
+_md5_=85ec1076faf39adf7bc81524e79aa23d
diff --git a/metadata/md5-cache/dev-lang/execline-2.9.0.0 b/metadata/md5-cache/dev-lang/execline-2.9.0.0
new file mode 100644
index 000000000000..193134f493ed
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/execline-2.9.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/skalibs-2.12.0.0:=
+DESCRIPTION=A non-interactive scripting language
+EAPI=8
+HOMEPAGE=https://www.skarnet.org/software/execline/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=>=dev-libs/skalibs-2.12.0.0:=
+SLOT=0/2.9
+SRC_URI=https://www.skarnet.org/software/execline/execline-2.9.0.0.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=c51e2cc1daca5467f86279ce986ab6f9
diff --git a/metadata/md5-cache/dev-lang/gforth-0.7.3-r2 b/metadata/md5-cache/dev-lang/gforth-0.7.3-r2
index 311e95e38feb..9e7454f12453 100644
--- a/metadata/md5-cache/dev-lang/gforth-0.7.3-r2
+++ b/metadata/md5-cache/dev-lang/gforth-0.7.3-r2
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gforth
 INHERIT=elisp-common
 IUSE=+check emacs
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=dev-libs/ffcall emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://gnu/gforth/gforth-0.7.3.tar.gz
 _eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=b88739ac83d7a959e935dab7b1dfb11f
+_md5_=6b8e9acd7d575c40a9a086dc063c277c
diff --git a/metadata/md5-cache/dev-lang/perl-5.34.1-r3 b/metadata/md5-cache/dev-lang/perl-5.34.1-r3
index 9d709c1ff99c..ec842735fe07 100644
--- a/metadata/md5-cache/dev-lang/perl-5.34.1-r3
+++ b/metadata/md5-cache/dev-lang/perl-5.34.1-r3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.perl.org/
 INHERIT=alternatives flag-o-matic toolchain-funcs multilib multiprocessing
 IUSE=berkdb debug doc gdbm ithreads minimal quadmath
-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
+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=|| ( Artistic GPL-1+ )
 PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.5 >=virtual/perl-CPAN-2.290.0 >=virtual/perl-Encode-3.120.0 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib virtual/libcrypt:=
 SLOT=0/5.34
 SRC_URI=mirror://cpan/src/5.0/perl-5.34.1.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.34.1.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.34.0-patches-1/perl-5.34.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.34.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.7/perl-cross-1.3.7.tar.gz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.34.1-zlib-1.2.12.patch.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.34.1-zlib-1.2.12-encrypt-standard.zip.bin
 _eclasses_=alternatives	a0c93671b4b99c1326c746e95dc53396	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a1a8efe1f050369187cc020beda172fd
+_md5_=8fff0efe927a5f3d2495f7b1220a4912
diff --git a/metadata/md5-cache/dev-lang/python-3.10.5 b/metadata/md5-cache/dev-lang/python-3.10.5
index c921c00b5c4b..c212b0153d77 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.5
+++ b/metadata/md5-cache/dev-lang/python-3.10.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/
 INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml verify-sig
-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=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/3.10.5/Python-3.10.5.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.5.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.5/Python-3.10.5.tar.xz.asc )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7f076e6d0b6927badb505ecc98c428c7
+_md5_=b3a83481010f928842dc5c2193a8c8e8
diff --git a/metadata/md5-cache/dev-lang/python-3.9.13 b/metadata/md5-cache/dev-lang/python-3.9.13
index a750178e09bb..3812dbb9a864 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.13
+++ b/metadata/md5-cache/dev-lang/python-3.9.13
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/
 INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml verify-sig
-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=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.13.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tar.xz.asc )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=372c75493c87d025d84c09551c327d4a
+_md5_=d929e0cf66ead17abc6f0d8bb0bc063b
diff --git a/metadata/md5-cache/dev-lang/rust-1.61.0-r1 b/metadata/md5-cache/dev-lang/rust-1.61.0-r1
index c56226d936b5..dc4746d639fa 100644
--- a/metadata/md5-cache/dev-lang/rust-1.61.0-r1
+++ b/metadata/md5-cache/dev-lang/rust-1.61.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.rust-lang.org/
 INHERIT=bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig
 IUSE=clippy cpu_flags_x86_sse2 debug dist doc miri nightly parallel-compiler profiler rls rustfmt rust-src system-bootstrap system-llvm test wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore 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 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= elibc_musl? ( sys-libs/libunwind:= ) system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:14[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:14[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:14[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:14[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:14[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:14[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:14[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:14[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:14[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:14[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:14[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:14[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:14[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:14[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:14[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:14[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:14[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-15:= wasm? ( sys-devel/lld ) ) app-eselect/eselect-rust sys-apps/lsb-release
 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_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) miri? ( nightly ) parallel-compiler? ( nightly ) rls? ( rust-src ) test? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=stable/1.61
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.61.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.61.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.60.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.60.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.60.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.60.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.60.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.60.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.60.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.60.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.60.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.60.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.60.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.60.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.60.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.60.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.60.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.60.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=f1c132d20fae6b7f6313e1e319537815
+_md5_=5eed4c03854168341266a7f988ac1cd9
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.61.0 b/metadata/md5-cache/dev-lang/rust-bin-1.61.0
index be26c8fb3466..fd7026a0d062 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.61.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.61.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.rust-lang.org/
 INHERIT=multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
 IUSE=clippy cpu_flags_x86_sse2 doc prefix rls rust-src rustfmt 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 ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=app-eselect/eselect-rust-20190311 sys-apps/lsb-release
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
-SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.61.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.61.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.61.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.61.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2022-05-19/rust-src-1.61.0.tar.xz )
+SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.61.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.61.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.61.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.61.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2022-05-19/rust-src-1.61.0.tar.xz ) sparc? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-lang/rust-bin/rust-1.61.0-sparc64-unknown-linux-gnu.tar.xz )
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=24bb7c31686a20c044291ab17200178a
+_md5_=6972ac977c865e084d8fb60d2e680050
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 31a795ede0f6..ac44a51885d5 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/elfutils-0.187 b/metadata/md5-cache/dev-libs/elfutils-0.187
index e370002fc798..4b3fff3da9e9 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.187
+++ b/metadata/md5-cache/dev-libs/elfutils-0.187
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://sourceware.org/elfutils/
 INHERIT=flag-o-matic multilib-minimal verify-sig
 IUSE=bzip2 lzma nls static-libs test +threads +utils valgrind 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 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
 RDEPEND=>=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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) zstd? ( app-arch/zstd:=[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(-)?] ) elibc_musl? ( dev-libs/libbsd sys-libs/argp-standalone sys-libs/fts-standalone sys-libs/obstack-standalone ) !dev-libs/libelf
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sourceware.org/elfutils/ftp/0.187/elfutils-0.187.tar.bz2 https://dev.gentoo.org/~sam/distfiles/dev-libs/elfutils/elfutils-0.187-patches.tar.xz verify-sig? ( https://sourceware.org/elfutils/ftp/0.187/elfutils-0.187.tar.bz2.sig )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=43666f8d4a3611fa1ef129be45608149
+_md5_=c5515fc12405c89406fa77beaf33266f
diff --git a/metadata/md5-cache/dev-libs/ffcall-2.4 b/metadata/md5-cache/dev-libs/ffcall-2.4
index e69a48860b5e..ba10630393ae 100644
--- a/metadata/md5-cache/dev-libs/ffcall-2.4
+++ b/metadata/md5-cache/dev-libs/ffcall-2.4
@@ -3,9 +3,9 @@ DESCRIPTION=Build foreign function call interfaces in embedded interpreter
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/libffcall/
 INHERIT=flag-o-matic
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/libffcall/libffcall-2.4.tar.gz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f5dcf8136a85dfe1ef7c811ef5544ecd
+_md5_=2acc7ac796aed9822ff9eff49c9be9b2
diff --git a/metadata/md5-cache/dev-libs/gjs-1.72.0 b/metadata/md5-cache/dev-libs/gjs-1.72.0
index cd7849bfc804..b2cd63bf3089 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.72.0
+++ b/metadata/md5-cache/dev-libs/gjs-1.72.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.72/gjs-1.72.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=581b66b9855731b12111a00166f29058
+_md5_=f8875afc02a07e4ec54425371531452f
diff --git a/metadata/md5-cache/dev-libs/glib-2.72.2 b/metadata/md5-cache/dev-libs/glib-2.72.2
index 39a07651b0c2..2688cc0fad83 100644
--- a/metadata/md5-cache/dev-libs/glib-2.72.2
+++ b/metadata/md5-cache/dev-libs/glib-2.72.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.gtk.org/
 INHERIT=flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
 IUSE=dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr 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 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.72.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(-)?] >=dev-libs/libpcre-8.31: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(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=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(-)?] >=virtual/libintl-0-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(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) fam? ( >=virtual/fam-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(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.2.tar.xz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=eb8aca44fcde41ce2485515e94b98b94
+_md5_=028cb141c573015be5c8e84e0e649f59
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.17.23034-r1 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.17.23034-r1
deleted file mode 100644
index eef8712ea117..000000000000
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.17.23034-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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:= dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.11061-r1 >=dev-util/intel-graphics-system-controller-0.2.4:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.7.15 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-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
-LICENSE=MIT
-RDEPEND=>=media-libs/gmmlib-22.0.2:=
-SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/22.17.23034.tar.gz -> intel-compute-runtime-22.17.23034.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dacc2cc2a55ba357d723863df346e1f1
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.18.23063-r1 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.18.23063-r1
deleted file mode 100644
index f5a7ab9bc5b6..000000000000
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.18.23063-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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:= dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.11061-r1 >=dev-util/intel-graphics-system-controller-0.2.4:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.7.15 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-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
-LICENSE=MIT
-RDEPEND=>=media-libs/gmmlib-22.0.2:=
-SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/22.18.23063.tar.gz -> intel-compute-runtime-22.18.23063.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3d1ab25267c27ac0bc040ff2cb178e71
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.20.23198 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.20.23198
index 5c8f2646606b..a8a2c9697c41 100644
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.20.23198
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.20.23198
@@ -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.0.2:=
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/22.20.23198.tar.gz -> intel-compute-runtime-22.20.23198.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3d1ab25267c27ac0bc040ff2cb178e71
+_md5_=a4f8721cbcefd7ebad434ccb6f6b43b3
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.19.23136-r1 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.24.23453
similarity index 89%
rename from metadata/md5-cache/dev-libs/intel-compute-runtime-22.19.23136-r1
rename to metadata/md5-cache/dev-libs/intel-compute-runtime-22.24.23453
index 19657be000ec..fa23c42442b3 100644
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.19.23136-r1
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.24.23453
@@ -10,6 +10,6 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=media-libs/gmmlib-22.0.2:=
 SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/22.19.23136.tar.gz -> intel-compute-runtime-22.19.23136.tar.gz
+SRC_URI=https://github.com/intel/compute-runtime/archive/22.24.23453.tar.gz -> intel-compute-runtime-22.24.23453.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3d1ab25267c27ac0bc040ff2cb178e71
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20211123-r1 b/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20211123-r1
deleted file mode 100644
index af0b273789b1..000000000000
--- a/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20211123-r1
+++ /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 test
-DEPEND=x11-libs/libdrm
-DESCRIPTION=A 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
-SRC_URI=https://github.com/intel/metrics-library/archive/3fd6eb0544fadcec2ac762aedee7c2d5d6479feb.tar.gz -> intel-metrics-library-0_pre20211123.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3780eb7cb6b11ff2d8f7052598f1e45c
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20220512 b/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20220512
index 2037c07b3aff..25cc944aaae4 100644
--- a/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20220512
+++ b/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20220512
@@ -5,10 +5,10 @@ DESCRIPTION=A user mode driver helper library that provides access to GPU perfor
 EAPI=8
 HOMEPAGE=https://github.com/intel/metrics-library
 INHERIT=cmake
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=x11-libs/libdrm
 SLOT=0
 SRC_URI=https://github.com/intel/metrics-library/archive/7d97bb29c4db1d79702402f8331d9be371a87f83.tar.gz -> intel-metrics-library-0_pre20220512.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1c60536f5c327cb37e9f368fd4847581
+_md5_=d059239604131e3b8c945cb49e62b319
diff --git a/metadata/md5-cache/dev-libs/level-zero-1.8.1 b/metadata/md5-cache/dev-libs/level-zero-1.8.1
index 869d843b064b..1ad32b4eac04 100644
--- a/metadata/md5-cache/dev-libs/level-zero-1.8.1
+++ b/metadata/md5-cache/dev-libs/level-zero-1.8.1
@@ -4,9 +4,9 @@ DESCRIPTION=oneAPI Level Zero headers, loader and validation layer
 EAPI=8
 HOMEPAGE=https://github.com/oneapi-src/level-zero
 INHERIT=cmake
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/oneapi-src/level-zero/archive/refs/tags/v1.8.1.tar.gz -> level-zero-1.8.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ce4cdca2052701308862165c1c6fbe6c
+_md5_=4cc08bb748d81b4bb7bf9eab224897dc
diff --git a/metadata/md5-cache/dev-libs/libbytesize-2.5 b/metadata/md5-cache/dev-libs/libbytesize-2.5
deleted file mode 100644
index 7082d56107a6..000000000000
--- a/metadata/md5-cache/dev-libs/libbytesize-2.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gettext doc? ( dev-util/gtk-doc ) test? ( dev-python/pocketlint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/polib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/mpfr:= dev-libs/libpcre2 python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
-DESCRIPTION=Tiny library providing a C "class" for working with arbitrary big sizes in bytes
-EAPI=7
-HOMEPAGE=https://github.com/storaged-project/libbytesize
-INHERIT=autotools python-r1
-IUSE=doc python test tools python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=LGPL-2+
-RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:= dev-libs/libpcre2 python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) tools? ( python )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/storaged-project/libbytesize/releases/download/2.5/libbytesize-2.5.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=734a7d7ebf6c8b1b5739f095c11ad108
diff --git a/metadata/md5-cache/dev-libs/libclc-14.0.6 b/metadata/md5-cache/dev-libs/libclc-14.0.6
new file mode 100644
index 000000000000..1f18b8e28c1a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libclc-14.0.6
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( sys-devel/clang:14 sys-devel/clang:13 sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) verify-sig? ( sec-keys/openpgp-keys-llvm ) >=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=video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig
+KEYWORDS=~amd64 ~x86
+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	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	e68bb6ac1b36c6eeced323c0334f1a4f	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3d0d9669ff1ac2ee9699d7e441b97db2
diff --git a/metadata/md5-cache/dev-libs/marisa-0.2.5 b/metadata/md5-cache/dev-libs/marisa-0.2.5
deleted file mode 100644
index 1fe8b2bc4c09..000000000000
--- a/metadata/md5-cache/dev-libs/marisa-0.2.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) dev-lang/swig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) )
-DESCRIPTION=Matching Algorithm with Recursively Implemented StorAge
-EAPI=7
-HOMEPAGE=https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/
-INHERIT=autotools distutils-r1
-IUSE=python static-libs python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm64 ppc ppc64 sparc x86
-LICENSE=|| ( BSD-2 LGPL-2.1+ )
-RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
-SLOT=0
-SRC_URI=https://github.com/s-yata/marisa-trie/archive/v0.2.5.tar.gz -> marisa-0.2.5.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b6354e76ae9fd5b7dba8ae27be44f09a
diff --git a/metadata/md5-cache/dev-libs/nspr-4.34 b/metadata/md5-cache/dev-libs/nspr-4.34
index 48c0e39a39b8..a14970282555 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.34
+++ b/metadata/md5-cache/dev-libs/nspr-4.34
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.mozilla.org/projects/nspr/
 INHERIT=autotools toolchain-funcs multilib-minimal
 IUSE=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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.34/src/nspr-4.34.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d87348c4756fd7374f3bd35d90d638da
+_md5_=5fa2059d05e0f741d5890db9f1047ab4
diff --git a/metadata/md5-cache/dev-libs/nss-3.80 b/metadata/md5-cache/dev-libs/nss-3.80
new file mode 100644
index 000000000000..dbe912d5fcf1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nss-3.80
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/nspr-4.34[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-db/sqlite-3.8.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-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(-)?] virtual/pkgconfig
+DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
+EAPI=8
+HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
+INHERIT=flag-o-matic multilib toolchain-funcs multilib-minimal
+IUSE=cacert test +utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx 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 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+RDEPEND=>=dev-libs/nspr-4.34[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-db/sqlite-3.8.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-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(-)?] virtual/pkgconfig
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_80_RTM/src/nss-3.80.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=36d5687d6633641bd3779372a7aee87d
diff --git a/metadata/md5-cache/dev-libs/poco-1.11.2 b/metadata/md5-cache/dev-libs/poco-1.11.2-r1
similarity index 97%
rename from metadata/md5-cache/dev-libs/poco-1.11.2
rename to metadata/md5-cache/dev-libs/poco-1.11.2-r1
index e41eb4834dc3..c42010ff88c3 100644
--- a/metadata/md5-cache/dev-libs/poco-1.11.2
+++ b/metadata/md5-cache/dev-libs/poco-1.11.2-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.11.2-release.tar.gz -> poco-1.11.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fb5c9083247f2cfef6eb67cf0dad4f30
+_md5_=17620138cc4fce44e1daa0b75e893d3d
diff --git a/metadata/md5-cache/dev-libs/qqwing-1.3.4 b/metadata/md5-cache/dev-libs/qqwing-1.3.4-r1
similarity index 100%
rename from metadata/md5-cache/dev-libs/qqwing-1.3.4
rename to metadata/md5-cache/dev-libs/qqwing-1.3.4-r1
diff --git a/metadata/md5-cache/dev-libs/sdformat-9.8.0 b/metadata/md5-cache/dev-libs/sdformat-9.8.0
new file mode 100644
index 000000000000..deb3ba07f58c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/sdformat-9.8.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/ruby:* virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:6=
+DESCRIPTION=Simulation Description Format (SDF) parser
+EAPI=8
+HOMEPAGE=http://sdformat.org/
+INHERIT=cmake
+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
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=282408ac6e0b9a4d6da3e8caef2273ea
diff --git a/metadata/md5-cache/dev-libs/skalibs-2.12.0.1 b/metadata/md5-cache/dev-libs/skalibs-2.12.0.1
new file mode 100644
index 000000000000..e90e49e4fe73
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/skalibs-2.12.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DESCRIPTION=General-purpose libraries from skarnet.org
+EAPI=8
+HOMEPAGE=https://www.skarnet.org/software/skalibs/
+INHERIT=toolchain-funcs
+IUSE=doc ipv6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=ISC
+SLOT=0/2.12
+SRC_URI=https://www.skarnet.org/software/skalibs/skalibs-2.12.0.1.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=ceb492b105601be61f059139a30fb4c1
diff --git a/metadata/md5-cache/dev-libs/tlsh-4.8.2 b/metadata/md5-cache/dev-libs/tlsh-4.8.2
index 199eb4da63b4..2c6dad4b71e6 100644
--- a/metadata/md5-cache/dev-libs/tlsh-4.8.2
+++ b/metadata/md5-cache/dev-libs/tlsh-4.8.2
@@ -4,9 +4,9 @@ DESCRIPTION=Fuzzy matching library
 EAPI=8
 HOMEPAGE=https://github.com/trendmicro/tlsh
 INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( Apache-2.0 BSD )
 SLOT=0
 SRC_URI=https://github.com/trendmicro/tlsh/archive/4.8.2.tar.gz -> tlsh-4.8.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4ca69fe70b87b2e3ca5d7edeafa4768f
+_md5_=5fd4fe9651add929264bbcbf22ffa4f4
diff --git a/metadata/md5-cache/dev-libs/weston-10.0.1 b/metadata/md5-cache/dev-libs/weston-10.0.1
new file mode 100644
index 000000000000..bb58421dbb29
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/weston-10.0.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 ) virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.24 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.95 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm(+)] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.3:= ) rdp? ( >=net-misc/freerdp-2.2.0:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
+DESCRIPTION=Wayland reference compositor
+EAPI=8
+HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
+INHERIT=meson python-any-r1 readme.gentoo-r1 xdg-utils
+IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT CC-BY-SA-3.0
+RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.24 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.95 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm(+)] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.3:= ) rdp? ( >=net-misc/freerdp-2.2.0:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
+REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) remoting? ( drm gles2 ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/wayland/weston/-/releases/10.0.1/downloads/weston-10.0.1.tar.xz
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1870505cd2bcf43c56dabed47ff747a9
diff --git a/metadata/md5-cache/dev-libs/weston-9999 b/metadata/md5-cache/dev-libs/weston-9999
index 49c5855423cd..70713e3ca6e8 100644
--- a/metadata/md5-cache/dev-libs/weston-9999
+++ b/metadata/md5-cache/dev-libs/weston-9999
@@ -1,16 +1,16 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 ) virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 ) virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install setup test unpack
-DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.24 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.95 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm(+)] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.3:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
+DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.24 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.95 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm(+)] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.3:= ) rdp? ( >=net-misc/freerdp-2.3.0:=[server] ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
 DESCRIPTION=Wayland reference compositor
-EAPI=7
+EAPI=8
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
 INHERIT=meson python-any-r1 readme.gentoo-r1 xdg-utils git-r3
-IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland
+IUSE=colord +desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland
 LICENSE=MIT CC-BY-SA-3.0
 PROPERTIES=live
-RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.24 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.95 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm(+)] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.3:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
-REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) remoting? ( drm gles2 ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
+RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.24 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.95 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm(+)] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.3:= ) rdp? ( >=net-misc/freerdp-2.3.0:=[server] ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
+REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) remoting? ( drm gles2 ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm headless rdp wayland-compositor X )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=24b61f6a218c14e5423460047748815e
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0133f1cf55737a4811be2ae032e975ba
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 41d903b29ff9..0b8bf26aedaa 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/easy-format-1.2.0 b/metadata/md5-cache/dev-ml/easy-format-1.2.0
index a5baa3c005a8..a387abb05238 100644
--- a/metadata/md5-cache/dev-ml/easy-format-1.2.0
+++ b/metadata/md5-cache/dev-ml/easy-format-1.2.0
@@ -2,12 +2,13 @@ DEFINED_PHASES=compile install
 DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Pretty-printing library for OCaml
 EAPI=7
-HOMEPAGE=https://github.com/mjambon/easy-format
+HOMEPAGE=https://github.com/ocaml-community/easy-format
+INHERIT=findlib
 IUSE=examples +ocamlopt +ocamlopt
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.2.0
-SRC_URI=https://github.com/mjambon/easy-format/archive/v1.2.0.tar.gz -> easy-format-1.2.0.tar.gz
+SRC_URI=https://github.com/ocaml-community/easy-format/archive/v1.2.0.tar.gz -> easy-format-1.2.0.tar.gz
 _eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
-_md5_=ac78b787a31b18fe4756015720b0ac9d
+_md5_=d24c5117ab1802d2416cb0632a43d187
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6 b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
new file mode 100644
index 000000000000..0b87094f0a5f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 verify-sig? ( sec-keys/openpgp-keys-llvm ) >=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-14.0.6:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-14.0.6[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.6[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.6[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.6[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.6[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.6[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.6[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.6[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.6[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.6[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.6[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.6[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.6[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.6[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.6[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.6[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.6[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.6[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.6[llvm_targets_M68k] ) !!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_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_M68k 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-14.0.6:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-14.0.6[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.6[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.6[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.6[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.6[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.6[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.6[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.6[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.6[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.6[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.6[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.6[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.6[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.6[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.6[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.6[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.6[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.6[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.6[llvm_targets_M68k] )
+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_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_M68k )
+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	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	e68bb6ac1b36c6eeced323c0334f1a4f	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fbae63c9b8e8f4c773111b71ce3e17ae
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index fca1950b6f77..ae5734767c20 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/boolean-py-4.0 b/metadata/md5-cache/dev-python/boolean-py-4.0
index 898227b79c0f..d18ab30d7654 100644
--- a/metadata/md5-cache/dev-python/boolean-py-4.0
+++ b/metadata/md5-cache/dev-python/boolean-py-4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/boolean.py/ https://github.com/bastikr/boolean.py/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/bastikr/boolean.py/archive/v4.0.tar.gz -> boolean.py-4.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8263c44e9daa3c1a984d13abfc61ef86
+_md5_=99f53be696032329040ae701687f006f
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.15 b/metadata/md5-cache/dev-python/boto3-1.24.15
new file mode 100644
index 000000000000..20347700f60d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.15
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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=doc test python_targets_python3_8 python_targets_python3_9 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.27.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.24.15.tar.gz -> boto3-1.24.15.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.16 b/metadata/md5-cache/dev-python/boto3-1.24.16
new file mode 100644
index 000000000000..422a9e741c52
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.16
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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=doc test python_targets_python3_8 python_targets_python3_9 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.27.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.24.16.tar.gz -> boto3-1.24.16.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.17 b/metadata/md5-cache/dev-python/boto3-1.24.17
new file mode 100644
index 000000000000..7571c42be2e1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.17
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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=doc test python_targets_python3_8 python_targets_python3_9 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.27.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.24.17.tar.gz -> boto3-1.24.17.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.15 b/metadata/md5-cache/dev-python/botocore-1.27.15
new file mode 100644
index 000000000000..9d096fef3c81
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.15
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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=doc test python_targets_python3_8 python_targets_python3_9 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.27.15.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=251ab9b79e6c92dfb42db053bb2839a4
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.16 b/metadata/md5-cache/dev-python/botocore-1.27.16
new file mode 100644
index 000000000000..9c4363e0eaf5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.16
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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=doc test python_targets_python3_8 python_targets_python3_9 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.27.16.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=251ab9b79e6c92dfb42db053bb2839a4
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.17 b/metadata/md5-cache/dev-python/botocore-1.27.17
new file mode 100644
index 000000000000..29d47311b190
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.17
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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=doc test python_targets_python3_8 python_targets_python3_9 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.27.17.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=251ab9b79e6c92dfb42db053bb2839a4
diff --git a/metadata/md5-cache/dev-python/calver-2021.7.30 b/metadata/md5-cache/dev-python/calver-2021.7.30
new file mode 100644
index 000000000000..49ed658b4346
--- /dev/null
+++ b/metadata/md5-cache/dev-python/calver-2021.7.30
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Setuptools extension for CalVer package versions
+EAPI=8
+HOMEPAGE=https://github.com/di/calver/ https://pypi.org/project/calver/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/di/calver/archive/2021.7.30.tar.gz -> calver-2021.7.30.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a8d4defbd78d09aab718bb68576a2b54
diff --git a/metadata/md5-cache/dev-python/cerberus-1.3.4-r1 b/metadata/md5-cache/dev-python/cerberus-1.3.4-r1
index d71b2ad5e098..cd231e664655 100644
--- a/metadata/md5-cache/dev-python/cerberus-1.3.4-r1
+++ b/metadata/md5-cache/dev-python/cerberus-1.3.4-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://docs.python-cerberus.org/ https://github.com/pyeve/cerberus/ https://pypi.org/project/Cerberus/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv ~x86
 LICENSE=ISC
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/pyeve/cerberus/archive/1.3.4.tar.gz -> cerberus-1.3.4.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=617ead8b0fa896530d99df8d572ebe7f
+_md5_=5a61becd550e7cb5fddc9e929286baf1
diff --git a/metadata/md5-cache/dev-python/cheetah3-3.2.6 b/metadata/md5-cache/dev-python/cheetah3-3.2.6
deleted file mode 100644
index 1a69d330bf3e..000000000000
--- a/metadata/md5-cache/dev-python/cheetah3-3.2.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/cheetah python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python-powered template engine and code generator
-EAPI=7
-HOMEPAGE=https://cheetahtemplate.org/ https://pypi.org/project/Cheetah3/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/cheetah python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/CheetahTemplate3/cheetah3/archive/3.2.6.tar.gz -> cheetah3-3.2.6.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0a449eddbd90791246d03be62569f02b
diff --git a/metadata/md5-cache/dev-python/cherrypy-18.6.1 b/metadata/md5-cache/dev-python/cherrypy-18.6.1
deleted file mode 100644
index b25eede1ef87..000000000000
--- a/metadata/md5-cache/dev-python/cherrypy-18.6.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/routes[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/objgraph[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/path-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-toolbelt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-services[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/cheroot-8.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/portend-2.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zc-lockfile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jaraco-collections[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ssl? ( dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CherryPy is a pythonic, object-oriented HTTP framework
-EAPI=8
-HOMEPAGE=https://cherrypy.dev https://pypi.org/project/CherryPy/
-INHERIT=distutils-r1
-IUSE=ssl test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/cheroot-8.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/portend-2.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zc-lockfile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jaraco-collections[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ssl? ( dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/C/CherryPy/CherryPy-18.6.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3aa807a3033deaec974cbc6a3f3ea58a
diff --git a/metadata/md5-cache/dev-python/cjkwrap-2.2-r2 b/metadata/md5-cache/dev-python/cjkwrap-2.2-r2
index 5009da4beefd..633d98f97b0f 100644
--- a/metadata/md5-cache/dev-python/cjkwrap-2.2-r2
+++ b/metadata/md5-cache/dev-python/cjkwrap-2.2-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://f.gallai.re/cjkwrap https://gitlab.com/fgallaire/cjkwrap
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-3+
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/fgallaire/cjkwrap/archive/v2.2.tar.gz -> cjkwrap-2.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1456b358788ecfc1e82754faff63d10d
+_md5_=8ecbdeaca21a8274fb429d1881e287b8
diff --git a/metadata/md5-cache/dev-python/clang-python-14.0.6 b/metadata/md5-cache/dev-python/clang-python-14.0.6
new file mode 100644
index 000000000000..c1ce5bbc62ba
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-14.0.6
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) verify-sig? ( sec-keys/openpgp-keys-llvm ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=install prepare test unpack
+DEPEND=>=sys-devel/clang-14.0.6:* !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_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=sys-devel/clang-14.0.6:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 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	e68bb6ac1b36c6eeced323c0334f1a4f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=2d8fe6fac7a8c51e306d9b9bcedcd58f
diff --git a/metadata/md5-cache/dev-python/immutables-0.17 b/metadata/md5-cache/dev-python/configupdater-3.1
similarity index 83%
rename from metadata/md5-cache/dev-python/immutables-0.17
rename to metadata/md5-cache/dev-python/configupdater-3.1
index af3213a96477..d495b40280e0 100644
--- a/metadata/md5-cache/dev-python/immutables-0.17
+++ b/metadata/md5-cache/dev-python/configupdater-3.1
@@ -1,16 +1,16 @@
 BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A high-performance immutable mapping type for Python
+DESCRIPTION=Parser like ConfigParser but for updating configuration files
 EAPI=8
-HOMEPAGE=https://github.com/MagicStack/immutables/ https://pypi.org/project/immutables/
+HOMEPAGE=https://github.com/pyscaffold/configupdater/ https://pypi.org/project/ConfigUpdater/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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
-LICENSE=Apache-2.0
+KEYWORDS=~amd64
+LICENSE=MIT PSF-2 PYTHON
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/MagicStack/immutables/archive/v0.17.tar.gz -> immutables-0.17.gh.tar.gz
+SRC_URI=https://github.com/pyscaffold/configupdater/archive/v3.1.tar.gz -> configupdater-3.1.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c64a86dd9d4d11c52c678cbaea01935f
+_md5_=d08c201cc7c366e4e0f68b1f7aab0fb2
diff --git a/metadata/md5-cache/dev-python/csscompressor-0.9.5 b/metadata/md5-cache/dev-python/csscompressor-0.9.5
deleted file mode 100644
index 32616426db7a..000000000000
--- a/metadata/md5-cache/dev-python/csscompressor-0.9.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A python port of YUI CSS Compressor
-EAPI=8
-HOMEPAGE=https://github.com/sprymix/csscompressor https://pypi.org/project/csscompressor/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~riscv x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/csscompressor/csscompressor-0.9.5.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9fd2578b3f940fce19ec988a0b24e7ff
diff --git a/metadata/md5-cache/dev-python/csscompressor-0.9.5-r1 b/metadata/md5-cache/dev-python/csscompressor-0.9.5-r1
index 20342dc89b0e..2fcaf36d1999 100644
--- a/metadata/md5-cache/dev-python/csscompressor-0.9.5-r1
+++ b/metadata/md5-cache/dev-python/csscompressor-0.9.5-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sprymix/csscompressor https://pypi.org/project/csscompressor/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/csscompressor/csscompressor-0.9.5.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=248f06276e7b3590f90553a0e0289f9e
+_md5_=e96111184dbc9730dfbe8abf9a88ccfb
diff --git a/metadata/md5-cache/dev-python/dask-2022.6.1 b/metadata/md5-cache/dev-python/dask-2022.6.1
new file mode 100644
index 000000000000..0e74fa15caa2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dask-2022.6.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numexpr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-rerunfailures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
+EAPI=8
+HOMEPAGE=https://www.dask.org/ https://github.com/dask/dask/ https://pypi.org/project/dask/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dask/dask/archive/2022.6.1.tar.gz -> dask-2022.6.1.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=620b26c1a2bb7ed02f529dda0bdaeb09
diff --git a/metadata/md5-cache/dev-python/ddt-1.4.4 b/metadata/md5-cache/dev-python/ddt-1.4.4
deleted file mode 100644
index 794056f8bb5d..000000000000
--- a/metadata/md5-cache/dev-python/ddt-1.4.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library to multiply test cases
-EAPI=8
-HOMEPAGE=https://pypi.org/project/ddt/ https://github.com/datadriventests/ddt/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/datadriventests/ddt/archive/1.4.4.tar.gz -> ddt-1.4.4.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6bc23ac38a95a7162894c06eed94e67e
diff --git a/metadata/md5-cache/dev-python/ddt-1.5.0 b/metadata/md5-cache/dev-python/ddt-1.5.0
index 889c04776f3d..37ddcf0b19ae 100644
--- a/metadata/md5-cache/dev-python/ddt-1.5.0
+++ b/metadata/md5-cache/dev-python/ddt-1.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ddt/ https://github.com/datadriventests/ddt/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/datadriventests/ddt/archive/1.5.0.tar.gz -> ddt-1.5.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d673fa65635f02f03dcd1e53dd3325b8
+_md5_=a06cac8b616caf0a3f8e0eb1db49fe8c
diff --git a/metadata/md5-cache/dev-python/dirty-equals-0.4 b/metadata/md5-cache/dev-python/dirty-equals-0.4-r1
similarity index 98%
rename from metadata/md5-cache/dev-python/dirty-equals-0.4
rename to metadata/md5-cache/dev-python/dirty-equals-0.4-r1
index c33d0925aa7a..b4f25bdb8f67 100644
--- a/metadata/md5-cache/dev-python/dirty-equals-0.4
+++ b/metadata/md5-cache/dev-python/dirty-equals-0.4-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/samuelcolvin/dirty-equals/archive/v0.4.tar.gz -> dirty-equals-0.4.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2ae96ac8d89748885b0b56882b32e8fd
+_md5_=6f40b4f1694c4f9ca0b5f1f07c68c5e9
diff --git a/metadata/md5-cache/dev-python/distro-1.7.0 b/metadata/md5-cache/dev-python/distro-1.7.0
index e94764bd7dd7..d26104474883 100644
--- a/metadata/md5-cache/dev-python/distro-1.7.0
+++ b/metadata/md5-cache/dev-python/distro-1.7.0
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://distro.readthedocs.io/en/latest/ https://pypi.org/project/distro/ https://github.com/python-distro/distro/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/distro/distro-1.7.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3c1e99cf6f8520f843f0e3a63a7f58ba
+_md5_=194b01f9691359597a786c5b3beb57db
diff --git a/metadata/md5-cache/dev-python/docopt-0.6.2-r4 b/metadata/md5-cache/dev-python/docopt-0.6.2-r4
deleted file mode 100644
index 63580425d01c..000000000000
--- a/metadata/md5-cache/dev-python/docopt-0.6.2-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pythonic argument parser, that will make you smile
-EAPI=7
-HOMEPAGE=https://pypi.org/project/docopt/ https://github.com/docopt/docopt
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/docopt/docopt/archive/0.6.2.tar.gz -> docopt-0.6.2.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=82db43cae165c89abf0f5d1f4d1e56fc
diff --git a/metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc8 b/metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc8
index 64ecfc4ba495..f7a588bb03de 100644
--- a/metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc8
+++ b/metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc8
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/agronholm/exceptiongroup/ https://pypi.org/project/exceptiongroup/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT PSF-2.4
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/agronholm/exceptiongroup/archive/1.0.0rc8.tar.gz -> exceptiongroup-1.0.0rc8.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1456289ccad64d3efbf89b6398fa035a
+_md5_=18c2aa5ff2adb3143952346c332b8657
diff --git a/metadata/md5-cache/dev-python/extras-1.0.0-r1 b/metadata/md5-cache/dev-python/extras-1.0.0-r1
deleted file mode 100644
index 740a0074272c..000000000000
--- a/metadata/md5-cache/dev-python/extras-1.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Useful extra bits for Python that should be in the standard library
-EAPI=8
-HOMEPAGE=https://github.com/testing-cabal/extras/ https://pypi.org/project/extras/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/e/extras/extras-1.0.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d519554ca6524c40417eb935b50ac757
diff --git a/metadata/md5-cache/dev-python/flit_scm-1.6.2 b/metadata/md5-cache/dev-python/flit_scm-1.6.2
index 6e1478d29dc4..57001f4cb65d 100644
--- a/metadata/md5-cache/dev-python/flit_scm-1.6.2
+++ b/metadata/md5-cache/dev-python/flit_scm-1.6.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/WillDaSilva/flit_scm/ https://pypi.org/project/flit-scm/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/flit_core-3.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm-6.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/tomli-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://gitlab.com/WillDaSilva/flit_scm/-/archive/1.6.2/flit_scm-1.6.2.tar.bz2
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=94cb49c56c35e6dbede6b2cae4d4a5fe
+_md5_=cb80499484a72ef932db2b9354f8d9b5
diff --git a/metadata/md5-cache/dev-python/git-review-2.3.1 b/metadata/md5-cache/dev-python/git-review-2.3.1
new file mode 100644
index 000000000000..963315c65049
--- /dev/null
+++ b/metadata/md5-cache/dev-python/git-review-2.3.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-python/pbr-4.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tool to submit code to Gerrit
+EAPI=8
+HOMEPAGE=https://git.openstack.org/cgit/openstack-infra/git-review
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/requests-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/g/git-review/git-review-2.3.1.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e285a682f04e9c28b3f97c3e9d497d2d
diff --git a/metadata/md5-cache/dev-python/gsd-2.5.3 b/metadata/md5-cache/dev-python/gsd-2.5.3
new file mode 100644
index 000000000000..ee62d85262b3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gsd-2.5.3
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=GSD - file format specification and a library to read and write it
+EAPI=8
+HOMEPAGE=https://github.com/glotzerlab/gsd/ https://pypi.org/project/gsd/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/glotzerlab/gsd/releases/download/v2.5.3/gsd-v2.5.3.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=130e297fab5e99041a68650dc2151301
diff --git a/metadata/md5-cache/dev-python/h5py-3.6.0 b/metadata/md5-cache/dev-python/h5py-3.6.0
deleted file mode 100644
index 557ba8d94be5..000000000000
--- a/metadata/md5-cache/dev-python/h5py-3.6.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.14.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pkgconfig[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/QtPy[testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( sci-libs/hdf5:=[hl(+)] >=dev-python/numpy-1.14.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/hdf5:=[hl(+)]
-DESCRIPTION=Simple Python interface to HDF5 files
-EAPI=8
-HOMEPAGE=https://www.h5py.org/ https://github.com/h5py/h5py/ https://pypi.org/project/h5py/
-INHERIT=distutils-r1
-IUSE=examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=sci-libs/hdf5:=[hl(+)] >=dev-python/numpy-1.14.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/h/h5py/h5py-3.6.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7eda29c34cfa65ba42416d716df73845
diff --git a/metadata/md5-cache/dev-python/h5py-3.7.0 b/metadata/md5-cache/dev-python/h5py-3.7.0
index aa75a555f4b5..8a5fc9383e70 100644
--- a/metadata/md5-cache/dev-python/h5py-3.7.0
+++ b/metadata/md5-cache/dev-python/h5py-3.7.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.h5py.org/ https://github.com/h5py/h5py/ https://pypi.org/project/h5py/
 INHERIT=distutils-r1
 IUSE=examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/hdf5:=[hl(+)] >=dev-python/numpy-1.14.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h5py/h5py-3.7.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=355407003461f1ae4716f2ccedba2940
+_md5_=7eda29c34cfa65ba42416d716df73845
diff --git a/metadata/md5-cache/dev-python/httpcore-0.14.7-r1 b/metadata/md5-cache/dev-python/httpcore-0.14.7-r1
deleted file mode 100644
index c4faf6ef3d31..000000000000
--- a/metadata/md5-cache/dev-python/httpcore-0.14.7-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-httpbin[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-trio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/socksio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( =dev-python/anyio-3*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/h11-0.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/h2-5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/sniffio-1*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A minimal low-level HTTP client
-EAPI=8
-HOMEPAGE=https://www.encode.io/httpcore/ https://github.com/encode/httpcore/ https://pypi.org/project/httpcore/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND==dev-python/anyio-3*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/h11-0.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/h2-5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/sniffio-1*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/encode/httpcore/archive/0.14.7.tar.gz -> httpcore-0.14.7.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=28455530b4ccd0b2520137b38ecfd9f1
diff --git a/metadata/md5-cache/dev-python/httpx-0.22.0-r3 b/metadata/md5-cache/dev-python/httpx-0.22.0-r3
deleted file mode 100644
index b3932f7fb5ca..000000000000
--- a/metadata/md5-cache/dev-python/httpx-0.22.0-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/h2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-trio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/socksio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uvicorn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/charset_normalizer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sniffio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/httpcore-0.14*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rfc3986-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] cli? ( =dev-python/click-8*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/pygments-2*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/rich-13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Fully-featured HTTP client which provides sync and async APIs
-EAPI=8
-HOMEPAGE=https://www.python-httpx.org/ https://github.com/encode/httpx/ https://pypi.org/project/httpx/
-INHERIT=distutils-r1 optfeature
-IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-python/certifi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/charset_normalizer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sniffio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/httpcore-0.14*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rfc3986-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] cli? ( =dev-python/click-8*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/pygments-2*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/rich-13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/encode/httpx/archive/0.22.0.tar.gz -> httpx-0.22.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=58692d8e244a7db002f86b805cfc806a
diff --git a/metadata/md5-cache/dev-python/humanize-4.2.1 b/metadata/md5-cache/dev-python/humanize-4.2.1
new file mode 100644
index 000000000000..3bf2dbdd6e6b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/humanize-4.2.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Common humanization utilities
+EAPI=8
+HOMEPAGE=https://github.com/python-humanize/humanize/ https://pypi.org/project/humanize/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/h/humanize/humanize-4.2.1.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=abcc828d46d66b09f1d027adde5bc1c9
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.47.4 b/metadata/md5-cache/dev-python/hypothesis-6.47.4
new file mode 100644
index 000000000000..78159f90c7d5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.47.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,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_8(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,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_8(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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.47.4.tar.gz -> hypothesis-hypothesis-python-6.47.4.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=1e97789147663e40c9f1a140390f4d27
diff --git a/metadata/md5-cache/dev-python/immutables-0.18 b/metadata/md5-cache/dev-python/immutables-0.18
index 7fefaf434d1c..8a7c45b65a11 100644
--- a/metadata/md5-cache/dev-python/immutables-0.18
+++ b/metadata/md5-cache/dev-python/immutables-0.18
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/MagicStack/immutables/ https://pypi.org/project/immutables/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/MagicStack/immutables/archive/v0.18.tar.gz -> immutables-0.18.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3417b5518a72dc7ad82f01b8119451bb
+_md5_=d23da6f518c1a5936dd43f417b969c1f
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-4.11.3 b/metadata/md5-cache/dev-python/importlib_metadata-4.11.3
deleted file mode 100644
index 8c5bb6c32b77..000000000000
--- a/metadata/md5-cache/dev-python/importlib_metadata-4.11.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyfakefs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)?] ) ) test? ( dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read metadata from Python packages
-EAPI=7
-HOMEPAGE=https://github.com/python/importlib_metadata
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-4.11.3.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=79e623dbdafd245a05dfd297320c4d41
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-4.11.4 b/metadata/md5-cache/dev-python/importlib_metadata-4.11.4
index 28277977a670..764e97c475f6 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-4.11.4
+++ b/metadata/md5-cache/dev-python/importlib_metadata-4.11.4
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/python/importlib_metadata
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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
+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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-4.11.4.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f6827ee95907f400380f8d817086d674
+_md5_=a5067190e1f41dc100fb201d40e89b82
diff --git a/metadata/md5-cache/dev-python/ini2toml-0.11 b/metadata/md5-cache/dev-python/ini2toml-0.11
new file mode 100644
index 000000000000..0b375c9d4248
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ini2toml-0.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomlkit[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-20.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-0.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Automatically conversion of .ini/.cfg files to TOML equivalents
+EAPI=8
+HOMEPAGE=https://pypi.org/project/ini2toml/ https://github.com/abravalheri/ini2toml/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 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/packaging-20.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-0.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/abravalheri/ini2toml/archive/v0.11.tar.gz -> ini2toml-0.11.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=0ec87d8983e058c8665862cec93d5df8
diff --git a/metadata/md5-cache/dev-python/ini2toml-0.11-r1 b/metadata/md5-cache/dev-python/ini2toml-0.11-r1
new file mode 100644
index 000000000000..64cace15d48c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ini2toml-0.11-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/configupdater[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyproject-fmt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomlkit[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-20.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-0.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Automatically conversion of .ini/.cfg files to TOML equivalents
+EAPI=8
+HOMEPAGE=https://pypi.org/project/ini2toml/ https://github.com/abravalheri/ini2toml/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/packaging-20.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-0.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/abravalheri/ini2toml/archive/v0.11.tar.gz -> ini2toml-0.11.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a97b5c755b953f411871f74d5345c41f
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.7.1 b/metadata/md5-cache/dev-python/ipywidgets-7.7.1
new file mode 100644
index 000000000000..875e21c68085
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.7.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/ipykernel-4.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython_genutils-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/widgetsnbextension-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=IPython HTML widgets for Jupyter
+EAPI=8
+HOMEPAGE=https://ipywidgets.readthedocs.io/ https://github.com/jupyter-widgets/ipywidgets/ https://pypi.org/project/ipywidgets/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/ipykernel-4.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython_genutils-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/widgetsnbextension-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipywidgets/ipywidgets-7.7.1.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6b5963dd9afcd9f2ed7300ce5fcf7236
diff --git a/metadata/md5-cache/dev-python/jupyter_server-1.18.0 b/metadata/md5-cache/dev-python/jupyter_server-1.18.0
new file mode 100644
index 000000000000..b78973e1b206
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_server-1.18.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-console-scripts[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tornasync[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/pydata-sphinx-theme[python_targets_python3_10(-)] dev-python/myst_parser[python_targets_python3_10(-)] dev-python/ipython[python_targets_python3_10(-)] dev-python/sphinxemoji[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/sphinxcontrib-openapi[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/pydata-sphinx-theme[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/ipython[python_targets_python3_9(-)] dev-python/sphinxemoji[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/sphinxcontrib-openapi[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/pydata-sphinx-theme[python_targets_python3_8(-)] dev-python/myst_parser[python_targets_python3_8(-)] dev-python/ipython[python_targets_python3_8(-)] dev-python/sphinxemoji[python_targets_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-)] dev-python/sphinxcontrib-openapi[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/anyio-3.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/anyio-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/argon2-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbconvert-6.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbformat-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_packaging-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Core services, APIs, and REST endpoints to Jupyter web applications
+EAPI=8
+HOMEPAGE=https://jupyter.org
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/anyio-3.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/anyio-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/argon2-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbconvert-6.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbformat-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jupyter_server/jupyter_server-1.18.0.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=550754f1a7ecd8b518e89d9d5c590a24
diff --git a/metadata/md5-cache/dev-python/kaptan-0.5.12-r1 b/metadata/md5-cache/dev-python/kaptan-0.5.12-r1
deleted file mode 100644
index 5dcf1213eaeb..000000000000
--- a/metadata/md5-cache/dev-python/kaptan-0.5.12-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pyyaml-3.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Configuration manager in your pocket
-EAPI=7
-HOMEPAGE=https://github.com/emre/kaptan
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/pyyaml-3.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/k/kaptan/kaptan-0.5.12.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2be830dd68e480ee5f728abfac4db0f8
diff --git a/metadata/md5-cache/dev-python/kaptan-0.5.12-r2 b/metadata/md5-cache/dev-python/kaptan-0.5.12-r2
index 051cddbe1a4b..2ff88e706829 100644
--- a/metadata/md5-cache/dev-python/kaptan-0.5.12-r2
+++ b/metadata/md5-cache/dev-python/kaptan-0.5.12-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/emre/kaptan
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/pyyaml-3.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kaptan/kaptan-0.5.12.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=34425f0ac3bc81fa2cb2728d364b0417
+_md5_=5bdfe13c06173f62a1d4986ed993f631
diff --git a/metadata/md5-cache/dev-python/keyring-23.5.0 b/metadata/md5-cache/dev-python/keyring-23.5.0
deleted file mode 100644
index 01811aed90cf..000000000000
--- a/metadata/md5-cache/dev-python/keyring-23.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jeepney[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/jaraco-packaging[python_targets_python3_10(-)] dev-python/rst-linker[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-)] dev-python/rst-linker[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Provides access to the system keyring service
-EAPI=8
-HOMEPAGE=https://github.com/jaraco/keyring
-INHERIT=distutils-r1
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=PSF-2
-RDEPEND=dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jeepney[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jaraco/keyring/archive/v23.5.0.tar.gz -> keyring-23.5.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d1733eaa2b04157b34a521735791f621
diff --git a/metadata/md5-cache/dev-python/keyring-23.5.1 b/metadata/md5-cache/dev-python/keyring-23.5.1
deleted file mode 100644
index 70e171b66adc..000000000000
--- a/metadata/md5-cache/dev-python/keyring-23.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/secretstorage-3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jeepney-0.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,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
-HOMEPAGE=https://github.com/jaraco/keyring/ https://pypi.org/project/keyring/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 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 ~x64-macos
-LICENSE=PSF-2
-RDEPEND=>=dev-python/secretstorage-3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jeepney-0.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jaraco/keyring/archive/v23.5.1.tar.gz -> keyring-23.5.1.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=dc73a03a9e1d66b1a8fbab06f9f392b4
diff --git a/metadata/md5-cache/dev-python/keyring-23.6.0 b/metadata/md5-cache/dev-python/keyring-23.6.0
index 87bcf82ed6a9..d19eac39ad3e 100644
--- a/metadata/md5-cache/dev-python/keyring-23.6.0
+++ b/metadata/md5-cache/dev-python/keyring-23.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jaraco/keyring/ https://pypi.org/project/keyring/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=PSF-2
 RDEPEND=>=dev-python/secretstorage-3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jeepney-0.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/jaraco/keyring/archive/v23.6.0.tar.gz -> keyring-23.6.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b25003acc5c856e6fc3880c1b266d545
+_md5_=9cb7ca7540f0450644dc7af7d6f6bbc7
diff --git a/metadata/md5-cache/dev-python/kgb-7.0-r1 b/metadata/md5-cache/dev-python/kgb-7.0-r1
index 9b5bb593d7a7..a5a471875f38 100644
--- a/metadata/md5-cache/dev-python/kgb-7.0-r1
+++ b/metadata/md5-cache/dev-python/kgb-7.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/beanbaginc/kgb/ https://pypi.org/project/kgb/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beanbaginc/kgb/archive/release-7.0.tar.gz -> kgb-release-7.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=71b069781cd18ecbc61ce43f783e55be
+_md5_=7d72a56564e716810454679416cf47d6
diff --git a/metadata/md5-cache/dev-python/license-expression-30.0.0 b/metadata/md5-cache/dev-python/license-expression-30.0.0
index e1be14b70a45..ea912f9684eb 100644
--- a/metadata/md5-cache/dev-python/license-expression-30.0.0
+++ b/metadata/md5-cache/dev-python/license-expression-30.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/license-expression/ https://github.com/nexB/license-expression/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/boolean-py-4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/nexB/license-expression/archive/v30.0.0.tar.gz -> license-expression-30.0.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f8eaec809f3a4abdd5de88a9998814e3
+_md5_=eed8a2871248381f061a52fea6814a85
diff --git a/metadata/md5-cache/dev-python/lit-14.0.6 b/metadata/md5-cache/dev-python/lit-14.0.6
new file mode 100644
index 000000000000..dd708542aba6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-14.0.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/llvm ) verify-sig? ( sec-keys/openpgp-keys-llvm ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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_8 python_targets_python3_9 python_targets_python3_10 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 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	10a93585889c3ca7651cbcd2ee831e47	llvm.org	e68bb6ac1b36c6eeced323c0334f1a4f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=341400d05e04f3c2df41ec651e867979
diff --git a/metadata/md5-cache/dev-python/lz4-4.0.1 b/metadata/md5-cache/dev-python/lz4-4.0.1
index e9dcd472b31b..e4cce9e9a8b6 100644
--- a/metadata/md5-cache/dev-python/lz4-4.0.1
+++ b/metadata/md5-cache/dev-python/lz4-4.0.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-arch/lz4:= python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-4.0.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=cb2b3db417378bfffc95ca2f978d79a3
+_md5_=6da08f22cb45d99a74f3612aeb103112
diff --git a/metadata/md5-cache/dev-python/m2r-0.2.1 b/metadata/md5-cache/dev-python/m2r-0.2.1
deleted file mode 100644
index 38eb276e927d..000000000000
--- a/metadata/md5-cache/dev-python/m2r-0.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mistune-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mistune-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Markdown to reStructuredText converter
-EAPI=7
-HOMEPAGE=https://github.com/miyakogi/m2r https://pypi.org/project/m2r/
-INHERIT=distutils-r1
-IUSE=test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mistune-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/miyakogi/m2r/archive/v0.2.1.tar.gz -> m2r-0.2.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=75db5f0137ea63dc3226f1c9762ab8df
diff --git a/metadata/md5-cache/dev-python/mamba-0.11.2 b/metadata/md5-cache/dev-python/mamba-0.11.2
index a7bceb84b987..4ffb4ed6155c 100644
--- a/metadata/md5-cache/dev-python/mamba-0.11.2
+++ b/metadata/md5-cache/dev-python/mamba-0.11.2
@@ -2,7 +2,7 @@ BDEPEND=test? ( >=dev-python/clint-0.3.1[python_targets_python3_8(-)?,python_tar
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python test runner born under the banner of Behavior Driven Development
 EAPI=8
-HOMEPAGE=https://nestorsalceda.github.io/mamba
+HOMEPAGE=https://nestorsalceda.com/mamba/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm64
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nestorsalceda/mamba/archive/v0.11.2.tar.gz -> mamba-0.11.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7bcaa031e2587bf3666de31f8ab03dbe
+_md5_=7551292965d28472a04aeec06419b1da
diff --git a/metadata/md5-cache/dev-python/manuel-1.12.4 b/metadata/md5-cache/dev-python/manuel-1.12.4
new file mode 100644
index 000000000000..bd996b543671
--- /dev/null
+++ b/metadata/md5-cache/dev-python/manuel-1.12.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/zope-testing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Lets you mix and match traditional doctests with custom test syntax
+EAPI=8
+HOMEPAGE=https://github.com/benji-york/manuel/ https://pypi.org/project/manuel/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/manuel/manuel-1.12.4.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=426ab49300f4789d1d766609d67c2949
diff --git a/metadata/md5-cache/dev-python/markdown-it-py-2.1.0 b/metadata/md5-cache/dev-python/markdown-it-py-2.1.0
index e86dd6c458b6..ac5679abd86c 100644
--- a/metadata/md5-cache/dev-python/markdown-it-py-2.1.0
+++ b/metadata/md5-cache/dev-python/markdown-it-py-2.1.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest-regressions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/attrs-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mdurl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pytest-regressions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/attrs-22[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mdurl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python port of markdown-it, Markdown parser
 EAPI=8
-HOMEPAGE=https://pypi.org/project/markdown-it-py/ https://github.com/executablebooks/markdown-it-py
+HOMEPAGE=https://pypi.org/project/markdown-it-py/ https://github.com/executablebooks/markdown-it-py/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=<dev-python/attrs-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mdurl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=<dev-python/attrs-22[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mdurl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/executablebooks/markdown-it-py/archive/v2.1.0.tar.gz -> markdown-it-py-2.1.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2e724e966809f95a3157b2748af904ef
+_md5_=979da6beea456b00499f501058429ece
diff --git a/metadata/md5-cache/dev-python/mdit-py-plugins-0.3.0 b/metadata/md5-cache/dev-python/mdit-py-plugins-0.3.0
index 1ad983944780..22b8f40e573b 100644
--- a/metadata/md5-cache/dev-python/mdit-py-plugins-0.3.0
+++ b/metadata/md5-cache/dev-python/mdit-py-plugins-0.3.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest-regressions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/markdown-it-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pytest-regressions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/markdown-it-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of plugins for markdown-it-py
 EAPI=8
-HOMEPAGE=https://pypi.org/project/mdit-py-plugins/ https://github.com/executablebooks/mdit-py-plugins
+HOMEPAGE=https://pypi.org/project/mdit-py-plugins/ https://github.com/executablebooks/mdit-py-plugins/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=dev-python/markdown-it-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=dev-python/markdown-it-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/executablebooks/mdit-py-plugins/archive/v0.3.0.tar.gz -> mdit-py-plugins-0.3.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9866f9db719c4a43109228522d4f8ad3
+_md5_=4b718291de9d0fa6ce16c52dada21c37
diff --git a/metadata/md5-cache/dev-python/mdurl-0.1.1 b/metadata/md5-cache/dev-python/mdurl-0.1.1
index 155a37123f50..23c04927cf99 100644
--- a/metadata/md5-cache/dev-python/mdurl-0.1.1
+++ b/metadata/md5-cache/dev-python/mdurl-0.1.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Markdown URL utilities
 EAPI=8
 HOMEPAGE=https://pypi.org/project/mdurl/ https://github.com/executablebooks/mdurl/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hukkin/mdurl/archive/0.1.1.tar.gz -> mdurl-0.1.1.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9f04519ade0ce9ffe65f5ccc5c0235aa
+_md5_=d368446f223f5f05cf0ec20d8c17ea89
diff --git a/metadata/md5-cache/dev-python/mdx_gh_links-0.2 b/metadata/md5-cache/dev-python/mdx_gh_links-0.2
deleted file mode 100644
index 814efc4961cb..000000000000
--- a/metadata/md5-cache/dev-python/mdx_gh_links-0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An extension which adds links to GitHub users, repositories, issues and commits
-EAPI=7
-HOMEPAGE=https://github.com/Python-Markdown/github-links
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/m/mdx_gh_links/mdx_gh_links-0.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=14112366bf4bcf228b52ddfd5c183d06
diff --git a/metadata/md5-cache/dev-python/mdx_gh_links-0.2-r1 b/metadata/md5-cache/dev-python/mdx_gh_links-0.2-r1
index cfef7a637af6..bcb48de08235 100644
--- a/metadata/md5-cache/dev-python/mdx_gh_links-0.2-r1
+++ b/metadata/md5-cache/dev-python/mdx_gh_links-0.2-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/Python-Markdown/github-links
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 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/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mdx_gh_links/mdx_gh_links-0.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=212426eb89d58c7564a54b05f3c23366
+_md5_=002d1d936344b36623b2612b1bfacb19
diff --git a/metadata/md5-cache/dev-python/meson-python-0.6.0 b/metadata/md5-cache/dev-python/meson-python-0.6.0-r1
similarity index 56%
rename from metadata/md5-cache/dev-python/meson-python-0.6.0
rename to metadata/md5-cache/dev-python/meson-python-0.6.0-r1
index cf6d176eafd6..e4b7c5c4dcaf 100644
--- a/metadata/md5-cache/dev-python/meson-python-0.6.0
+++ b/metadata/md5-cache/dev-python/meson-python-0.6.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/patchelf ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/furo[python_targets_python3_10(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/furo[python_targets_python3_9(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/furo[python_targets_python3_8(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/pyproject-metadata-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/meson-0.60.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/furo[python_targets_python3_10(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/furo[python_targets_python3_9(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/furo[python_targets_python3_8(-)] dev-python/sphinx-autodoc-typehints[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/pyproject-metadata-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/meson-0.60.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/patchelf >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Meson PEP 517 Python build backend
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-python/pyproject-metadata-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/meson-0.60.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+RDEPEND=>=dev-python/pyproject-metadata-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/meson-0.60.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/patchelf python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FFY00/meson-python/archive/0.6.0.tar.gz -> meson-python-0.6.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=24084a14684e2a3ce9859e880452a764
+_md5_=78fd496ade80637f6b5b81880cbf169e
diff --git a/metadata/md5-cache/dev-python/minimock-1.3.0-r1 b/metadata/md5-cache/dev-python/minimock-1.3.0-r1
new file mode 100644
index 000000000000..216ede11cd00
--- /dev/null
+++ b/metadata/md5-cache/dev-python/minimock-1.3.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The simplest possible mock library
+EAPI=8
+HOMEPAGE=https://github.com/lowks/minimock/ https://pypi.org/project/MiniMock/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/lowks/minimock/archive/v1.3.0.tar.gz -> minimock-1.3.0.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=7556b28be34081e9f35d7d386b37169f
diff --git a/metadata/md5-cache/dev-python/mkdocs-1.3.0 b/metadata/md5-cache/dev-python/mkdocs-1.3.0
deleted file mode 100644
index 8a124118a015..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-1.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/mdx_gh_links[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/mdx_gh_links[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/mdx_gh_links[python_targets_python3_8(-)] dev-python/mkdocs-redirects[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/Babel-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/watchdog-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ghp-import-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml_env_tag-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mergedeep-1.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Project documentation with Markdown
-EAPI=8
-HOMEPAGE=https://www.mkdocs.org https://github.com/mkdocs/mkdocs
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~riscv x86
-LICENSE=BSD
-RDEPEND=>=dev-python/Babel-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/click-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/watchdog-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ghp-import-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml_env_tag-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mergedeep-1.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mkdocs/mkdocs/archive/1.3.0.tar.gz -> mkdocs-1.3.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4d0a0f8465ac36628766aa56707c62c4
diff --git a/metadata/md5-cache/dev-python/mkdocs-1.3.0-r1 b/metadata/md5-cache/dev-python/mkdocs-1.3.0-r1
index f19380975d8a..7ca590c72fa8 100644
--- a/metadata/md5-cache/dev-python/mkdocs-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/mkdocs-1.3.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.mkdocs.org https://github.com/mkdocs/mkdocs
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 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/Babel-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/watchdog-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ghp-import-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml_env_tag-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mergedeep-1.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/mkdocs/mkdocs/archive/1.3.0.tar.gz -> mkdocs-1.3.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ec48f621c2e75df06f31d9eaebb7cc7a
+_md5_=779416f05e7682287d3e8cec14015a64
diff --git a/metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1-r1 b/metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1-r1
deleted file mode 100644
index 885f66db3b9f..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/mkdocs[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Bootstrap theme for MkDocs
-EAPI=7
-HOMEPAGE=https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootstrap
-INHERIT=distutils-r1 docs
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/mkdocs python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/mkdocs/mkdocs-bootstrap/archive/1.1.tar.gz -> mkdocs-bootstrap-1.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	docs	8ed2a8a28ff109e7a3582c9abb7fe327	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9cd81062165daa3ca9ae8d2c5e3a608d
diff --git a/metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1-r2 b/metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1-r2
index 8e239b86c49f..00fece2157a7 100644
--- a/metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1-r2
+++ b/metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootstrap
 INHERIT=distutils-r1 docs
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/mkdocs python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/mkdocs/mkdocs-bootstrap/archive/1.1.tar.gz -> mkdocs-bootstrap-1.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	docs	8ed2a8a28ff109e7a3582c9abb7fe327	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b021ebc0b0659ba92aaf11bfa58d2d6a
+_md5_=732b24434682d9e206d2ce8ecf91c9b7
diff --git a/metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1-r1 b/metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1-r1
deleted file mode 100644
index 6b3db6a4379a..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/mkdocs[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Bootswatch themes for MkDocs
-EAPI=7
-HOMEPAGE=https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootswatch
-INHERIT=distutils-r1 docs
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/mkdocs python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/mkdocs/mkdocs-bootswatch/archive/1.1.tar.gz -> mkdocs-bootswatch-1.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	docs	8ed2a8a28ff109e7a3582c9abb7fe327	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=650c27e58f339b12397b4850084cf039
diff --git a/metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1-r2 b/metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1-r2
index 2ff6d80a705d..63fdb4c0a82c 100644
--- a/metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1-r2
+++ b/metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootswatch
 INHERIT=distutils-r1 docs
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/mkdocs python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/mkdocs/mkdocs-bootswatch/archive/1.1.tar.gz -> mkdocs-bootswatch-1.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	docs	8ed2a8a28ff109e7a3582c9abb7fe327	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3d5da7cb1e002fc49bd337bd9ad04379
+_md5_=b26e0ebc3db1f67214de0c0638fad4e0
diff --git a/metadata/md5-cache/dev-python/mkdocs-git-authors-plugin-0.6.2 b/metadata/md5-cache/dev-python/mkdocs-git-authors-plugin-0.6.2
deleted file mode 100644
index 24c179701bab..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-git-authors-plugin-0.6.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mkdocs-material[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) doc? ( dev-vcs/git ) test? ( dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mkdocs plugin to display git authors of a page
-EAPI=8
-HOMEPAGE=https://github.com/timvink/mkdocs-git-authors-plugin/ https://pypi.org/project/mkdocs-git-authors-plugin/
-INHERIT=distutils-r1 docs
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/timvink/mkdocs-git-authors-plugin/archive/refs/tags/v0.6.2.tar.gz -> mkdocs-git-authors-plugin-0.6.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	docs	8ed2a8a28ff109e7a3582c9abb7fe327	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0fb5028d7b3a41e44fad5d9aff3b1781
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-8.2.16 b/metadata/md5-cache/dev-python/mkdocs-material-8.2.16
index a2c38d9db98d..09098bf4026d 100644
--- a/metadata/md5-cache/dev-python/mkdocs-material-8.2.16
+++ b/metadata/md5-cache/dev-python/mkdocs-material-8.2.16
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/squidfunk/mkdocs-material/ https://pypi.org/project/mkdocs-material/
 INHERIT=distutils-r1 docs
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 PDEPEND=>=dev-python/mkdocs-material-extensions-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 RDEPEND=>=dev-python/jinja-2.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pymdown-extensions-9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/8.2.16.tar.gz -> mkdocs-material-8.2.16.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	docs	8ed2a8a28ff109e7a3582c9abb7fe327	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d34d5814c562b3c319a1d94293f6a2a9
+_md5_=1bad5a51d3f6e4f44ce8cec2eb6b4df5
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-8.2.8 b/metadata/md5-cache/dev-python/mkdocs-material-8.2.8
deleted file mode 100644
index 7f1336e83c03..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-material-8.2.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material-extensions[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material-extensions[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-material-extensions[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-redirects[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Material Design theme for MkDocs
-EAPI=8
-HOMEPAGE=https://github.com/squidfunk/mkdocs-material/ https://pypi.org/project/mkdocs-material/
-INHERIT=distutils-r1 docs
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
-KEYWORDS=amd64 ~riscv x86
-LICENSE=MIT
-PDEPEND=>=dev-python/mkdocs-material-extensions-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-RDEPEND=>=dev-python/jinja-2.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pymdown-extensions-9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/8.2.8.tar.gz -> mkdocs-material-8.2.8.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	docs	8ed2a8a28ff109e7a3582c9abb7fe327	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f19e31e59c662cf7e24e1069c9cdfdd5
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-8.2.15 b/metadata/md5-cache/dev-python/mkdocs-material-8.3.8
similarity index 97%
rename from metadata/md5-cache/dev-python/mkdocs-material-8.2.15
rename to metadata/md5-cache/dev-python/mkdocs-material-8.3.8
index 75a3eb768ab2..3ae792701d38 100644
--- a/metadata/md5-cache/dev-python/mkdocs-material-8.2.15
+++ b/metadata/md5-cache/dev-python/mkdocs-material-8.3.8
@@ -11,6 +11,6 @@ PDEPEND=>=dev-python/mkdocs-material-extensions-1.0.3[python_targets_python3_8(-
 RDEPEND=>=dev-python/jinja-2.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pymdown-extensions-9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/8.2.15.tar.gz -> mkdocs-material-8.2.15.gh.tar.gz
+SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/8.3.8.tar.gz -> mkdocs-material-8.3.8.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	docs	8ed2a8a28ff109e7a3582c9abb7fe327	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=d34d5814c562b3c319a1d94293f6a2a9
diff --git a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0 b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0
deleted file mode 100644
index 058152883a19..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An MkDocs plugin to minify HTML and/or JS files prior to being written to disk
-EAPI=8
-HOMEPAGE=https://github.com/byrnereese/mkdocs-minify-plugin https://pypi.org/project/mkdocs-minify-plugin/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-text/htmlmin-0.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsmin-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/m/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a3cbcfbcff5d87e060a194732eb288d7
diff --git a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0-r1 b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0-r1
deleted file mode 100644
index f8af490d8dc2..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An MkDocs plugin to minify HTML and/or JS files prior to being written to disk
-EAPI=8
-HOMEPAGE=https://github.com/byrnereese/mkdocs-minify-plugin https://pypi.org/project/mkdocs-minify-plugin/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/csscompressor-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-text/htmlmin-0.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsmin-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/m/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=28274bc6a3603b716157489fbc53dcbd
diff --git a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0-r2 b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0-r2
index 9e5c5bf4aaeb..58231ddd687c 100644
--- a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0-r2
+++ b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/byrnereese/mkdocs-minify-plugin https://pypi.org/project/mkdocs-minify-plugin/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/csscompressor-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-text/htmlmin-0.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsmin-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=baa37250c91b065b1d44904732d55d3a
+_md5_=c5ffb753e6a9b8b8936b5e3d873f88cf
diff --git a/metadata/md5-cache/dev-python/moto-3.1.10 b/metadata/md5-cache/dev-python/moto-3.1.10
deleted file mode 100644
index ac68fe95b9c3..000000000000
--- a/metadata/md5-cache/dev-python/moto-3.1.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openapi-spec-validator-0.2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mock library for boto
-EAPI=8
-HOMEPAGE=https://github.com/spulec/moto
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openapi-spec-validator-0.2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/moto/moto-3.1.10.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c44e6919a6bbbcfac3794745b470e120
diff --git a/metadata/md5-cache/dev-python/moto-3.1.11 b/metadata/md5-cache/dev-python/moto-3.1.11
deleted file mode 100644
index d0ce0fb90ad4..000000000000
--- a/metadata/md5-cache/dev-python/moto-3.1.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openapi-spec-validator-0.2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mock library for boto
-EAPI=8
-HOMEPAGE=https://github.com/spulec/moto
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openapi-spec-validator-0.2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/moto/moto-3.1.11.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ca50c8370633fc990eadfb9ec2834f5c
diff --git a/metadata/md5-cache/dev-python/moto-3.1.12 b/metadata/md5-cache/dev-python/moto-3.1.12
index 30f892028cf5..464549946c60 100644
--- a/metadata/md5-cache/dev-python/moto-3.1.12
+++ b/metadata/md5-cache/dev-python/moto-3.1.12
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/spulec/moto
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openapi-spec-validator-0.2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-3.1.12.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ca50c8370633fc990eadfb9ec2834f5c
+_md5_=92086d4d1d0b0b5029dbe932623bf55c
diff --git a/metadata/md5-cache/dev-python/moto-3.1.9 b/metadata/md5-cache/dev-python/moto-3.1.9
deleted file mode 100644
index fcff6a278199..000000000000
--- a/metadata/md5-cache/dev-python/moto-3.1.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mock library for boto
-EAPI=8
-HOMEPAGE=https://github.com/spulec/moto
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/moto/moto-3.1.9.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=93d8d414871607d572d7e75b418f94f9
diff --git a/metadata/md5-cache/dev-python/munch-2.5.0-r1 b/metadata/md5-cache/dev-python/munch-2.5.0-r1
deleted file mode 100644
index 7461285e7388..000000000000
--- a/metadata/md5-cache/dev-python/munch-2.5.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A dot-accessible dictionary (a la JavaScript objects)
-EAPI=7
-HOMEPAGE=https://github.com/Infinidat/munch
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/munch/munch-2.5.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=08b74c4336153690e80d11b258311185
diff --git a/metadata/md5-cache/dev-python/munch-2.5.0-r2 b/metadata/md5-cache/dev-python/munch-2.5.0-r2
index a265a8c90052..83c54c453794 100644
--- a/metadata/md5-cache/dev-python/munch-2.5.0-r2
+++ b/metadata/md5-cache/dev-python/munch-2.5.0-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Infinidat/munch/ https://pypi.org/project/munch/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/munch/munch-2.5.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=26964082bdda7fe9ad631df7e77584df
+_md5_=3f123c190eb26aeef1436156f43f4ae8
diff --git a/metadata/md5-cache/dev-python/mygpoclient-1.9 b/metadata/md5-cache/dev-python/mygpoclient-1.9
new file mode 100644
index 000000000000..757cab3eac75
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mygpoclient-1.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/minimock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A gpodder.net client library
+EAPI=8
+HOMEPAGE=https://github.com/gpodder/mygpoclient/ https://pypi.org/project/mygpoclient/ https://mygpoclient.readthedocs.io/en/latest/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gpodder/mygpoclient/archive/1.9.tar.gz -> mygpoclient-1.9.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=ea04825a5f37b447617e1db026be5fee
diff --git a/metadata/md5-cache/dev-python/lz4-4.0.0 b/metadata/md5-cache/dev-python/mysqlclient-2.1.1
similarity index 52%
rename from metadata/md5-cache/dev-python/lz4-4.0.0
rename to metadata/md5-cache/dev-python/mysqlclient-2.1.1
index ca164275d370..9ccc8726f11c 100644
--- a/metadata/md5-cache/dev-python/lz4-4.0.0
+++ b/metadata/md5-cache/dev-python/mysqlclient-2.1.1
@@ -1,17 +1,17 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pkgconfig[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-arch/lz4:= >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-db/mariadb[server] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ) ) test? ( dev-db/mysql-connector-c:0= >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4:=
-DESCRIPTION=LZ4 Bindings for Python
+DEPEND=dev-db/mysql-connector-c:0=
+DESCRIPTION=Python interface to MySQL
 EAPI=8
-HOMEPAGE=https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4
+HOMEPAGE=https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=app-arch/lz4:= python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=dev-db/mysql-connector-c:0= python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/l/lz4/lz4-4.0.0.tar.gz
+SRC_URI=mirror://pypi/m/mysqlclient/mysqlclient-2.1.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=08cb0c1226601c6c259664c54eb09fbd
+_md5_=4a1a8b4cc522123be4f0eaa73d0d834e
diff --git a/metadata/md5-cache/dev-python/myst_parser-0.18.0 b/metadata/md5-cache/dev-python/myst_parser-0.18.0
index cf98fe62ad08..6f3e80449042 100644
--- a/metadata/md5-cache/dev-python/myst_parser-0.18.0
+++ b/metadata/md5-cache/dev-python/myst_parser-0.18.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-regressions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-param-files[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/docutils-0.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown-it-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mdit-py-plugins[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sphinx-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-regressions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-param-files[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/docutils-0.19[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown-it-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mdit-py-plugins[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sphinx-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extended commonmark compliant parser, with bridges to sphinx
 EAPI=8
 HOMEPAGE=https://github.com/executablebooks/MyST-Parser/ https://pypi.org/project/myst-parser/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv
 LICENSE=MIT
-RDEPEND=<dev-python/docutils-0.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown-it-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mdit-py-plugins[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sphinx-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=<dev-python/docutils-0.19[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown-it-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mdit-py-plugins[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sphinx-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/executablebooks/MyST-Parser/archive/v0.18.0.tar.gz -> MyST-Parser-0.18.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=84fef596311b7238de8710c020320d07
+_md5_=7385af15f078cc45186c0832ba932854
diff --git a/metadata/md5-cache/dev-python/nuitka-0.9 b/metadata/md5-cache/dev-python/nuitka-0.9
new file mode 100644
index 000000000000..d2fcb5c8d3d2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nuitka-0.9
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python to native compiler
+EAPI=8
+HOMEPAGE=https://www.nuitka.net
+INHERIT=distutils-r1 flag-o-matic optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~loong ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://nuitka.net/releases/Nuitka-0.9.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a74a9f966bba95c284e57252c51c882a
diff --git a/metadata/md5-cache/dev-python/numexpr-2.8.1-r1 b/metadata/md5-cache/dev-python/numexpr-2.8.1-r1
index 6e62ea0abd78..8592d871327c 100644
--- a/metadata/md5-cache/dev-python/numexpr-2.8.1-r1
+++ b/metadata/md5-cache/dev-python/numexpr-2.8.1-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=https://github.com/pydata/numexpr/archive/v2.8.1.tar.gz -> numexpr-2.8.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fdac9a88456e987065a3cd360992be5f
+_md5_=24fe6d8af199cfec1167ee9140946742
diff --git a/metadata/md5-cache/dev-python/numpy-1.23.0 b/metadata/md5-cache/dev-python/numpy-1.23.0
new file mode 100644
index 000000000000..4a68cd6f9a39
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numpy-1.23.0
@@ -0,0 +1,17 @@
+BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/cython-0.29.30[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/pkgconfig ) doc? ( app-arch/unzip ) test? ( >=dev-python/hypothesis-5.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cffi-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/fortran )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=lapack? ( virtual/fortran )
+DESCRIPTION=Fast array and numerical python library
+EAPI=8
+HOMEPAGE=https://numpy.org/ https://github.com/numpy/numpy/ https://pypi.org/project/numpy/
+INHERIT=distutils-r1 flag-o-matic fortran-2 toolchain-funcs
+IUSE=doc lapack test python_targets_python3_8 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 ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] ) lapack? ( virtual/fortran )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/numpy/numpy-1.23.0.tar.gz doc? ( https://numpy.org/doc/1.23/numpy-html.zip -> numpy-html-1.23.0.zip https://numpy.org/doc/1.23/numpy-ref.pdf -> numpy-ref-1.23.0.pdf https://numpy.org/doc/1.23/numpy-user.pdf -> numpy-user-1.23.0.pdf )
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b1c2fb13d2e3788671b03451320d7f58
diff --git a/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.0 b/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.0
new file mode 100644
index 000000000000..2def93d96c6b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenAPI schema validation for Python
+EAPI=8
+HOMEPAGE=https://github.com/p1c2u/openapi-schema-validator/ https://pypi.org/project/openapi-schema-validator/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
+LICENSE=BSD
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/p1c2u/openapi-schema-validator/archive/0.3.0.tar.gz -> openapi-schema-validator-0.3.0.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=bdaf22160b056704e7873ada43c73a5d
diff --git a/metadata/md5-cache/dev-python/openapi-spec-validator-0.4.0 b/metadata/md5-cache/dev-python/openapi-spec-validator-0.4.0
index cc06cbd6bead..927a7e4e388f 100644
--- a/metadata/md5-cache/dev-python/openapi-spec-validator-0.4.0
+++ b/metadata/md5-cache/dev-python/openapi-spec-validator-0.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/p1c2u/openapi-spec-validator/ https://pypi.org/project/openapi-spec-validator/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jsonschema-3.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-schema-validator-0.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/p1c2u/openapi-spec-validator/archive/0.4.0.tar.gz -> openapi-spec-validator-0.4.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3261cfae59a480327b96438b9ef91be5
+_md5_=fc9c7310fc6ff0027a6d305175251f6b
diff --git a/metadata/md5-cache/dev-python/oslo-utils-6.0.0 b/metadata/md5-cache/dev-python/oslo-utils-6.0.0
new file mode 100644
index 000000000000..f8b425e89b73
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-utils-6.0.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pbr-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( python_targets_python3_8? ( >=dev-python/eventlet-0.23.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/eventlet-0.23.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ddt-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2013.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Oslo Utility library
+EAPI=8
+HOMEPAGE=https://launchpad.net/oslo
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2013.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-6.0.0.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=9a779f32f1fbf78469df0fe118da5491
diff --git a/metadata/md5-cache/dev-python/pandas-1.4.3 b/metadata/md5-cache/dev-python/pandas-1.4.3
new file mode 100644
index 000000000000..f08dc7fb034c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pandas-1.4.3
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-python/numpy-1.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2020.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cython-0.29.24[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( x11-base/xorg-server[xvfb] x11-apps/xhost app-text/pandoc dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbsphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpydoc-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openpyxl-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytables-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlrd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel ) ) dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-5.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pymysql[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-xdist-1.31[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psycopg:2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel )
+DESCRIPTION=Powerful data structures for data analysis and statistics
+EAPI=8
+HOMEPAGE=https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/
+INHERIT=distutils-r1 multiprocessing optfeature virtualx
+IUSE=doc full-support minimal test X python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/numpy-1.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2020.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !minimal? ( >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) full-support? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pandas-dev/pandas/releases/download/v1.4.3/pandas-1.4.3.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=674a6a1490b130c4bb1ad53241077e7b
diff --git a/metadata/md5-cache/dev-python/pdm-pep517-0.12.7 b/metadata/md5-cache/dev-python/pdm-pep517-0.12.7
index 33a7774bfe90..c72951e7e205 100644
--- a/metadata/md5-cache/dev-python/pdm-pep517-0.12.7
+++ b/metadata/md5-cache/dev-python/pdm-pep517-0.12.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pdm-pep517/ https://github.com/pdm-project/pdm-pep517/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/pdm-project/pdm-pep517/archive/0.12.7.tar.gz -> pdm-pep517-0.12.7.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1022891ef2d1d303256bde9b20e1b7a9
+_md5_=2b622916e9d3550a8c50e44c0654077c
diff --git a/metadata/md5-cache/dev-python/pillow-9.0.1-r1 b/metadata/md5-cache/dev-python/pillow-9.0.1-r1
deleted file mode 100644
index 199b0b483c77..000000000000
--- a/metadata/md5-cache/dev-python/pillow-9.0.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[tk?,threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[tk?,threads(+)] ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= )
-DESCRIPTION=Python Imaging Library (fork)
-EAPI=8
-HOMEPAGE=https://python-pillow.org/
-INHERIT=distutils-r1 toolchain-funcs virtualx
-IUSE=examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=HPND
-RDEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[tk?,threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[tk?,threads(+)] )
-REQUIRED_USE=test? ( jpeg jpeg2k tiff truetype ) || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-pillow/Pillow/archive/9.0.1.tar.gz -> pillow-9.0.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=366f66f69eb170b11a6ab9955fe2b384
diff --git a/metadata/md5-cache/dev-python/pillow-9.1.1 b/metadata/md5-cache/dev-python/pillow-9.1.1
index 09838ffd3db8..5d50f304361e 100644
--- a/metadata/md5-cache/dev-python/pillow-9.1.1
+++ b/metadata/md5-cache/dev-python/pillow-9.1.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://python-pillow.org/
 INHERIT=distutils-r1 toolchain-funcs virtualx
 IUSE=examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( media-libs/libjpeg-turbo ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[tk?,threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[tk?,threads(+)] )
 REQUIRED_USE=test? ( jpeg jpeg2k tiff truetype ) || ( python_targets_pypy3 python_targets_python3_8 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=https://github.com/python-pillow/Pillow/archive/9.1.1.tar.gz -> pillow-9.1.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=bc6f6f3aabe39be377b2a252ceb8ad2a
+_md5_=c05fd193da43aa42ae5995bf396064a9
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.8.2 b/metadata/md5-cache/dev-python/pkginfo-1.8.2
deleted file mode 100644
index 2d1ce68498c5..000000000000
--- a/metadata/md5-cache/dev-python/pkginfo-1.8.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Provides an API for querying the distutils metadata written in a PKG-INFO file
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pkginfo/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkginfo/pkginfo-1.8.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=01057bbc2d419fbbca4ffe73e99d0cdd
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.8.2-r1 b/metadata/md5-cache/dev-python/pkginfo-1.8.2-r1
deleted file mode 100644
index cf82fced0373..000000000000
--- a/metadata/md5-cache/dev-python/pkginfo-1.8.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Provides an API for querying the distutils metadata written in a PKG-INFO file
-EAPI=8
-HOMEPAGE=https://launchpad.net/pkginfo/ https://pypi.org/project/pkginfo/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 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 ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkginfo/pkginfo-1.8.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=25bb9e1b29f83fd57e743392504256ec
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.8.3 b/metadata/md5-cache/dev-python/pkginfo-1.8.3
index 581257c0779c..a7ad591b6c4e 100644
--- a/metadata/md5-cache/dev-python/pkginfo-1.8.3
+++ b/metadata/md5-cache/dev-python/pkginfo-1.8.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://launchpad.net/pkginfo/ https://pypi.org/project/pkginfo/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 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 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkginfo/pkginfo-1.8.3.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=25bb9e1b29f83fd57e743392504256ec
+_md5_=20b9639e5563dc1020ccc23d7f21529e
diff --git a/metadata/md5-cache/dev-python/psutil-5.9.1 b/metadata/md5-cache/dev-python/psutil-5.9.1
index c9121a7004a6..1171d64cc9cc 100644
--- a/metadata/md5-cache/dev-python/psutil-5.9.1
+++ b/metadata/md5-cache/dev-python/psutil-5.9.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/giampaolo/psutil https://pypi.org/project/psutil/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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
+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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.9.1.tar.gz https://dev.gentoo.org/~mgorny/dist/psutil-5.9.1-tests-r2.patch.xz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7151b38f7907d651feaee7a323045d92
+_md5_=4f95ae67c3c8722c45613e639305d970
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.15.0 b/metadata/md5-cache/dev-python/pycryptodome-3.15.0
new file mode 100644
index 000000000000..d40c5e371123
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.15.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/gmp:0= >=dev-libs/libtomcrypt-1.18.2-r1:=
+DESCRIPTION=A self-contained cryptographic library for Python
+EAPI=8
+HOMEPAGE=https://www.pycryptodome.org/ https://github.com/Legrandin/pycryptodome/ https://pypi.org/project/pycryptodome/
+INHERIT=distutils-r1
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-2 Unlicense
+RDEPEND=dev-libs/gmp:0= >=dev-libs/libtomcrypt-1.18.2-r1:= virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/pycrypto python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/Legrandin/pycryptodome/archive/v3.15.0.tar.gz -> pycryptodome-3.15.0.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b67b764c823e06b9269eb827bfabcb1f
diff --git a/metadata/md5-cache/dev-python/pycson-0.8-r3 b/metadata/md5-cache/dev-python/pycson-0.8-r3
index b8afc358e46a..a724ae0749f1 100644
--- a/metadata/md5-cache/dev-python/pycson-0.8-r3
+++ b/metadata/md5-cache/dev-python/pycson-0.8-r3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/avakar/pycson/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc ~riscv ~x86
+KEYWORDS=amd64 ~ppc ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/speg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/avakar/pycson/archive/0.8.tar.gz -> pycson-0.8.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=312287daa1f38b6758853e5a7efdc192
+_md5_=3b8d3533d099b9ca719fe151794fe412
diff --git a/metadata/md5-cache/dev-python/pydantic-1.9.0-r2 b/metadata/md5-cache/dev-python/pydantic-1.9.0-r2
deleted file mode 100644
index 9ebd6218ecd2..000000000000
--- a/metadata/md5-cache/dev-python/pydantic-1.9.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dotenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/python-email-validator-1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Data parsing and validation using Python type hints
-EAPI=8
-HOMEPAGE=https://github.com/samuelcolvin/pydantic
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pydantic/pydantic-1.9.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2159563894fcf884395bc5c880ebb858
diff --git a/metadata/md5-cache/dev-python/pydantic-1.9.0-r4 b/metadata/md5-cache/dev-python/pydantic-1.9.0-r4
deleted file mode 100644
index ab18f538e599..000000000000
--- a/metadata/md5-cache/dev-python/pydantic-1.9.0-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dotenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-email-validator-1.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Data parsing and validation using Python type hints
-EAPI=8
-HOMEPAGE=https://github.com/samuelcolvin/pydantic
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pydantic/pydantic-1.9.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=87428e72defb7854760af666b0b806ff
diff --git a/metadata/md5-cache/dev-python/pydantic-1.9.1 b/metadata/md5-cache/dev-python/pydantic-1.9.1
index 0123043316b8..bc407bbe7962 100644
--- a/metadata/md5-cache/dev-python/pydantic-1.9.1
+++ b/metadata/md5-cache/dev-python/pydantic-1.9.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/samuelcolvin/pydantic
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pydantic/pydantic-1.9.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4750600c18b58c22e986d527f54f3cb7
+_md5_=f56455e9d5759ff4ec893cdf27de1012
diff --git a/metadata/md5-cache/dev-python/pydiffx-1.0.1-r1 b/metadata/md5-cache/dev-python/pydiffx-1.0.1-r1
index a7089c31ec1f..c33528e1a162 100644
--- a/metadata/md5-cache/dev-python/pydiffx-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/pydiffx-1.0.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://diffx.org/pydiffx/ https://github.com/beanbaginc/diffx/ https://pypi.org/project/pydiffx/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beanbaginc/diffx/archive/pydiffx/release-1.0.1.tar.gz -> diffx-pydiffx-release-1.0.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b0ddae0e0675ed2aeea4fe74250be2c9
+_md5_=6348270fb9136a14ac1a1a4e3a8e19fb
diff --git a/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2 b/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2
deleted file mode 100644
index 2324d97fc7cd..000000000000
--- a/metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python package for drawing Feynman diagrams
-EAPI=7
-HOMEPAGE=http://pyfeyn.hepforge.org/ https://pypi.org/project/pyfeyn/
-INHERIT=distutils-r1
-IUSE=latex python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-python/pyx-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?] latex? ( dev-texlive/texlive-mathscience ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyfeyn/pyfeyn-1.0.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3e3a71e2825f56879782b42df4a8105c
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.49 b/metadata/md5-cache/dev-python/pyghmi-1.5.49
new file mode 100644
index 000000000000..1863487e0612
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyghmi-1.5.49
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/cryptography-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A pure python implementation of IPMI protocol
+EAPI=8
+HOMEPAGE=https://opendev.org/x/pyghmi/ https://pypi.org/project/pyghmi/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyghmi/pyghmi-1.5.49.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=c2f9f76cea3d11599a7bb56cc4ee84ef
diff --git a/metadata/md5-cache/dev-python/pygit2-1.9.1 b/metadata/md5-cache/dev-python/pygit2-1.9.1
deleted file mode 100644
index 3d1fd7a855a9..000000000000
--- a/metadata/md5-cache/dev-python/pygit2-1.9.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/cffi-1.9.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( =dev-libs/libgit2-1.4*:= >=dev-python/cffi-1.9.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-libs/libgit2-1.4*:=
-DESCRIPTION=Python bindings for libgit2
-EAPI=8
-HOMEPAGE=https://github.com/libgit2/pygit2/ https://pypi.org/project/pygit2/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~riscv x86
-LICENSE=GPL-2-with-linking-exception
-RDEPEND==dev-libs/libgit2-1.4*:= >=dev-python/cffi-1.9.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/libgit2/pygit2/archive/v1.9.1.tar.gz -> pygit2-1.9.1.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=df67be64f8bc8c4255bf80d0a3c4cedb
diff --git a/metadata/md5-cache/dev-python/pygit2-1.9.2 b/metadata/md5-cache/dev-python/pygit2-1.9.2
index 12c78b861c00..5dbea5bbcdb3 100644
--- a/metadata/md5-cache/dev-python/pygit2-1.9.2
+++ b/metadata/md5-cache/dev-python/pygit2-1.9.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/libgit2/pygit2/ https://pypi.org/project/pygit2/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2-with-linking-exception
 RDEPEND==dev-libs/libgit2-1.4*:= >=dev-python/cffi-1.9.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/libgit2/pygit2/archive/v1.9.2.tar.gz -> pygit2-1.9.2.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e7d9e0104d7929f6f4f44a5295deed3a
+_md5_=2188c848fe96ef574adbd0f0c31626a4
diff --git a/metadata/md5-cache/dev-python/pyproject-fmt-0.3.3 b/metadata/md5-cache/dev-python/pyproject-fmt-0.3.3
new file mode 100644
index 000000000000..039f2ceeaaa0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyproject-fmt-0.3.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-mock-3.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-0.22.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Format your pyproject.toml file
+EAPI=8
+HOMEPAGE=https://github.com/tox-dev/pyproject-fmt/ https://pypi.org/project/pyproject-fmt/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tox-dev/pyproject-fmt/archive/0.3.3.tar.gz -> pyproject-fmt-0.3.3.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=caa331479bf6c79d33acd99e50f639b1
diff --git a/metadata/md5-cache/dev-python/pytest-datadir-1.3.1-r1 b/metadata/md5-cache/dev-python/pytest-datadir-1.3.1-r1
index f6a549e054db..510f61edc65a 100644
--- a/metadata/md5-cache/dev-python/pytest-datadir-1.3.1-r1
+++ b/metadata/md5-cache/dev-python/pytest-datadir-1.3.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pytest plugin for manipulating test data directories and files
 EAPI=8
-HOMEPAGE=https://github.com/gabrielcnr/pytest-datadir
+HOMEPAGE=https://github.com/gabrielcnr/pytest-datadir/ https://pypi.org/project/pytest-datadir/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-datadir/pytest-datadir-1.3.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3f60138126f0176227ffae9a81bd79cf
+_md5_=e9de3eee68897833f4436f02dcc9e457
diff --git a/metadata/md5-cache/dev-python/pytest-httpx-0.20.0 b/metadata/md5-cache/dev-python/pytest-httpx-0.20.0
deleted file mode 100644
index 4a0ff51a5f75..000000000000
--- a/metadata/md5-cache/dev-python/pytest-httpx-0.20.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( =dev-python/httpx-0.22*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pytest-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Send responses to HTTPX using pytest
-EAPI=8
-HOMEPAGE=https://colin-b.github.io/pytest_httpx/ https://github.com/Colin-b/pytest_httpx/ https://pypi.org/project/pytest-httpx/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND==dev-python/httpx-0.22*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pytest-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Colin-b/pytest_httpx/archive/v0.20.0.tar.gz -> pytest-httpx-0.20.0.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=643e5818556ba416d03bb0aabe3b8aad
diff --git a/metadata/md5-cache/dev-python/pytest-mock-3.8.1 b/metadata/md5-cache/dev-python/pytest-mock-3.8.1
new file mode 100644
index 000000000000..723303003d20
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-mock-3.8.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Thin-wrapper around the mock package for easier use with pytest
+EAPI=8
+HOMEPAGE=https://github.com/pytest-dev/pytest-mock/ https://pypi.org/project/pytest-mock/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 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=MIT
+RDEPEND=>=dev-python/pytest-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-3.8.1.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=f0c20ef46892604e808b9f63d86a3262
diff --git a/metadata/md5-cache/dev-python/pytest-param-files-0.3.4 b/metadata/md5-cache/dev-python/pytest-param-files-0.3.4
index 9645d70c319e..1e6795e85c32 100644
--- a/metadata/md5-cache/dev-python/pytest-param-files-0.3.4
+++ b/metadata/md5-cache/dev-python/pytest-param-files-0.3.4
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pytest parametrize decorators from external files.
 EAPI=8
-HOMEPAGE=https://pypi.org/project/pytest_param_files/ https://github.com/chrisjsewell/pytest-param-files
+HOMEPAGE=https://github.com/chrisjsewell/pytest-param-files/ https://pypi.org/project/pytest_param_files/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/chrisjsewell/pytest-param-files/archive/v0.3.4.tar.gz -> pytest-param-files-0.3.4.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=46239cce8df351dba7a0420099109963
+_md5_=3e931eb0e2715a605b0e75f32d190da3
diff --git a/metadata/md5-cache/dev-python/pytest-qt-4.1.0 b/metadata/md5-cache/dev-python/pytest-qt-4.1.0
new file mode 100644
index 000000000000..65bfea7ec570
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-qt-4.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/PyQt5[gui,testlib,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/pyside2[gui,testlib,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/pyside2[gui,testlib,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/pyside2[gui,testlib,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( dev-python/QtPy[gui,testlib,widgets(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,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=Pytest plugin for PyQt5 and PySide2 applications
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pytest-qt/ https://github.com/pytest-dev/pytest-qt/
+INHERIT=distutils-r1 virtualx
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/QtPy[gui,testlib,widgets(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-qt/pytest-qt-4.1.0.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=6252f23ad96d54f93764b97863bd5948
diff --git a/metadata/md5-cache/dev-python/pytest-regressions-2.3.1 b/metadata/md5-cache/dev-python/pytest-regressions-2.3.1
index f588f0f97266..14863c3b878b 100644
--- a/metadata/md5-cache/dev-python/pytest-regressions-2.3.1
+++ b/metadata/md5-cache/dev-python/pytest-regressions-2.3.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-datadir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-datadir[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Easy to use fixtures to write regression tests
 EAPI=8
 HOMEPAGE=https://github.com/ESSS/pytest-regressions
 INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-datadir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-datadir[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-regressions/pytest-regressions-2.3.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=730dfc522811c4b1469e508e7d5bc0e7
+_md5_=22b4747167f55952fc77dba0d88b59d0
diff --git a/metadata/md5-cache/dev-python/pytest-skip-markers-1.2.0 b/metadata/md5-cache/dev-python/pytest-skip-markers-1.2.0
deleted file mode 100644
index 3f764395b741..000000000000
--- a/metadata/md5-cache/dev-python/pytest-skip-markers-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools-declarative-requirements[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-shell-utilities[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyfakefs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-subtests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-shell-utilities[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Pytest plugin which implements a few useful skip markers
-EAPI=8
-HOMEPAGE=https://pytest-skip-markers.readthedocs.io/en/latest/ https://github.com/saltstack/pytest-skip-markers
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-shell-utilities[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/saltstack/pytest-skip-markers/archive/refs/tags/1.2.0.tar.gz -> pytest-skip-markers-1.2.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0836873dcb25aba026ea523563ba7dc0
diff --git a/metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0 b/metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0
deleted file mode 100644
index d6127f7454d8..000000000000
--- a/metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools-declarative-requirements[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-shell-utilities[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyfakefs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-subtests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-shell-utilities[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Pytest plugin which implements a few useful skip markers
-EAPI=8
-HOMEPAGE=https://pytest-skip-markers.readthedocs.io/en/latest/ https://github.com/saltstack/pytest-skip-markers
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tempdir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-shell-utilities[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/saltstack/pytest-skip-markers/archive/refs/tags/1.3.0.tar.gz -> pytest-skip-markers-1.3.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4a7b705adae09f99bcb7634ee9c9e43b
diff --git a/metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r1 b/metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r1
index 13deb7008269..b83600efd9af 100644
--- a/metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pytest-skip-markers.readthedocs.io/en/latest/ https://github.com/saltstack/pytest-skip-markers
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 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=Apache-2.0
 RDEPEND=>=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/saltstack/pytest-skip-markers/archive/1.3.0.tar.gz -> pytest-skip-markers-1.3.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=632105904173ad1504f94639b38249f4
+_md5_=d8d18c8e1bf488e009c49bd0e26d6df6
diff --git a/metadata/md5-cache/dev-python/pytoolconfig-1.1.2 b/metadata/md5-cache/dev-python/pytoolconfig-1.1.2
index 77216f491bc8..0458e51c3dce 100644
--- a/metadata/md5-cache/dev-python/pytoolconfig-1.1.2
+++ b/metadata/md5-cache/dev-python/pytoolconfig-1.1.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pdm-pep517-0.12.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/sphinx-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tabulate-0.8.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pdm-pep517-0.12.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python tool configuration
 EAPI=8
-HOMEPAGE=https://pypi.org/project/pytoolconfig/ https://github.com/bageljrkhanofemus/pytoolconfig
+HOMEPAGE=https://pypi.org/project/pytoolconfig/ https://github.com/bageljrkhanofemus/pytoolconfig/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=LGPL-3
-RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytoolconfig/pytoolconfig-1.1.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=86b11ea103b22f7912ee944e2fcaab3d
+_md5_=7d428d1995f7d31b562b86f13410011c
diff --git a/metadata/md5-cache/dev-python/pyzmq-23.0.0 b/metadata/md5-cache/dev-python/pyzmq-23.0.0
index ce0fad05542a..11f8d3e2b9b3 100644
--- a/metadata/md5-cache/dev-python/pyzmq-23.0.0
+++ b/metadata/md5-cache/dev-python/pyzmq-23.0.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://zeromq.org/languages/python/ https://pypi.org/project/pyzmq/ https://github.com/zeromq/pyzmq/
 INHERIT=flag-o-matic distutils-r1 toolchain-funcs
 IUSE=+draft test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=>=net-libs/zeromq-4.2.2-r2:=[drafts] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 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/zeromq/pyzmq/archive/v23.0.0.tar.gz -> pyzmq-23.0.0.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ba9fde97cb58a3b803795e283a3a3d2f
+_md5_=32fbfe5530e89faa18dda84af97c3e8a
diff --git a/metadata/md5-cache/dev-python/requests-2.27.1-r1 b/metadata/md5-cache/dev-python/requests-2.27.1-r2
similarity index 99%
rename from metadata/md5-cache/dev-python/requests-2.27.1-r1
rename to metadata/md5-cache/dev-python/requests-2.27.1-r2
index 6486eeb1b250..103c8a169439 100644
--- a/metadata/md5-cache/dev-python/requests-2.27.1-r1
+++ b/metadata/md5-cache/dev-python/requests-2.27.1-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.27.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e2031e1ec4019e0cb37905169d3c1991
+_md5_=ef4194c200b2f6ed985c8f68b51d5248
diff --git a/metadata/md5-cache/dev-python/rich-12.4.1 b/metadata/md5-cache/dev-python/rich-12.4.1
deleted file mode 100644
index 955650f65d59..000000000000
--- a/metadata/md5-cache/dev-python/rich-12.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?] ) >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for renrering rich text, tables, etc. to the terminal
-EAPI=8
-HOMEPAGE=https://github.com/Textualize/rich
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_8 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=MIT
-RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Textualize/rich/archive/v12.4.1.tar.gz -> rich-12.4.1.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a10c5bf43c0cd740a9a961f3a51fc480
diff --git a/metadata/md5-cache/dev-python/rich-12.4.4 b/metadata/md5-cache/dev-python/rich-12.4.4
index d5da4ad9e0ed..bfe660882435 100644
--- a/metadata/md5-cache/dev-python/rich-12.4.4
+++ b/metadata/md5-cache/dev-python/rich-12.4.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Textualize/rich/ https://pypi.org/project/rich/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_pypy3 python_targets_python3_8 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=MIT
 RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/Textualize/rich/archive/v12.4.4.tar.gz -> rich-12.4.4.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7f760106334dd3268291170a76d6fedf
+_md5_=276b61aaae50e3864922ee8fccb78034
diff --git a/metadata/md5-cache/dev-python/rope-1.2.0 b/metadata/md5-cache/dev-python/rope-1.2.0
index c2fd7678fca9..8c2f1b1201ab 100644
--- a/metadata/md5-cache/dev-python/rope-1.2.0
+++ b/metadata/md5-cache/dev-python/rope-1.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/rope/ https://github.com/python-rope/rope/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=LGPL-3+
 RDEPEND=dev-python/pytoolconfig[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rope/rope-1.2.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f0f3959aa9b7bf531d859d7ed2f35818
+_md5_=213d6b7b8db47fc9dd8cf22cc1686baa
diff --git a/metadata/md5-cache/dev-python/routes-2.5.1-r1 b/metadata/md5-cache/dev-python/routes-2.5.1-r2
similarity index 98%
rename from metadata/md5-cache/dev-python/routes-2.5.1-r1
rename to metadata/md5-cache/dev-python/routes-2.5.1-r2
index c2d65499bac6..636b140ea714 100644
--- a/metadata/md5-cache/dev-python/routes-2.5.1-r1
+++ b/metadata/md5-cache/dev-python/routes-2.5.1-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bbangert/routes/archive/v2.5.1.tar.gz -> routes-2.5.1.gh.tar.gz https://github.com/bbangert/routes/pull/107.patch -> routes-2.5.1-pytest.patch
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=043be8217b4c168fa79cbdf40f713353
+_md5_=6df2f8b80217ab32efa3e375be9c11b3
diff --git a/metadata/md5-cache/dev-python/scipy-1.8.0 b/metadata/md5-cache/dev-python/scipy-1.8.0
deleted file mode 100644
index 327d52fb4cb2..000000000000
--- a/metadata/md5-cache/dev-python/scipy-1.8.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/swig >=dev-python/cython-0.29.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/pkgconfig doc? ( app-arch/unzip ) pythran? ( dev-python/pythran[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.17.3[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=dev-python/numpy-1.17.3[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) virtual/fortran
-DESCRIPTION=Scientific algorithms library for Python
-EAPI=7
-HOMEPAGE=https://scipy.org/ https://github.com/scipy/scipy/ https://pypi.org/project/scipy/
-INHERIT=fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-IUSE=doc +pythran sparse test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 -hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
-LICENSE=BSD LGPL-2
-RDEPEND=>=dev-python/numpy-1.17.3[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/scipy/scipy-1.8.0.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.7.1/scipy-html-1.7.1.zip https://docs.scipy.org/doc/scipy-1.7.1/scipy-ref-1.7.1.pdf )
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=14a956ac3db0e023c53990d8e26feac9
diff --git a/metadata/md5-cache/dev-python/scipy-1.8.1 b/metadata/md5-cache/dev-python/scipy-1.8.1
index 46bbc97f54a4..4db2e000ac22 100644
--- a/metadata/md5-cache/dev-python/scipy-1.8.1
+++ b/metadata/md5-cache/dev-python/scipy-1.8.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://scipy.org/ https://github.com/scipy/scipy/ https://pypi.org/project/scipy/
 INHERIT=fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
 IUSE=doc +pythran sparse test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 -hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 arm arm64 -hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD LGPL-2
 RDEPEND=>=dev-python/numpy-1.17.3[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.8.1.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.8.1/scipy-html-1.8.1.zip https://docs.scipy.org/doc/scipy-1.8.1/scipy-ref-1.8.1.pdf )
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ff5bb1198b3b5e4522b1042bb1735a1f
+_md5_=a1cccb3f60ac2b65371ae49665d7d9ba
diff --git a/metadata/md5-cache/dev-python/scipy-1.9.0_rc1 b/metadata/md5-cache/dev-python/scipy-1.9.0_rc1
new file mode 100644
index 000000000000..97556f181158
--- /dev/null
+++ b/metadata/md5-cache/dev-python/scipy-1.9.0_rc1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/swig >=dev-python/cython-0.29.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pythran[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/patchelf virtual/pkgconfig doc? ( app-arch/unzip ) test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.17.3[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/meson-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-python/numpy-1.17.3[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) virtual/fortran
+DESCRIPTION=Scientific algorithms library for Python
+EAPI=8
+HOMEPAGE=https://scipy.org/ https://github.com/scipy/scipy/ https://pypi.org/project/scipy/
+INHERIT=fortran-2 distutils-r1 multiprocessing
+IUSE=doc +sparse test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+LICENSE=BSD LGPL-2
+RDEPEND=>=dev-python/numpy-1.17.3[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/arpack:0= virtual/cblas virtual/lapack sparse? ( sci-libs/umfpack:0= ) dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/scipy/scipy-1.9.0rc1.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.8.1/scipy-html-1.8.1.zip https://docs.scipy.org/doc/scipy-1.8.1/scipy-ref-1.8.1.pdf )
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=4eeee1a4f887f071ef8984ea907b1229
diff --git a/metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r1 b/metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r1
deleted file mode 100644
index ee0b017ba55e..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pypiserver[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Requirements Support For Setuptools Declarative setup.cfg
-EAPI=8
-HOMEPAGE=https://pypi.org/project/setuptools-declarative-requirements/ https://github.com/s0undt3ch/setuptools-declarative-requirements
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/s0undt3ch/setuptools-declarative-requirements/archive/refs/tags/1.2.0.tar.gz -> setuptools-declarative-requirements-1.2.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8b945283a95f2086b2d53e2890dadf1c
diff --git a/metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r2 b/metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r2
index 0d1815771629..2e69ff232ddc 100644
--- a/metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r2
+++ b/metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/setuptools-declarative-requirements/ https://github.com/s0undt3ch/setuptools-declarative-requirements
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/s0undt3ch/setuptools-declarative-requirements/archive/1.2.0.tar.gz -> setuptools-declarative-requirements-1.2.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3cd747f5dd23e7d95c0ce7a77763b7ec
+_md5_=fbac0284e6fbe27de81ed4a4c3cdc401
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-7.0.2 b/metadata/md5-cache/dev-python/setuptools_scm-7.0.2
new file mode 100644
index 000000000000..6ea38b8239ad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools_scm-7.0.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-vcs/git !sparc? ( dev-vcs/mercurial ) ) test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Manage versions by scm tags via setuptools
+EAPI=7
+HOMEPAGE=https://github.com/pypa/setuptools_scm/ https://pypi.org/project/setuptools-scm/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-7.0.2.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=7e245da232eba80dffe845bc42f2aa60
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1 b/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
index 0f1ce4ecca79..0f1109860ee3 100644
--- a/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
+++ b/metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ea6a84dfb34b4e0c5328c1d0040a3b17
+_md5_=1d81e7335aeeba3ac8421cfe87e85ca4
diff --git a/metadata/md5-cache/dev-python/speg-0.3-r3 b/metadata/md5-cache/dev-python/speg-0.3-r3
index 4cfbe6fd1825..4b8dd78fc2c2 100644
--- a/metadata/md5-cache/dev-python/speg-0.3-r3
+++ b/metadata/md5-cache/dev-python/speg-0.3-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/avakar/speg/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc ~riscv ~x86
+KEYWORDS=amd64 ~ppc ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/avakar/speg/archive/v0.3.tar.gz -> speg-0.3.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a8e626c855324b5fd051b4ebfc4d0509
+_md5_=cb6b0e65f0211295b12b0a5f809828e4
diff --git a/metadata/md5-cache/dev-python/sphinx-pytest-0.0.4 b/metadata/md5-cache/dev-python/sphinx-pytest-0.0.4
new file mode 100644
index 000000000000..c71cb7dedc93
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-pytest-0.0.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Helpful pytest fixtures for Sphinx extensions
+EAPI=8
+HOMEPAGE=https://github.com/chrisjsewell/sphinx-pytest/ https://pypi.org/project/sphinx_pytest/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv
+LICENSE=MIT
+RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/chrisjsewell/sphinx-pytest/archive/v0.0.4.tar.gz -> sphinx-pytest-0.0.4.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=d721cb486c442f457602cf7242ee76aa
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-openapi-0.7.0-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-openapi-0.7.0-r1
deleted file mode 100644
index c709ab72862b..000000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-openapi-0.7.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-httpdomain[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/m2r[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/picobox[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deepmerge[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=OpenAPI (fka Swagger) spec renderer for Sphinx
-EAPI=8
-HOMEPAGE=https://pypi.org/project/sphinxcontrib-openapi/ https://github.com/sphinx-contrib/openapi/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinxcontrib-httpdomain[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/m2r[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/picobox[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deepmerge[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=dc811eeab9635d9ea464ec02df79dc1c
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4-r2
similarity index 99%
rename from metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4-r1
rename to metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4-r2
index 32f41d2339f6..a97623e6513f 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/1.2.4.tar.gz -> sphinxcontrib-websupport-1.2.4.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c1333c9227fe3d542e51ae900ee74ad7
+_md5_=959b570d38ce84bc952cf51dd36c9944
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.38 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.38
new file mode 100644
index 000000000000..0d349fedcf47
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.38
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[sqlite] ) ) test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[sqlite?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[sqlite?] ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python SQL toolkit and Object Relational Mapper
+EAPI=8
+HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
+INHERIT=distutils-r1 optfeature
+IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 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=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[sqlite?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[sqlite?] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.38.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=06ed5f2d932ae54b6998f77e71b0d866
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.39 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.39
new file mode 100644
index 000000000000..c5b3b32ceb5b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.39
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[sqlite] ) ) test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[sqlite?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[sqlite?] ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python SQL toolkit and Object Relational Mapper
+EAPI=8
+HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
+INHERIT=distutils-r1 optfeature
+IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 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=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[sqlite?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[sqlite?] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.39.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=06ed5f2d932ae54b6998f77e71b0d866
diff --git a/metadata/md5-cache/dev-python/tabulate-0.8.9 b/metadata/md5-cache/dev-python/tabulate-0.8.9
deleted file mode 100644
index 725d200a02b6..000000000000
--- a/metadata/md5-cache/dev-python/tabulate-0.8.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) dev-python/colorclass[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pretty-print tabular data
-EAPI=7
-HOMEPAGE=https://pypi.org/project/tabulate/ https://github.com/astanin/python-tabulate
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/astanin/python-tabulate/archive/v0.8.9.tar.gz -> tabulate-0.8.9.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bc689619287e1202c57490102491b50b
diff --git a/metadata/md5-cache/dev-python/tenacity-8.0.1 b/metadata/md5-cache/dev-python/tenacity-8.0.1
deleted file mode 100644
index ad2ad1ecf250..000000000000
--- a/metadata/md5-cache/dev-python/tenacity-8.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=General-purpose retrying library
-EAPI=8
-HOMEPAGE=https://github.com/jd/tenacity
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/tenacity/tenacity-8.0.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d7385ee53ed3035428967f3d576733fe
diff --git a/metadata/md5-cache/dev-python/tlsh-4.8.2 b/metadata/md5-cache/dev-python/tlsh-4.8.2
index b17e19a09532..f292205289c4 100644
--- a/metadata/md5-cache/dev-python/tlsh-4.8.2
+++ b/metadata/md5-cache/dev-python/tlsh-4.8.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/python-tlsh/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=dev-libs/tlsh python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/trendmicro/tlsh/archive/4.8.2.tar.gz -> tlsh-4.8.2.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=edd076796fa6d564caee6cf32eed29f6
+_md5_=f3ddb705fc30f4aef72477cd42b0ca0a
diff --git a/metadata/md5-cache/dev-python/tomlkit-0.10.2 b/metadata/md5-cache/dev-python/tomlkit-0.10.2
deleted file mode 100644
index 2d422399d2a5..000000000000
--- a/metadata/md5-cache/dev-python/tomlkit-0.10.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Style preserving TOML library
-EAPI=8
-HOMEPAGE=https://github.com/sdispater/tomlkit/ https://pypi.org/project/tomlkit/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 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=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/tomlkit/tomlkit-0.10.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8468b06deac2549b16eb30eaa793b661
diff --git a/metadata/md5-cache/dev-python/tomlkit-0.11.0 b/metadata/md5-cache/dev-python/tomlkit-0.11.0
index c4611bd8575f..190155173903 100644
--- a/metadata/md5-cache/dev-python/tomlkit-0.11.0
+++ b/metadata/md5-cache/dev-python/tomlkit-0.11.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sdispater/tomlkit/ https://pypi.org/project/tomlkit/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tomlkit/tomlkit-0.11.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f07c48cac8eed20330eec89b7a4c9139
+_md5_=78196461ffc27dd221fea43f66ed3c1a
diff --git a/metadata/md5-cache/dev-python/trove-classifiers-2022.6.23 b/metadata/md5-cache/dev-python/trove-classifiers-2022.6.23
new file mode 100644
index 000000000000..e5f17a7db084
--- /dev/null
+++ b/metadata/md5-cache/dev-python/trove-classifiers-2022.6.23
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/calver[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,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
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/trove-classifiers/archive/2022.6.23.tar.gz -> trove-classifiers-2022.6.23.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=8e59a55e5c5dad5a3500f535658cefd7
diff --git a/metadata/md5-cache/dev-python/typeguard-2.13.3 b/metadata/md5-cache/dev-python/typeguard-2.13.3
deleted file mode 100644
index d946a1a67c6d..000000000000
--- a/metadata/md5-cache/dev-python/typeguard-2.13.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Run-time type checker for Python
-EAPI=8
-HOMEPAGE=https://pypi.org/project/typeguard/ https://github.com/agronholm/typeguard/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/agronholm/typeguard/archive/2.13.3.tar.gz -> typeguard-2.13.3.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=28c417666fc50cae626dda909796e490
diff --git a/metadata/md5-cache/dev-python/uri_template-1.1.0 b/metadata/md5-cache/dev-python/uri_template-1.1.0
deleted file mode 100644
index 9cf02283f358..000000000000
--- a/metadata/md5-cache/dev-python/uri_template-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=URI Template expansion in strict adherence to RFC 6570
-EAPI=8
-HOMEPAGE=https://gitlab.linss.com/open-source/uri_template/
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://gitlab.linss.com/open-source/uri_template/-/archive/v1.1.0/uri_template-v1.1.0.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2539b0a9238802716bafdc85950c153b
diff --git a/metadata/md5-cache/dev-python/uri_template-1.2.0 b/metadata/md5-cache/dev-python/uri_template-1.2.0-r1
similarity index 98%
rename from metadata/md5-cache/dev-python/uri_template-1.2.0
rename to metadata/md5-cache/dev-python/uri_template-1.2.0-r1
index 3f6d907260de..50b06032212e 100644
--- a/metadata/md5-cache/dev-python/uri_template-1.2.0
+++ b/metadata/md5-cache/dev-python/uri_template-1.2.0-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 SLOT=0
 SRC_URI=https://gitlab.linss.com/open-source/uri_template/-/archive/v1.2.0/uri_template-v1.2.0.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8bc82a9faecefba69842a6a816ddf29b
+_md5_=27a118571a1ef74735274f7e4c277fd8
diff --git a/metadata/md5-cache/dev-python/uvicorn-0.18.1 b/metadata/md5-cache/dev-python/uvicorn-0.18.1
new file mode 100644
index 000000000000..eb06b33265e8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uvicorn-0.18.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dotenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/websockets-10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wsproto[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/asgiref-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/h11-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Lightning-fast ASGI server implementation
+EAPI=8
+HOMEPAGE=https://www.uvicorn.org/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/asgiref-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/h11-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/encode/uvicorn/archive/0.18.1.tar.gz -> uvicorn-0.18.1.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=bd1ed9122e45ea3eefb9c0374d48c33d
diff --git a/metadata/md5-cache/dev-python/watchfiles-0.14.1 b/metadata/md5-cache/dev-python/watchfiles-0.14.1
deleted file mode 100644
index 1de6db28397d..000000000000
--- a/metadata/md5-cache/dev-python/watchfiles-0.14.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/dirty-equals[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( =dev-python/anyio-3*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Simple, modern file watching and code reload in Python
-EAPI=8
-HOMEPAGE=https://pypi.org/project/watchfiles/ https://github.com/samuelcolvin/watchfiles/
-INHERIT=cargo distutils-r1
-IUSE=test debug python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86
-LICENSE=MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD CC0-1.0 ISC MIT Unlicense
-RDEPEND==dev-python/anyio-3*[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/samuelcolvin/watchfiles/archive/v0.14.1.tar.gz -> watchfiles-0.14.1.gh.tar.gz https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.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/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.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/filetime/0.2.16/download -> filetime-0.2.16.crate https://crates.io/api/v1/crates/fsevent-sys/4.1.0/download -> fsevent-sys-4.1.0.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/inotify/0.9.6/download -> inotify-0.9.6.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/kqueue/1.0.5/download -> kqueue-1.0.5.crate https://crates.io/api/v1/crates/kqueue-sys/1.0.3/download -> kqueue-sys-1.0.3.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/libc/0.2.124/download -> libc-0.2.124.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.16/download -> log-0.4.16.crate https://crates.io/api/v1/crates/mio/0.8.2/download -> mio-0.8.2.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/notify/5.0.0-pre.15/download -> notify-5.0.0-pre.15.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.2/download -> parking_lot_core-0.9.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.37/download -> proc-macro2-1.0.37.crate https://crates.io/api/v1/crates/pyo3/0.16.4/download -> pyo3-0.16.4.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.4/download -> pyo3-build-config-0.16.4.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.4/download -> pyo3-ffi-0.16.4.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.4/download -> pyo3-macros-0.16.4.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.4/download -> pyo3-macros-backend-0.16.4.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.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/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/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/syn/1.0.91/download -> syn-1.0.91.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.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/unindent/0.1.8/download -> unindent-0.1.8.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/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.34.0/download -> windows-sys-0.34.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.34.0/download -> windows_aarch64_msvc-0.34.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.34.0/download -> windows_i686_gnu-0.34.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.34.0/download -> windows_i686_msvc-0.34.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.34.0/download -> windows_x86_64_gnu-0.34.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.34.0/download -> windows_x86_64_msvc-0.34.0.crate
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9b25b0d4d6060374ee114e5601c576fa
diff --git a/metadata/md5-cache/dev-python/watchfiles-0.15.0 b/metadata/md5-cache/dev-python/watchfiles-0.15.0-r1
similarity index 99%
rename from metadata/md5-cache/dev-python/watchfiles-0.15.0
rename to metadata/md5-cache/dev-python/watchfiles-0.15.0-r1
index c4924390629f..53a4ed5cb3e4 100644
--- a/metadata/md5-cache/dev-python/watchfiles-0.15.0
+++ b/metadata/md5-cache/dev-python/watchfiles-0.15.0-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/samuelcolvin/watchfiles/archive/v0.15.0.tar.gz -> watchfiles-0.15.0.gh.tar.gz https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.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/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.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/filetime/0.2.16/download -> filetime-0.2.16.crate https://crates.io/api/v1/crates/fsevent-sys/4.1.0/download -> fsevent-sys-4.1.0.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/inotify/0.9.6/download -> inotify-0.9.6.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/kqueue/1.0.5/download -> kqueue-1.0.5.crate https://crates.io/api/v1/crates/kqueue-sys/1.0.3/download -> kqueue-sys-1.0.3.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/libc/0.2.124/download -> libc-0.2.124.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.16/download -> log-0.4.16.crate https://crates.io/api/v1/crates/mio/0.8.2/download -> mio-0.8.2.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/notify/5.0.0-pre.15/download -> notify-5.0.0-pre.15.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.2/download -> parking_lot_core-0.9.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.37/download -> proc-macro2-1.0.37.crate https://crates.io/api/v1/crates/pyo3/0.16.4/download -> pyo3-0.16.4.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.4/download -> pyo3-build-config-0.16.4.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.4/download -> pyo3-ffi-0.16.4.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.4/download -> pyo3-macros-0.16.4.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.4/download -> pyo3-macros-backend-0.16.4.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.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/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/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/syn/1.0.91/download -> syn-1.0.91.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.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/unindent/0.1.8/download -> unindent-0.1.8.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/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.34.0/download -> windows-sys-0.34.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.34.0/download -> windows_aarch64_msvc-0.34.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.34.0/download -> windows_i686_gnu-0.34.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.34.0/download -> windows_i686_msvc-0.34.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.34.0/download -> windows_x86_64_gnu-0.34.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.34.0/download -> windows_x86_64_msvc-0.34.0.crate
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9c3801be56d29d2998e89aeaec605c0b
+_md5_=cb764898eff04b7e7685a2776ee4fb40
diff --git a/metadata/md5-cache/dev-python/watchgod-0.8.2 b/metadata/md5-cache/dev-python/watchgod-0.8.2-r1
similarity index 98%
rename from metadata/md5-cache/dev-python/watchgod-0.8.2
rename to metadata/md5-cache/dev-python/watchgod-0.8.2-r1
index 0ee04b4ccc8a..1f8599b32aa9 100644
--- a/metadata/md5-cache/dev-python/watchgod-0.8.2
+++ b/metadata/md5-cache/dev-python/watchgod-0.8.2-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/samuelcolvin/watchfiles/archive/v0.8.2.tar.gz -> watchfiles-0.8.2.gh.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e1dc40c54f4c1c2c48be9bb89e4bd357
+_md5_=5c5f59557459f1668e3be69c9dd04f5f
diff --git a/metadata/md5-cache/dev-python/widgetsnbextension-3.6.1 b/metadata/md5-cache/dev-python/widgetsnbextension-3.6.1
new file mode 100644
index 000000000000..e7e31a834b13
--- /dev/null
+++ b/metadata/md5-cache/dev-python/widgetsnbextension-3.6.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=IPython HTML widgets for Jupyter
+EAPI=8
+HOMEPAGE=https://ipython.org/ https://pypi.org/project/widgetsnbextension/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/w/widgetsnbextension/widgetsnbextension-3.6.1.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=01c9a01d0a4889ba9327d3785a955fb9
diff --git a/metadata/md5-cache/dev-python/xcffib-0.11.1 b/metadata/md5-cache/dev-python/xcffib-0.11.1
deleted file mode 100644
index f8b78be2abea..000000000000
--- a/metadata/md5-cache/dev-python/xcffib-0.11.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xeyes ) test? ( python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/libxcb >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libxcb
-DESCRIPTION=A drop in replacement for xpyb, an XCB python binding
-EAPI=7
-HOMEPAGE=https://github.com/tych0/xcffib
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/libxcb python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/x/xcffib/xcffib-0.11.1.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b1bdda1042fe447e08369943eb329c60
diff --git a/metadata/md5-cache/dev-python/xcffib-0.11.1-r1 b/metadata/md5-cache/dev-python/xcffib-0.11.1-r1
index f9c134eeb8cf..3fcf40497d75 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.11.1-r1
+++ b/metadata/md5-cache/dev-python/xcffib-0.11.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tych0/xcffib
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/libxcb python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.11.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3560a8310ddb666ede4718b39051cefa
+_md5_=3f91593e04f9a6258d1f140c654a9413
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.11.3 b/metadata/md5-cache/dev-python/xmlschema-1.11.3
new file mode 100644
index 000000000000..7a5e9527a3d8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xmlschema-1.11.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/elementpath-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An XML Schema validator and decoder
+EAPI=8
+HOMEPAGE=https://github.com/sissaschool/xmlschema/ https://pypi.org/project/xmlschema/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 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 ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/elementpath-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.11.3.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=835171e4a13260b6ffdc35b18d7e4eb1
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 641ab15b243f..a8d7ac12f60e 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.5 b/metadata/md5-cache/dev-qt/qtlocation-5.15.5
index cf78aa7d6e99..648fd98efdec 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.5
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.15.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtlocation https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.5* =dev-qt/qtdeclarative-5.15.5* =dev-qt/qtgui-5.15.5* =dev-qt/qtnetwork-5.15.5* =dev-qt/qtpositioning-5.15.5*[qml] =dev-qt/qtsql-5.15.5* sys-libs/zlib
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtlocation-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtlocation-5.15.5-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	940277ddd12b71b77005c4316b59a68a	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=5d55f673ce5cf1ae9ef7c8cdc1e95b90
+_md5_=5d23022ce80caa46ec45cb90f0181fbd
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 59db6dfdf1cf..73c7fbf89ab7 100644
Binary files a/metadata/md5-cache/dev-ros/Manifest.gz and b/metadata/md5-cache/dev-ros/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-1.3.0-r1 b/metadata/md5-cache/dev-ros/ament_cmake_core-1.3.0-r1
new file mode 100644
index 000000000000..d5540c90d25a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-1.3.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/ament_package[python_targets_python3_10(-)] dev-python/catkin_pkg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/ament_package[python_targets_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/ament_package[python_targets_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)] ) ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/ament_package dev-python/catkin_pkg
+DESCRIPTION=The core of the ament buildsystem in CMake
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+INHERIT=cmake python-any-r1
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/ament_package dev-python/catkin_pkg
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.3.0.tar.gz -> ament_cmake-1.3.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1c42966a406d5fabee370d2ea62046f7
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-9999 b/metadata/md5-cache/dev-ros/ament_cmake_core-9999
index f0cdac86e047..f05111a72cbb 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_core-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-python/ament_package dev-python/catkin_pkg
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d90d642fca85f95e8096bdc5d533c6bc
+_md5_=1c42966a406d5fabee370d2ea62046f7
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index ead5b5c616d7..0574dbeb6bf1 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/cliver-0.3.2-r1 b/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
index b7370b736b62..478be15b3222 100644
--- a/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://yaauie.github.io/cliver/
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~sparc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yaauie/cliver/archive/3d72e99af19c273a3f88adcd4b96c4b65b1b6d4b.tar.gz -> cliver-0.3.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=deaf7451e52527f028ed57d7ba61b8c9
+_md5_=e748102e7c31f4fe9faed768bfa8dad6
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.10.0 b/metadata/md5-cache/dev-ruby/erubi-1.10.0
deleted file mode 100644
index 082330678716..000000000000
--- a/metadata/md5-cache/dev-ruby/erubi-1.10.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=a ERB template engine for ruby; a simplified fork of Erubis
-EAPI=7
-HOMEPAGE=https://github.com/jeremyevans/erubi
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/jeremyevans/erubi/archive/1.10.0.tar.gz -> erubi-1.10.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=64b804a7dacfc7bb4797742058cc9df1
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.9.0 b/metadata/md5-cache/dev-ruby/erubi-1.9.0
deleted file mode 100644
index 56572ef8a46e..000000000000
--- a/metadata/md5-cache/dev-ruby/erubi-1.9.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=a ERB template engine for ruby; a simplified fork of Erubis
-EAPI=7
-HOMEPAGE=https://github.com/jeremyevans/erubi
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/erubi-1.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=75743b64965b7260268242389d214801
diff --git a/metadata/md5-cache/dev-ruby/fattr-2.4.0-r1 b/metadata/md5-cache/dev-ruby/fattr-2.4.0-r1
new file mode 100644
index 000000000000..7c9e292bdeea
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/fattr-2.4.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=fattr.rb is a "fatter attr" for ruby
+EAPI=8
+HOMEPAGE=https://github.com/ahoward/fattr
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test
+KEYWORDS=~amd64 ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/fattr-2.4.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=d92fd48c0054778098a0cbbf5b471c13
diff --git a/metadata/md5-cache/dev-ruby/fuubar-2.5.1 b/metadata/md5-cache/dev-ruby/fuubar-2.5.1
index 89650e91e1ac..56efa6d08824 100644
--- a/metadata/md5-cache/dev-ruby/fuubar-2.5.1
+++ b/metadata/md5-cache/dev-ruby/fuubar-2.5.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/thekompanee/fuubar
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/thekompanee/fuubar/archive/releases/v2.5.1.tar.gz -> fuubar-2.5.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=668eecdf83b935c8d733bef0380b81db
+_md5_=d3e90a422b53c98cd93fec49170c20c7
diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.20-r2 b/metadata/md5-cache/dev-ruby/gpgme-2.0.20-r2
deleted file mode 100644
index de19de9b2171..000000000000
--- a/metadata/md5-cache/dev-ruby/gpgme-2.0.20-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-crypt/gpgme:= ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Ruby language binding for GnuPG Made Easy
-EAPI=7
-HOMEPAGE=https://github.com/ueno/ruby-gpgme
-INHERIT=ruby-ng ruby-fakegem flag-o-matic
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=app-crypt/gpgme:= ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ) || ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ueno/ruby-gpgme/archive/v2.0.20.tar.gz -> ruby-gpgme-2.0.20.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fb5a526b102e96a042dd48d42f3f58b4
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.9.0 b/metadata/md5-cache/dev-ruby/hiera-3.9.0
index 90b932739c26..49979b9c8507 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.9.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.9.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://docs.puppet.com/hiera/
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby26? ( dev-ruby/deep_merge[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/deep_merge[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/deep_merge[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/deep_merge[ruby_targets_ruby31(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-3.9.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4a02c7cd60480619025a3f9124d61e42
+_md5_=27e02dcb24471742dfa9db8b6ea6adb0
diff --git a/metadata/md5-cache/dev-ruby/hocon-1.3.1-r1 b/metadata/md5-cache/dev-ruby/hocon-1.3.1-r1
index 507ade00fe28..106cd3a868f0 100644
--- a/metadata/md5-cache/dev-ruby/hocon-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/hocon-1.3.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/puppetlabs/ruby-hocon
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/ruby-hocon/archive/1.3.1.tar.gz -> hocon-1.3.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=780bd1dcc72401e1834a4fedbf40880c
+_md5_=4db7e052f0535e995b998ac030634df3
diff --git a/metadata/md5-cache/dev-ruby/http-accept-1.7.0 b/metadata/md5-cache/dev-ruby/http-accept-1.7.0
index b89ce9a3422e..32acdef86c41 100644
--- a/metadata/md5-cache/dev-ruby/http-accept-1.7.0
+++ b/metadata/md5-cache/dev-ruby/http-accept-1.7.0
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Parse Accept and Accept-Language HTTP headers
 EAPI=7
 HOMEPAGE=https://github.com/socketry/http-accept
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/socketry/http-accept/archive/v1.7.0.tar.gz -> http-accept-1.7.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=84c0c82bb9957de694b8c9f6ed89c8dc
+_md5_=53c438d9e3aa8d4b3d354203ead33238
diff --git a/metadata/md5-cache/dev-ruby/http-accept-2.1.1 b/metadata/md5-cache/dev-ruby/http-accept-2.1.1
deleted file mode 100644
index 71c56e9557cf..000000000000
--- a/metadata/md5-cache/dev-ruby/http-accept-2.1.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Parse Accept and Accept-Language HTTP headers
-EAPI=7
-HOMEPAGE=https://github.com/socketry/http-accept
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/socketry/http-accept/archive/v2.1.1.tar.gz -> http-accept-2.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=55b02e53c406e248497f6dea7b2275d4
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-2.2.0 b/metadata/md5-cache/dev-ruby/http-form_data-2.2.0
deleted file mode 100644
index 5a92cbcd4e41..000000000000
--- a/metadata/md5-cache/dev-ruby/http-form_data-2.2.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Utility-belt to build form data request bodies
-EAPI=7
-HOMEPAGE=https://github.com/httprb/form_data.rb
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://rubygems.org/gems/http-form_data-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e11f29a7fb1f32216d84d0d9d9cbbf64
diff --git a/metadata/md5-cache/dev-ruby/json_schema-0.20.8 b/metadata/md5-cache/dev-ruby/json_schema-0.20.8
deleted file mode 100644
index f20f29f1f3ed..000000000000
--- a/metadata/md5-cache/dev-ruby/json_schema-0.20.8
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/ecma-re-validator[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/ecma-re-validator[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A JSON Schema V4 and Hyperschema V4 parser and validator
-EAPI=7
-HOMEPAGE=https://github.com/brandur/json_schema
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/brandur/json_schema/archive/v0.20.8.tar.gz -> json_schema-0.20.8.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0f0b658a6f8baf2aeefc6df7c3e5afc0
diff --git a/metadata/md5-cache/dev-ruby/mail-2.7.1 b/metadata/md5-cache/dev-ruby/mail-2.7.1
deleted file mode 100644
index ceca701f5769..000000000000
--- a/metadata/md5-cache/dev-ruby/mail-2.7.1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=An email handling library
-EAPI=6
-HOMEPAGE=https://github.com/mikel/mail
-INHERIT=ruby-fakegem eapi7-ver
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=2.7
-SRC_URI=https://github.com/mikel/mail/archive/2.7.1.tar.gz -> mail-2.7.1-git.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2f5a8322ec61694be316c6510d4488ba
diff --git a/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1 b/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
deleted file mode 100644
index 34c0e09881e0..000000000000
--- a/metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Define and access metadata in MiniTest::Spec descriptions and specs
-EAPI=7
-HOMEPAGE=https://github.com/ordinaryzelig/minispec-metadata
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/minispec-metadata-3.3.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b425c9445875f6649831ed561d61d2a6
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.5.2 b/metadata/md5-cache/dev-ruby/msgpack-1.5.2
index 9c7b11010af4..c3e8b226ac1c 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.5.2
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.5.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://msgpack.org/
 INHERIT=ruby-fakegem
 IUSE=doc ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/msgpack-1.5.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b387caf2d359eebd47cee8d609700c54
+_md5_=2329da581e09bcdf739cb530346da3cb
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2 b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
index f286b63968c5..5f6b06da7ff5 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.rubydoc.info/gems/multi_xml
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sferik/multi_xml/archive/v0.6.0.tar.gz -> multi_xml-0.6.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=dbab736afc8952eccda24e249649d8b1
+_md5_=094b78269534e7904e99ab76f38b0e40
diff --git a/metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1 b/metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
index 71bbb9f0f12e..e02b9178f608 100644
--- a/metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/net-telnet
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~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=|| ( Ruby-BSD BSD-2 )
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby/net-telnet/archive/v0.2.0.tar.gz -> net-telnet-0.2.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0d2ab5d0196991bcd199cf195bad7290
+_md5_=c8d7d2fdf71fa0a688442b931316fe0c
diff --git a/metadata/md5-cache/dev-ruby/network_interface-0.0.2 b/metadata/md5-cache/dev-ruby/network_interface-0.0.2
deleted file mode 100644
index 396b9c9eded4..000000000000
--- a/metadata/md5-cache/dev-ruby/network_interface-0.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby26(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby27(-)] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=network_interface layer from metasploit pcaprub
-EAPI=6
-HOMEPAGE=https://github.com/rapid7/network_interface
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://rubygems.org/gems/network_interface-0.0.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=83fa0e9cd3dee0ad2d390e681a92a236
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.4.4 b/metadata/md5-cache/dev-ruby/oauth2-1.4.4
deleted file mode 100644
index f477d96d8601..000000000000
--- a/metadata/md5-cache/dev-ruby/oauth2-1.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby26(-)] <dev-ruby/faraday-2.0[ruby_targets_ruby26(-)] dev-ruby/jwt:2[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.3[ruby_targets_ruby26(-)] =dev-ruby/multi_json-1*[ruby_targets_ruby26(-)] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby26(-)] >=dev-ruby/rack-1.2:*[ruby_targets_ruby26(-)] <dev-ruby/rack-3:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby27(-)] <dev-ruby/faraday-2.0[ruby_targets_ruby27(-)] dev-ruby/jwt:2[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.3[ruby_targets_ruby27(-)] =dev-ruby/multi_json-1*[ruby_targets_ruby27(-)] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.2:*[ruby_targets_ruby27(-)] <dev-ruby/rack-3:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] dev-ruby/rspec-stubbed_env[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/rspec-stubbed_env[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem
-EAPI=7
-HOMEPAGE=https://github.com/intridea/oauth2
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby26(-)] <dev-ruby/faraday-2.0[ruby_targets_ruby26(-)] dev-ruby/jwt:2[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.3[ruby_targets_ruby26(-)] =dev-ruby/multi_json-1*[ruby_targets_ruby26(-)] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby26(-)] >=dev-ruby/rack-1.2:*[ruby_targets_ruby26(-)] <dev-ruby/rack-3:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby27(-)] <dev-ruby/faraday-2.0[ruby_targets_ruby27(-)] dev-ruby/jwt:2[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.3[ruby_targets_ruby27(-)] =dev-ruby/multi_json-1*[ruby_targets_ruby27(-)] >=dev-ruby/multi_xml-0.5:0[ruby_targets_ruby27(-)] >=dev-ruby/rack-1.2:*[ruby_targets_ruby27(-)] <dev-ruby/rack-3:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/intridea/oauth2/archive/v1.4.4.tar.gz -> oauth2-1.4.4.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=eee1046d6d1e2c1444b3ed287a8d377b
diff --git a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2 b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
deleted file mode 100644
index c3b3317969d4..000000000000
--- a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=OpenSSL CBC-MAC (CCM) ruby gem
-EAPI=6
-HOMEPAGE=https://github.com/SmallLars/openssl-ccm
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=1.2.2
-SRC_URI=https://rubygems.org/gems/openssl-ccm-1.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e7a4e7a44cae6ae17f6d681d3961543f
diff --git a/metadata/md5-cache/dev-ruby/parser-3.0.3.2 b/metadata/md5-cache/dev-ruby/parser-3.0.3.2
index 0dc6bd397545..7b2a9b91a582 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.0.3.2
+++ b/metadata/md5-cache/dev-ruby/parser-3.0.3.2
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/racc[ruby_targets_ruby26(-)] ) dev-ruby/cliver[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/racc[ruby_targets_ruby27(-)] ) dev-ruby/cliver[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/racc[ruby_targets_ruby30(-)] ) dev-ruby/cliver[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/racc[ruby_targets_ruby26(-)] ) dev-ruby/cliver[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/racc[ruby_targets_ruby27(-)] ) dev-ruby/cliver[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/racc[ruby_targets_ruby30(-)] ) dev-ruby/cliver[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/racc[ruby_targets_ruby31(-)] ) dev-ruby/cliver[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/ast-2.4*[ruby_targets_ruby31(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND==dev-util/ragel-6* ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=A production-ready Ruby parser written in pure Ruby
 EAPI=8
 HOMEPAGE=https://github.com/whitequark/parser
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~sparc
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/ast-2.4*[ruby_targets_ruby31(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.0.3.2.tar.gz -> parser-3.0.3.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=72757fe3b62df79dc9647be16b0f63aa
+_md5_=8123b7cbfc57e7fe99d513e70f9d3f57
diff --git a/metadata/md5-cache/dev-ruby/parser-3.1.0.0 b/metadata/md5-cache/dev-ruby/parser-3.1.0.0
index 18802e8589ba..d9fe0d079fbc 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.1.0.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.1.0.0
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/racc[ruby_targets_ruby26(-)] ) dev-ruby/cliver[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/racc[ruby_targets_ruby27(-)] ) dev-ruby/cliver[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/racc[ruby_targets_ruby30(-)] ) dev-ruby/cliver[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/racc[ruby_targets_ruby26(-)] ) dev-ruby/cliver[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/racc[ruby_targets_ruby27(-)] ) dev-ruby/cliver[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/racc[ruby_targets_ruby30(-)] ) dev-ruby/cliver[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/racc[ruby_targets_ruby31(-)] ) dev-ruby/cliver[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/ast-2.4*[ruby_targets_ruby31(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND==dev-util/ragel-6* ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=A production-ready Ruby parser written in pure Ruby
 EAPI=8
 HOMEPAGE=https://github.com/whitequark/parser
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~sparc
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/ast-2.4*[ruby_targets_ruby31(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.1.0.0.tar.gz -> parser-3.1.0.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=07b62ee773ddbae378bf6c1cd982c7b2
+_md5_=c88c40ba45fcbd12ff7dc9751ac1ba56
diff --git a/metadata/md5-cache/dev-ruby/parser-3.1.1.0 b/metadata/md5-cache/dev-ruby/parser-3.1.1.0
index 506acbf93430..484ec8868b84 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.1.1.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.1.1.0
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/racc[ruby_targets_ruby26(-)] ) dev-ruby/cliver[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/racc[ruby_targets_ruby27(-)] ) dev-ruby/cliver[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/racc[ruby_targets_ruby30(-)] ) dev-ruby/cliver[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/racc[ruby_targets_ruby26(-)] ) dev-ruby/cliver[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/racc[ruby_targets_ruby27(-)] ) dev-ruby/cliver[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/racc[ruby_targets_ruby30(-)] ) dev-ruby/cliver[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/racc[ruby_targets_ruby31(-)] ) dev-ruby/cliver[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/ast-2.4*[ruby_targets_ruby31(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND==dev-util/ragel-6* ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=A production-ready Ruby parser written in pure Ruby
 EAPI=8
 HOMEPAGE=https://github.com/whitequark/parser
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~sparc
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/ast-2.4*[ruby_targets_ruby31(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.1.1.0.tar.gz -> parser-3.1.1.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=07b62ee773ddbae378bf6c1cd982c7b2
+_md5_=c88c40ba45fcbd12ff7dc9751ac1ba56
diff --git a/metadata/md5-cache/dev-ruby/parser-3.1.2.0 b/metadata/md5-cache/dev-ruby/parser-3.1.2.0
index d18f285781b1..bf6f302ca03d 100644
--- a/metadata/md5-cache/dev-ruby/parser-3.1.2.0
+++ b/metadata/md5-cache/dev-ruby/parser-3.1.2.0
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/racc[ruby_targets_ruby26(-)] ) dev-ruby/cliver[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/racc[ruby_targets_ruby27(-)] ) dev-ruby/cliver[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/racc[ruby_targets_ruby30(-)] ) dev-ruby/cliver[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/racc[ruby_targets_ruby26(-)] ) dev-ruby/cliver[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/racc[ruby_targets_ruby27(-)] ) dev-ruby/cliver[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/racc[ruby_targets_ruby30(-)] ) dev-ruby/cliver[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/racc[ruby_targets_ruby31(-)] ) dev-ruby/cliver[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/ast-2.4*[ruby_targets_ruby31(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND==dev-util/ragel-6* ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=A production-ready Ruby parser written in pure Ruby
 EAPI=8
 HOMEPAGE=https://github.com/whitequark/parser
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~sparc
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( =dev-ruby/ast-2.4*[ruby_targets_ruby30(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( =dev-ruby/ast-2.4*[ruby_targets_ruby31(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v3.1.2.0.tar.gz -> parser-3.1.2.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=07b62ee773ddbae378bf6c1cd982c7b2
+_md5_=c88c40ba45fcbd12ff7dc9751ac1ba56
diff --git a/metadata/md5-cache/dev-ruby/pg-1.4.1 b/metadata/md5-cache/dev-ruby/pg-1.4.1
new file mode 100644
index 000000000000..c04255ccf8d7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pg-1.4.1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-db/postgresql test? ( >=dev-db/postgresql-9.4[server(+),threads] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Ruby extension library providing an API to PostgreSQL
+EAPI=8
+HOMEPAGE=https://github.com/ged/ruby-pg
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( GPL-2 Ruby )
+RDEPEND=dev-db/postgresql:* ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/ged/ruby-pg/archive/v1.4.1.tar.gz -> pg-1.4.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=c7952809239c59e0131927bd7dafcbd9
diff --git a/metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1 b/metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1
index 5d551e8c790b..bf9d04ecbdad 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rack-test/rack-test
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby26(-)] <dev-ruby/rack-3:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby27(-)] <dev-ruby/rack-3:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby30(-)] <dev-ruby/rack-3:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/rack-test/rack-test/archive/v1.1.0.tar.gz -> rack-test-1.1.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c70804523aa846dd51959a1846571012
+_md5_=83382e6e7cfdec5db9f7445841e5146c
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1 b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
deleted file mode 100644
index 8e1c1b5f209b..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Compare doms and assert certain elements exists in doms using Nokogiri
-EAPI=6
-HOMEPAGE=https://github.com/kaspth/rails-dom-testing
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://rubygems.org/gems/rails-dom-testing-2.0.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c1653992ed8dd6a0ca1f1561afb9d10a
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1
deleted file mode 100644
index f167c42a85fa..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Sanitize HTML fragments in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rafaelfranca/rails-html-sanitizer
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://rubygems.org/gems/rails-html-sanitizer-1.3.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4ac02ad66afde058e6fb617d815e93db
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.1 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.1
deleted file mode 100644
index cf0a22f00947..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rails-dom-testing[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Sanitize HTML fragments in Rails applications
-EAPI=8
-HOMEPAGE=https://github.com/rafaelfranca/rails-html-sanitizer
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://rubygems.org/gems/rails-html-sanitizer-1.4.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ca4c76cbb73d41b1905d8944235b6d66
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.3 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.3
index 0c36ae2ac2eb..8a81d7fdb0b0 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.3
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/rafaelfranca/rails-html-sanitizer
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/loofah-2.3:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rails-html-sanitizer-1.4.3.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7f6dc0f7c14409ddeb596d1c0edd9b57
+_md5_=5c1b9187c2e95922d78d11aac0f813c0
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.5 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.5
deleted file mode 100644
index ed78b0996425..000000000000
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.5
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Ruby implementation of the GNU readline C library
-EAPI=6
-HOMEPAGE=https://rubygems.org/gems/rb-readline
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/rb-readline-0.5.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5482a3e5eb76907bb0eb1a1509715c50
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4 b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4
index 5dddf8d2b6ed..446a5c507217 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://redcloth.org/
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/archive/v4.3.2.tar.gz -> RedCloth-4.3.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b98efe79c00a4f87f8e813007e72d4d2
+_md5_=9d19dab11cdcab4c58cb4948693bba46
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.4.0 b/metadata/md5-cache/dev-ruby/regexp_parser-2.4.0
index c90c0e284389..1335653faed7 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.4.0
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.4.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ammar/regexp_parser
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.4.0.tar.gz -> regexp_parser-2.4.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c25082651af2e80d19cabbe2858eab8e
+_md5_=cc6caeb2782838b9ab26e07d2d8aeb00
diff --git a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2 b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
deleted file mode 100644
index ce2c7847fb1f..000000000000
--- a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=A simple Ruby library to parse robots.txt
-EAPI=6
-HOMEPAGE=https://rubygems.org/gems/robots
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/robots-0.10.1.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f0c14e499642e7ad358da752adfbe330
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.9.0 b/metadata/md5-cache/dev-ruby/rspec-3.9.0
deleted file mode 100644
index 62b446c8b8e8..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-3.9.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( =dev-ruby/rspec-core-3.9*[ruby_targets_ruby26(-)] =dev-ruby/rspec-expectations-3.9*[ruby_targets_ruby26(-)] =dev-ruby/rspec-mocks-3.9*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-core-3.9*[ruby_targets_ruby27(-)] =dev-ruby/rspec-expectations-3.9*[ruby_targets_ruby27(-)] =dev-ruby/rspec-mocks-3.9*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=7
-HOMEPAGE=https://github.com/rspec/rspec
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( =dev-ruby/rspec-core-3.9*[ruby_targets_ruby26(-)] =dev-ruby/rspec-expectations-3.9*[ruby_targets_ruby26(-)] =dev-ruby/rspec-mocks-3.9*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-core-3.9*[ruby_targets_ruby27(-)] =dev-ruby/rspec-expectations-3.9*[ruby_targets_ruby27(-)] =dev-ruby/rspec-mocks-3.9*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://rubygems.org/gems/rspec-3.9.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c3b3c5ecfa980884062d2442e2bf7be4
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.9.3 b/metadata/md5-cache/dev-ruby/rspec-core-3.9.3
deleted file mode 100644
index a974874052f3..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.9.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.9*[ruby_targets_ruby26(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.9*[ruby_targets_ruby27(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby26(-)] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26(-)] dev-ruby/syntax[ruby_targets_ruby26(-)] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby26(-)] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby26(-)] >=dev-ruby/rspec-support-3.9.1:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby27(-)] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby27(-)] dev-ruby/syntax[ruby_targets_ruby27(-)] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby27(-)] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby27(-)] >=dev-ruby/rspec-support-3.9.1:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=7
-HOMEPAGE=https://github.com/rspec/rspec-core
-INHERIT=ruby-fakegem
-IUSE=highlight test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.9*[ruby_targets_ruby26(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.9*[ruby_targets_ruby27(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-core/archive/v3.9.3.tar.gz -> rspec-core-3.9.3-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5eb8d1b54fcc35074856af7a48fcce6c
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.9.4 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.9.4
deleted file mode 100644
index 463f07d0fb5e..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.9.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26(-)] <dev-ruby/diff-lcs-2[ruby_targets_ruby26(-)] =dev-ruby/rspec-support-3.9*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] <dev-ruby/diff-lcs-2[ruby_targets_ruby27(-)] =dev-ruby/rspec-support-3.9*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby26(-)] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby27(-)] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=7
-HOMEPAGE=https://github.com/rspec/rspec-expectations
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26(-)] <dev-ruby/diff-lcs-2[ruby_targets_ruby26(-)] =dev-ruby/rspec-support-3.9*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] <dev-ruby/diff-lcs-2[ruby_targets_ruby27(-)] =dev-ruby/rspec-support-3.9*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.9.4.tar.gz -> rspec-expectations-3.9.4-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bdf7ec72ac0340bf107150247566de0f
diff --git a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0 b/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0
deleted file mode 100644
index f3c2b18f53cd..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/rspec[ruby_targets_ruby26(-)] dev-util/cucumber[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec[ruby_targets_ruby27(-)] dev-util/cucumber[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=Set of matchers and helpers to allow you test your APIs responses
-EAPI=6
-HOMEPAGE=https://github.com/waterlink/rspec-json_expectations
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=1
-SRC_URI=https://rubygems.org/gems/rspec-json_expectations-2.2.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=934a31bbfe92d67d9c6a758391a6c11d
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.9.1 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.9.1
deleted file mode 100644
index 6ed77776b1a1..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.9.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.9*[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.9*[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=7
-HOMEPAGE=https://github.com/rspec/rspec-mocks
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.9*[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-support-3.9*[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby27(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.9.1.tar.gz -> rspec-mocks-3.9.1-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4d39f15043434bb269eb9750f05aee31
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.9.4 b/metadata/md5-cache/dev-ruby/rspec-support-3.9.4
deleted file mode 100644
index f5547c5e1cd8..000000000000
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.9.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-3.9.0:3[ruby_targets_ruby26(-)] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/rspec-3.9.0:3[ruby_targets_ruby27(-)] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
-EAPI=7
-HOMEPAGE=https://github.com/rspec/rspec-support
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/rspec/rspec-support/archive/v3.9.4.tar.gz -> rspec-support-3.9.4-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d3a8367995f96e6aaab9b0a82b4d249c
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r2 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r2
deleted file mode 100644
index 57f2bf289182..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=net-nds/openldap-2:= dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0= ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=A Ruby interface to some LDAP libraries
-EAPI=6
-HOMEPAGE=https://github.com/bearded/ruby-ldap
-INHERIT=multilib ruby-fakegem
-IUSE=ssl ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
-LICENSE=BSD
-RDEPEND=>=net-nds/openldap-2:= dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0= ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://rubygems.org/gems/ruby-ldap-0.9.20.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=147a1df2d8e870546e8d5867608e3aae
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1
index 0e3ac5ce3c14..7bc5274d0da5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/larskanis/opengl
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/opengl-0.10.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ae887c33c4ca0dca02672d27c0937f5f
+_md5_=2159d5598b0a7e60c9404564a012ddd0
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2 b/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
deleted file mode 100644
index a6828fe66dda..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/racc[ruby_targets_ruby26(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby26(-)] >=dev-ruby/sexp_processor-4.13.0:4[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/racc[ruby_targets_ruby27(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby27(-)] >=dev-ruby/sexp_processor-4.13.0:4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-util/unifdef ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A ruby parser written in pure ruby
-EAPI=7
-HOMEPAGE=https://github.com/seattlerb/ruby_parser
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://rubygems.org/gems/ruby_parser-3.14.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=47642a395e045e78237e28b1a596c8ba
diff --git a/metadata/md5-cache/dev-ruby/sprockets-4.1.0 b/metadata/md5-cache/dev-ruby/sprockets-4.1.0
new file mode 100644
index 000000000000..2ca4ec6c5d41
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sprockets-4.1.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby26(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby26(-)] <dev-ruby/rack-3:*[ruby_targets_ruby26(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby27(-)] <dev-ruby/rack-3:*[ruby_targets_ruby27(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby30(-)] <dev-ruby/rack-3:*[ruby_targets_ruby30(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/json[ruby_targets_ruby26(-)] dev-ruby/rack-test[ruby_targets_ruby26(-)] =dev-ruby/coffee-script-2*[ruby_targets_ruby26(-)] =dev-ruby/execjs-2*[ruby_targets_ruby26(-)] =dev-ruby/sass-3*[ruby_targets_ruby26(-)] >=dev-ruby/sass-3.1[ruby_targets_ruby26(-)] dev-ruby/sassc[ruby_targets_ruby26(-)] dev-ruby/uglifier[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/json[ruby_targets_ruby27(-)] dev-ruby/rack-test[ruby_targets_ruby27(-)] =dev-ruby/coffee-script-2*[ruby_targets_ruby27(-)] =dev-ruby/execjs-2*[ruby_targets_ruby27(-)] =dev-ruby/sass-3*[ruby_targets_ruby27(-)] >=dev-ruby/sass-3.1[ruby_targets_ruby27(-)] dev-ruby/sassc[ruby_targets_ruby27(-)] dev-ruby/uglifier[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/json[ruby_targets_ruby30(-)] dev-ruby/rack-test[ruby_targets_ruby30(-)] =dev-ruby/coffee-script-2*[ruby_targets_ruby30(-)] =dev-ruby/execjs-2*[ruby_targets_ruby30(-)] =dev-ruby/sass-3*[ruby_targets_ruby30(-)] >=dev-ruby/sass-3.1[ruby_targets_ruby30(-)] dev-ruby/sassc[ruby_targets_ruby30(-)] dev-ruby/uglifier[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Ruby library for compiling and serving web assets
+EAPI=8
+HOMEPAGE=https://github.com/rails/sprockets
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby26(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby26(-)] <dev-ruby/rack-3:*[ruby_targets_ruby26(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby27(-)] <dev-ruby/rack-3:*[ruby_targets_ruby27(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] >=dev-ruby/rack-1:*[ruby_targets_ruby30(-)] <dev-ruby/rack-3:*[ruby_targets_ruby30(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=4
+SRC_URI=https://github.com/rails/sprockets/archive/v4.1.0.tar.gz -> sprockets-4.1.0-git.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=9efc7003dd1d9b6c8f871952e39c152f
diff --git a/metadata/md5-cache/dev-ruby/timers-4.3.3 b/metadata/md5-cache/dev-ruby/timers-4.3.3
index 7f5fba20b8e2..1cdb2cbe38c2 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.3.3
+++ b/metadata/md5-cache/dev-ruby/timers-4.3.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/tarcieri/timers
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/tarcieri/timers/archive/v4.3.3.tar.gz -> timers-4.3.3.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a5087de0401a6c992725c777accc6891
+_md5_=2b07f4539f760bdb7a949efced2c88f3
diff --git a/metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1 b/metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1
index 7e2a652ea571..c552d9931837 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/sourcemap[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Ruby wrapper for UglifyJS JavaScript compressor
 EAPI=8
 HOMEPAGE=https://github.com/lautis/uglifier
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/lautis/uglifier/archive/v4.2.0.tar.gz -> uglifier-4.2.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3511dc29be9c9e207d1b25f314199134
+_md5_=b041b87cbfd6d440bf68a3f4eb71fff4
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-2.2.0 b/metadata/md5-cache/dev-ruby/unicode-display_width-2.2.0
new file mode 100644
index 000000000000..51a5a8252eb5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-2.2.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Adds String#display_width to get the display size using EastAsianWidth.txt
+EAPI=8
+HOMEPAGE=https://github.com/janlelis/unicode-display_width
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v2.2.0.tar.gz -> unicode-display_width-2.2.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=639151bf30300a42f77ea02fb5ddadfd
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.12.0 b/metadata/md5-cache/dev-ruby/zentest-4.12.0
deleted file mode 100644
index f1a1c270f6ad..000000000000
--- a/metadata/md5-cache/dev-ruby/zentest-4.12.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Rails
-EAPI=7
-HOMEPAGE=https://github.com/seattlerb/zentest
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/ZenTest-4.12.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b1c56094b493fe627f5e38e55204f4ed
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 94fcfafb7203..96b6ecb1ec09 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/cargo-audit-0.15.0 b/metadata/md5-cache/dev-util/cargo-audit-0.15.0
deleted file mode 100644
index b3cfc38d10f9..000000000000
--- a/metadata/md5-cache/dev-util/cargo-audit-0.15.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=virtual/rust-1.53
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=dev-libs/openssl:0= dev-libs/libgit2:=
-DESCRIPTION=Audit Cargo.lock for security vulnerabilities
-EAPI=8
-HOMEPAGE=https://github.com/rustsec/cargo-audit
-INHERIT=cargo
-IUSE=fix debug
-KEYWORDS=~amd64 ~ppc64
-LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT MPL-2.0 Unlicense
-PROPERTIES=test_network
-RDEPEND=dev-libs/openssl:0= dev-libs/libgit2:=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/RustSec/rustsec/archive/refs/tags/cargo-audit/v0.15.0.tar.gz -> cargo-audit-0.15.0.tar.gz https://crates.io/api/v1/crates/abscissa_core/0.5.2/download -> abscissa_core-0.5.2.crate https://crates.io/api/v1/crates/abscissa_derive/0.5.0/download -> abscissa_derive-0.5.0.crate https://crates.io/api/v1/crates/addr2line/0.15.2/download -> addr2line-0.15.2.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/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/askama/0.10.5/download -> askama-0.10.5.crate https://crates.io/api/v1/crates/askama_derive/0.10.5/download -> askama_derive-0.10.5.crate https://crates.io/api/v1/crates/askama_escape/0.10.1/download -> askama_escape-0.10.1.crate https://crates.io/api/v1/crates/askama_shared/0.11.1/download -> askama_shared-0.11.1.crate https://crates.io/api/v1/crates/atom_syndication/0.9.1/download -> atom_syndication-0.9.1.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.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.60/download -> backtrace-0.3.60.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitvec/0.19.5/download -> bitvec-0.19.5.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.3.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/bumpalo/3.7.0/download -> bumpalo-3.7.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/0.5.6/download -> bytes-0.5.6.crate https://crates.io/api/v1/crates/bytes/1.0.1/download -> bytes-1.0.1.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/canonical-path/2.0.2/download -> canonical-path-2.0.2.crate https://crates.io/api/v1/crates/cargo-edit/0.7.0/download -> cargo-edit-0.7.0.crate https://crates.io/api/v1/crates/cargo_metadata/0.11.4/download -> cargo_metadata-0.11.4.crate https://crates.io/api/v1/crates/cc/1.0.68/download -> cc-1.0.68.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.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/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/color-backtrace/0.3.0/download -> color-backtrace-0.3.0.crate https://crates.io/api/v1/crates/combine/4.6.0/download -> combine-4.6.0.crate https://crates.io/api/v1/crates/comrak/0.10.1/download -> comrak-0.10.1.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/crates-index/0.16.7/download -> crates-index-0.16.7.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/derive_builder/0.9.0/download -> derive_builder-0.9.0.crate https://crates.io/api/v1/crates/derive_builder_core/0.9.0/download -> derive_builder_core-0.9.0.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/diligent-date-parser/0.1.2/download -> diligent-date-parser-0.1.2.crate https://crates.io/api/v1/crates/dirs/3.0.2/download -> dirs-3.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.28/download -> encoding_rs-0.8.28.crate https://crates.io/api/v1/crates/entities/1.0.1/download -> entities-1.0.1.crate https://crates.io/api/v1/crates/env_proxy/0.4.1/download -> env_proxy-0.4.1.crate https://crates.io/api/v1/crates/error-chain/0.12.4/download -> error-chain-0.12.4.crate https://crates.io/api/v1/crates/failure/0.1.8/download -> failure-0.1.8.crate https://crates.io/api/v1/crates/failure_derive/0.1.8/download -> failure_derive-0.1.8.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/fixedbitset/0.2.0/download -> fixedbitset-0.2.0.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.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fs-err/2.6.0/download -> fs-err-2.6.0.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/funty/1.1.0/download -> funty-1.1.0.crate https://crates.io/api/v1/crates/futures-channel/0.3.15/download -> futures-channel-0.3.15.crate https://crates.io/api/v1/crates/futures-core/0.3.15/download -> futures-core-0.3.15.crate https://crates.io/api/v1/crates/futures-io/0.3.15/download -> futures-io-0.3.15.crate https://crates.io/api/v1/crates/futures-sink/0.3.15/download -> futures-sink-0.3.15.crate https://crates.io/api/v1/crates/futures-task/0.3.15/download -> futures-task-0.3.15.crate https://crates.io/api/v1/crates/futures-util/0.3.15/download -> futures-util-0.3.15.crate https://crates.io/api/v1/crates/generational-arena/0.2.8/download -> generational-arena-0.2.8.crate https://crates.io/api/v1/crates/generic-array/0.12.4/download -> generic-array-0.12.4.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gimli/0.24.0/download -> gimli-0.24.0.crate https://crates.io/api/v1/crates/git2/0.13.20/download -> git2-0.13.20.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/gumdrop/0.7.0/download -> gumdrop-0.7.0.crate https://crates.io/api/v1/crates/gumdrop/0.8.0/download -> gumdrop-0.8.0.crate https://crates.io/api/v1/crates/gumdrop_derive/0.7.0/download -> gumdrop_derive-0.7.0.crate https://crates.io/api/v1/crates/gumdrop_derive/0.8.0/download -> gumdrop_derive-0.8.0.crate https://crates.io/api/v1/crates/h2/0.2.7/download -> h2-0.2.7.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/http/0.2.4/download -> http-0.2.4.crate https://crates.io/api/v1/crates/httparse/1.4.1/download -> httparse-1.4.1.crate https://crates.io/api/v1/crates/http-body/0.3.1/download -> http-body-0.3.1.crate https://crates.io/api/v1/crates/httpdate/0.3.2/download -> httpdate-0.3.2.crate https://crates.io/api/v1/crates/humansize/1.1.1/download -> humansize-1.1.1.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.0.1/download -> humantime-serde-1.0.1.crate https://crates.io/api/v1/crates/hyper/0.13.10/download -> hyper-0.13.10.crate https://crates.io/api/v1/crates/hyper-tls/0.4.3/download -> hyper-tls-0.4.3.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/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indexmap/1.6.2/download -> indexmap-1.6.2.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/ipnet/2.3.1/download -> ipnet-2.3.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.22/download -> jobserver-0.1.22.crate https://crates.io/api/v1/crates/js-sys/0.3.51/download -> js-sys-0.3.51.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.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/lexical-core/0.7.6/download -> lexical-core-0.7.6.crate https://crates.io/api/v1/crates/libc/0.2.97/download -> libc-0.2.97.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.21+1.1.0/download -> libgit2-sys-0.12.21+1.1.0.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.21/download -> libssh2-sys-0.2.21.crate https://crates.io/api/v1/crates/libz-sys/1.1.3/download -> libz-sys-1.1.3.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/matchers/0.0.1/download -> matchers-0.0.1.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.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.3/download -> mime_guess-2.0.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/native-tls/0.2.7/download -> native-tls-0.2.7.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nom/6.1.2/download -> nom-6.1.2.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.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-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/object/0.25.3/download -> object-0.25.3.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.crate https://crates.io/api/v1/crates/openssl/0.10.35/download -> openssl-0.10.35.crate https://crates.io/api/v1/crates/openssl-probe/0.1.4/download -> openssl-probe-0.1.4.crate https://crates.io/api/v1/crates/openssl-src/111.15.0+1.1.1k/download -> openssl-src-111.15.0+1.1.1k.crate https://crates.io/api/v1/crates/openssl-sys/0.9.64/download -> openssl-sys-0.9.64.crate https://crates.io/api/v1/crates/owning_ref/0.4.1/download -> owning_ref-0.4.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pest_derive/2.1.0/download -> pest_derive-2.1.0.crate https://crates.io/api/v1/crates/pest_generator/2.1.3/download -> pest_generator-2.1.3.crate https://crates.io/api/v1/crates/pest_meta/2.1.3/download -> pest_meta-2.1.3.crate https://crates.io/api/v1/crates/petgraph/0.5.1/download -> petgraph-0.5.1.crate https://crates.io/api/v1/crates/pin-project/1.0.7/download -> pin-project-1.0.7.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.7/download -> pin-project-internal-1.0.7.crate https://crates.io/api/v1/crates/pin-project-lite/0.1.12/download -> pin-project-lite-0.1.12.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.6/download -> pin-project-lite-0.2.6.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.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro2/1.0.27/download -> proc-macro2-1.0.27.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/quick-xml/0.20.0/download -> quick-xml-0.20.0.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/radium/0.5.3/download -> radium-0.5.3.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.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.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.9/download -> redox_syscall-0.2.9.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.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.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.10.10/download -> reqwest-0.10.10.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.20/download -> rustc-demangle-0.1.20.crate https://crates.io/api/v1/crates/rust-embed/5.9.0/download -> rust-embed-5.9.0.crate https://crates.io/api/v1/crates/rust-embed-impl/5.9.0/download -> rust-embed-impl-5.9.0.crate https://crates.io/api/v1/crates/rust-embed-utils/5.1.0/download -> rust-embed-utils-5.1.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.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.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/secrecy/0.6.0/download -> secrecy-0.6.0.crate https://crates.io/api/v1/crates/security-framework/2.3.1/download -> security-framework-2.3.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.3.0/download -> security-framework-sys-2.3.0.crate https://crates.io/api/v1/crates/semver/0.10.0/download -> semver-0.10.0.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver/1.0.3/download -> semver-1.0.3.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.126/download -> serde-1.0.126.crate https://crates.io/api/v1/crates/serde_derive/1.0.126/download -> serde_derive-1.0.126.crate https://crates.io/api/v1/crates/serde_json/1.0.64/download -> serde_json-1.0.64.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.0/download -> serde_urlencoded-0.7.0.crate https://crates.io/api/v1/crates/sha-1/0.8.2/download -> sha-1-0.8.2.crate https://crates.io/api/v1/crates/shell-words/1.0.0/download -> shell-words-1.0.0.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.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.3/download -> slab-0.4.3.crate https://crates.io/api/v1/crates/smallvec/0.6.14/download -> smallvec-0.6.14.crate https://crates.io/api/v1/crates/smartstring/0.2.6/download -> smartstring-0.2.6.crate https://crates.io/api/v1/crates/smol_str/0.1.17/download -> smol_str-0.1.17.crate https://crates.io/api/v1/crates/socket2/0.3.19/download -> socket2-0.3.19.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.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.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/structopt/0.3.21/download -> structopt-0.3.21.crate https://crates.io/api/v1/crates/structopt-derive/0.4.14/download -> structopt-derive-0.4.14.crate https://crates.io/api/v1/crates/subprocess/0.2.7/download -> subprocess-0.2.7.crate https://crates.io/api/v1/crates/syn/1.0.73/download -> syn-1.0.73.crate https://crates.io/api/v1/crates/synstructure/0.12.4/download -> synstructure-0.12.4.crate https://crates.io/api/v1/crates/tap/1.0.1/download -> tap-1.0.1.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.25/download -> thiserror-1.0.25.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.25/download -> thiserror-impl-1.0.25.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.2.0/download -> tinyvec-1.2.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/tokio/0.2.25/download -> tokio-0.2.25.crate https://crates.io/api/v1/crates/tokio-tls/0.3.1/download -> tokio-tls-0.3.1.crate https://crates.io/api/v1/crates/tokio-util/0.3.1/download -> tokio-util-0.3.1.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/toml_edit/0.2.1/download -> toml_edit-0.2.1.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.26/download -> tracing-0.1.26.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.15/download -> tracing-attributes-0.1.15.crate https://crates.io/api/v1/crates/tracing-core/0.1.18/download -> tracing-core-0.1.18.crate https://crates.io/api/v1/crates/tracing-futures/0.2.5/download -> tracing-futures-0.2.5.crate https://crates.io/api/v1/crates/tracing-log/0.1.2/download -> tracing-log-0.1.2.crate https://crates.io/api/v1/crates/tracing-subscriber/0.1.6/download -> tracing-subscriber-0.1.6.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/twoway/0.2.2/download -> twoway-0.2.2.crate https://crates.io/api/v1/crates/typed-arena/1.7.0/download -> typed-arena-1.7.0.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unchecked-index/0.2.2/download -> unchecked-index-0.2.2.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.5/download -> unicode-bidi-0.3.5.crate https://crates.io/api/v1/crates/unicode_categories/0.1.1/download -> unicode_categories-0.1.1.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download -> unicode-segmentation-1.7.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.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/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.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/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.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/wasm-bindgen/0.2.74/download -> wasm-bindgen-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.74/download -> wasm-bindgen-backend-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.24/download -> wasm-bindgen-futures-0.4.24.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.74/download -> wasm-bindgen-macro-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.74/download -> wasm-bindgen-macro-support-0.2.74.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.74/download -> wasm-bindgen-shared-0.2.74.crate https://crates.io/api/v1/crates/web-sys/0.3.51/download -> web-sys-0.3.51.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.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/winreg/0.7.0/download -> winreg-0.7.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/wyz/0.2.0/download -> wyz-0.2.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/zeroize/1.3.0/download -> zeroize-1.3.0.crate
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=81cbafee14bd1406ec986611256a3ca0
diff --git a/metadata/md5-cache/dev-util/cargo-audit-0.15.2 b/metadata/md5-cache/dev-util/cargo-audit-0.15.2-r1
similarity index 99%
rename from metadata/md5-cache/dev-util/cargo-audit-0.15.2
rename to metadata/md5-cache/dev-util/cargo-audit-0.15.2-r1
index b2f183187a3a..5e8f4717ed23 100644
--- a/metadata/md5-cache/dev-util/cargo-audit-0.15.2
+++ b/metadata/md5-cache/dev-util/cargo-audit-0.15.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=virtual/rust-1.53
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=dev-libs/openssl:0= dev-libs/libgit2:=
+DEPEND=dev-libs/openssl:0=
 DESCRIPTION=Audit Cargo.lock for security vulnerabilities
 EAPI=8
 HOMEPAGE=https://github.com/rustsec/cargo-audit
@@ -9,9 +9,9 @@ IUSE=fix debug
 KEYWORDS=~amd64 ~ppc64
 LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT MPL-2.0 Unlicense
 PROPERTIES=test_network
-RDEPEND=dev-libs/openssl:0= dev-libs/libgit2:=
+RDEPEND=dev-libs/openssl:0=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/RustSec/rustsec/archive/refs/tags/cargo-audit/v0.15.2.tar.gz -> cargo-audit-0.15.2.tar.gz https://crates.io/api/v1/crates/abscissa_core/0.5.2/download -> abscissa_core-0.5.2.crate https://crates.io/api/v1/crates/abscissa_derive/0.5.0/download -> abscissa_derive-0.5.0.crate https://crates.io/api/v1/crates/addr2line/0.16.0/download -> addr2line-0.16.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/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/askama/0.10.5/download -> askama-0.10.5.crate https://crates.io/api/v1/crates/askama_derive/0.10.5/download -> askama_derive-0.10.5.crate https://crates.io/api/v1/crates/askama_escape/0.10.1/download -> askama_escape-0.10.1.crate https://crates.io/api/v1/crates/askama_shared/0.11.1/download -> askama_shared-0.11.1.crate https://crates.io/api/v1/crates/atom_syndication/0.10.0/download -> atom_syndication-0.10.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.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.61/download -> backtrace-0.3.61.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.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.1/download -> bitflags-1.3.1.crate https://crates.io/api/v1/crates/bitvec/0.19.5/download -> bitvec-0.19.5.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.3.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/bumpalo/3.7.0/download -> bumpalo-3.7.0.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/0.5.6/download -> bytes-0.5.6.crate https://crates.io/api/v1/crates/bytes/1.0.1/download -> bytes-1.0.1.crate https://crates.io/api/v1/crates/canonical-path/2.0.2/download -> canonical-path-2.0.2.crate https://crates.io/api/v1/crates/cargo-edit/0.7.0/download -> cargo-edit-0.7.0.crate https://crates.io/api/v1/crates/cargo_metadata/0.11.4/download -> cargo_metadata-0.11.4.crate https://crates.io/api/v1/crates/cc/1.0.69/download -> cc-1.0.69.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.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/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/color-backtrace/0.3.0/download -> color-backtrace-0.3.0.crate https://crates.io/api/v1/crates/combine/4.6.0/download -> combine-4.6.0.crate https://crates.io/api/v1/crates/comrak/0.12.1/download -> comrak-0.12.1.crate https://crates.io/api/v1/crates/core-foundation/0.9.1/download -> core-foundation-0.9.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download -> core-foundation-sys-0.8.2.crate https://crates.io/api/v1/crates/crates-index/0.17.0/download -> crates-index-0.17.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling/0.12.4/download -> darling-0.12.4.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_core/0.12.4/download -> darling_core-0.12.4.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/darling_macro/0.12.4/download -> darling_macro-0.12.4.crate https://crates.io/api/v1/crates/derive_builder/0.10.2/download -> derive_builder-0.10.2.crate https://crates.io/api/v1/crates/derive_builder_core/0.10.2/download -> derive_builder_core-0.10.2.crate https://crates.io/api/v1/crates/derive_builder_macro/0.10.2/download -> derive_builder_macro-0.10.2.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/diligent-date-parser/0.1.2/download -> diligent-date-parser-0.1.2.crate https://crates.io/api/v1/crates/dirs/3.0.2/download -> dirs-3.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.28/download -> encoding_rs-0.8.28.crate https://crates.io/api/v1/crates/entities/1.0.1/download -> entities-1.0.1.crate https://crates.io/api/v1/crates/env_proxy/0.4.1/download -> env_proxy-0.4.1.crate https://crates.io/api/v1/crates/error-chain/0.12.4/download -> error-chain-0.12.4.crate https://crates.io/api/v1/crates/failure/0.1.8/download -> failure-0.1.8.crate https://crates.io/api/v1/crates/failure_derive/0.1.8/download -> failure_derive-0.1.8.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/fixedbitset/0.4.0/download -> fixedbitset-0.4.0.crate https://crates.io/api/v1/crates/flate2/1.0.21/download -> flate2-1.0.21.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.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fs-err/2.6.0/download -> fs-err-2.6.0.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/funty/1.1.0/download -> funty-1.1.0.crate https://crates.io/api/v1/crates/futures-channel/0.3.16/download -> futures-channel-0.3.16.crate https://crates.io/api/v1/crates/futures-core/0.3.16/download -> futures-core-0.3.16.crate https://crates.io/api/v1/crates/futures-io/0.3.16/download -> futures-io-0.3.16.crate https://crates.io/api/v1/crates/futures-sink/0.3.16/download -> futures-sink-0.3.16.crate https://crates.io/api/v1/crates/futures-task/0.3.16/download -> futures-task-0.3.16.crate https://crates.io/api/v1/crates/futures-util/0.3.16/download -> futures-util-0.3.16.crate https://crates.io/api/v1/crates/generational-arena/0.2.8/download -> generational-arena-0.2.8.crate https://crates.io/api/v1/crates/generic-array/0.12.4/download -> generic-array-0.12.4.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/gimli/0.25.0/download -> gimli-0.25.0.crate https://crates.io/api/v1/crates/git2/0.13.22/download -> git2-0.13.22.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/gumdrop/0.7.0/download -> gumdrop-0.7.0.crate https://crates.io/api/v1/crates/gumdrop/0.8.0/download -> gumdrop-0.8.0.crate https://crates.io/api/v1/crates/gumdrop_derive/0.7.0/download -> gumdrop_derive-0.7.0.crate https://crates.io/api/v1/crates/gumdrop_derive/0.8.0/download -> gumdrop_derive-0.8.0.crate https://crates.io/api/v1/crates/h2/0.2.7/download -> h2-0.2.7.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.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/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/http/0.2.4/download -> http-0.2.4.crate https://crates.io/api/v1/crates/http-body/0.3.1/download -> http-body-0.3.1.crate https://crates.io/api/v1/crates/httparse/1.4.1/download -> httparse-1.4.1.crate https://crates.io/api/v1/crates/httpdate/0.3.2/download -> httpdate-0.3.2.crate https://crates.io/api/v1/crates/humansize/1.1.1/download -> humansize-1.1.1.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.0.1/download -> humantime-serde-1.0.1.crate https://crates.io/api/v1/crates/hyper/0.13.10/download -> hyper-0.13.10.crate https://crates.io/api/v1/crates/hyper-tls/0.4.3/download -> hyper-tls-0.4.3.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/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/ipnet/2.3.1/download -> ipnet-2.3.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/jobserver/0.1.23/download -> jobserver-0.1.23.crate https://crates.io/api/v1/crates/js-sys/0.3.52/download -> js-sys-0.3.52.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.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/lexical-core/0.7.6/download -> lexical-core-0.7.6.crate https://crates.io/api/v1/crates/libc/0.2.99/download -> libc-0.2.99.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.23+1.2.0/download -> libgit2-sys-0.12.23+1.2.0.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.21/download -> libssh2-sys-0.2.21.crate https://crates.io/api/v1/crates/libz-sys/1.1.3/download -> libz-sys-1.1.3.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/matchers/0.0.1/download -> matchers-0.0.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.4.0/download -> memchr-2.4.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.3/download -> mime_guess-2.0.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/native-tls/0.2.8/download -> native-tls-0.2.8.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/never/0.1.0/download -> never-0.1.0.crate https://crates.io/api/v1/crates/nom/6.1.2/download -> nom-6.1.2.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-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/object/0.26.0/download -> object-0.26.0.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/onig/6.2.0/download -> onig-6.2.0.crate https://crates.io/api/v1/crates/onig_sys/69.7.0/download -> onig_sys-69.7.0.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.crate https://crates.io/api/v1/crates/openssl/0.10.35/download -> openssl-0.10.35.crate https://crates.io/api/v1/crates/openssl-probe/0.1.4/download -> openssl-probe-0.1.4.crate https://crates.io/api/v1/crates/openssl-src/111.15.0+1.1.1k/download -> openssl-src-111.15.0+1.1.1k.crate https://crates.io/api/v1/crates/openssl-sys/0.9.65/download -> openssl-sys-0.9.65.crate https://crates.io/api/v1/crates/owning_ref/0.4.1/download -> owning_ref-0.4.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pest_derive/2.1.0/download -> pest_derive-2.1.0.crate https://crates.io/api/v1/crates/pest_generator/2.1.3/download -> pest_generator-2.1.3.crate https://crates.io/api/v1/crates/pest_meta/2.1.3/download -> pest_meta-2.1.3.crate https://crates.io/api/v1/crates/petgraph/0.6.0/download -> petgraph-0.6.0.crate https://crates.io/api/v1/crates/pin-project/1.0.8/download -> pin-project-1.0.8.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.8/download -> pin-project-internal-1.0.8.crate https://crates.io/api/v1/crates/pin-project-lite/0.1.12/download -> pin-project-lite-0.1.12.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.7/download -> pin-project-lite-0.2.7.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.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plist/1.2.1/download -> plist-1.2.1.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.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-macro2/1.0.28/download -> proc-macro2-1.0.28.crate https://crates.io/api/v1/crates/quick-xml/0.22.0/download -> quick-xml-0.22.0.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/radium/0.5.3/download -> radium-0.5.3.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.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.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.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.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.10.10/download -> reqwest-0.10.10.crate https://crates.io/api/v1/crates/rust-embed/5.9.0/download -> rust-embed-5.9.0.crate https://crates.io/api/v1/crates/rust-embed-impl/5.9.0/download -> rust-embed-impl-5.9.0.crate https://crates.io/api/v1/crates/rust-embed-utils/5.1.0/download -> rust-embed-utils-5.1.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.20/download -> rustc-demangle-0.1.20.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.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.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/secrecy/0.6.0/download -> secrecy-0.6.0.crate https://crates.io/api/v1/crates/security-framework/2.3.1/download -> security-framework-2.3.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.3.0/download -> security-framework-sys-2.3.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver/0.10.0/download -> semver-0.10.0.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver/1.0.4/download -> semver-1.0.4.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/serde/1.0.127/download -> serde-1.0.127.crate https://crates.io/api/v1/crates/serde_derive/1.0.127/download -> serde_derive-1.0.127.crate https://crates.io/api/v1/crates/serde_json/1.0.66/download -> serde_json-1.0.66.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.0/download -> serde_urlencoded-0.7.0.crate https://crates.io/api/v1/crates/sha-1/0.8.2/download -> sha-1-0.8.2.crate https://crates.io/api/v1/crates/shell-words/1.0.0/download -> shell-words-1.0.0.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.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.4/download -> slab-0.4.4.crate https://crates.io/api/v1/crates/smallvec/0.6.14/download -> smallvec-0.6.14.crate https://crates.io/api/v1/crates/smartstring/0.2.9/download -> smartstring-0.2.9.crate https://crates.io/api/v1/crates/smol_str/0.1.17/download -> smol_str-0.1.17.crate https://crates.io/api/v1/crates/socket2/0.3.19/download -> socket2-0.3.19.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.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.8.0/download -> strsim-0.8.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/structopt/0.3.22/download -> structopt-0.3.22.crate https://crates.io/api/v1/crates/structopt-derive/0.4.15/download -> structopt-derive-0.4.15.crate https://crates.io/api/v1/crates/subprocess/0.2.7/download -> subprocess-0.2.7.crate https://crates.io/api/v1/crates/syn/1.0.74/download -> syn-1.0.74.crate https://crates.io/api/v1/crates/synstructure/0.12.5/download -> synstructure-0.12.5.crate https://crates.io/api/v1/crates/syntect/4.6.0/download -> syntect-4.6.0.crate https://crates.io/api/v1/crates/tap/1.0.1/download -> tap-1.0.1.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.25/download -> thiserror-1.0.25.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.25/download -> thiserror-impl-1.0.25.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.3.1/download -> tinyvec-1.3.1.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/tokio/0.2.25/download -> tokio-0.2.25.crate https://crates.io/api/v1/crates/tokio-tls/0.3.1/download -> tokio-tls-0.3.1.crate https://crates.io/api/v1/crates/tokio-util/0.3.1/download -> tokio-util-0.3.1.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/toml_edit/0.2.1/download -> toml_edit-0.2.1.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.26/download -> tracing-0.1.26.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.15/download -> tracing-attributes-0.1.15.crate https://crates.io/api/v1/crates/tracing-core/0.1.18/download -> tracing-core-0.1.18.crate https://crates.io/api/v1/crates/tracing-futures/0.2.5/download -> tracing-futures-0.2.5.crate https://crates.io/api/v1/crates/tracing-log/0.1.2/download -> tracing-log-0.1.2.crate https://crates.io/api/v1/crates/tracing-subscriber/0.1.6/download -> tracing-subscriber-0.1.6.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/twoway/0.2.2/download -> twoway-0.2.2.crate https://crates.io/api/v1/crates/typed-arena/1.7.0/download -> typed-arena-1.7.0.crate https://crates.io/api/v1/crates/typenum/1.13.0/download -> typenum-1.13.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unchecked-index/0.2.2/download -> unchecked-index-0.2.2.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.6/download -> unicode-bidi-0.3.6.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.8.0/download -> unicode-segmentation-1.8.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.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/unicode_categories/0.1.1/download -> unicode_categories-0.1.1.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.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/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.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/wasm-bindgen/0.2.75/download -> wasm-bindgen-0.2.75.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.75/download -> wasm-bindgen-backend-0.2.75.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.25/download -> wasm-bindgen-futures-0.4.25.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.75/download -> wasm-bindgen-macro-0.2.75.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.75/download -> wasm-bindgen-macro-support-0.2.75.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.75/download -> wasm-bindgen-shared-0.2.75.crate https://crates.io/api/v1/crates/web-sys/0.3.52/download -> web-sys-0.3.52.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.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/winreg/0.7.0/download -> winreg-0.7.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/wyz/0.2.0/download -> wyz-0.2.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate https://crates.io/api/v1/crates/zeroize/1.3.0/download -> zeroize-1.3.0.crate
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e9a9671b3bcdfe5a2b25ce911f7f788c
+_md5_=34b1f6a61c8f0dbe23850958fb4c5fbb
diff --git a/metadata/md5-cache/dev-util/cargo-audit-0.17.0 b/metadata/md5-cache/dev-util/cargo-audit-0.17.0
new file mode 100644
index 000000000000..d13f7d1c25d9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cargo-audit-0.17.0
@@ -0,0 +1,17 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=dev-libs/openssl:0=
+DESCRIPTION=Audit Cargo.lock for security vulnerabilities
+EAPI=8
+HOMEPAGE=https://github.com/rustsec/cargo-audit
+INHERIT=cargo
+IUSE=fix debug
+KEYWORDS=~amd64 ~ppc64
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT MPL-2.0 Unlicense
+PROPERTIES=test_network
+RDEPEND=dev-libs/openssl:0=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/RustSec/rustsec/archive/refs/tags/cargo-audit/v0.17.0.tar.gz -> cargo-audit-0.17.0.tar.gz https://crates.io/api/v1/crates/abscissa_core/0.6.0/download -> abscissa_core-0.6.0.crate https://crates.io/api/v1/crates/abscissa_derive/0.6.0/download -> abscissa_derive-0.6.0.crate https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.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/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.56/download -> anyhow-1.0.56.crate https://crates.io/api/v1/crates/arc-swap/1.5.0/download -> arc-swap-1.5.0.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/atom_syndication/0.11.0/download -> atom_syndication-0.11.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.64/download -> backtrace-0.3.64.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.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.7.3/download -> block-buffer-0.7.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-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/bumpalo/3.9.1/download -> bumpalo-3.9.1.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.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.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/camino/1.0.7/download -> camino-1.0.7.crate https://crates.io/api/v1/crates/canonical-path/2.0.2/download -> canonical-path-2.0.2.crate https://crates.io/api/v1/crates/cargo-edit/0.9.1/download -> cargo-edit-0.9.1.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_metadata/0.14.2/download -> cargo_metadata-0.14.2.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/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/chunked_transfer/1.4.0/download -> chunked_transfer-1.4.0.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/clap/3.1.18/download -> clap-3.1.18.crate https://crates.io/api/v1/crates/clap_derive/3.1.18/download -> clap_derive-3.1.18.crate https://crates.io/api/v1/crates/clap_lex/0.2.0/download -> clap_lex-0.2.0.crate https://crates.io/api/v1/crates/color-eyre/0.6.1/download -> color-eyre-0.6.1.crate https://crates.io/api/v1/crates/combine/4.6.3/download -> combine-4.6.3.crate https://crates.io/api/v1/crates/comrak/0.12.1/download -> comrak-0.12.1.crate https://crates.io/api/v1/crates/concolor-control/0.0.7/download -> concolor-control-0.0.7.crate https://crates.io/api/v1/crates/concolor-query/0.0.4/download -> concolor-query-0.0.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.2/download -> cpufeatures-0.2.2.crate https://crates.io/api/v1/crates/crates-index/0.18.7/download -> crates-index-0.18.7.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.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/darling/0.12.4/download -> darling-0.12.4.crate https://crates.io/api/v1/crates/darling_core/0.12.4/download -> darling_core-0.12.4.crate https://crates.io/api/v1/crates/darling_macro/0.12.4/download -> darling_macro-0.12.4.crate https://crates.io/api/v1/crates/derive_builder/0.10.2/download -> derive_builder-0.10.2.crate https://crates.io/api/v1/crates/derive_builder_core/0.10.2/download -> derive_builder_core-0.10.2.crate https://crates.io/api/v1/crates/derive_builder_macro/0.10.2/download -> derive_builder_macro-0.10.2.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/diligent-date-parser/0.1.3/download -> diligent-date-parser-0.1.3.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.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/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/dunce/1.0.2/download -> dunce-1.0.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encoding_rs/0.8.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/entities/1.0.1/download -> entities-1.0.1.crate https://crates.io/api/v1/crates/env_proxy/0.4.1/download -> env_proxy-0.4.1.crate https://crates.io/api/v1/crates/eyre/0.6.8/download -> eyre-0.6.8.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/fixedbitset/0.4.1/download -> fixedbitset-0.4.1.crate https://crates.io/api/v1/crates/flate2/1.0.23/download -> flate2-1.0.23.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.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fs-err/2.7.0/download -> fs-err-2.7.0.crate https://crates.io/api/v1/crates/generic-array/0.12.4/download -> generic-array-0.12.4.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.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.26.1/download -> gimli-0.26.1.crate https://crates.io/api/v1/crates/git2/0.14.2/download -> git2-0.14.2.crate https://crates.io/api/v1/crates/gumdrop/0.8.1/download -> gumdrop-0.8.1.crate https://crates.io/api/v1/crates/gumdrop_derive/0.8.1/download -> gumdrop_derive-0.8.1.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.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/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/humansize/1.1.1/download -> humansize-1.1.1.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/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indenter/0.3.3/download -> indenter-0.3.3.crate https://crates.io/api/v1/crates/indexmap/1.8.1/download -> indexmap-1.8.1.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/js-sys/0.3.57/download -> js-sys-0.3.57.crate https://crates.io/api/v1/crates/kstring/1.0.6/download -> kstring-1.0.6.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.123/download -> libc-0.2.123.crate https://crates.io/api/v1/crates/libgit2-sys/0.13.2+1.4.2/download -> libgit2-sys-0.13.2+1.4.2.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.23/download -> libssh2-sys-0.2.23.crate https://crates.io/api/v1/crates/libz-sys/1.1.5/download -> libz-sys-1.1.5.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/log/0.4.16/download -> log-0.4.16.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.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/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/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.1/download -> miniz_oxide-0.5.1.crate https://crates.io/api/v1/crates/native-tls/0.2.10/download -> native-tls-0.2.10.crate https://crates.io/api/v1/crates/never/0.1.0/download -> never-0.1.0.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.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-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/object/0.27.1/download -> object-0.27.1.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/onig/6.3.1/download -> onig-6.3.1.crate https://crates.io/api/v1/crates/onig_sys/69.7.1/download -> onig_sys-69.7.1.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.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.38/download -> openssl-0.10.38.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.18.0+1.1.1n/download -> openssl-src-111.18.0+1.1.1n.crate https://crates.io/api/v1/crates/openssl-sys/0.9.72/download -> openssl-sys-0.9.72.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/owo-colors/3.3.0/download -> owo-colors-3.3.0.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pest_derive/2.1.0/download -> pest_derive-2.1.0.crate https://crates.io/api/v1/crates/pest_generator/2.1.3/download -> pest_generator-2.1.3.crate https://crates.io/api/v1/crates/pest_meta/2.1.3/download -> pest_meta-2.1.3.crate https://crates.io/api/v1/crates/petgraph/0.6.0/download -> petgraph-0.6.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.8/download -> pin-project-lite-0.2.8.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/plist/1.3.1/download -> plist-1.3.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-macro2/1.0.37/download -> proc-macro2-1.0.37.crate https://crates.io/api/v1/crates/quick-xml/0.22.0/download -> quick-xml-0.22.0.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.5.5/download -> regex-1.5.5.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.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rust-embed/6.4.0/download -> rust-embed-6.4.0.crate https://crates.io/api/v1/crates/rust-embed-impl/6.2.0/download -> rust-embed-impl-6.2.0.crate https://crates.io/api/v1/crates/rust-embed-utils/7.2.0/download -> rust-embed-utils-7.2.0.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/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustls/0.20.4/download -> rustls-0.20.4.crate https://crates.io/api/v1/crates/ryu/1.0.9/download -> ryu-1.0.9.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.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.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/secrecy/0.8.0/download -> secrecy-0.8.0.crate https://crates.io/api/v1/crates/security-framework/2.6.1/download -> security-framework-2.6.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/semver/1.0.9/download -> semver-1.0.9.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/serde_derive/1.0.136/download -> serde_derive-1.0.136.crate https://crates.io/api/v1/crates/serde_json/1.0.79/download -> serde_json-1.0.79.crate https://crates.io/api/v1/crates/sha-1/0.8.2/download -> sha-1-0.8.2.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/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/smartstring/1.0.1/download -> smartstring-1.0.1.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.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/subprocess/0.2.8/download -> subprocess-0.2.8.crate https://crates.io/api/v1/crates/syn/1.0.91/download -> syn-1.0.91.crate https://crates.io/api/v1/crates/synstructure/0.12.6/download -> synstructure-0.12.6.crate https://crates.io/api/v1/crates/syntect/4.6.0/download -> syntect-4.6.0.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.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/textwrap/0.11.0/download -> textwrap-0.11.0.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.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.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.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/time/0.3.9/download -> time-0.3.9.crate https://crates.io/api/v1/crates/tinyvec/1.5.1/download -> tinyvec-1.5.1.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.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/toml_edit/0.13.4/download -> toml_edit-0.13.4.crate https://crates.io/api/v1/crates/tracing/0.1.34/download -> tracing-0.1.34.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.20/download -> tracing-attributes-0.1.20.crate https://crates.io/api/v1/crates/tracing-core/0.1.26/download -> tracing-core-0.1.26.crate https://crates.io/api/v1/crates/tracing-log/0.1.2/download -> tracing-log-0.1.2.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.11/download -> tracing-subscriber-0.3.11.crate https://crates.io/api/v1/crates/twoway/0.2.2/download -> twoway-0.2.2.crate https://crates.io/api/v1/crates/typed-arena/1.7.0/download -> typed-arena-1.7.0.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unchecked-index/0.2.2/download -> unchecked-index-0.2.2.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.7/download -> unicode-bidi-0.3.7.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.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/unicode_categories/0.1.1/download -> unicode_categories-0.1.1.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.4.0/download -> ureq-2.4.0.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.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/vec_map/0.8.2/download -> vec_map-0.8.2.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/wait-timeout/0.2.0/download -> wait-timeout-0.2.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/wasm-bindgen/0.2.80/download -> wasm-bindgen-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.80/download -> wasm-bindgen-backend-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.80/download -> wasm-bindgen-macro-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.80/download -> wasm-bindgen-macro-support-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.80/download -> wasm-bindgen-shared-0.2.80.crate https://crates.io/api/v1/crates/web-sys/0.3.57/download -> web-sys-0.3.57.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.3/download -> webpki-roots-0.22.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/xdg/2.4.1/download -> xdg-2.4.1.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate https://crates.io/api/v1/crates/zeroize/1.5.4/download -> zeroize-1.5.4.crate
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b216652020e7ff1f1eef59b526bdc6bb
diff --git a/metadata/md5-cache/dev-util/diffoscope-216 b/metadata/md5-cache/dev-util/diffoscope-216
index 58dfb2eaeb68..d21612248db1 100644
--- a/metadata/md5-cache/dev-util/diffoscope-216
+++ b/metadata/md5-cache/dev-util/diffoscope-216
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
 INHERIT=distutils-r1
 IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diffoscope/diffoscope-216.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=59d12709ec29c26c624f49d2af181856
+_md5_=27fac03f8e1f1928e0badac1c0690334
diff --git a/metadata/md5-cache/dev-util/ebuildtester-42 b/metadata/md5-cache/dev-util/ebuildtester-42
new file mode 100644
index 000000000000..067ef7ea734c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ebuildtester-42
@@ -0,0 +1,17 @@
+BDEPEND=test? ( app-containers/docker sys-fs/fuse dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=A dockerized approach to test a Gentoo package within a clean stage3 container
+EAPI=8
+HOMEPAGE=https://ebuildtester.readthedocs.io/
+INHERIT=bash-completion-r1 distutils-r1
+IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=app-containers/docker sys-fs/fuse python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/e/ebuildtester/ebuildtester-42.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e5f0d87b2250a3b7524c472664a1055a
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.72.2 b/metadata/md5-cache/dev-util/gdbus-codegen-2.72.2
index cb6f7e57e0e2..81a2af41a9c3 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.72.2
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.72.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gtk.org/
 INHERIT=gnome.org distutils-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.2.tar.xz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	gnome.org	429073e99d7067d3462e875bf5c6e14a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6b5f434b7ee7870b5e8f353f351b15e0
+_md5_=7f1a9a7279172c8ec70591751e0b5133
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.72.2 b/metadata/md5-cache/dev-util/glib-utils-2.72.2
index 3529b193e64a..30228c803b82 100644
--- a/metadata/md5-cache/dev-util/glib-utils-2.72.2
+++ b/metadata/md5-cache/dev-util/glib-utils-2.72.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gtk.org/
 INHERIT=gnome.org python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-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=LGPL-2.1+
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.2.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=693d8649ce56ef1e7ccf644bd7e4c655
+_md5_=ab92a34b80a7c415fcd43e3f9513ba0c
diff --git a/metadata/md5-cache/dev-util/gource-0.53 b/metadata/md5-cache/dev-util/gource-0.53
new file mode 100644
index 000000000000..7c30dd28ceaa
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gource-0.53
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/boost-1.46:=[threads(+)] >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre2:= dev-libs/tinyxml media-libs/libglvnd[X] media-libs/freetype:2 virtual/glu:0 >=media-libs/glm-0.9.3
+DESCRIPTION=A software version control visualization tool
+EAPI=8
+HOMEPAGE=https://gource.io/
+INHERIT=autotools flag-o-matic
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.46:=[threads(+)] >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre2:= dev-libs/tinyxml media-libs/libglvnd[X] media-libs/freetype:2 virtual/glu:0 media-fonts/freefont
+SLOT=0
+SRC_URI=https://github.com/acaudwell/Gource/releases/download/gource-0.53/gource-0.53.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=0b2abbb667c449d6cb819fa5aed1ecd3
diff --git a/metadata/md5-cache/dev-util/howdoi-2.0.19 b/metadata/md5-cache/dev-util/howdoi-2.0.19
index d8f4e8c0469e..e9223467ad90 100644
--- a/metadata/md5-cache/dev-util/howdoi-2.0.19
+++ b/metadata/md5-cache/dev-util/howdoi-2.0.19
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
+BDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A code search tool
 EAPI=8
 HOMEPAGE=https://pypi.org/project/howdoi/
 INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cachelib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/keep[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyquery-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/requests-2.24.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cachelib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/keep[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyquery-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.24.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/howdoi/howdoi-2.0.19.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a9223f1e92bfe84292b200a7add95d88
+_md5_=d0e509c1474e3d4b8af645f5a6d10e23
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11104 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11104
deleted file mode 100644
index ba7eb3804940..000000000000
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11104
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND==sys-devel/lld-12* || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) >=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:12= dev-util/spirv-tools =sys-devel/lld-12* sys-devel/llvm:12= !!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
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=dev-libs/opencl-clang:12= dev-util/spirv-tools =sys-devel/lld-12* sys-devel/llvm:12=
-SLOT=0
-SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.11104.tar.gz -> intel-graphics-compiler-1.0.11104.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dcd31b731d2ee25c928336547b585620
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11222_p20220518 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11222_p20220518
deleted file mode 100644
index 213bed4a9c4a..000000000000
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11222_p20220518
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND==sys-devel/lld-13* || ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) >=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:13= dev-util/spirv-tools =sys-devel/lld-13* sys-devel/llvm:13= !!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
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-libs/opencl-clang:13= dev-util/spirv-tools =sys-devel/lld-13* sys-devel/llvm:13=
-SLOT=0
-SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/1198ba40214dae81d0f65431ae5b786e95e80ab6.tar.gz -> intel-graphics-compiler-1.0.11222_p20220518.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=084e481816923f04d7654f6264161036
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11279_p20220528 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11279_p20220528
deleted file mode 100644
index ded63644d1ce..000000000000
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11279_p20220528
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND==sys-devel/lld-13* || ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) >=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:13= dev-util/spirv-tools =sys-devel/lld-13* sys-devel/llvm:13= !!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
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-libs/opencl-clang:13= dev-util/spirv-tools =sys-devel/lld-13* sys-devel/llvm:13=
-SLOT=0
-SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/28ff9ed04d17b5af2002158d51992cbed06e6a95.tar.gz -> intel-graphics-compiler-1.0.11279_p20220528.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3c1a7841a8ce42618ed8392773e03a94
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11378 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11378
index 12fd0f0a2f44..ac3519584c87 100644
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11378
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11378
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/intel-graphics-compiler
 INHERIT=cmake flag-o-matic llvm python-any-r1
 IUSE=debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=dev-libs/opencl-clang:13= dev-util/spirv-tools =sys-devel/lld-13* sys-devel/llvm:13=
 SLOT=0
 SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.11378.tar.gz -> intel-graphics-compiler-1.0.11378.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b4e717bc9c1df316fa996715c16a189f
+_md5_=af3a5dba4c92374eea0789e5e1f98fb0
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.346.1 b/metadata/md5-cache/dev-util/jenkins-bin-2.346.1
new file mode 100644
index 000000000000..abc2d19ea053
--- /dev/null
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.346.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=acct-group/jenkins acct-user/jenkins
+DESCRIPTION=Extensible continuous integration server
+EAPI=8
+HOMEPAGE=https://jenkins.io/
+INHERIT=systemd
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=acct-group/jenkins acct-user/jenkins media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 || ( virtual/jre:17 virtual/jre:11 )
+SLOT=lts
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.346.1/jenkins.war -> jenkins-bin-2.346.1.war
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=d757885bc81fb70137db1cf525515bbd
diff --git a/metadata/md5-cache/dev-util/kube-linter-0.3.0 b/metadata/md5-cache/dev-util/kube-linter-0.3.0
new file mode 100644
index 000000000000..51d5e882c59b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kube-linter-0.3.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=kubernetes yaml and helm chart static analysis tool
+EAPI=8
+HOMEPAGE=https://kubelinter.io
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/stackrox/kube-linter/archive/0.3.0.tar.gz -> kube-linter-0.3.0.tar.gz https://dev.gentoo.org/~williamh/dist/kube-linter-0.3.0-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=9cf9710e8bc3b3e782caafd01de69c65
diff --git a/metadata/md5-cache/dev-util/kubeval-0.16.1 b/metadata/md5-cache/dev-util/kubeval-0.16.1
new file mode 100644
index 000000000000..8c9236419fb1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kubeval-0.16.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=validate kubernetes YAML or JSON configuration files
+EAPI=8
+HOMEPAGE=https://kubeval.com
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD MIT MPL-2.0
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/instrumenta/kubeval/archive/v0.16.1.tar.gz -> kubeval-0.16.1.tar.gz https://dev.gentoo.org/~williamh/dist/kubeval-0.16.1-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=bb86567ca856b41e2e0a517022f5a2ff
diff --git a/metadata/md5-cache/dev-util/lldb-14.0.6 b/metadata/md5-cache/dev-util/lldb-14.0.6
new file mode 100644
index 000000000000..9ece21cf5010
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-14.0.6
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( ~dev-python/lit-14.0.6[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-14.0.6[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-14.0.6[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) sys-devel/lld ) verify-sig? ( sec-keys/openpgp-keys-llvm ) >=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-14.0.6 ~sys-devel/llvm-14.0.6 !!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_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~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-14.0.6 ~sys-devel/llvm-14.0.6 python? ( python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) 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_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 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	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	e68bb6ac1b36c6eeced323c0334f1a4f	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=43bd36332b843aa3d6c1e9c34b0278bb
diff --git a/metadata/md5-cache/dev-util/rbtools-3.1 b/metadata/md5-cache/dev-util/rbtools-3.1
index cc20f7eba382..445b655d6c96 100644
--- a/metadata/md5-cache/dev-util/rbtools-3.1
+++ b/metadata/md5-cache/dev-util/rbtools-3.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.reviewboard.org/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pydiffx-1.0.1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.reviewboard.org/releases/RBTools/3.1/RBTools-3.1.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4caf44fd3c38ce0abdfb9f72451f3958
+_md5_=838e6721c020401fdc079f5a8541749d
diff --git a/metadata/md5-cache/dev-util/rpmdevtools-9.5 b/metadata/md5-cache/dev-util/rpmdevtools-9.5
index eecb99ccb262..6c3485ef4626 100644
--- a/metadata/md5-cache/dev-util/rpmdevtools-9.5
+++ b/metadata/md5-cache/dev-util/rpmdevtools-9.5
@@ -1,16 +1,16 @@
 BDEPEND=sys-apps/help2man
 DEFINED_PHASES=prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) app-arch/rpm[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-lang/perl:* python_single_target_python3_8? ( dev-python/progressbar2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/progressbar2[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/requests_download[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/requests_download[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) app-arch/rpm[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-lang/perl:* python_single_target_python3_8? ( dev-python/progressbar2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/progressbar2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/progressbar2[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/requests_download[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/requests_download[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/requests_download[python_targets_python3_10(-)] )
 DESCRIPTION=Collection of rpm packaging related utilities
 EAPI=7
 HOMEPAGE=https://pagure.io/rpmdevtools
 INHERIT=python-single-r1
-IUSE=emacs python_single_target_python3_8 python_single_target_python3_9
+IUSE=emacs python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) app-arch/rpm[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-lang/perl:* python_single_target_python3_8? ( dev-python/progressbar2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/progressbar2[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/requests_download[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/requests_download[python_targets_python3_9(-)] ) net-misc/curl emacs? ( app-emacs/rpm-spec-mode )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) app-arch/rpm[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-lang/perl:* python_single_target_python3_8? ( dev-python/progressbar2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/progressbar2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/progressbar2[python_targets_python3_10(-)] ) python_single_target_python3_8? ( dev-python/requests_download[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/requests_download[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/requests_download[python_targets_python3_10(-)] ) net-misc/curl emacs? ( app-emacs/rpm-spec-mode )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://releases.pagure.org/rpmdevtools/rpmdevtools-9.5.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=22e65faeeb0e0463f6b4a52f2b945822
+_md5_=7cce4c24ce26bf42ac8d66b53209bafa
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index eb68d09676db..345f95e50a72 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/savagewheels-1.6.1-r2 b/metadata/md5-cache/games-arcade/savagewheels-1.6.1-r2
index dd3f137826c9..4c855ee7309d 100644
--- a/metadata/md5-cache/games-arcade/savagewheels-1.6.1-r2
+++ b/metadata/md5-cache/games-arcade/savagewheels-1.6.1-r2
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=media-libs/libsdl[joystick] sound? ( media-libs/sdl-mixer[mod,modplug] )
 DESCRIPTION=2D car crashing game similar to the old classic Destruction Derby
 EAPI=7
-HOMEPAGE=https://github.com/petarov/savagewheels
+HOMEPAGE=https://github.com/kenamick/savagewheels
 INHERIT=cmake
 IUSE=sound
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=media-libs/libsdl[joystick] sound? ( media-libs/sdl-mixer[mod,modplug] )
 SLOT=0
-SRC_URI=https://github.com/petarov/savagewheels/archive/1.6.1.tar.gz -> savagewheels-1.6.1.tar.gz https://github.com/petarov/savagewheels/releases/download/v1.4/savagewheels-gamedata.tar.gz -> savagewheels-gamedata-1.4.0.tar.gz
+SRC_URI=https://github.com/kenamick/savagewheels/archive/1.6.1.tar.gz -> savagewheels-1.6.1.tar.gz https://github.com/kenamick/savagewheels/releases/download/v1.4/savagewheels-gamedata.tar.gz -> savagewheels-gamedata-1.4.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b2a2b9a6458a0b0c0ff49b8323bcb6d2
+_md5_=bb13718f7cd93b206fa0ed8440a96016
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index b0800eb4b295..688ffd1e9d54 100644
Binary files a/metadata/md5-cache/games-engines/Manifest.gz and b/metadata/md5-cache/games-engines/Manifest.gz differ
diff --git a/metadata/md5-cache/games-engines/scrap-engine-1.2.0 b/metadata/md5-cache/games-engines/scrap-engine-1.2.0
new file mode 100644
index 000000000000..5f81a2cf1106
--- /dev/null
+++ b/metadata/md5-cache/games-engines/scrap-engine-1.2.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Terminal-based Python game engine involving objects on a map
+EAPI=8
+HOMEPAGE=https://github.com/lxgr-linux/scrap_engine
+INHERIT=distutils-r1
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/lxgr-linux/scrap_engine/archive/refs/tags/1.2.0.tar.gz -> scrap-engine-1.2.0.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e0eaf69ca46a739ed041573fa3a6ac63
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index a59972401bda..a948425fa90b 100644
Binary files a/metadata/md5-cache/games-fps/Manifest.gz and b/metadata/md5-cache/games-fps/Manifest.gz differ
diff --git a/metadata/md5-cache/games-fps/duke3d-data-1.0-r5 b/metadata/md5-cache/games-fps/duke3d-data-1.0-r5
index dfb0775b0e00..d4b68a8708d1 100644
--- a/metadata/md5-cache/games-fps/duke3d-data-1.0-r5
+++ b/metadata/md5-cache/games-fps/duke3d-data-1.0-r5
@@ -3,8 +3,9 @@ DEFINED_PHASES=install nofetch postinst unpack
 DESCRIPTION=Duke Nukem 3D (Atomic Edition) data files
 EAPI=7
 HOMEPAGE=http://www.3drealms.com/
+INHERIT=cdrom
 IUSE=+demo gog cdinstall
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=DUKE3D gog? ( GOG-EULA )
 PROPERTIES=cdinstall? ( interactive )
 REQUIRED_USE=^^ ( cdinstall demo gog )
@@ -12,4 +13,4 @@ RESTRICT=bindist gog? ( fetch ) mirror
 SLOT=0
 SRC_URI=demo? ( ftp://ftp.3drealms.com/share/3dduke13.zip ) gog? ( gog_duke_nukem_3d_atomic_edition_2.0.0.9.sh )
 _eclasses_=cdrom	03e2d7752b66208567758120f15471cc	portability	d33a77692bb47e8227f27e17fb9c3c05
-_md5_=3932df369f697de34d993f5891b43b27
+_md5_=eaff9524c64f5fdb1eb541e7e36456b8
diff --git a/metadata/md5-cache/games-fps/eduke32-20211202.9831 b/metadata/md5-cache/games-fps/eduke32-20211202.9831
deleted file mode 100644
index 018520f5378b..000000000000
--- a/metadata/md5-cache/games-fps/eduke32-20211202.9831
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-arch/unzip x86? ( dev-lang/nasm )
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=media-libs/flac media-libs/libogg media-libs/libsdl2[alsa,joystick,opengl?,sound,video] media-libs/libvorbis media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) vpx? ( media-libs/libvpx:= ) xmp? ( media-libs/exempi:2= ) timidity? ( media-sound/timidity++ )
-DESCRIPTION=An open source engine port of the classic PC first person shooter Duke Nukem 3D
-EAPI=7
-HOMEPAGE=http://www.eduke32.com/
-INHERIT=desktop toolchain-funcs xdg-utils
-IUSE=duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BUILDLIC GPL-2 HRP
-PDEPEND=duke3d? ( games-fps/duke3d-data )
-RDEPEND=media-libs/flac media-libs/libogg media-libs/libsdl2[alsa,joystick,opengl?,sound,video] media-libs/libvorbis media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) vpx? ( media-libs/libvpx:= ) xmp? ( media-libs/exempi:2= )
-REQUIRED_USE=hrp? ( duke3d !voxels ) offensive? ( duke3d ) opl? ( duke3d !sc-55 ) psx? ( duke3d ) sc-55? ( duke3d !opl ) voxels? ( !hrp ) vpx? ( opengl )
-RESTRICT=bindist test
-SLOT=0
-SRC_URI=http://dukeworld.com/eduke32/synthesis/20211202-9831-a7ab79e69/eduke32_src_20211202-9831-a7ab79e69.tar.xz https://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a9947279674838b3caf3b30b83801f15
diff --git a/metadata/md5-cache/games-fps/eduke32-20220204.9957 b/metadata/md5-cache/games-fps/eduke32-20220204.9957
deleted file mode 100644
index 540b66a5348a..000000000000
--- a/metadata/md5-cache/games-fps/eduke32-20220204.9957
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-arch/unzip x86? ( dev-lang/nasm )
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=media-libs/flac media-libs/libogg media-libs/libsdl2[alsa,joystick,opengl?,sound,video] media-libs/libvorbis media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) vpx? ( media-libs/libvpx:= ) xmp? ( media-libs/exempi:2= ) timidity? ( media-sound/timidity++ )
-DESCRIPTION=An open source engine port of the classic PC first person shooter Duke Nukem 3D
-EAPI=8
-HOMEPAGE=http://www.eduke32.com/
-INHERIT=desktop toolchain-funcs xdg-utils
-IUSE=duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BUILDLIC GPL-2 HRP
-PDEPEND=duke3d? ( games-fps/duke3d-data )
-RDEPEND=media-libs/flac media-libs/libogg media-libs/libsdl2[alsa,joystick,opengl?,sound,video] media-libs/libvorbis media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) vpx? ( media-libs/libvpx:= ) xmp? ( media-libs/exempi:2= )
-REQUIRED_USE=hrp? ( duke3d !voxels ) offensive? ( duke3d ) opl? ( duke3d !sc-55 ) psx? ( duke3d ) sc-55? ( duke3d !opl ) voxels? ( !hrp ) vpx? ( opengl )
-RESTRICT=bindist test
-SLOT=0
-SRC_URI=http://dukeworld.com/eduke32/synthesis/20220204-9957-6df591a07/eduke32_src_20220204-9957-6df591a07.tar.xz https://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1c9766ad7ad19eea0874a67c073c4f46
diff --git a/metadata/md5-cache/games-fps/eduke32-20220422.10033 b/metadata/md5-cache/games-fps/eduke32-20220422.10033
index a18b71d5b948..fb58e87b3a58 100644
--- a/metadata/md5-cache/games-fps/eduke32-20220422.10033
+++ b/metadata/md5-cache/games-fps/eduke32-20220422.10033
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.eduke32.com/
 INHERIT=desktop toolchain-funcs xdg-utils
 IUSE=duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=BUILDLIC GPL-2 HRP
 PDEPEND=duke3d? ( games-fps/duke3d-data )
 RDEPEND=media-libs/flac media-libs/libogg media-libs/libsdl2[alsa,joystick,opengl?,sound,video] media-libs/libvorbis media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) vpx? ( media-libs/libvpx:= ) xmp? ( media-libs/exempi:2= )
@@ -15,4 +15,4 @@ RESTRICT=bindist test
 SLOT=0
 SRC_URI=http://dukeworld.com/eduke32/synthesis/20220422-10033-3927367ba/eduke32_src_20220422-10033-3927367ba.tar.xz https://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8c38b47048998511427a8d87d9535c78
+_md5_=b2dd0ead45eb8c01e24758778e7d25d6
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 3a30b0679d76..90286bb7a2bd 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/pokete-0.7.3 b/metadata/md5-cache/games-rpg/pokete-0.7.3
new file mode 100644
index 000000000000..fa01125fb967
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/pokete-0.7.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst setup
+DESCRIPTION=Terminal-based clone of the game Pokémon
+EAPI=8
+HOMEPAGE=https://github.com/lxgr-linux/pokete
+INHERIT=desktop python-single-r1 xdg
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) python_single_target_python3_9? ( >=games-engines/scrap-engine-1.2.0[python_targets_python3_9(-)] !kernel_linux? ( >=dev-python/pynput-1.7.6[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=games-engines/scrap-engine-1.2.0[python_targets_python3_10(-)] !kernel_linux? ( >=dev-python/pynput-1.7.6[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( >=games-engines/scrap-engine-1.2.0[python_targets_python3_11(-)] !kernel_linux? ( >=dev-python/pynput-1.7.6[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/lxgr-linux/pokete/archive/refs/tags/0.7.3.tar.gz -> pokete-0.7.3.tar.gz
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5dd91b6081f1e7dcf99fe9f61dbc92c2
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 7c1dbab02e53..0bc3d81eb659 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/bedrock-server-1.18.12.01-r2 b/metadata/md5-cache/games-server/bedrock-server-1.18.12.01-r2
deleted file mode 100644
index 8abd1b446126..000000000000
--- a/metadata/md5-cache/games-server/bedrock-server-1.18.12.01-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install
-DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
-EAPI=8
-HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* amd64
-LICENSE=Mojang
-RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.18.12.01.zip
-_md5_=cd327b7e06186d65483755305b81e813
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.19.1.01 b/metadata/md5-cache/games-server/bedrock-server-1.19.1.01
index 9000db1541fc..1f9126378697 100644
--- a/metadata/md5-cache/games-server/bedrock-server-1.19.1.01
+++ b/metadata/md5-cache/games-server/bedrock-server-1.19.1.01
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
 EAPI=8
 HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=Mojang
 RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.1.01.zip
-_md5_=aaf5f776bcbb8fa9b6ce8732514ba237
+_md5_=cd327b7e06186d65483755305b81e813
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.18.33.02 b/metadata/md5-cache/games-server/bedrock-server-1.19.2.02
similarity index 96%
rename from metadata/md5-cache/games-server/bedrock-server-1.18.33.02
rename to metadata/md5-cache/games-server/bedrock-server-1.19.2.02
index 7c299e698ea7..83f471bdddf8 100644
--- a/metadata/md5-cache/games-server/bedrock-server-1.18.33.02
+++ b/metadata/md5-cache/games-server/bedrock-server-1.19.2.02
@@ -8,5 +8,5 @@ LICENSE=Mojang
 RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.18.33.02.zip
+SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.2.02.zip
 _md5_=aaf5f776bcbb8fa9b6ce8732514ba237
diff --git a/metadata/md5-cache/games-sports/Manifest.gz b/metadata/md5-cache/games-sports/Manifest.gz
index 3f923cf31f3a..5080a99cfabf 100644
Binary files a/metadata/md5-cache/games-sports/Manifest.gz and b/metadata/md5-cache/games-sports/Manifest.gz differ
diff --git a/metadata/md5-cache/games-sports/skatebird-12 b/metadata/md5-cache/games-sports/skatebird-14
similarity index 100%
rename from metadata/md5-cache/games-sports/skatebird-12
rename to metadata/md5-cache/games-sports/skatebird-14
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index d5d5141cc099..770f08526f2e 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-shell-42.1-r3 b/metadata/md5-cache/gnome-base/gnome-shell-42.1-r3
new file mode 100644
index 000000000000..918d12f352f7
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-shell-42.1-r3
@@ -0,0 +1,18 @@
+BDEPEND=dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.17 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.71.1 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-42.0:0/10[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:= networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) media-libs/mesa[X(+)]
+DESCRIPTION=Provides core UI functions for the GNOME desktop
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
+INHERIT=gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+ LGPL-2+
+PDEPEND=>=gnome-base/gdm-3.5[introspection(+)] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
+RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.71.1 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-42.0:0/10[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:= networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] media-libs/graphene[introspection] >=dev-libs/libgweather-4.0.0:4[introspection] x11-libs/pango[introspection] net-libs/libsoup:2.4[introspection] >=sys-power/upower-0.99:=[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell || ( sys-apps/xdg-desktop-portal-gnome <sys-apps/xdg-desktop-portal-gtk-1.14.0 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ?? ( elogind systemd )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell/42/gnome-shell-42.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f5ac86fa48e8f7018291938c83f8f6d7
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index a133e6dfa0a1..6c6ef6c4a9c3 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-documents-3.34.0-r1 b/metadata/md5-cache/gnome-extra/gnome-documents-3.34.0-r1
deleted file mode 100644
index f9bc23a319a4..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-documents-3.34.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-text/evince-3.13.3[introspection] app-misc/tracker:0/2.0 >=dev-libs/gjs-1.48.0 >=dev-libs/glib-2.39.3:2 gnome-base/gnome-desktop:3=[introspection] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.22.15:3[introspection] >=net-libs/libsoup-2.41.3:2.4 >=net-libs/webkit-gtk-2.6:4[introspection] >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] >=net-libs/gnome-online-accounts-3.2.0[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/appstream-glib dev-libs/libxslt dev-util/glib-utils >=sys-devel/gettext-0.19.8 dev-util/itstool virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A document manager application for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Documents
-INHERIT=gnome.org gnome2-utils meson xdg
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=app-text/evince-3.13.3[introspection] app-misc/tracker:0/2.0 >=dev-libs/gjs-1.48.0 >=dev-libs/glib-2.39.3:2 gnome-base/gnome-desktop:3=[introspection] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.22.15:3[introspection] >=net-libs/libsoup-2.41.3:2.4 >=net-libs/webkit-gtk-2.6:4[introspection] >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] >=net-libs/gnome-online-accounts-3.2.0[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] >=app-misc/tracker-miners-2:0 net-misc/gnome-online-miners sys-apps/dbus x11-themes/adwaita-icon-theme
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-documents/3.34/gnome-documents-3.34.0.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2991407bc612e76c41c8e222f9eec7ad
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 7debf7b4d851..6112476b7ca4 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.5.0 b/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.5.0
index 57d165f36428..24433119e3f1 100644
--- a/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.5.0
+++ b/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.5.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/emersion/xdg-desktop-portal-wlr
 INHERIT=meson
 IUSE=elogind systemd
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=media-video/pipewire-0.3.34:= dev-libs/inih dev-libs/wayland || ( systemd? ( >=sys-apps/systemd-237 ) elogind? ( >=sys-auth/elogind-237 ) sys-libs/basu ) sys-apps/xdg-desktop-portal
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0/9999
 SRC_URI=https://github.com/emersion/xdg-desktop-portal-wlr/releases/download/v0.5.0/xdg-desktop-portal-wlr-0.5.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=17d33e851fbd08da18b37ec633627bec
+_md5_=298d74587714a7ed500f5832fc3d5aaa
diff --git a/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.6.0 b/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.6.0
new file mode 100644
index 000000000000..53a9e774e2dd
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.6.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/wayland-protocols virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-video/pipewire-0.3.34:= dev-libs/inih dev-libs/wayland || ( systemd? ( >=sys-apps/systemd-237 ) elogind? ( >=sys-auth/elogind-237 ) sys-libs/basu )
+DESCRIPTION=xdg-desktop-portal backend for wlroots
+EAPI=7
+HOMEPAGE=https://github.com/emersion/xdg-desktop-portal-wlr
+INHERIT=meson
+IUSE=elogind systemd
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=media-video/pipewire-0.3.34:= dev-libs/inih dev-libs/wayland || ( systemd? ( >=sys-apps/systemd-237 ) elogind? ( >=sys-auth/elogind-237 ) sys-libs/basu ) sys-apps/xdg-desktop-portal
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0/9999
+SRC_URI=https://github.com/emersion/xdg-desktop-portal-wlr/releases/download/v0.6.0/xdg-desktop-portal-wlr-0.6.0.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=17d33e851fbd08da18b37ec633627bec
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 2e4eebc9113e..4c1e9948ffa7 100644
Binary files a/metadata/md5-cache/kde-apps/Manifest.gz and b/metadata/md5-cache/kde-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-22.04.2 b/metadata/md5-cache/kde-apps/kdepim-meta-22.04.2
index db971421652a..0fb9e572c158 100644
--- a/metadata/md5-cache/kde-apps/kdepim-meta-22.04.2
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-22.04.2
@@ -3,8 +3,8 @@ DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
 EAPI=8
 HOMEPAGE=https://apps.kde.org/kontact/
 IUSE=bogofilter clamav spamassassin
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=metapackage
 RDEPEND=>=app-office/kalendar-22.04.2:5 >=kde-apps/akonadi-22.04.2:5 >=kde-apps/akonadiconsole-22.04.2:5 >=kde-apps/akonadi-calendar-22.04.2:5 >=kde-apps/akonadi-contacts-22.04.2:5 >=kde-apps/akonadi-import-wizard-22.04.2:5 >=kde-apps/akonadi-mime-22.04.2:5 >=kde-apps/akonadi-notes-22.04.2:5 >=kde-apps/akonadi-search-22.04.2:5 >=kde-apps/akregator-22.04.2:5 >=kde-apps/calendarjanitor-22.04.2:5 >=kde-apps/calendarsupport-22.04.2:5 >=kde-apps/eventviews-22.04.2:5 >=kde-apps/grantlee-editor-22.04.2:5 >=kde-apps/grantleetheme-22.04.2:5 >=kde-apps/incidenceeditor-22.04.2:5 >=kde-apps/kaddressbook-22.04.2:5 >=kde-apps/kalarm-22.04.2:5 >=kde-apps/kcalutils-22.04.2:5 >=kde-apps/kdepim-addons-22.04.2:5 >=kde-apps/kdepim-runtime-22.04.2:5 >=kde-apps/kidentitymanagement-22.04.2:5 >=kde-apps/kimap-22.04.2:5 >=kde-apps/kitinerary-22.04.2:5 >=kde-apps/kldap-22.04.2:5 >=kde-apps/kleopatra-22.04.2:5 >=kde-apps/kmail-22.04.2:5 >=kde-apps/kmail-account-wizard-22.04.2:5 >=kde-apps/kmailtransport-22.04.2:5 >=kde-apps/kmbox-22.04.2:5 >=kde-apps/kmime-22.04.2:5 >=kde-apps/knotes-22.04.2:5 >=kde-apps/konsolekalendar-22.04.2:5 >=kde-apps/kontact-22.04.2:5 >=kde-apps/kontactinterface-22.04.2:5 >=kde-apps/korganizer-22.04.2:5 >=kde-apps/kpimtextedit-22.04.2:5 >=kde-apps/kpkpass-22.04.2:5 >=kde-apps/ksmtp-22.04.2:5 >=kde-apps/libgravatar-22.04.2:5 >=kde-apps/libkdepim-22.04.2:5 >=kde-apps/libkgapi-22.04.2:5 >=kde-apps/libkleo-22.04.2:5 >=kde-apps/libksieve-22.04.2:5 >=kde-apps/libktnef-22.04.2:5 >=kde-apps/mailcommon-22.04.2:5 >=kde-apps/mailimporter-22.04.2:5 >=kde-apps/mbox-importer-22.04.2:5 >=kde-apps/messagelib-22.04.2:5 >=kde-apps/pim-data-exporter-22.04.2:5 >=kde-apps/pim-sieve-editor-22.04.2:5 >=kde-apps/pimcommon-22.04.2:5 >=kde-misc/zanshin-22.04.2:5 bogofilter? ( mail-filter/bogofilter ) clamav? ( app-antivirus/clamav ) spamassassin? ( mail-filter/spamassassin )
 SLOT=5
-_md5_=6bd961dffd01d57b651b14787e574284
+_md5_=960ea1ce54c58420af7d455b3fb8dd38
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 2986d1c4dab0..5568c60b4e5e 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/alpine-2.26 b/metadata/md5-cache/mail-client/alpine-2.26
new file mode 100644
index 000000000000..35cc774b5faf
--- /dev/null
+++ b/metadata/md5-cache/mail-client/alpine-2.26
@@ -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 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=sys-libs/ncurses:= virtual/libcrypt:= kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap:= ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=An easy to use text-based based mail and news client
+EAPI=8
+HOMEPAGE=https://alpineapp.email/ https://repo.or.cz/alpine.git/
+INHERIT=autotools optfeature toolchain-funcs
+IUSE=+chappa ipv6 kerberos ldap nls onlyalpine passfile smime ssl threads
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=sys-libs/ncurses:= virtual/libcrypt:= kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap:= ) ssl? ( dev-libs/openssl:0= ) app-misc/mime-types
+SLOT=0
+SRC_URI=https://alpineapp.email/alpine/release/src/alpine-2.26.tar.xz chappa? ( https://alpineapp.email/alpine/patches/alpine-2.26/all.patch.gz -> alpine-2.26-chappa-5.patch.gz )
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=ffacf98f95c869c838c5ce6d6255f8a3
diff --git a/metadata/md5-cache/mail-client/mailx-8.1.2.20180807 b/metadata/md5-cache/mail-client/mailx-8.1.2.20180807
index 8b65bf72f1d1..bdd6eb307de9 100644
--- a/metadata/md5-cache/mail-client/mailx-8.1.2.20180807
+++ b/metadata/md5-cache/mail-client/mailx-8.1.2.20180807
@@ -10,4 +10,4 @@ RDEPEND=>=net-libs/liblockfile-1.03 dev-libs/libbsd virtual/mta mail-client/mail
 SLOT=0
 SRC_URI=http://http.debian.net/debian/pool/main/b/bsd-mailx/bsd-mailx_8.1.2-0.20180807cvs.orig.tar.xz http://http.debian.net/debian/pool/main/b/bsd-mailx/bsd-mailx_8.1.2-0.20180807cvs-1.debian.tar.xz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=549e65e450ea56646bbdc519bf578605
+_md5_=b658f863a13aa55b25d3c6f83e630bd3
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 22fe1018bf49..c24023703fa5 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/fira-mono-4.202 b/metadata/md5-cache/media-fonts/fira-mono-4.202
index 679a73e5c077..524a42bb30a4 100644
--- a/metadata/md5-cache/media-fonts/fira-mono-4.202
+++ b/metadata/md5-cache/media-fonts/fira-mono-4.202
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://mozilla.github.io/Fira
 INHERIT=font
 IUSE=+otf ttf X
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~riscv x86
 LICENSE=OFL-1.1
 REQUIRED_USE=|| ( otf ttf )
 SLOT=0
 SRC_URI=https://github.com/mozilla/Fira/archive/4.202.tar.gz -> Fira-4.202.tar.gz
 _eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=7facca340008f215a3faaa78784297ba
+_md5_=566a717f323de44e954b978fa6a717c5
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 2db1be47c191..fba55c25d985 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/prusaslicer-2.6.0_pre20220620 b/metadata/md5-cache/media-gfx/prusaslicer-2.6.0_pre20220620
new file mode 100644
index 000000000000..f1f6a4ef385c
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/prusaslicer-2.6.0_pre20220620
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-cpp/eigen:3 >=dev-cpp/tbb-2021.4.0:= >=dev-libs/boost-1.73.0:=[nls,threads(+)] 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 media-libs/glew:0= media-libs/libpng:0= media-libs/qhull:= sci-libs/libigl 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://www.prusa3d.com/prusaslicer/
+INHERIT=cmake wxwidgets xdg
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT
+RDEPEND=dev-cpp/eigen:3 >=dev-cpp/tbb-2021.4.0:= >=dev-libs/boost-1.73.0:=[nls,threads(+)] 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 media-libs/glew:0= media-libs/libpng:0= media-libs/qhull:= sci-libs/libigl 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://dev.gentoo.org/~slashbeast/distfiles/prusaslicer/prusaslicer-2.6.0_pre20220620.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=59bb4b73daba1c2ddb4ae657c5ec35cc
diff --git a/metadata/md5-cache/media-gfx/xsane-0.999-r3 b/metadata/md5-cache/media-gfx/xsane-0.999-r3
deleted file mode 100644
index 19d0b8a2ea8f..000000000000
--- a/metadata/md5-cache/media-gfx/xsane-0.999-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-gfx/sane-backends x11-libs/gtk+:2 x11-misc/xdg-utils jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) gimp? ( media-gfx/gimp:0/2 ) lcms? ( media-libs/lcms:2 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Graphical scanning frontend
-EAPI=6
-HOMEPAGE=http://www.xsane.org/
-INHERIT=autotools desktop epatch strip-linguas toolchain-funcs
-IUSE=nls jpeg png tiff gimp lcms ocr
-KEYWORDS=~alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-PDEPEND=ocr? ( app-text/gocr )
-RDEPEND=media-gfx/sane-backends x11-libs/gtk+:2 x11-misc/xdg-utils jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) gimp? ( media-gfx/gimp:0/2 ) lcms? ( media-libs/lcms:2 )
-SLOT=0
-SRC_URI=http://www.xsane.org/download/xsane-0.999.tar.gz https://dev.gentoo.org/~dilfridge/distfiles/xsane-0.998-patches-2.tar.xz https://dev.gentoo.org/~pacho/xsane/xsane-256x256.png
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=883f7b7eeda97287891153a7e744fe84
diff --git a/metadata/md5-cache/media-gfx/xsane-0.999-r4 b/metadata/md5-cache/media-gfx/xsane-0.999-r4
new file mode 100644
index 000000000000..39cac7b82453
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/xsane-0.999-r4
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=media-gfx/sane-backends x11-libs/gtk+:2 x11-misc/xdg-utils jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) tiff? ( media-libs/tiff:= ) gimp? ( media-gfx/gimp:0/2 ) lcms? ( media-libs/lcms:2 )
+DESCRIPTION=Graphical scanning frontend
+EAPI=8
+HOMEPAGE=http://www.xsane.org/
+INHERIT=autotools desktop strip-linguas toolchain-funcs
+IUSE=nls jpeg png tiff gimp lcms ocr
+KEYWORDS=~alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+PDEPEND=ocr? ( app-text/gocr )
+RDEPEND=media-gfx/sane-backends x11-libs/gtk+:2 x11-misc/xdg-utils jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) tiff? ( media-libs/tiff:= ) gimp? ( media-gfx/gimp:0/2 ) lcms? ( media-libs/lcms:2 )
+SLOT=0
+SRC_URI=http://www.xsane.org/download/xsane-0.999.tar.gz https://dev.gentoo.org/~soap/distfiles/xsane-0.998-patches-3.tar.xz https://dev.gentoo.org/~pacho/xsane/xsane-256x256.png
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=bd21c7e5c43d807ea7ca6d88cd2620a0
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index baa1bd27c265..d56093779f33 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/assimp-5.0.1 b/metadata/md5-cache/media-libs/assimp-5.0.1
deleted file mode 100644
index 1784471e9cad..000000000000
--- a/metadata/md5-cache/media-libs/assimp-5.0.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-libs/boost:= sys-libs/zlib[minizip] samples? ( media-libs/freeglut virtual/opengl x11-libs/libX11 ) test? ( dev-cpp/gtest )
-DESCRIPTION=Importer library to import assets from 3D files
-EAPI=7
-HOMEPAGE=https://github.com/assimp/assimp
-INHERIT=cmake
-IUSE=doc samples test
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= sys-libs/zlib[minizip] samples? ( media-libs/freeglut virtual/opengl x11-libs/libX11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/assimp/assimp/archive/v5.0.1.tar.gz -> assimp-5.0.1.tar.gz doc? ( https://github.com/assimp/assimp/releases/download/v5.0.1/assimp-docs-5.0.1.pdf )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=268a2f796441e76b6b9fcf4cffb2338e
diff --git a/metadata/md5-cache/media-libs/assimp-5.2.2 b/metadata/md5-cache/media-libs/assimp-5.2.2
deleted file mode 100644
index 449ca0e1ae5e..000000000000
--- a/metadata/md5-cache/media-libs/assimp-5.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-cpp/gtest ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= sys-libs/zlib[minizip] samples? ( media-libs/freeglut virtual/opengl x11-libs/libX11 )
-DESCRIPTION=Importer library to import assets from 3D files
-EAPI=8
-HOMEPAGE=https://github.com/assimp/assimp
-INHERIT=cmake
-IUSE=samples test
-KEYWORDS=amd64 ~arm arm64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= sys-libs/zlib[minizip] samples? ( media-libs/freeglut virtual/opengl x11-libs/libX11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/assimp/assimp/archive/v5.2.2.tar.gz -> assimp-5.2.2.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a7dcd5ccc18cd26fc49002591436569d
diff --git a/metadata/md5-cache/media-libs/assimp-5.2.3 b/metadata/md5-cache/media-libs/assimp-5.2.3
deleted file mode 100644
index 86aa7d9b6948..000000000000
--- a/metadata/md5-cache/media-libs/assimp-5.2.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-cpp/gtest ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= sys-libs/zlib[minizip] samples? ( media-libs/freeglut virtual/opengl x11-libs/libX11 )
-DESCRIPTION=Importer library to import assets from 3D files
-EAPI=8
-HOMEPAGE=https://github.com/assimp/assimp
-INHERIT=cmake
-IUSE=samples test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= sys-libs/zlib[minizip] samples? ( media-libs/freeglut virtual/opengl x11-libs/libX11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/assimp/assimp/archive/v5.2.3.tar.gz -> assimp-5.2.3.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=733e247e22f51909581719695bd5f27b
diff --git a/metadata/md5-cache/media-libs/clutter-1.26.4 b/metadata/md5-cache/media-libs/clutter-1.26.4-r1
similarity index 56%
rename from metadata/md5-cache/media-libs/clutter-1.26.4
rename to metadata/md5-cache/media-libs/clutter-1.26.4-r1
index fbd77c04a509..57b564818e1e 100644
--- a/metadata/md5-cache/media-libs/clutter-1.26.4
+++ b/metadata/md5-cache/media-libs/clutter-1.26.4-r1
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.20 >=app-text/docbook-sgml-utils-0.6.14[jadetex] dev-libs/libxslt ) >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/atk-2.5.3[introspection?] >=dev-libs/json-glib-0.12[introspection?] >=media-libs/cogl-1.21.2:1.0=[introspection?,pango,wayland?] >=x11-libs/cairo-1.14:=[aqua?,glib] >=x11-libs/pango-1.30[introspection?] virtual/opengl x11-libs/libdrm:= egl? ( >=dev-libs/libinput-0.19.0 media-libs/cogl[gles2,kms] >=dev-libs/libgudev-136 x11-libs/libxkbcommon ) gtk? ( >=x11-libs/gtk+-3.22.6:3[aqua?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) X? ( media-libs/fontconfig >=x11-libs/libX11-1.3.1 x11-libs/libXext x11-libs/libXdamage >=x11-libs/libXi-1.3 >=x11-libs/libXcomposite-0.4 ) wayland? ( dev-libs/wayland x11-libs/gdk-pixbuf:2 ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.20 >=app-text/docbook-sgml-utils-0.6.14[jadetex] dev-libs/libxslt ) X? ( x11-base/xorg-proto ) test? ( x11-libs/gdk-pixbuf ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/atk-2.5.3[introspection?] >=dev-libs/json-glib-0.12[introspection?] >=media-libs/cogl-1.21.2:1.0=[introspection?,pango,wayland?] >=x11-libs/cairo-1.14:=[aqua?,glib] >=x11-libs/pango-1.30[introspection?] virtual/opengl x11-libs/libdrm:= egl? ( >=dev-libs/libinput-0.19.0 media-libs/cogl[gles2,kms] >=dev-libs/libgudev-136 x11-libs/libxkbcommon ) gtk? ( >=x11-libs/gtk+-3.22.6:3[aqua?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) X? ( media-libs/fontconfig >=x11-libs/libX11-1.3.1 x11-libs/libXext x11-libs/libXdamage >=x11-libs/libXi-1.3 >=x11-libs/libXcomposite-0.4 ) wayland? ( dev-libs/wayland x11-libs/gdk-pixbuf:2 ) X? ( x11-base/xorg-proto ) test? ( x11-libs/gdk-pixbuf )
 DESCRIPTION=Clutter is a library for creating graphical user interfaces
-EAPI=6
+EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/Clutter
 INHERIT=gnome2 virtualx
 IUSE=aqua debug doc egl gtk +introspection test wayland X test
@@ -9,8 +10,8 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/atk-2.5.3[introspection?] >=dev-libs/json-glib-0.12[introspection?] >=media-libs/cogl-1.21.2:1.0=[introspection?,pango,wayland?] >=x11-libs/cairo-1.14:=[aqua?,glib] >=x11-libs/pango-1.30[introspection?] virtual/opengl x11-libs/libdrm:= egl? ( >=dev-libs/libinput-0.19.0 media-libs/cogl[gles2,kms] >=dev-libs/libgudev-136 x11-libs/libxkbcommon ) gtk? ( >=x11-libs/gtk+-3.22.6:3[aqua?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) X? ( media-libs/fontconfig >=x11-libs/libX11-1.3.1 x11-libs/libXext x11-libs/libXdamage >=x11-libs/libXi-1.3 >=x11-libs/libXcomposite-0.4 ) wayland? ( dev-libs/wayland x11-libs/gdk-pixbuf:2 )
 REQUIRED_USE=|| ( aqua wayland X ) wayland? ( egl )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=mirror://gnome/sources/clutter/1.26/clutter-1.26.4.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4aaa2dda4e8b3d52e3daf7d833e20ff7
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e7334d345e4783844c29a4213c63e207
diff --git a/metadata/md5-cache/media-libs/cogl-1.22.8-r1 b/metadata/md5-cache/media-libs/cogl-1.22.8-r2
similarity index 51%
rename from metadata/md5-cache/media-libs/cogl-1.22.8-r1
rename to metadata/md5-cache/media-libs/cogl-1.22.8-r2
index 08bc86073177..ecb4945fc23b 100644
--- a/metadata/md5-cache/media-libs/cogl-1.22.8-r1
+++ b/metadata/md5-cache/media-libs/cogl-1.22.8-r2
@@ -1,16 +1,17 @@
+BDEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32:2 x11-libs/cairo:= >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXrandr-1.2 virtual/opengl gles2? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.34.2:= ) kms? ( media-libs/mesa[egl(+),gbm(+)] x11-libs/libdrm:= ) pango? ( >=x11-libs/pango-1.20.0[introspection?] ) wayland? ( >=dev-libs/wayland-1.1.90 media-libs/mesa[egl(+),wayland] ) dev-util/glib-utils >=sys-devel/gettext-0.19 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.32:2 x11-libs/cairo:= >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXrandr-1.2 virtual/opengl gles2? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.34.2:= ) kms? ( media-libs/mesa[egl(+),gbm(+)] x11-libs/libdrm:= ) pango? ( >=x11-libs/pango-1.20.0[introspection?] ) wayland? ( >=dev-libs/wayland-1.1.90 media-libs/mesa[egl(+),wayland] )
 DESCRIPTION=A library for using 3D graphics hardware to draw pretty pictures
-EAPI=6
+EAPI=8
 HOMEPAGE=https://www.cogl3d.org/
-INHERIT=gnome2 multilib
+INHERIT=gnome2
 IUSE=debug examples gles2 gstreamer +introspection +kms +opengl +pango wayland
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT BSD
-RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/cairo:= >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXrandr-1.2 virtual/opengl gles2? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.34.2:= ) kms? ( media-libs/mesa[egl(+),gbm(+)] x11-libs/libdrm:= ) pango? ( >=x11-libs/pango-1.20.0[introspection?] ) wayland? ( >=dev-libs/wayland-1.1.90 media-libs/mesa[egl(+),wayland] ) !<media-libs/clutter-1.7
+RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/cairo:= >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXrandr-1.2 virtual/opengl gles2? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.34.2:= ) kms? ( media-libs/mesa[egl(+),gbm(+)] x11-libs/libdrm:= ) pango? ( >=x11-libs/pango-1.20.0[introspection?] ) wayland? ( >=dev-libs/wayland-1.1.90 media-libs/mesa[egl(+),wayland] )
 REQUIRED_USE=wayland? ( gles2 ) || ( gles2 opengl )
 RESTRICT=test
 SLOT=1.0/20
 SRC_URI=mirror://gnome/sources/cogl/1.22/cogl-1.22.8.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c29b93e3ab89bb41e30a34813657dd43
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fe8a00b42cbc0a3b1e894c192b5ac2cb
diff --git a/metadata/md5-cache/media-libs/gmmlib-22.1.3 b/metadata/md5-cache/media-libs/gmmlib-22.1.3
index 15109d63001b..e67e214c29c0 100644
--- a/metadata/md5-cache/media-libs/gmmlib-22.1.3
+++ b/metadata/md5-cache/media-libs/gmmlib-22.1.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/gmmlib
 INHERIT=cmake
 IUSE=+custom-cflags test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/12.1
 SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-22.1.3.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5ec30f98393c9d87df541fde613710f3
+_md5_=c0a450badc06372f924c6ad845ca0029
diff --git a/metadata/md5-cache/media-libs/gmmlib-22.1.2 b/metadata/md5-cache/media-libs/gmmlib-22.1.4
similarity index 91%
rename from metadata/md5-cache/media-libs/gmmlib-22.1.2
rename to metadata/md5-cache/media-libs/gmmlib-22.1.4
index 590185864fcc..345cd534ecb3 100644
--- a/metadata/md5-cache/media-libs/gmmlib-22.1.2
+++ b/metadata/md5-cache/media-libs/gmmlib-22.1.4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/gmmlib
 INHERIT=cmake
 IUSE=+custom-cflags test
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/12.1
-SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-22.1.2.tar.gz
+SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-22.1.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c0a450badc06372f924c6ad845ca0029
+_md5_=c01bc2ce8a6b9ef2cd5e127eaa9e6717
diff --git a/metadata/md5-cache/media-libs/gmmlib-9999 b/metadata/md5-cache/media-libs/gmmlib-9999
index 8469d722ce8f..35c68f1374b1 100644
--- a/metadata/md5-cache/media-libs/gmmlib-9999
+++ b/metadata/md5-cache/media-libs/gmmlib-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/12.1
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=626e12f96ae272d5a41a855bff553e4f
+_md5_=3a566fdb57b7848004667705fb10b981
diff --git a/metadata/md5-cache/media-libs/harfbuzz-4.3.0 b/metadata/md5-cache/media-libs/harfbuzz-4.3.0
index 4f5f3787147c..f9de3cfddcc1 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-4.3.0
+++ b/metadata/md5-cache/media-libs/harfbuzz-4.3.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 INHERIT=flag-o-matic meson-multilib python-any-r1 xdg-utils
 IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +truetype 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1: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=introspection? ( glib )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4.0.0
 SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/4.3.0.tar.gz -> harfbuzz-4.3.0.tar.gz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=698f872b16746d5922a718e576a461eb
+_md5_=91930ca00b41ec4c8f806cc5dc6aeb4f
diff --git a/metadata/md5-cache/media-libs/mesa-21.3.8 b/metadata/md5-cache/media-libs/mesa-21.3.8
deleted file mode 100644
index 9872c0e04f34..000000000000
--- a/metadata/md5-cache/media-libs/mesa-21.3.8
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[X?,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-1.2.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(-)?] gallium? ( unwind? ( sys-libs/libunwind[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? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) ) selinux? ( sys-libs/libselinux[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-1.18.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.107[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=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/libxshmfence-1.1:=[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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:13[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:12[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: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(-)?] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:13[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:12[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: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(-)?] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[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-base/xorg-proto ) !!sys-devel/llvm:0
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=7
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-INHERIT=llvm meson-multilib python-any-r1 linux-info
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_crocus video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +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
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[X?,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-1.2.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(-)?] gallium? ( unwind? ( sys-libs/libunwind[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? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) ) selinux? ( sys-libs/libselinux[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-1.18.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.107[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=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/libxshmfence-1.1:=[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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.107[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:13[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:12[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: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(-)?] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] sys-devel/llvm: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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:13[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:12[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: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(-)?] ) <sys-devel/llvm-14:=[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=d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) osmesa? ( gallium ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_crocus? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-21.3.8.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=de9beb207859f8ccc0d26eafc4605c1c
diff --git a/metadata/md5-cache/media-libs/mesa-22.0.3 b/metadata/md5-cache/media-libs/mesa-22.0.3
deleted file mode 100644
index e63c7e60fc47..000000000000
--- a/metadata/md5-cache/media-libs/mesa-22.0.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[X?,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-1.2.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(-)?] unwind? ( sys-libs/libunwind[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? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.109[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=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/libxshmfence-1.1:=[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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-14:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-14:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-14:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:13[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:12[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-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-14:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-14:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-14:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:13[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:12[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-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[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-base/xorg-proto ) !!sys-devel/llvm:0
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=7
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-INHERIT=llvm meson-multilib python-any-r1 linux-info
-IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +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
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[X?,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-1.2.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(-)?] unwind? ( sys-libs/libunwind[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? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.109[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=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/libxshmfence-1.1:=[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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-14:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-14:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-14:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:13[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:12[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-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-14:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-14:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-14:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:13[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:12[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-14:=[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=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-22.0.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e96505f007ddd0571776cddeee4584ac
diff --git a/metadata/md5-cache/media-libs/mesa-22.0.4 b/metadata/md5-cache/media-libs/mesa-22.0.4
deleted file mode 100644
index 6d7d779b3c69..000000000000
--- a/metadata/md5-cache/media-libs/mesa-22.0.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[X?,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-1.2.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(-)?] unwind? ( sys-libs/libunwind[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? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.109[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=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/libxshmfence-1.1:=[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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-14:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-14:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-14:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:13[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:12[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-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-14:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-14:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-14:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:13[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:12[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-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[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-base/xorg-proto ) !!sys-devel/llvm:0
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=7
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-INHERIT=llvm meson-multilib python-any-r1 linux-info
-IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[X?,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-1.2.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(-)?] unwind? ( sys-libs/libunwind[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? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.109[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=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/libxshmfence-1.1:=[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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-14:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-14:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-14:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:13[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:12[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-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-14:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-14:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-14:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:13[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:12[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-14:=[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=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-22.0.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=524cbdbcb314b69834889a0c1c786e8f
diff --git a/metadata/md5-cache/media-libs/mesa-22.0.5 b/metadata/md5-cache/media-libs/mesa-22.0.5
index 4a0280fdacb2..60058239a5c0 100644
--- a/metadata/md5-cache/media-libs/mesa-22.0.5
+++ b/metadata/md5-cache/media-libs/mesa-22.0.5
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 INHERIT=llvm meson-multilib python-any-r1 linux-info
 IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +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
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[X?,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-1.2.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(-)?] unwind? ( sys-libs/libunwind[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? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.109[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=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/libxshmfence-1.1:=[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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:14[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:13[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:12[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-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:14[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:13[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:12[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-15:=[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=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-22.0.5.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=cadf06a2a82e9253eb396f3188541aa0
+_md5_=0493eee6f23f376bac694d03956cf41a
diff --git a/metadata/md5-cache/media-libs/mesa-22.1.0 b/metadata/md5-cache/media-libs/mesa-22.1.0
deleted file mode 100644
index 0b486a31deb1..000000000000
--- a/metadata/md5-cache/media-libs/mesa-22.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[X?,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-1.2.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(-)?] unwind? ( sys-libs/libunwind[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? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=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/libxshmfence-1.1:=[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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:14[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:13[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:12[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-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:14[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:13[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:12[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-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[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-base/xorg-proto ) !!sys-devel/llvm:0
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=7
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-INHERIT=llvm meson-multilib python-any-r1 linux-info
-IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[X?,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-1.2.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(-)?] unwind? ( sys-libs/libunwind[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? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=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/libxshmfence-1.1:=[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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:14[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:13[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:12[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-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:14[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:13[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:12[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-15:=[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=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-22.1.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8f0589061e604da44c9f2a76c373a6a8
diff --git a/metadata/md5-cache/media-libs/mesa-22.1.1 b/metadata/md5-cache/media-libs/mesa-22.1.1
deleted file mode 100644
index 140485283ac8..000000000000
--- a/metadata/md5-cache/media-libs/mesa-22.1.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[X?,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-1.2.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(-)?] unwind? ( sys-libs/libunwind[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? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=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/libxshmfence-1.1:=[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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:14[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:13[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:12[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-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:14[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:13[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:12[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-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[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-base/xorg-proto ) !!sys-devel/llvm:0
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=8
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-INHERIT=llvm meson-multilib python-any-r1 linux-info
-IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[X?,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-1.2.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(-)?] unwind? ( sys-libs/libunwind[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? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=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/libxshmfence-1.1:=[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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:14[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:13[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:12[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-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:14[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:13[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:12[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-15:=[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=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-22.1.1.tar.xz
-_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1b69bc6d3ed78844cd3428455fe993cb
diff --git a/metadata/md5-cache/media-libs/mesa-amber-21.3.8 b/metadata/md5-cache/media-libs/mesa-amber-21.3.8
deleted file mode 100644
index 425810019d20..000000000000
--- a/metadata/md5-cache/media-libs/mesa-amber-21.3.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=!<=media-libs/mesa-21.3.8 !media-libs/mesa:amber media-libs/mesa[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/expat-2.1.0-r3:=[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/libglvnd-1.3.2[X?,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-1.2.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(-)?] selinux? ( sys-libs/libselinux[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-1.18.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.107[video_cards_nouveau?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) X? ( >=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/libxshmfence-1.1:=[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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[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-base/xorg-proto )
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=7
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-INHERIT=meson-multilib python-any-r1 linux-info
-IUSE=video_cards_r100 video_cards_r200 video_cards_radeon video_cards_i915 video_cards_i965 video_cards_intel video_cards_nouveau cpu_flags_x86_sse2 debug gles1 +gles2 selinux test valgrind wayland +X +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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=!<=media-libs/mesa-21.3.8 !media-libs/mesa:amber media-libs/mesa[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/expat-2.1.0-r3:=[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/libglvnd-1.3.2[X?,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-1.2.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(-)?] selinux? ( sys-libs/libselinux[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-1.18.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.107[video_cards_nouveau?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.107[video_cards_intel] ) X? ( >=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/libxshmfence-1.1:=[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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.107[video_cards_radeon] )
-RESTRICT=!test? ( test )
-SLOT=amber
-SRC_URI=https://archive.mesa3d.org/mesa-21.3.8.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=eca4f3f427ac02cb9226e49c7ad7e6a4
diff --git a/metadata/md5-cache/media-libs/openal-1.22.1 b/metadata/md5-cache/media-libs/openal-1.22.1
new file mode 100644
index 000000000000..5a385023d045
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openal-1.22.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( media-libs/alsa-lib[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(-)?] ) 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(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) 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(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) oss? ( virtual/os-headers )
+DESCRIPTION=A software implementation of the OpenAL 3D audio API
+EAPI=8
+HOMEPAGE=https://www.openal-soft.org/
+INHERIT=cmake-multilib
+IUSE=alsa coreaudio debug jack oss portaudio pulseaudio sdl sndio qt5 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2+ BSD
+RDEPEND=alsa? ( media-libs/alsa-lib[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(-)?] ) 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(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) 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(-)?] ) sndio? ( media-sound/sndio:=[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://www.openal-soft.org/openal-releases/openal-soft-1.22.1.tar.bz2
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d6a01130dd0bf573bd3be808623160e5
diff --git a/metadata/md5-cache/media-libs/sbc-2.0 b/metadata/md5-cache/media-libs/sbc-2.0
new file mode 100644
index 000000000000..37210a87cfa3
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sbc-2.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=Audio codec to connect bluetooth HQ audio devices as headphones or loudspeakers
+EAPI=8
+HOMEPAGE=https://git.kernel.org/?p=bluetooth/sbc.git
+INHERIT=multilib-minimal
+IUSE=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 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/bluetooth/sbc-2.0.tar.xz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b6e74d362fcfa2974d2a1a2eca4b9a97
diff --git a/metadata/md5-cache/media-libs/speex-1.2.1 b/metadata/md5-cache/media-libs/speex-1.2.1
new file mode 100644
index 000000000000..be99a022df86
--- /dev/null
+++ b/metadata/md5-cache/media-libs/speex-1.2.1
@@ -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 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=utils? ( media-libs/libogg:= media-libs/speexdsp[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=Audio compression format designed for speech
+EAPI=8
+HOMEPAGE=https://www.speex.org/
+INHERIT=autotools flag-o-matic multilib-minimal
+IUSE=cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils +vbr 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 ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=utils? ( media-libs/libogg:= media-libs/speexdsp[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://downloads.xiph.org/releases/speex/speex-1.2.1.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=4ee7ba06fe8df304a7703576a83af876
diff --git a/metadata/md5-cache/media-libs/speexdsp-1.2.1 b/metadata/md5-cache/media-libs/speexdsp-1.2.1
new file mode 100644
index 000000000000..b3bdd756344e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/speexdsp-1.2.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Audio compression format designed for speech -- DSP
+EAPI=8
+HOMEPAGE=https://www.speex.org/
+INHERIT=autotools flag-o-matic multilib-minimal
+IUSE=cpu_flags_x86_sse cpu_flags_x86_sse2 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://downloads.xiph.org/releases/speex/speexdsp-1.2.1.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=76ac0cde51b65d2fd13f6cd8b7dc1d84
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index be5b54698d72..d6e98d4b41e8 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/vamp-aubio-plugins-0.5.1-r2 b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r2
new file mode 100644
index 000000000000..40a244bdaece
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=media-libs/aubio media-libs/vamp-plugin-sdk =sci-libs/fftw-3* || ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] >=dev-python/pypy3-7.3.7-r1:0[threads(+)] )
+DESCRIPTION=Onset detection, pitch tracking, note tracking and tempo tracking plugins
+EAPI=7
+HOMEPAGE=https://www.vamp-plugins.org/
+INHERIT=python-any-r1 waf-utils
+KEYWORDS=-* ~amd64 -x86
+LICENSE=GPL-2
+RDEPEND=media-libs/aubio media-libs/vamp-plugin-sdk =sci-libs/fftw-3*
+SLOT=0
+SRC_URI=https://aubio.org/pub/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1.tar.bz2 https://waf.io/waf-2.0.20
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
+_md5_=54948f4366d5218471d5015f2c9f4973
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index a1701e4ae979..a02c6c6cf1ff 100644
Binary files a/metadata/md5-cache/media-radio/Manifest.gz and b/metadata/md5-cache/media-radio/Manifest.gz differ
diff --git a/metadata/md5-cache/media-radio/flrig-1.4.2 b/metadata/md5-cache/media-radio/flrig-1.4.2
deleted file mode 100644
index 2d2b9f95efdf..000000000000
--- a/metadata/md5-cache/media-radio/flrig-1.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext
-DESCRIPTION=Transceiver control program for Amateur Radio use
-EAPI=8
-HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
-SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/flrig-1.4.2.tar.gz
-_md5_=56731c097a09f2d78ca03289d9408273
diff --git a/metadata/md5-cache/media-radio/flrig-1.4.3 b/metadata/md5-cache/media-radio/flrig-1.4.3
deleted file mode 100644
index f4b770b2229a..000000000000
--- a/metadata/md5-cache/media-radio/flrig-1.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext
-DESCRIPTION=Transceiver control program for Amateur Radio use
-EAPI=8
-HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
-SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/flrig-1.4.3.tar.gz
-_md5_=56731c097a09f2d78ca03289d9408273
diff --git a/metadata/md5-cache/media-radio/flrig-1.4.4 b/metadata/md5-cache/media-radio/flrig-1.4.4
deleted file mode 100644
index 61722830471e..000000000000
--- a/metadata/md5-cache/media-radio/flrig-1.4.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext
-DESCRIPTION=Transceiver control program for Amateur Radio use
-EAPI=8
-HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
-SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/flrig-1.4.4.tar.gz
-_md5_=cf9ccd84a683f68505980f614568f9fb
diff --git a/metadata/md5-cache/media-radio/gpredict-2.3 b/metadata/md5-cache/media-radio/gpredict-2.3
deleted file mode 100644
index 95cd3f013c07..000000000000
--- a/metadata/md5-cache/media-radio/gpredict-2.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 x11-libs/goocanvas:2.0 net-misc/curl dev-util/intltool virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=Real-time satellite tracking and orbit prediction application
-EAPI=7
-HOMEPAGE=http://gpredict.oz9aec.net
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 x11-libs/goocanvas:2.0 net-misc/curl
-SLOT=0
-SRC_URI=https://github.com/csete/gpredict/archive/v2.3.tar.gz -> gpredict-2.3.tar.gz
-_md5_=25764701dee03a68cc82fdb2c5092079
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 5663727a7c45..3d4924f85161 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/cadence-0.9.1-r2 b/metadata/md5-cache/media-sound/cadence-0.9.1-r2
deleted file mode 100644
index 209b670eb390..000000000000
--- a/metadata/md5-cache/media-sound/cadence-0.9.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_9(-)] ) media-sound/jack_capture virtual/jack a2jmidid? ( media-sound/a2jmidid[dbus] ) pulseaudio? ( || ( media-sound/pulseaudio-daemon[jack] <media-sound/pulseaudio-15.99.1[daemon(+),jack] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Collection of tools useful for audio production
-EAPI=7
-HOMEPAGE=https://kxstudio.linuxaudio.org/Applications:Cadence
-INHERIT=python-single-r1 xdg desktop
-IUSE=a2jmidid pulseaudio opengl python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_9(-)] ) media-sound/jack_capture virtual/jack a2jmidid? ( media-sound/a2jmidid[dbus] ) pulseaudio? ( || ( media-sound/pulseaudio-daemon[jack] <media-sound/pulseaudio-15.99.1[daemon(+),jack] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/falkTX/Cadence/archive/v0.9.1.tar.gz -> cadence-0.9.1.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=60a421eb4524f610ca8943020d6081e4
diff --git a/metadata/md5-cache/media-sound/cadence-0.9.2 b/metadata/md5-cache/media-sound/cadence-0.9.2
index ea82aa03229f..9d569f8d590c 100644
--- a/metadata/md5-cache/media-sound/cadence-0.9.2
+++ b/metadata/md5-cache/media-sound/cadence-0.9.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://kxstudio.linuxaudio.org/Applications:Cadence
 INHERIT=python-single-r1 xdg desktop
 IUSE=a2jmidid pulseaudio opengl python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_11(-)] ) media-sound/jack_capture virtual/jack a2jmidid? ( media-sound/a2jmidid[dbus] ) pulseaudio? ( || ( media-sound/pulseaudio-daemon[jack] <media-sound/pulseaudio-15.99.1[daemon(+),jack] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/falkTX/Cadence/archive/v0.9.2.tar.gz -> cadence-0.9.2.tar.gz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2a7b6b764eced5e6cf08078a32b4e58a
+_md5_=49a94f17b9e66208c62e1935459df387
diff --git a/metadata/md5-cache/media-sound/denonavr-cli-1 b/metadata/md5-cache/media-sound/denonavr-cli-1
deleted file mode 100644
index 3bdf1c539797..000000000000
--- a/metadata/md5-cache/media-sound/denonavr-cli-1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A simple CLI for Denon AV receivers
-EAPI=8
-HOMEPAGE=https://github.com/mgorny/denonavr-cli/ https://pypi.org/project/denonavr-cli/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/denonavr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/denonavr-cli/archive/v1.tar.gz -> denonavr-cli-1.gh.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8f44b511cea2499521732ca0106abed4
diff --git a/metadata/md5-cache/media-sound/denonavr-cli-3 b/metadata/md5-cache/media-sound/denonavr-cli-3
new file mode 100644
index 000000000000..a06cc790cccd
--- /dev/null
+++ b/metadata/md5-cache/media-sound/denonavr-cli-3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/denonavr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A simple CLI for Denon AV receivers
+EAPI=8
+HOMEPAGE=https://github.com/mgorny/denonavr-cli/ https://pypi.org/project/denonavr-cli/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/denonavr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mgorny/denonavr-cli/archive/v3.tar.gz -> denonavr-cli-3.gh.tar.gz
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b5d7e96c076a425bff925c8e5a8e4818
diff --git a/metadata/md5-cache/media-sound/jalv-1.6.6 b/metadata/md5-cache/media-sound/jalv-1.6.6
index 7896df98740a..815c797821b0 100644
--- a/metadata/md5-cache/media-sound/jalv-1.6.6
+++ b/metadata/md5-cache/media-sound/jalv-1.6.6
@@ -1,9 +1,9 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) virtual/pkgconfig
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install setup
 DEPEND=dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil gtk? ( x11-libs/gtk+:3 ) gtkmm? ( dev-cpp/gtkmm:2.4 ) portaudio? ( media-libs/portaudio ) !portaudio? ( virtual/jack ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 DESCRIPTION=Simple but fully featured LV2 host for Jack
 EAPI=7
-HOMEPAGE=http://drobilla.net/software/jalv/
+HOMEPAGE=https://drobilla.net/software/jalv.html
 INHERIT=python-any-r1 qmake-utils waf-utils
 IUSE=gtk gtkmm portaudio qt5
 KEYWORDS=amd64
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sr
 SLOT=0
 SRC_URI=http://download.drobilla.net/jalv-1.6.6.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
-_md5_=e0b71e9ec98207b99e7e655fc89db03e
+_md5_=2d34763fdbd845cc7d75d9c2febd9aba
diff --git a/metadata/md5-cache/media-sound/lash-0.5.4-r5 b/metadata/md5-cache/media-sound/lash-0.5.4-r5
new file mode 100644
index 000000000000..e4680b50d7d8
--- /dev/null
+++ b/metadata/md5-cache/media-sound/lash-0.5.4-r5
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libxml2 sys-apps/util-linux[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/jack alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) ) || ( sys-libs/readline dev-libs/libedit ) python? ( dev-lang/swig )
+DESCRIPTION=LASH Audio Session Handler
+EAPI=7
+HOMEPAGE=http://www.nongnu.org/lash/
+INHERIT=autotools multilib-minimal python-single-r1
+IUSE=alsa debug gtk python 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 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 sys-apps/util-linux[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/jack alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) ) || ( sys-libs/readline dev-libs/libedit )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=0
+SRC_URI=mirror://nongnu/lash/lash-0.5.4.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=775ab51037ecd19c88e3b89364dd2a06
diff --git a/metadata/md5-cache/media-sound/lilypond-9999 b/metadata/md5-cache/media-sound/lilypond-9999
index ae0d3e3152f9..eb0263e4646c 100644
--- a/metadata/md5-cache/media-sound/lilypond-9999
+++ b/metadata/md5-cache/media-sound/lilypond-9999
@@ -1,16 +1,16 @@
 BDEPEND=dev-texlive/texlive-metapost sys-apps/texinfo sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-text/texi2html ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=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_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) app-text/t1utils dev-lang/perl dev-libs/kpathsea media-gfx/fontforge[png,python] sys-devel/gettext doc? ( dev-texlive/texlive-langcyrillic l10n_cs? ( dev-texlive/texlive-xetex ) l10n_ja? ( dev-texlive/texlive-langjapanese ) l10n_zh? ( dev-texlive/texlive-langchinese ) )
+DEPEND=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_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) app-text/t1utils dev-lang/perl dev-libs/kpathsea media-gfx/fontforge[png,python] sys-devel/gettext doc? ( dev-texlive/texlive-langcyrillic l10n_cs? ( dev-texlive/texlive-xetex ) l10n_ja? ( dev-texlive/texlive-langjapanese ) l10n_zh? ( dev-texlive/texlive-langchinese ) )
 DESCRIPTION=GNU Music Typesetter
 EAPI=7
 HOMEPAGE=http://lilypond.org/
 INHERIT=elisp-common autotools python-single-r1 toolchain-funcs xdg-utils git-r3
-IUSE=debug doc emacs profile vim-syntax 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_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=debug doc emacs profile vim-syntax 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_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=GPL-3 FDL-1.3
 PROPERTIES=live
-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_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+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_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	elisp-common	e7aaa047873789f549ea3df2f04b2145	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=774594d87b90fdbf8c61722f0bc6af4b
+_md5_=e514038bd77ef877538639c70667e813
diff --git a/metadata/md5-cache/media-sound/mixxx-2.3.2 b/metadata/md5-cache/media-sound/mixxx-2.3.2
index 3cb8f6b64f48..215c33cfde4e 100644
--- a/metadata/md5-cache/media-sound/mixxx-2.3.2
+++ b/metadata/md5-cache/media-sound/mixxx-2.3.2
@@ -12,4 +12,4 @@ RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtcore:5 dev-q
 SLOT=0
 SRC_URI=https://github.com/mixxxdj/mixxx/archive/refs/tags/2.3.2.tar.gz -> mixxx-2.3.2.tar.gz l10n_ca? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ca.pdf ) l10n_cs? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-cs.pdf ) l10n_de? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-de.pdf ) l10n_en? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf ) l10n_es? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-es.pdf ) l10n_fi? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fi.pdf ) l10n_fr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fr.pdf ) l10n_gl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-gl.pdf ) l10n_id? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-id.pdf ) l10n_it? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-it.pdf ) l10n_ja? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ja-JP.pdf ) l10n_kn? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-kn.pdf ) l10n_nl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-nl.pdf ) l10n_pl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pl.pdf ) l10n_pt? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pt.pdf ) l10n_ro? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ro.pdf ) l10n_ru? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ru.pdf ) l10n_sl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sl.pdf ) l10n_sq? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sq.pdf ) l10n_sr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sr.pdf ) l10n_tr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-tr.pdf ) l10n_zh-CN? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-CN.pdf ) l10n_zh-TW? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-TW.pdf ) https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=68d533fe4079ec3ddd58b9629b0e11cb
+_md5_=ef9b986d776ec91a11fa5b62e2f3ea7b
diff --git a/metadata/md5-cache/media-sound/mixxx-2.3.3 b/metadata/md5-cache/media-sound/mixxx-2.3.3
new file mode 100644
index 000000000000..b8a4d0d2bd70
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mixxx-2.3.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) ffmpeg? ( media-video/ffmpeg:0= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) wavpack? ( media-sound/wavpack ) dev-qt/qtconcurrent:5
+DESCRIPTION=Advanced Digital DJ tool based on Qt
+EAPI=8
+HOMEPAGE=https://www.mixxx.org/
+INHERIT=cmake xdg udev
+IUSE=aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack l10n_ca l10n_cs l10n_de l10n_en l10n_es l10n_fi l10n_fr l10n_gl l10n_id l10n_it l10n_ja l10n_kn l10n_nl l10n_pl l10n_pt l10n_ro l10n_ru l10n_sl l10n_sq l10n_sr l10n_tr l10n_zh-CN l10n_zh-TW
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) ffmpeg? ( media-video/ffmpeg:0= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) wavpack? ( media-sound/wavpack )
+SLOT=0
+SRC_URI=https://github.com/mixxxdj/mixxx/archive/refs/tags/2.3.3.tar.gz -> mixxx-2.3.3.tar.gz l10n_ca? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ca.pdf ) l10n_cs? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-cs.pdf ) l10n_de? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-de.pdf ) l10n_en? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf ) l10n_es? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-es.pdf ) l10n_fi? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fi.pdf ) l10n_fr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fr.pdf ) l10n_gl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-gl.pdf ) l10n_id? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-id.pdf ) l10n_it? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-it.pdf ) l10n_ja? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ja-JP.pdf ) l10n_kn? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-kn.pdf ) l10n_nl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-nl.pdf ) l10n_pl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pl.pdf ) l10n_pt? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pt.pdf ) l10n_ro? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ro.pdf ) l10n_ru? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ru.pdf ) l10n_sl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sl.pdf ) l10n_sq? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sq.pdf ) l10n_sr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sr.pdf ) l10n_tr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-tr.pdf ) l10n_zh-CN? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-CN.pdf ) l10n_zh-TW? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-TW.pdf ) https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=be7888f221684557508abcbc22082aca
diff --git a/metadata/md5-cache/media-sound/mixxx-2.3.9999 b/metadata/md5-cache/media-sound/mixxx-2.3.9999
index 388715ca4932..704e889cde3b 100644
--- a/metadata/md5-cache/media-sound/mixxx-2.3.9999
+++ b/metadata/md5-cache/media-sound/mixxx-2.3.9999
@@ -1,8 +1,8 @@
 BDEPEND=virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) ffmpeg? ( media-video/ffmpeg:0= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) wavpack? ( media-sound/wavpack ) dev-qt/qtconcurrent:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) ffmpeg? ( media-video/ffmpeg:0= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) wavpack? ( media-sound/wavpack ) dev-qt/qtconcurrent:5
 DESCRIPTION=Advanced Digital DJ tool based on Qt
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.mixxx.org/
 INHERIT=cmake xdg udev git-r3
 IUSE=aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack l10n_ca l10n_cs l10n_de l10n_en l10n_es l10n_fi l10n_fr l10n_gl l10n_id l10n_it l10n_ja l10n_kn l10n_nl l10n_pl l10n_pt l10n_ro l10n_ru l10n_sl l10n_sq l10n_sr l10n_tr l10n_zh-CN l10n_zh-TW
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) ffmpeg? ( media-video/ffmpeg:0= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=l10n_ca? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ca.pdf ) l10n_cs? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-cs.pdf ) l10n_de? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-de.pdf ) l10n_en? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf ) l10n_es? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-es.pdf ) l10n_fi? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fi.pdf ) l10n_fr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-fr.pdf ) l10n_gl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-gl.pdf ) l10n_id? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-id.pdf ) l10n_it? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-it.pdf ) l10n_ja? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ja-JP.pdf ) l10n_kn? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-kn.pdf ) l10n_nl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-nl.pdf ) l10n_pl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pl.pdf ) l10n_pt? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-pt.pdf ) l10n_ro? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ro.pdf ) l10n_ru? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-ru.pdf ) l10n_sl? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sl.pdf ) l10n_sq? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sq.pdf ) l10n_sr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-sr.pdf ) l10n_tr? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-tr.pdf ) l10n_zh-CN? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-CN.pdf ) l10n_zh-TW? ( https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-zh-TW.pdf ) https://downloads.mixxx.org/manual/2.3/mixxx-manual-2.3-en.pdf
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a5cde88c55acdd370540dca51c419c07
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8db46daea021a3c789405ae48862c551
diff --git a/metadata/md5-cache/media-sound/mixxx-9999 b/metadata/md5-cache/media-sound/mixxx-9999
index 1c902d360287..e7773de674e1 100644
--- a/metadata/md5-cache/media-sound/mixxx-9999
+++ b/metadata/md5-cache/media-sound/mixxx-9999
@@ -1,8 +1,8 @@
 BDEPEND=virtual/pkgconfig dev-qt/qttest:5 dev-qt/qtxmlpatterns:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) ffmpeg? ( media-video/ffmpeg:0= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) shout? ( >=media-libs/libshout-2.4.5 ) wavpack? ( media-sound/wavpack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) ffmpeg? ( media-video/ffmpeg:0= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) shout? ( >=media-libs/libshout-2.4.5 ) wavpack? ( media-sound/wavpack )
 DESCRIPTION=Advanced Digital DJ tool based on Qt
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.mixxx.org/
 INHERIT=cmake xdg udev git-r3
 IUSE=aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg media-libs/libsndfile media-libs/libsoundtouch media-libs/libvorbis media-libs/portaudio media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/glu virtual/libusb:1 virtual/opengl virtual/udev x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) ffmpeg? ( media-video/ffmpeg:0= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) qtkeychain? ( dev-libs/qtkeychain ) shout? ( >=media-libs/libshout-2.4.5 ) wavpack? ( media-sound/wavpack )
 SLOT=0
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dfd1d6bef716bff6a820c19e34abf805
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=9f4f3e8f0d5f22d114bf8bc7b9508ddc
diff --git a/metadata/md5-cache/media-sound/patchage-1.0.4 b/metadata/md5-cache/media-sound/patchage-1.0.4
deleted file mode 100644
index d469af915faa..000000000000
--- a/metadata/md5-cache/media-sound/patchage-1.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) dev-libs/boost virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 media-libs/ganv virtual/jack alsa? ( media-libs/alsa-lib ) jack-dbus? ( dev-libs/dbus-glib sys-apps/dbus ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Modular patch bay for JACK-based audio and MIDI systems
-EAPI=7
-HOMEPAGE=http://drobilla.net/software/patchage
-INHERIT=waf-utils python-any-r1 xdg
-IUSE=alsa debug jack-dbus
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 media-libs/ganv virtual/jack alsa? ( media-libs/alsa-lib ) jack-dbus? ( dev-libs/dbus-glib sys-apps/dbus )
-SLOT=0
-SRC_URI=http://download.drobilla.net/patchage-1.0.4.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dc831148844415cbc1fd20fa2fcbd424
diff --git a/metadata/md5-cache/media-sound/teamspeak-server-3.13.7 b/metadata/md5-cache/media-sound/teamspeak-server-3.13.7
new file mode 100644
index 000000000000..457161292d1e
--- /dev/null
+++ b/metadata/md5-cache/media-sound/teamspeak-server-3.13.7
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst unpack
+DESCRIPTION=A server software for hosting quality voice communication via the internet
+EAPI=8
+HOMEPAGE=https://www.teamspeak.com/
+INHERIT=systemd
+IUSE=doc mysql postgres tsdns
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3
+RDEPEND=acct-group/teamspeak acct-user/teamspeak postgres? ( dev-db/postgresql )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://files.teamspeak-services.com/releases/server/3.13.7/teamspeak3-server_linux_amd64-3.13.7.tar.bz2 ) x86? ( https://files.teamspeak-services.com/releases/server/3.13.7/teamspeak3-server_linux_x86-3.13.7.tar.bz2 )
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=4555ecfdd328760cd171612227acdc1c
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 09f1325326d7..1aabe8e6e570 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/openbsd-netcat-1.195-r1 b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
index abbb6781911b..b49337590491 100644
--- a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
+++ b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenBSD network swiss army knife
 EAPI=7
 HOMEPAGE=https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=!elibc_Darwin? ( dev-libs/libbsd ) !net-analyzer/netcat !net-analyzer/netcat6
 SLOT=0
 SRC_URI=http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.195.orig.tar.gz http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.195-2.debian.tar.xz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=511d21e3294fa7dbff93ede81988f97d
+_md5_=0bd0f44861cb2c7980b89e723af3bb3d
diff --git a/metadata/md5-cache/net-analyzer/sslscan-2.0.12 b/metadata/md5-cache/net-analyzer/sslscan-2.0.12
deleted file mode 100644
index 11c455bfce2c..000000000000
--- a/metadata/md5-cache/net-analyzer/sslscan-2.0.12
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Fast SSL configuration scanner
-EAPI=8
-HOMEPAGE=https://github.com/rbsec/sslscan
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rbsec/sslscan/archive/2.0.12.tar.gz -> sslscan-2.0.12.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1m.tar.gz -> sslscan-OpenSSL_1_1_1m.tar.gz
-_md5_=7185adfc07f4e3c74cd1a28e8a7c1512
diff --git a/metadata/md5-cache/net-analyzer/sslscan-2.0.12-r1 b/metadata/md5-cache/net-analyzer/sslscan-2.0.12-r1
deleted file mode 100644
index 4e68f93e6aa3..000000000000
--- a/metadata/md5-cache/net-analyzer/sslscan-2.0.12-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Fast SSL configuration scanner
-EAPI=8
-HOMEPAGE=https://github.com/rbsec/sslscan
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rbsec/sslscan/archive/2.0.12.tar.gz -> sslscan-2.0.12.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1n.tar.gz -> sslscan-OpenSSL_1_1_1n.tar.gz
-_md5_=4393212b8607cec4da184c93c18b6c3e
diff --git a/metadata/md5-cache/net-analyzer/sslscan-2.0.13 b/metadata/md5-cache/net-analyzer/sslscan-2.0.13
deleted file mode 100644
index 3e286709ad92..000000000000
--- a/metadata/md5-cache/net-analyzer/sslscan-2.0.13
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Fast SSL configuration scanner
-EAPI=8
-HOMEPAGE=https://github.com/rbsec/sslscan
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rbsec/sslscan/archive/2.0.13.tar.gz -> sslscan-2.0.13.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1n.tar.gz -> sslscan-OpenSSL_1_1_1n.tar.gz
-_md5_=4393212b8607cec4da184c93c18b6c3e
diff --git a/metadata/md5-cache/net-analyzer/sslscan-2.0.13-r1 b/metadata/md5-cache/net-analyzer/sslscan-2.0.13-r1
index 055e71380095..6c17e4ff6d7d 100644
--- a/metadata/md5-cache/net-analyzer/sslscan-2.0.13-r1
+++ b/metadata/md5-cache/net-analyzer/sslscan-2.0.13-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Fast SSL configuration scanner
 EAPI=8
 HOMEPAGE=https://github.com/rbsec/sslscan
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rbsec/sslscan/archive/2.0.13.tar.gz -> sslscan-2.0.13.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1n.tar.gz -> sslscan-OpenSSL_1_1_1n.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8c8c8b2f96dee88757849b3b2364b849
+_md5_=7ed8c7c691d0ccb11a5a3a4ef68369b9
diff --git a/metadata/md5-cache/net-analyzer/sslscan-2.0.14 b/metadata/md5-cache/net-analyzer/sslscan-2.0.14
new file mode 100644
index 000000000000..30ddfdc6cc40
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sslscan-2.0.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Fast SSL configuration scanner
+EAPI=8
+HOMEPAGE=https://github.com/rbsec/sslscan
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rbsec/sslscan/archive/2.0.14.tar.gz -> sslscan-2.0.14.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1o.tar.gz -> sslscan-OpenSSL_1_1_1o.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=8e2ec05f96b42966167530dad1e45a6a
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 2297c4cabe4e..4b0aec0c430a 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.2 b/metadata/md5-cache/net-dns/dnsdist-1.7.2
new file mode 100644
index 000000000000..e569820c3e0f
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnsdist-1.7.2
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup
+DEPEND=acct-group/dnsdist acct-user/dnsdist >=dev-libs/boost-1.35:= dev-libs/libedit:= >=dev-libs/protobuf-3:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) 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 ) net-libs/nghttp2
+DESCRIPTION=A highly DNS-, DoS- and abuse-aware loadbalancer
+EAPI=7
+HOMEPAGE=https://dnsdist.org
+INHERIT=flag-o-matic lua-single
+IUSE=dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/dnsdist acct-user/dnsdist >=dev-libs/boost-1.35:= dev-libs/libedit:= >=dev-libs/protobuf-3:= dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) regex? ( dev-libs/re2:= ) snmp? ( net-analyzer/net-snmp:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) systemd? ( sys-apps/systemd:0= ) 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 ) net-libs/nghttp2
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) dnscrypt? ( ssl ) gnutls? ( ssl ) doh? ( ssl !gnutls )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.7.2.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=a764fb81748691c6b67d6502deec6b7c
diff --git a/metadata/md5-cache/net-dns/s6-dns-2.3.5.3 b/metadata/md5-cache/net-dns/s6-dns-2.3.5.3-r1
similarity index 76%
rename from metadata/md5-cache/net-dns/s6-dns-2.3.5.3
rename to metadata/md5-cache/net-dns/s6-dns-2.3.5.3-r1
index ef7dc575f185..79db7849d9f5 100644
--- a/metadata/md5-cache/net-dns/s6-dns-2.3.5.3
+++ b/metadata/md5-cache/net-dns/s6-dns-2.3.5.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/skalibs-2.11.1.0:=[static-libs?]
+DEPEND==dev-libs/skalibs-2.11*:=[static-libs?]
 DESCRIPTION=Suite of DNS client programs and libraries for Unix systems
 EAPI=8
 HOMEPAGE=https://www.skarnet.org/software/s6-dns/
@@ -7,9 +7,9 @@ INHERIT=toolchain-funcs
 IUSE=static static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=>=dev-libs/skalibs-2.11.1.0:=[static-libs?]
+RDEPEND==dev-libs/skalibs-2.11*:=[static-libs?]
 REQUIRED_USE=static? ( static-libs )
 SLOT=0/2.3
 SRC_URI=https://www.skarnet.org/software/s6-dns/s6-dns-2.3.5.3.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f023f2c53cb0e1c0fef1c4d5b0e9d43f
+_md5_=8e5f86b0fb8a1f023aedea11e4984559
diff --git a/metadata/md5-cache/net-dns/s6-dns-2.3.5.4 b/metadata/md5-cache/net-dns/s6-dns-2.3.5.4
new file mode 100644
index 000000000000..51bc2ff46ae2
--- /dev/null
+++ b/metadata/md5-cache/net-dns/s6-dns-2.3.5.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/skalibs-2.12.0.0:=
+DESCRIPTION=Suite of DNS client programs and libraries for Unix systems
+EAPI=8
+HOMEPAGE=https://www.skarnet.org/software/s6-dns/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-libs/skalibs-2.12.0.0:=
+SLOT=0/2.3
+SRC_URI=https://www.skarnet.org/software/s6-dns/s6-dns-2.3.5.4.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6c97e96de9d0c548eb787ac27a245a69
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index cac58dd64b09..f202da22e498 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/cifs-utils-6.15 b/metadata/md5-cache/net-fs/cifs-utils-6.15
new file mode 100644
index 000000000000..115df148b5d7
--- /dev/null
+++ b/metadata/md5-cache/net-fs/cifs-utils-6.15
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/docutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=sys-apps/keyutils:= ads? ( sys-libs/talloc virtual/krb5 ) caps? ( sys-libs/libcap-ng ) pam? ( sys-libs/pam ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) )
+DESCRIPTION=Tools for Managing Linux CIFS Client Filesystems
+EAPI=8
+HOMEPAGE=https://wiki.samba.org/index.php/LinuxCIFS_utils
+INHERIT=autotools bash-completion-r1 linux-info pam python-single-r1
+IUSE=+acl +ads +caps creds pam +python systemd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=GPL-3
+PDEPEND=acl? ( >=net-fs/samba-4.0.0_alpha1 )
+RDEPEND=sys-apps/keyutils:= ads? ( sys-libs/talloc virtual/krb5 ) caps? ( sys-libs/libcap-ng ) pam? ( sys-libs/pam ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) )
+REQUIRED_USE=acl? ( ads ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=0
+SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.15.tar.bz2
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6e4120ff541fc4c530ba7f21cff9bf70
diff --git a/metadata/md5-cache/net-fs/samba-4.14.13 b/metadata/md5-cache/net-fs/samba-4.14.13
index a753807f3d50..aa33d75bd643 100644
--- a/metadata/md5-cache/net-fs/samba-4.14.13
+++ b/metadata/md5-cache/net-fs/samba-4.14.13
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://samba.org/
 INHERIT=python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
 IUSE=acl addc addns ads ceph client cluster cups debug fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 RDEPEND=>=app-arch/libarchive-3.1.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(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[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/libtasn1[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/popt[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-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] net-libs/libnsl:=[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-fs/e2fsprogs-1.46.4-r51[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/ldb-2.3.3[ldap(+)?,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/ldb-2.4.0[ldap(+)?,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/libcap[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/liburing:=[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:0= sys-libs/readline:0= >=sys-libs/talloc-2.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(-)?] >=sys-libs/tdb-1.4.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(-)?] >=sys-libs/tevent-0.10.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-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(-)?] virtual/libcrypt:=[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 python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[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? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),xml(+)] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.14.13.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d17508e7255b1ab4afa038e475023a04
+_md5_=5589e719053dbf928d947ea7527c71a8
diff --git a/metadata/md5-cache/net-fs/samba-4.15.7 b/metadata/md5-cache/net-fs/samba-4.15.7
index aa3a32735b63..26d9310b1a7f 100644
--- a/metadata/md5-cache/net-fs/samba-4.15.7
+++ b/metadata/md5-cache/net-fs/samba-4.15.7
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://samba.org/
 INHERIT=python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
 IUSE=acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 RDEPEND=>=app-arch/libarchive-3.1.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(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[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/libtasn1[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/popt[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-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[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/ldb-2.4.2[ldap(+)?,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/ldb-2.5.0[ldap(+)?,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/libcap[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/liburing:=[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:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.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(-)?] >=sys-libs/tdb-1.4.4[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/tevent-0.11.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(-)?] virtual/libcrypt:=[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 python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[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? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),xml(+)] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) addc? ( python json winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.15.7.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4dcf972279c689e54a707801edce60bd
+_md5_=e42e6314197bfeb9978466a89ecd2a0a
diff --git a/metadata/md5-cache/net-fs/samba-4.16.1 b/metadata/md5-cache/net-fs/samba-4.16.1
index ec14030a496a..e887d4c1be0e 100644
--- a/metadata/md5-cache/net-fs/samba-4.16.1
+++ b/metadata/md5-cache/net-fs/samba-4.16.1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.16.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e6610f021c2b1e87aeaaf116c702ee77
+_md5_=42a1efdf22cc4b40f778e609fc6efe57
diff --git a/metadata/md5-cache/net-fs/samba-4.16.2 b/metadata/md5-cache/net-fs/samba-4.16.2
new file mode 100644
index 000000000000..b1d17b9de992
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.16.2
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),xml(+)] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.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(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[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/libtasn1[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/popt[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-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[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/ldb-2.5.1[ldap(+)?,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/ldb-2.6.0[ldap(+)?,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/libcap[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/liburing:=[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:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.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(-)?] >=sys-libs/tdb-1.4.6[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/tevent-0.11.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(-)?] virtual/libcrypt:=[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 python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[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? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.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(-)?] dev-perl/JSON net-libs/libtirpc[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-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) spotlight? ( dev-libs/glib ) test? ( python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_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(-)?] ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),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_10? ( dev-python/subunit[python_targets_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(-)?] ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) )
+DESCRIPTION=Samba Suite Version 4
+EAPI=7
+HOMEPAGE=https://samba.org/
+INHERIT=python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+IUSE=acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.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(-)?] dev-lang/perl:= dev-libs/icu:=[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/libbsd[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/libtasn1[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/popt[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-perl/Parse-Yapp >=net-libs/gnutls-3.4.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(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[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/ldb-2.5.1[ldap(+)?,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/ldb-2.6.0[ldap(+)?,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/libcap[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/liburing:=[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:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.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(-)?] >=sys-libs/tdb-1.4.6[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/tevent-0.11.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(-)?] virtual/libcrypt:=[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 python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ads? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[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? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),xml(+)] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) addc? ( python json winbind ) ads? ( acl ldap python winbind ) cluster? ( ads ) gpg? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.16.2.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=74a50c93114f883c2e08f5be44234f25
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 3a37e0c63f92..5d825bd7a7f5 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/ftp-0.17.34.0.2.5.1 b/metadata/md5-cache/net-ftp/ftp-0.17.34.0.2.5.1
index 0d5cc8626fa2..733e68f90012 100644
--- a/metadata/md5-cache/net-ftp/ftp-0.17.34.0.2.5.1
+++ b/metadata/md5-cache/net-ftp/ftp-0.17.34.0.2.5.1
@@ -1,15 +1,15 @@
 BDEPEND=sys-apps/grep
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2:= readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= )
+DEPEND=>=sys-libs/ncurses-5.2:= elibc_musl? ( sys-libs/obstack-standalone ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= )
 DESCRIPTION=Standard Linux FTP client
 EAPI=7
 HOMEPAGE=http://www.hcs.harvard.edu/~dholland/computers/netkit.html
-INHERIT=flag-o-matic toolchain-funcs
+INHERIT=edo flag-o-matic toolchain-funcs
 IUSE=ipv6 readline ssl
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.2:= readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= )
+RDEPEND=>=sys-libs/ncurses-5.2:= elibc_musl? ( sys-libs/obstack-standalone ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= )
 SLOT=0
 SRC_URI=ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/netkit-ftp-0.17.tar.gz mirror://debian/pool/main/n/netkit-ftp-ssl/netkit-ftp-ssl_0.17.34+0.2-5.1.debian.tar.xz https://dev.gentoo.org/~sam/distfiles/net-ftp/ftp/netkit-ftp-0.17-patches-3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a924aaa992424a69badb0bf20515a204
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=f6919b219a0f7edbb65e4a854feea9da
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 14ec6f725218..cf7412890033 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/purple-events-0.99.1 b/metadata/md5-cache/net-im/purple-events-0.99.1
index beb5eff1ad2a..89c595b49862 100644
--- a/metadata/md5-cache/net-im/purple-events-0.99.1
+++ b/metadata/md5-cache/net-im/purple-events-0.99.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=install prepare
 DEPEND=net-im/pidgin
 DESCRIPTION=Allows a fine-grained control over libpurple events
 EAPI=7
-HOMEPAGE=http://purple-events.sardemff7.net/
+HOMEPAGE=https://github.com/sardemff7/purple-events
 INHERIT=autotools
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ RDEPEND=net-im/pidgin
 SLOT=0
 SRC_URI=https://github.com/sardemff7/purple-events/archive/v0.99.1.tar.gz -> purple-events-0.99.1.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=75b075d88fc3d2a8e88582b48f15da69
+_md5_=10ae060a9d3937238d67fcf0b9887656
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index f6d91d407844..188f9eebe2df 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/irssi-xmpp-0.54 b/metadata/md5-cache/net-irc/irssi-xmpp-0.54
index b0a3c31139a9..be55a3791fa2 100644
--- a/metadata/md5-cache/net-irc/irssi-xmpp-0.54
+++ b/metadata/md5-cache/net-irc/irssi-xmpp-0.54
@@ -1,9 +1,9 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
 DEPEND=net-irc/irssi net-libs/loudmouth
-DESCRIPTION=An irssi plugin providing Jabber/XMPP support
+DESCRIPTION=Irssi plugin providing Jabber/XMPP support
 EAPI=7
-HOMEPAGE=https://cybione.org/~irssi-xmpp/
+HOMEPAGE=https://github.com/cdidier/irssi-xmpp
 INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=net-irc/irssi net-libs/loudmouth
 SLOT=0
 SRC_URI=https://github.com/cdidier/irssi-xmpp/archive/v0.54.tar.gz -> irssi-xmpp-0.54.tar.gz https://dev.gentoo.org/~sam/distfiles/net-irc/irssi-xmpp/irssi-xmpp-0.54-musl-build.patch
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=54b3336d8d2bfb1be0c20191272dc4d1
+_md5_=5c1c09d21bd6898e1e1f420b1176ecc2
diff --git a/metadata/md5-cache/net-irc/irssi-xmpp-0.54-r1 b/metadata/md5-cache/net-irc/irssi-xmpp-0.54-r1
index 2d8e089430c2..81e36cfe0b85 100644
--- a/metadata/md5-cache/net-irc/irssi-xmpp-0.54-r1
+++ b/metadata/md5-cache/net-irc/irssi-xmpp-0.54-r1
@@ -1,9 +1,9 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
 DEPEND=net-irc/irssi net-libs/loudmouth
-DESCRIPTION=An irssi plugin providing Jabber/XMPP support
+DESCRIPTION=Irssi plugin providing Jabber/XMPP support
 EAPI=8
-HOMEPAGE=https://cybione.org/~irssi-xmpp/
+HOMEPAGE=https://github.com/cdidier/irssi-xmpp
 INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=net-irc/irssi net-libs/loudmouth
 SLOT=0
 SRC_URI=https://github.com/cdidier/irssi-xmpp/archive/v0.54.tar.gz -> irssi-xmpp-0.54.tar.gz https://dev.gentoo.org/~sam/distfiles/net-irc/irssi-xmpp/irssi-xmpp-0.54-musl-build.patch https://dev.gentoo.org/~sam/distfiles/net-irc/irssi-xmpp/irssi-xmpp-0.54-irssi.patch.xz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6f8076687fff822cea71aa6aa751b27e
+_md5_=779fffb71b1a8ed2d0b7c4bb376dad1b
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index d830abe8a55e..f97403923cc1 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/libqmi-1.30.8 b/metadata/md5-cache/net-libs/libqmi-1.30.8
new file mode 100644
index 000000000000..bb812fda2d1f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libqmi-1.30.8
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc )
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2.56 >=dev-libs/libgudev-232 mbim? ( >=net-libs/libmbim-1.18.0 ) qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= )
+DESCRIPTION=Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi
+IUSE=gtk-doc +mbim +qrtr
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.56 >=dev-libs/libgudev-232 mbim? ( >=net-libs/libmbim-1.18.0 ) qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= )
+SLOT=0/5.8
+SRC_URI=https://www.freedesktop.org/software/libqmi/libqmi-1.30.8.tar.xz
+_md5_=943a3126ec8d421f496ab5403f0ba6b7
diff --git a/metadata/md5-cache/net-libs/libqmi-9999 b/metadata/md5-cache/net-libs/libqmi-9999
index 914fdabda5d1..5f703e57bf8c 100644
--- a/metadata/md5-cache/net-libs/libqmi-9999
+++ b/metadata/md5-cache/net-libs/libqmi-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) dev-util/gtk-doc >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=dev-libs/glib-2.56 >=dev-libs/libgudev-232 mbim? ( >=net-libs/libmbim-1.18.0 )
+DEPEND=>=dev-libs/glib-2.56 >=dev-libs/libgudev-232 mbim? ( >=net-libs/libmbim-1.18.0 ) qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= )
 DESCRIPTION=Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi
 INHERIT=git-r3 autotools
-IUSE=gtk-doc +mbim
+IUSE=gtk-doc +mbim +qrtr
 LICENSE=LGPL-2
 PROPERTIES=live
-RDEPEND=>=dev-libs/glib-2.56 >=dev-libs/libgudev-232 mbim? ( >=net-libs/libmbim-1.18.0 )
+RDEPEND=>=dev-libs/glib-2.56 >=dev-libs/libgudev-232 mbim? ( >=net-libs/libmbim-1.18.0 ) qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= )
 SLOT=0/5.8
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=73cf44ccfdb0ade688249cc86016ed12
+_md5_=943a3126ec8d421f496ab5403f0ba6b7
diff --git a/metadata/md5-cache/net-libs/libqrtr-glib-1.2.2 b/metadata/md5-cache/net-libs/libqrtr-glib-1.2.2
index 3240060a813a..751b410bcf9a 100644
--- a/metadata/md5-cache/net-libs/libqrtr-glib-1.2.2
+++ b/metadata/md5-cache/net-libs/libqrtr-glib-1.2.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib
 INHERIT=meson
 IUSE=gtk-doc
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.56:2 dev-libs/gobject-introspection
 SLOT=0/0
 SRC_URI=https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/archive/1.2.2/libqrtr-glib-1.2.2.tar.bz2
 _eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8c27fe0d4e9e22756b038073dc09d803
+_md5_=784fb91be3c34c57a0ccf3a186345668
diff --git a/metadata/md5-cache/net-libs/libyang-2.0.194 b/metadata/md5-cache/net-libs/libyang-2.0.194
index 2679d8ea43f7..1af3c68e59cd 100644
--- a/metadata/md5-cache/net-libs/libyang-2.0.194
+++ b/metadata/md5-cache/net-libs/libyang-2.0.194
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/CESNET/libyang
 INHERIT=cmake-multilib
 IUSE=doc 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=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/libpcre2[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
 SRC_URI=https://github.com/CESNET/libyang/archive/v2.0.194.tar.gz -> libyang-2.0.194.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d3b2ed4e3ae2f6fa5f6883c11fd7ca51
+_md5_=4317ff26cfe4950c8fa2aad1ceb3a694
diff --git a/metadata/md5-cache/net-libs/net6-1.3.14-r2 b/metadata/md5-cache/net-libs/net6-1.3.14-r2
index 6f799541a778..d8ee7f0fa8bf 100644
--- a/metadata/md5-cache/net-libs/net6-1.3.14-r2
+++ b/metadata/md5-cache/net-libs/net6-1.3.14-r2
@@ -3,13 +3,13 @@ DEFINED_PHASES=configure install
 DEPEND=dev-libs/libsigc++:2 >=net-libs/gnutls-1.2.10:=
 DESCRIPTION=Network access framework for IPv4/IPv6 written in C++
 EAPI=7
-HOMEPAGE=http://gobby.0x539.de/
+HOMEPAGE=https://gobby.github.io/
 INHERIT=flag-o-matic
 IUSE=nls
 KEYWORDS=amd64 ~arm ~hppa ppc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libsigc++:2 >=net-libs/gnutls-1.2.10:=
 SLOT=0
-SRC_URI=http://releases.0x539.de/net6/net6-1.3.14.tar.gz
+SRC_URI=https://github.com/gobby/net6/releases/download/v1.3.14/net6-1.3.14.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fe747934aa846228b1dfbae7eec9339b
+_md5_=8d339dcf2d56e0ef7ae6c95936bf8d6a
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.47.0 b/metadata/md5-cache/net-libs/nghttp2-1.47.0
index 9b396371af5d..f58f81249a93 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.47.0
+++ b/metadata/md5-cache/net-libs/nghttp2-1.47.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://nghttp2.org/
 INHERIT=multilib-minimal
 IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml 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 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),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/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),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/libev-4.15[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-1.2.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(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7: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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/1.14
 SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.47.0/nghttp2-1.47.0.tar.xz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7995b000dd3b8caf0cca9c8347c2ac7d
+_md5_=ba8c6b2dc0a7d72ed86900035562f7d1
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.46.0 b/metadata/md5-cache/net-libs/nghttp2-1.48.0
similarity index 93%
rename from metadata/md5-cache/net-libs/nghttp2-1.46.0
rename to metadata/md5-cache/net-libs/nghttp2-1.48.0
index c70dd2e35f1a..99b048d8ae0e 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.46.0
+++ b/metadata/md5-cache/net-libs/nghttp2-1.48.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://nghttp2.org/
 INHERIT=multilib-minimal
 IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=cxx? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),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/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads(+)] ) hpack-tools? ( >=dev-libs/jansson-2.5:= ) jemalloc? ( dev-libs/jemalloc:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-),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/libev-4.15[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-1.2.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(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.7: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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/1.14
-SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.46.0/nghttp2-1.46.0.tar.xz
+SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.48.0/nghttp2-1.48.0.tar.xz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=26e0d362ec7e4ddb36be618526bf399c
+_md5_=7995b000dd3b8caf0cca9c8347c2ac7d
diff --git a/metadata/md5-cache/net-libs/ppp-defs-0 b/metadata/md5-cache/net-libs/ppp-defs-0
new file mode 100644
index 000000000000..bbbd12456b3f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/ppp-defs-0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Shim header for net/ppp_defs.h on musl
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Musl
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv x86
+LICENSE=public-domain
+RDEPEND=!sys-libs/glibc
+SLOT=0
+_md5_=6f3999817bdcae1e734df3ca61b3ffbe
diff --git a/metadata/md5-cache/net-libs/rest-0.8.1 b/metadata/md5-cache/net-libs/rest-0.8.1-r1
similarity index 50%
rename from metadata/md5-cache/net-libs/rest-0.8.1
rename to metadata/md5-cache/net-libs/rest-0.8.1-r1
index 330c9a2d18d3..5dc4ef43e7a1 100644
--- a/metadata/md5-cache/net-libs/rest-0.8.1
+++ b/metadata/md5-cache/net-libs/rest-0.8.1-r1
@@ -1,15 +1,16 @@
+BDEPEND=dev-util/glib-utils >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.40 virtual/pkgconfig test? ( 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(-)?] ) >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-misc/ca-certificates >=dev-libs/glib-2.24: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(-)?] 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(-)?] net-libs/libsoup:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.40 virtual/pkgconfig test? ( 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(-)?] ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEPEND=app-misc/ca-certificates >=dev-libs/glib-2.24: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(-)?] 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(-)?] net-libs/libsoup:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 DESCRIPTION=Helper library for RESTful services
-EAPI=6
+EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/Librest
 INHERIT=gnome2 multilib-minimal virtualx
 IUSE=+introspection 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 test
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-misc/ca-certificates >=dev-libs/glib-2.24: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(-)?] 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(-)?] net-libs/libsoup:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.7
 SRC_URI=mirror://gnome/sources/rest/0.8/rest-0.8.1.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f0380eb4b40df23da8480c87f558bce5
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=81d1463e072338b27d327a0259d0f237
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index a5032ec56468..712e9ce0ad83 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/dbmail-3.2.3-r5 b/metadata/md5-cache/net-mail/dbmail-3.2.3-r5
index 4cb9035b873a..4cb2aa84a9c1 100644
--- a/metadata/md5-cache/net-mail/dbmail-3.2.3-r5
+++ b/metadata/md5-cache/net-mail/dbmail-3.2.3-r5
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/dbmail acct-user/dbmail app-text/asciidoc app-crypt/mhash app-text/xmlto dev-db/libzdb >=dev-libs/glib-2.16 dev-libs/gmime:2.6 dev-libs/libevent:= sys-libs/zlib virtual/libcrypt:= ldap? ( >=net-nds/openldap-2.3.33:= ) sieve? ( >=mail-filter/libsieve-2.2.1 ) ssl? ( dev-libs/openssl:= )
+DEPEND=acct-group/dbmail acct-user/dbmail app-text/asciidoc app-crypt/mhash app-text/xmlto dev-db/libzdb >=dev-libs/glib-2.16 dev-libs/gmime:2.6 dev-libs/libevent:= sys-libs/zlib virtual/libcrypt:= ldap? ( >=net-nds/openldap-2.3.33:= ) sieve? ( >=mail-filter/libsieve-2.2.1 ) ssl? ( dev-libs/openssl:= ) elibc_musl? ( sys-libs/queue-standalone )
 DESCRIPTION=Fast and scalable sql based email services
 EAPI=7
 HOMEPAGE=https://www.dbmail.org/
@@ -12,4 +12,4 @@ RDEPEND=acct-group/dbmail acct-user/dbmail app-text/asciidoc app-crypt/mhash app
 SLOT=0
 SRC_URI=https://github.com/dbmail/dbmail/archive/v3.2.3.tar.gz -> dbmail-3.2.3.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4bb75b81b68cfa314a66e18bc8928227
+_md5_=cf796e66ee5add4376036d1f136c33c6
diff --git a/metadata/md5-cache/net-mail/dbmail-3.2.5-r2 b/metadata/md5-cache/net-mail/dbmail-3.2.5-r2
index a79bcad28c86..7848f5ba822b 100644
--- a/metadata/md5-cache/net-mail/dbmail-3.2.5-r2
+++ b/metadata/md5-cache/net-mail/dbmail-3.2.5-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-db/libzdb sieve? ( >=mail-filter/libsieve-2.2.1 ) ldap? ( >=net-nds/openldap-2.3.33:= ) jemalloc? ( dev-libs/jemalloc:= ) app-text/asciidoc app-text/xmlto app-crypt/mhash sys-libs/zlib dev-libs/gmime:2.6 >=dev-libs/glib-2.16 dev-libs/libevent:= virtual/libcrypt:= ssl? ( dev-libs/openssl:= )
+DEPEND=dev-db/libzdb sieve? ( >=mail-filter/libsieve-2.2.1 ) ldap? ( >=net-nds/openldap-2.3.33:= ) jemalloc? ( dev-libs/jemalloc:= ) elibc_musl? ( sys-libs/queue-standalone ) app-text/asciidoc app-text/xmlto app-crypt/mhash sys-libs/zlib dev-libs/gmime:2.6 >=dev-libs/glib-2.16 dev-libs/libevent:= virtual/libcrypt:= ssl? ( dev-libs/openssl:= ) elibc_musl? ( sys-libs/queue-standalone )
 DESCRIPTION=Fast and scalable sql based email services
 EAPI=7
 HOMEPAGE=https://www.dbmail.org/
@@ -8,8 +8,8 @@ INHERIT=systemd readme.gentoo-r1
 IUSE=+doc jemalloc ldap sieve ssl static systemd
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-db/libzdb sieve? ( >=mail-filter/libsieve-2.2.1 ) ldap? ( >=net-nds/openldap-2.3.33:= ) jemalloc? ( dev-libs/jemalloc:= ) app-text/asciidoc app-text/xmlto app-crypt/mhash sys-libs/zlib dev-libs/gmime:2.6 >=dev-libs/glib-2.16 dev-libs/libevent:= virtual/libcrypt:= ssl? ( dev-libs/openssl:= ) acct-group/dbmail acct-user/dbmail
+RDEPEND=dev-db/libzdb sieve? ( >=mail-filter/libsieve-2.2.1 ) ldap? ( >=net-nds/openldap-2.3.33:= ) jemalloc? ( dev-libs/jemalloc:= ) elibc_musl? ( sys-libs/queue-standalone ) app-text/asciidoc app-text/xmlto app-crypt/mhash sys-libs/zlib dev-libs/gmime:2.6 >=dev-libs/glib-2.16 dev-libs/libevent:= virtual/libcrypt:= ssl? ( dev-libs/openssl:= ) acct-group/dbmail acct-user/dbmail
 SLOT=0
 SRC_URI=https://github.com/dbmail/dbmail/archive/v3.2.5.tar.gz -> dbmail-3.2.5.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=003c131901c90dcd7be7bf754a963920
+_md5_=1996700a29c0f53061ec9e59a89aa6c5
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 141ad574668c..10756fb8fd53 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/axel-2.17.8 b/metadata/md5-cache/net-misc/axel-2.17.11
similarity index 73%
rename from metadata/md5-cache/net-misc/axel-2.17.8
rename to metadata/md5-cache/net-misc/axel-2.17.11
index 42e5577c0e93..7cdac94eae36 100644
--- a/metadata/md5-cache/net-misc/axel-2.17.8
+++ b/metadata/md5-cache/net-misc/axel-2.17.11
@@ -4,9 +4,9 @@ DESCRIPTION=Light Unix download accelerator
 EAPI=7
 HOMEPAGE=https://github.com/axel-download-accelerator/axel
 IUSE=debug nls ssl
-KEYWORDS=amd64 ~hppa ppc ppc64 sparc x86
+KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0= ) nls? ( virtual/libintl virtual/libiconv )
 SLOT=0
-SRC_URI=https://github.com/axel-download-accelerator/axel/releases/download/v2.17.8/axel-2.17.8.tar.xz
-_md5_=21e982bef22df4a701aa0cc3b0abc850
+SRC_URI=https://github.com/axel-download-accelerator/axel/releases/download/v2.17.11/axel-2.17.11.tar.xz
+_md5_=d9394e1a94d0a9401ebebcf514076586
diff --git a/metadata/md5-cache/net-misc/axel-2.17.9 b/metadata/md5-cache/net-misc/axel-2.17.9
deleted file mode 100644
index c1c513210079..000000000000
--- a/metadata/md5-cache/net-misc/axel-2.17.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure postinst
-DEPEND=ssl? ( dev-libs/openssl:0= ) nls? ( sys-devel/gettext )
-DESCRIPTION=Light Unix download accelerator
-EAPI=7
-HOMEPAGE=https://github.com/axel-download-accelerator/axel
-IUSE=debug nls ssl
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl:0= ) nls? ( virtual/libintl virtual/libiconv )
-SLOT=0
-SRC_URI=https://github.com/axel-download-accelerator/axel/releases/download/v2.17.9/axel-2.17.9.tar.xz
-_md5_=673efa2c12bd39a1b5e795e43db52d96
diff --git a/metadata/md5-cache/net-misc/dropbox-151.4.4304 b/metadata/md5-cache/net-misc/dropbox-151.4.4304
new file mode 100644
index 000000000000..92284737a4f9
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbox-151.4.4304
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/patchelf virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
+EAPI=7
+HOMEPAGE=https://www.dropbox.com/
+INHERIT=desktop pax-utils systemd xdg
+IUSE=selinux X
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
+RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libxcb
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-151.4.4304.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-151.4.4304.tar.gz ) https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ee732e48347e53dbbd1fe14a25fb7a9e
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.36.4 b/metadata/md5-cache/net-misc/networkmanager-1.36.4
index d4df4db207a6..afa2a36bdde7 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.36.4
+++ b/metadata/md5-cache/net-misc/networkmanager-1.36.4
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] dev-lang/vala:0.54[vapigen(+)] dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] ) ) test? ( >=dev-libs/jansson-2.7 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[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-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[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-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
 DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.36/NetworkManager-1.36.4.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=894d769c8b863c8f54d66d9012dee1f1
+_md5_=882eaf6ab5c05a037d00402bdec46425
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.38.0 b/metadata/md5-cache/net-misc/networkmanager-1.38.0
index faece2d72cdb..98b42d8816fc 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.38.0
+++ b/metadata/md5-cache/net-misc/networkmanager-1.38.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] dev-lang/vala:0.54[vapigen(+)] dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] ) ) test? ( >=dev-libs/jansson-2.7 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[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-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[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-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
 DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.38/NetworkManager-1.38.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=ed3646b7f49c0f54e9e6a20d6c11f7b8
+_md5_=028a3c71baf54be69432e8bae62f8830
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.38.2 b/metadata/md5-cache/net-misc/networkmanager-1.38.2
index 049ef2d0a837..2487948e5400 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.38.2
+++ b/metadata/md5-cache/net-misc/networkmanager-1.38.2
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) ) test? ( >=dev-libs/jansson-2.7 || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[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-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[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-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
 DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.38/NetworkManager-1.38.2.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=84efb386d1076e2fa87858e23654470d
+_md5_=2b70b56be49893362e115734594770a3
diff --git a/metadata/md5-cache/net-misc/openssh-9.0_p1-r2 b/metadata/md5-cache/net-misc/openssh-9.0_p1-r2
new file mode 100644
index 000000000000..f46aa07db805
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openssh-9.0_p1-r2
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig sys-devel/autoconf verify-sig? ( sec-keys/openpgp-keys-openssh ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst preinst prepare pretend test unpack
+DEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) virtual/libcrypt:=[static-libs(+)] >=sys-libs/zlib-1.2.3:=[static-libs(+)] )
+DESCRIPTION=Port of OpenBSD's free SSH release
+EAPI=7
+HOMEPAGE=https://www.openssh.com/
+INHERIT=user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
+IUSE=abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss 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=BSD GPL-2
+RDEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) !prefix? ( sys-apps/shadow ) X? ( x11-apps/xauth )
+REQUIRED_USE=hpn? ( ssl ) ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !sctp ssl !xmss ) xmss? ( ssl ) test? ( ssl ) test? ( !xmss )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.0p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.0p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff ) X509? ( https://roumenpetrov.info/openssh/x509-13.4.1/openssh-9.0p1+x509-13.4.1.diff.gz ) verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.0p1.tar.gz.asc )
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	user-info	69a1ed744ec33cf2c910ff2bd6084d11	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=cb9ca26448ebdd16964c61ddabb634d3
diff --git a/metadata/md5-cache/net-misc/s6-networking-2.5.1.0 b/metadata/md5-cache/net-misc/s6-networking-2.5.1.0-r1
similarity index 50%
rename from metadata/md5-cache/net-misc/s6-networking-2.5.1.0
rename to metadata/md5-cache/net-misc/s6-networking-2.5.1.0-r1
index 907cf8051c3e..541679d3d6a5 100644
--- a/metadata/md5-cache/net-misc/s6-networking-2.5.1.0
+++ b/metadata/md5-cache/net-misc/s6-networking-2.5.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=dev-lang/execline-2.8.1.0:=[static-libs?] >=dev-libs/skalibs-2.11.0.0:=[static-libs?] >=sys-apps/s6-2.11.0.0:=[execline,static-libs?] ssl? ( dev-libs/libretls ) !static? ( >=net-dns/s6-dns-2.3.5.2:= ) >=net-dns/s6-dns-2.3.5.2[static-libs?]
+DEPEND=>=dev-lang/execline-2.8.1.0:=[static-libs(-)?] =dev-libs/skalibs-2.11*:=[static-libs?] >=sys-apps/s6-2.11.0.0:=[execline,static-libs(-)?] ssl? ( dev-libs/libretls ) !static? ( >=net-dns/s6-dns-2.3.5.2:= ) >=net-dns/s6-dns-2.3.5.2[static-libs(-)?]
 DESCRIPTION=Suite of small networking utilities for Unix systems
 EAPI=8
 HOMEPAGE=https://www.skarnet.org/software/s6-networking/
@@ -7,9 +7,9 @@ INHERIT=toolchain-funcs
 IUSE=ssl static static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=>=dev-lang/execline-2.8.1.0:=[static-libs?] >=dev-libs/skalibs-2.11.0.0:=[static-libs?] >=sys-apps/s6-2.11.0.0:=[execline,static-libs?] ssl? ( dev-libs/libretls ) !static? ( >=net-dns/s6-dns-2.3.5.2:= )
+RDEPEND=>=dev-lang/execline-2.8.1.0:=[static-libs(-)?] =dev-libs/skalibs-2.11*:=[static-libs?] >=sys-apps/s6-2.11.0.0:=[execline,static-libs(-)?] ssl? ( dev-libs/libretls ) !static? ( >=net-dns/s6-dns-2.3.5.2:= )
 REQUIRED_USE=static? ( static-libs ) ssl? ( !static !static-libs )
 SLOT=0/2.5
 SRC_URI=https://www.skarnet.org/software/s6-networking/s6-networking-2.5.1.0.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2f1407a93f89fae843a3cf625b66644e
+_md5_=ca0cd8e8ddda3da6d6aa9d805ad585af
diff --git a/metadata/md5-cache/net-misc/s6-networking-2.5.1.1 b/metadata/md5-cache/net-misc/s6-networking-2.5.1.1
new file mode 100644
index 000000000000..ac7767a40ff4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/s6-networking-2.5.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-lang/execline:= >=dev-libs/skalibs-2.12.0.0:= net-dns/s6-dns:= sys-apps/s6:=[execline] ssl? ( dev-libs/libretls )
+DESCRIPTION=Suite of small networking utilities for Unix systems
+EAPI=8
+HOMEPAGE=https://www.skarnet.org/software/s6-networking/
+INHERIT=toolchain-funcs
+IUSE=ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=dev-lang/execline:= >=dev-libs/skalibs-2.12.0.0:= net-dns/s6-dns:= sys-apps/s6:=[execline] ssl? ( dev-libs/libretls )
+SLOT=0/2.5
+SRC_URI=https://www.skarnet.org/software/s6-networking/s6-networking-2.5.1.1.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e4ad21f8071925a0a4f07c61c71d2e05
diff --git a/metadata/md5-cache/net-misc/sysrepo-2.1.64 b/metadata/md5-cache/net-misc/sysrepo-2.1.64
index ca0b12ffa16e..f9c81dd38734 100644
--- a/metadata/md5-cache/net-misc/sysrepo-2.1.64
+++ b/metadata/md5-cache/net-misc/sysrepo-2.1.64
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.sysrepo.org
 INHERIT=cmake
 IUSE=doc test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=net-libs/libyang-2.0.194
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sysrepo/sysrepo/archive/v2.1.64.tar.gz -> sysrepo-2.1.64.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=68ae1c22a03b253b2c733a94d161b43e
+_md5_=996e930d69968952bf74182327d8e5d9
diff --git a/metadata/md5-cache/net-misc/wget-1.21.3 b/metadata/md5-cache/net-misc/wget-1.21.3
index 542988ed6863..be6e1ced877a 100644
--- a/metadata/md5-cache/net-misc/wget-1.21.3
+++ b/metadata/md5-cache/net-misc/wget-1.21.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/wget/
 INHERIT=flag-o-matic python-any-r1 toolchain-funcs verify-sig
 IUSE=cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib 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
+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=GPL-3
 RDEPEND=!static? ( cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:= ) metalink? ( app-crypt/gpgme media-libs/libmetalink ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.21.3.tar.gz verify-sig? ( mirror://gnu/wget/wget-1.21.3.tar.gz.sig )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e9e7d3a3240cecc4bf14871921d68805
+_md5_=18efde65dc897dcf5492cf49abfd0406
diff --git a/metadata/md5-cache/net-misc/xmrig-6.18.0 b/metadata/md5-cache/net-misc/xmrig-6.18.0
new file mode 100644
index 000000000000..13a23af13418
--- /dev/null
+++ b/metadata/md5-cache/net-misc/xmrig-6.18.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libuv:= hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= )
+DESCRIPTION=RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner
+EAPI=8
+HOMEPAGE=https://xmrig.com https://github.com/xmrig/xmrig
+INHERIT=cmake systemd
+IUSE=cpu_flags_x86_sse4_1 donate hwloc opencl +ssl
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 GPL-3+ MIT
+RDEPEND=dev-libs/libuv:= hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= ) !arm64? ( sys-apps/msr-tools )
+SLOT=0
+SRC_URI=https://github.com/xmrig/xmrig/archive/v6.18.0.tar.gz -> xmrig-6.18.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=192d858406caab4e3f0ad41c3a417b68
diff --git a/metadata/md5-cache/net-misc/xmrig-9999 b/metadata/md5-cache/net-misc/xmrig-9999
index aab704a5a9f1..2a4dcdfbd846 100644
--- a/metadata/md5-cache/net-misc/xmrig-9999
+++ b/metadata/md5-cache/net-misc/xmrig-9999
@@ -2,7 +2,7 @@ BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-v
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-libs/libuv:= hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= )
 DESCRIPTION=RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner
-EAPI=7
+EAPI=8
 HOMEPAGE=https://xmrig.com https://github.com/xmrig/xmrig
 INHERIT=cmake systemd git-r3
 IUSE=cpu_flags_x86_sse4_1 donate hwloc opencl +ssl
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 GPL-3+ MIT
 PROPERTIES=live
 RDEPEND=dev-libs/libuv:= hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= ) !arm64? ( sys-apps/msr-tools )
 SLOT=0
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=aafb8ef7ad87715b1017edf372373350
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=192d858406caab4e3f0ad41c3a417b68
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index dcb1cd1317b3..edccae7ad8ab 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/networkmanager-strongswan-1.5.2-r1 b/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.5.2-r1
deleted file mode 100644
index c41734ce1f7e..000000000000
--- a/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.5.2-r1
+++ /dev/null
@@ -1,14 +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 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=app-crypt/libsecret >=net-libs/libnma-1.1.0 net-misc/networkmanager >=net-vpn/strongswan-5.8.3[networkmanager] x11-libs/gtk+:3
-DESCRIPTION=NetworkManager StrongSwan plugin
-EAPI=8
-HOMEPAGE=https://www.strongswan.org/
-INHERIT=autotools
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=app-crypt/libsecret >=net-libs/libnma-1.1.0 net-misc/networkmanager >=net-vpn/strongswan-5.8.3[networkmanager] x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-1.5.2.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6c8329e672297152fffde7edd33242e4
diff --git a/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.6.0 b/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.6.0
index dfd452792b87..8ffdd72043ea 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.6.0
+++ b/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.6.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.strongswan.org/
 INHERIT=autotools
 IUSE=gtk4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-crypt/libsecret >=net-libs/libnma-1.1.0 net-misc/networkmanager >=net-vpn/strongswan-5.8.3[networkmanager] !gtk4? ( x11-libs/gtk+:3 ) gtk4? ( net-libs/libnma gui-libs/gtk:4 )
 SLOT=0
 SRC_URI=https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-1.6.0.tar.bz2
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2a57880c79b7cf099dfa004c2e3ee812
+_md5_=febdb1a6b12761ce9a4b8b99b81e72da
diff --git a/metadata/md5-cache/net-vpn/pptpd-1.4.0-r3 b/metadata/md5-cache/net-vpn/pptpd-1.4.0-r3
index 19858e8d94de..bb94fdc0ae2a 100644
--- a/metadata/md5-cache/net-vpn/pptpd-1.4.0-r3
+++ b/metadata/md5-cache/net-vpn/pptpd-1.4.0-r3
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=net-dialup/ppp:= tcpd? ( sys-apps/tcp-wrappers )
+DEPEND=net-dialup/ppp:= tcpd? ( sys-apps/tcp-wrappers ) elibc_musl? ( net-libs/ppp-defs )
 DESCRIPTION=Linux Point-to-Point Tunnelling Protocol Server
 EAPI=7
 HOMEPAGE=http://poptop.sourceforge.net/
@@ -12,4 +12,4 @@ RDEPEND=net-dialup/ppp:= tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=mirror://sourceforge/poptop/pptpd-1.4.0.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=dd1c49bb7da6ae9d4e63b12c7cfe9ac8
+_md5_=224919acef5baf64c30c529b72a727c3
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 325ca535adb0..e08bc3ca40f0 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/gnuradio-3.8.5.0-r1 b/metadata/md5-cache/net-wireless/gnuradio-3.8.5.0-r1
new file mode 100644
index 000000000000..4027e9dadc0f
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.8.5.0-r1
@@ -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 postinst postrm prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-libs/boost:0=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:0=[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:0=[python,python_targets_python3_10(-)] ) dev-libs/log4cpp:= python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_8? ( dev-python/thrift[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/thrift[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyqtgraph[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) ) grc? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[opengl,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)] ) python_single_target_python3_9? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_9(-)] ) python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) ) utils? ( python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/click[python_targets_python3_9(-)] dev-python/click-plugins[python_targets_python3_9(-)] dev-python/mako[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= ) !!<net-wireless/gnuradio-3.8 app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq )
+DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
+EAPI=8
+HOMEPAGE=https://www.gnuradio.org/
+INHERIT=cmake python-single-r1 virtualx xdg-utils
+IUSE=+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-libs/boost:0=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:0=[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:0=[python,python_targets_python3_10(-)] ) dev-libs/log4cpp:= python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) sci-libs/fftw:3.0= sci-libs/mpir:= sci-libs/volk:= alsa? ( media-libs/alsa-lib:= ) ctrlport? ( python_single_target_python3_8? ( dev-python/thrift[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/thrift[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/thrift[python_targets_python3_10(-)] ) ) fec? ( sci-libs/gsl:= dev-python/scipy ) filter? ( dev-python/scipy python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyqtgraph[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyqtgraph[python_targets_python3_10(-)] ) ) grc? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) jack? ( virtual/jack ) portaudio? ( >=media-libs/portaudio-19_pre ) qt5? ( python_single_target_python3_8? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[opengl,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) trellis? ( dev-python/scipy ) uhd? ( python_single_target_python3_8? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_8(-)] ) python_single_target_python3_9? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_9(-)] ) python_single_target_python3_10? ( >=net-wireless/uhd-3.9.6:=[python_single_target_python3_10(-)] ) ) utils? ( python_single_target_python3_8? ( dev-python/click[python_targets_python3_8(-)] dev-python/click-plugins[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/click[python_targets_python3_9(-)] dev-python/click-plugins[python_targets_python3_9(-)] dev-python/mako[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/click[python_targets_python3_10(-)] dev-python/click-plugins[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1:= ) wavelet? ( sci-libs/gsl:= dev-libs/gmp:= sci-libs/lapack ) zeromq? ( >=net-libs/zeromq-2.1.11:= )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) jack? ( audio ) oss? ( audio ) portaudio? ( audio ) analog? ( filter ) channels? ( filter analog qt5 ) digital? ( filter analog ) dtv? ( filter analog fec ) modtool? ( utils ) qt5? ( filter ) trellis? ( analog digital ) uhd? ( filter analog ) vocoder? ( filter analog ) wavelet? ( analog )
+RESTRICT=test !test? ( test )
+SLOT=0/3.8.5.0
+SRC_URI=https://github.com/gnuradio/gnuradio/archive/refs/tags/v3.8.5.0.tar.gz -> gnuradio-3.8.5.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=faa6f0d9a65c8178ca0ae774df9b34ac
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 0397bd64af95..4dc3307efe60 100644
Binary files a/metadata/md5-cache/sci-calculators/Manifest.gz and b/metadata/md5-cache/sci-calculators/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-calculators/bc-gh-5.2.0 b/metadata/md5-cache/sci-calculators/bc-gh-5.2.0
deleted file mode 100644
index 547edc2deab7..000000000000
--- a/metadata/md5-cache/sci-calculators/bc-gh-5.2.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Implementation of POSIX bc with GNU extensions
-EAPI=7
-HOMEPAGE=https://git.yzena.com/gavin/bc
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://github.com/gavinhoward/bc/releases/download/5.2.0/bc-5.2.0.tar.xz
-_md5_=ae4c814a04f9f5430a23d6e9aa101bb8
diff --git a/metadata/md5-cache/sci-calculators/bc-gh-5.1.1 b/metadata/md5-cache/sci-calculators/bc-gh-5.3.3
similarity index 57%
rename from metadata/md5-cache/sci-calculators/bc-gh-5.1.1
rename to metadata/md5-cache/sci-calculators/bc-gh-5.3.3
index 09fe92e101be..24fd8c8e742d 100644
--- a/metadata/md5-cache/sci-calculators/bc-gh-5.1.1
+++ b/metadata/md5-cache/sci-calculators/bc-gh-5.3.3
@@ -1,9 +1,9 @@
 DEFINED_PHASES=configure
 DESCRIPTION=Implementation of POSIX bc with GNU extensions
-EAPI=7
+EAPI=8
 HOMEPAGE=https://git.yzena.com/gavin/bc
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD-2
 SLOT=0
-SRC_URI=https://github.com/gavinhoward/bc/releases/download/5.1.1/bc-5.1.1.tar.xz
-_md5_=ae4c814a04f9f5430a23d6e9aa101bb8
+SRC_URI=https://github.com/gavinhoward/bc/releases/download/5.3.3/bc-5.3.3.tar.xz
+_md5_=b94f583f67edcbc79045930bfe014122
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 207376416122..5a0c8a791fe1 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/gazebo-11.10.1 b/metadata/md5-cache/sci-electronics/gazebo-11.10.1
deleted file mode 100644
index cde5323a7e89..000000000000
--- a/metadata/md5-cache/sci-electronics/gazebo-11.10.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( app-text/ronn-ng app-text/ronn ) app-arch/gzip virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar <dev-cpp/tbb-2021:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= <x11-libs/qwt-6.2.0:6=[qt5(+)] dev-qt/qttest:5 x11-apps/mesa-progs test? ( dev-libs/libxslt )
-DESCRIPTION=A 3D multiple robot simulator with dynamics
-EAPI=7
-HOMEPAGE=http://gazebosim.org/
-INHERIT=cmake flag-o-matic
-IUSE=cpu_flags_x86_sse2 test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar <dev-cpp/tbb-2021:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= <x11-libs/qwt-6.2.0:6=[qt5(+)]
-RESTRICT=!test? ( test )
-SLOT=0/11
-SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.10.1.tar.bz2
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f220472a2a46978c4dcf9610929d8486
diff --git a/metadata/md5-cache/sci-electronics/gazebo-11.11.0 b/metadata/md5-cache/sci-electronics/gazebo-11.11.0
new file mode 100644
index 000000000000..42a28acfe188
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/gazebo-11.11.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( app-text/ronn-ng app-text/ronn ) app-arch/gzip virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.8:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux >=media-gfx/graphviz-4 net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)] dev-qt/qttest:5 x11-apps/mesa-progs test? ( dev-libs/libxslt )
+DESCRIPTION=A 3D multiple robot simulator with dynamics
+EAPI=7
+HOMEPAGE=http://gazebosim.org/
+INHERIT=cmake flag-o-matic
+IUSE=cpu_flags_x86_sse2 test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.8:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux >=media-gfx/graphviz-4 net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= x11-libs/qwt:6=[qt5(+)]
+RESTRICT=!test? ( test )
+SLOT=0/11
+SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.11.0.tar.bz2
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=83c12959ee1441b489fb073786f8510f
diff --git a/metadata/md5-cache/sci-electronics/gazebo-11.9.1-r1 b/metadata/md5-cache/sci-electronics/gazebo-11.9.1-r1
deleted file mode 100644
index d57d9e335d2e..000000000000
--- a/metadata/md5-cache/sci-electronics/gazebo-11.9.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( app-text/ronn-ng app-text/ronn ) app-arch/gzip virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar <dev-cpp/tbb-2021:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= <x11-libs/qwt-6.2.0:6=[qt5(+)] dev-qt/qttest:5 x11-apps/mesa-progs test? ( dev-libs/libxslt )
-DESCRIPTION=A 3D multiple robot simulator with dynamics
-EAPI=7
-HOMEPAGE=http://gazebosim.org/
-INHERIT=cmake flag-o-matic
-IUSE=cpu_flags_x86_sse2 test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar <dev-cpp/tbb-2021:= >=dev-games/ogre-1.7.4:=[freeimage] <dev-games/ogre-1.10 >=media-libs/freeimage-3.15.4[png] sci-libs/libccd >=media-video/ffmpeg-2.6:0= sci-libs/gts >=sci-physics/bullet-2.82:= >=dev-libs/sdformat-9.1:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads(+)] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:5= sci-libs/ignition-math:6= net-libs/ignition-transport:8= sci-libs/ignition-common:3= sci-libs/ignition-fuel-tools:4= <x11-libs/qwt-6.2.0:6=[qt5(+)]
-RESTRICT=!test? ( test )
-SLOT=0/11
-SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.9.1.tar.bz2
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=00c9b0feba2c961bbb95a5f3c00ef16e
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 337839a3bfa8..d2ffd3c94571 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/hdf5-1.12.2-r3 b/metadata/md5-cache/sci-libs/hdf5-1.12.2-r4
similarity index 97%
rename from metadata/md5-cache/sci-libs/hdf5-1.12.2-r3
rename to metadata/md5-cache/sci-libs/hdf5-1.12.2-r4
index f1d3eaeb1550..37f6d07ddc53 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.12.2-r3
+++ b/metadata/md5-cache/sci-libs/hdf5-1.12.2-r4
@@ -13,4 +13,4 @@ REQUIRED_USE=cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran !hl )
 SLOT=0/1.12.2
 SRC_URI=https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-1.12.2/src/hdf5-1.12.2.tar.bz2
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d5c5ec9b12244eb9d875cac83774e056
+_md5_=6dd20fcb4f43eed1467e8b4b9e2b29be
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 59ac12f25c6c..a17efcab6bf4 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/pspp-1.6.0 b/metadata/md5-cache/sci-mathematics/pspp-1.6.0
index ee6a6f6b5dd6..2e07cdf83e35 100644
--- a/metadata/md5-cache/sci-mathematics/pspp-1.6.0
+++ b/metadata/md5-cache/sci-mathematics/pspp-1.6.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/pspp/pspp.html
 INHERIT=python-any-r1 xdg
 IUSE=doc examples gtk ncurses nls perl postgres
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/libxml2:2 sci-libs/gsl:0= sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/libiconv x11-libs/cairo[svg] x11-libs/pango gtk? ( dev-util/glib-utils x11-libs/gtk+:3 x11-libs/gtksourceview:4= >=x11-libs/spread-sheet-widget-0.7 ) postgres? ( dev-db/postgresql:=[server] )
 SLOT=0/1.6.0
 SRC_URI=mirror://gnu/pspp/pspp-1.6.0.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=473111bb45bcb078e56b2621272cbdf4
+_md5_=c2ab7753a4b9a8d60ea0551611f547cc
diff --git a/metadata/md5-cache/sec-policy/Manifest.gz b/metadata/md5-cache/sec-policy/Manifest.gz
index e45c06b8b9eb..a25eb6452943 100644
Binary files a/metadata/md5-cache/sec-policy/Manifest.gz and b/metadata/md5-cache/sec-policy/Manifest.gz differ
diff --git a/metadata/md5-cache/sec-policy/apparmor-profiles-3.0.1 b/metadata/md5-cache/sec-policy/apparmor-profiles-3.0.1
deleted file mode 100644
index 329135ff4722..000000000000
--- a/metadata/md5-cache/sec-policy/apparmor-profiles-3.0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A collection of profiles for the AppArmor application security system
-EAPI=7
-HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
-IUSE=minimal
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/3.0/3.0.1/+download/apparmor-3.0.1.tar.gz
-_md5_=8a98d2d82b39d059a6b04b48a79f72ca
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index a5feb3b11d70..95b17f41a2ac 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/apparmor-3.0.1 b/metadata/md5-cache/sys-apps/apparmor-3.0.1
deleted file mode 100644
index b725144e4555..000000000000
--- a/metadata/md5-cache/sys-apps/apparmor-3.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install prepare test
-DEPEND=~sys-libs/libapparmor-3.0.1 dev-lang/perl sys-devel/bison sys-devel/gettext sys-devel/flex doc? ( dev-tex/latex2html )
-DESCRIPTION=Userspace utils and init scripts for the AppArmor application security system
-EAPI=7
-HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
-INHERIT=systemd toolchain-funcs
-IUSE=doc
-KEYWORDS=amd64 ~arm64
-LICENSE=GPL-2
-RDEPEND=~sys-libs/libapparmor-3.0.1
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/3.0/3.0.1/+download/apparmor-3.0.1.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=80dceda4f2d10142843bb1fed8222954
diff --git a/metadata/md5-cache/sys-apps/apparmor-utils-3.0.1 b/metadata/md5-cache/sys-apps/apparmor-utils-3.0.1
deleted file mode 100644
index 583b4f30ea84..000000000000
--- a/metadata/md5-cache/sys-apps/apparmor-utils-3.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl ~sys-libs/libapparmor-3.0.1 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) sys-devel/gettext dev-lang/perl
-DESCRIPTION=Additional userspace utils to assist with AppArmor profile management
-EAPI=6
-HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
-INHERIT=eapi7-ver perl-module python-r1 toolchain-funcs
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl ~sys-libs/libapparmor-3.0.1 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ~sys-libs/libapparmor-3.0.1[perl,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~sys-apps/apparmor-3.0.1 dev-perl/Locale-gettext dev-perl/RPC-XML dev-perl/TermReadKey dev-python/notify2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-lang/perl:=
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/3.0/3.0.1/+download/apparmor-3.0.1.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e8bfc399aa44ead57110a080da6d946c
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.8.0-r1 b/metadata/md5-cache/sys-apps/pciutils-3.8.0-r1
index b782745dfa99..0fba1ee61bbf 100644
--- a/metadata/md5-cache/sys-apps/pciutils-3.8.0-r1
+++ b/metadata/md5-cache/sys-apps/pciutils-3.8.0-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=static-libs? ( !udev )
 SLOT=0
 SRC_URI=https://mj.ucw.cz/download/linux/pci/pciutils-3.8.0.tar.gz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d4a0488771c40bd60ea5e5276218e58f
+_md5_=55149863208aee517af273c1897fb04d
diff --git a/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r6 b/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r6
index dbc66524460e..0998cd2c057d 100644
--- a/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r6
+++ b/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r6
@@ -11,4 +11,4 @@ RDEPEND=acct-group/plugdev >=sys-apps/util-linux-2.17.2 crypt? ( >=sys-fs/crypts
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pmount/pmount_0.9.99-alpha.orig.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=48fea456d71196aebc2da1d343d9f535
+_md5_=5069638ed04ffac970df383585f2b9e2
diff --git a/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r7 b/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r7
new file mode 100644
index 000000000000..8f203778882e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r7
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool sys-devel/gettext
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=acct-group/plugdev >=sys-apps/util-linux-2.17.2 crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )
+DESCRIPTION=Policy based mounter that gives the ability to mount removable devices as a user
+EAPI=8
+HOMEPAGE=https://launchpad.net/pmount
+INHERIT=bash-completion-r1
+IUSE=crypt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/plugdev >=sys-apps/util-linux-2.17.2 crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/p/pmount/pmount_0.9.99-alpha.orig.tar.bz2
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b1f8c17c5dee4ab63f538da2ea5bae6b
diff --git a/metadata/md5-cache/sys-apps/s6-2.11.1.0 b/metadata/md5-cache/sys-apps/s6-2.11.1.0-r1
similarity index 63%
rename from metadata/md5-cache/sys-apps/s6-2.11.1.0
rename to metadata/md5-cache/sys-apps/s6-2.11.1.0-r1
index a4dfd1040001..606574f720b6 100644
--- a/metadata/md5-cache/sys-apps/s6-2.11.1.0
+++ b/metadata/md5-cache/sys-apps/s6-2.11.1.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs?] ) >=dev-libs/skalibs-2.11.2.0:=[static-libs?]
+DEPEND=execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs(-)?] ) >=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?]
 DESCRIPTION=skarnet.org's small and secure supervision software suite
 EAPI=8
 HOMEPAGE=https://www.skarnet.org/software/s6/
@@ -7,9 +7,9 @@ INHERIT=toolchain-funcs
 IUSE=+execline static static-libs
 KEYWORDS=amd64 ~arm x86
 LICENSE=ISC
-RDEPEND=execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs?] ) >=dev-libs/skalibs-2.11.2.0:=[static-libs?]
+RDEPEND=execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs(-)?] ) >=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?]
 REQUIRED_USE=static? ( static-libs )
 SLOT=0/2.11
 SRC_URI=https://www.skarnet.org/software/s6/s6-2.11.1.0.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=da3031cd4fbad1ff6a7a81324df40990
+_md5_=0fd562a5ac71573b1f7300d216110932
diff --git a/metadata/md5-cache/sys-apps/s6-2.11.1.1 b/metadata/md5-cache/sys-apps/s6-2.11.1.1
new file mode 100644
index 000000000000..8cc2ab8716e5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-2.11.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/skalibs:= execline? ( dev-lang/execline:= )
+DESCRIPTION=skarnet.org's small and secure supervision software suite
+EAPI=8
+HOMEPAGE=https://www.skarnet.org/software/s6/
+INHERIT=toolchain-funcs
+IUSE=+execline
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=dev-libs/skalibs:= execline? ( dev-lang/execline:= )
+SLOT=0/2.11
+SRC_URI=https://www.skarnet.org/software/s6/s6-2.11.1.1.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=429f269072dd7569a04d649851bc4d32
diff --git a/metadata/md5-cache/sys-apps/s6-linux-init-1.0.7.3 b/metadata/md5-cache/sys-apps/s6-linux-init-1.0.7.3-r1
similarity index 51%
rename from metadata/md5-cache/sys-apps/s6-linux-init-1.0.7.3
rename to metadata/md5-cache/sys-apps/s6-linux-init-1.0.7.3-r1
index d01525463c6b..25ccb586d975 100644
--- a/metadata/md5-cache/sys-apps/s6-linux-init-1.0.7.3
+++ b/metadata/md5-cache/sys-apps/s6-linux-init-1.0.7.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-lang/execline-2.8.3.0:=[static-libs?] >=dev-libs/skalibs-2.11.2.0:=[static-libs?] >=sys-apps/s6-2.11.1.0:=[execline,static-libs?] sysv-utils? ( !sys-apps/systemd[sysv-utils] !sys-apps/sysvinit )
+DEPEND=>=dev-lang/execline-2.8.3.0:=[static-libs(-)?] >=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?] >=sys-apps/s6-2.11.1.0:=[execline,static-libs(-)?] sysv-utils? ( !sys-apps/systemd[sysv-utils] !sys-apps/sysvinit )
 DESCRIPTION=Generates an init binary for s6-based init systems
 EAPI=8
 HOMEPAGE=https://www.skarnet.org/software/s6-linux-init/
@@ -7,9 +7,9 @@ INHERIT=toolchain-funcs
 IUSE=static static-libs +sysv-utils
 KEYWORDS=amd64 ~arm x86
 LICENSE=ISC
-RDEPEND=>=dev-lang/execline-2.8.3.0:=[static-libs?] >=dev-libs/skalibs-2.11.2.0:=[static-libs?] >=sys-apps/s6-2.11.1.0:=[execline,static-libs?] sysv-utils? ( !sys-apps/systemd[sysv-utils] !sys-apps/sysvinit )
+RDEPEND=>=dev-lang/execline-2.8.3.0:=[static-libs(-)?] >=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?] >=sys-apps/s6-2.11.1.0:=[execline,static-libs(-)?] sysv-utils? ( !sys-apps/systemd[sysv-utils] !sys-apps/sysvinit )
 REQUIRED_USE=static? ( static-libs )
 SLOT=0/1.0
 SRC_URI=https://www.skarnet.org/software/s6-linux-init/s6-linux-init-1.0.7.3.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a3549cc7a34eba73a4148b982719f317
+_md5_=a1fff10820705b2b0e73b64de33e8a4b
diff --git a/metadata/md5-cache/sys-apps/s6-linux-init-1.0.8.0 b/metadata/md5-cache/sys-apps/s6-linux-init-1.0.8.0
new file mode 100644
index 000000000000..92aba0c31a1a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-linux-init-1.0.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-lang/execline:= dev-libs/skalibs:= sys-apps/s6:=[execline] sysv-utils? ( !sys-apps/systemd[sysv-utils] !sys-apps/sysvinit )
+DESCRIPTION=Generates an init binary for s6-based init systems
+EAPI=8
+HOMEPAGE=https://www.skarnet.org/software/s6-linux-init/
+INHERIT=toolchain-funcs
+IUSE=+sysv-utils
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=dev-lang/execline:= dev-libs/skalibs:= sys-apps/s6:=[execline] sysv-utils? ( !sys-apps/systemd[sysv-utils] !sys-apps/sysvinit )
+SLOT=0/1.0
+SRC_URI=https://www.skarnet.org/software/s6-linux-init/s6-linux-init-1.0.8.0.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=57efc48a179a9aaa8365942bbd386a40
diff --git a/metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.7 b/metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.7-r1
similarity index 68%
rename from metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.7
rename to metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.7-r1
index 4cd16a3a4723..1479d1afa66f 100644
--- a/metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.7
+++ b/metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=!static? ( >=dev-libs/skalibs-2.11.1.0:= ) static? ( >=dev-libs/skalibs-2.11.1.0[static-libs] )
+DEPEND=!static? ( =dev-libs/skalibs-2.11*:= ) static? ( =dev-libs/skalibs-2.11*[static-libs] )
 DESCRIPTION=Set of tiny linux utilities
 EAPI=8
 HOMEPAGE=https://www.skarnet.org/software/s6-linux-utils/
@@ -7,8 +7,8 @@ INHERIT=toolchain-funcs
 IUSE=static
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=ISC
-RDEPEND=!static? ( >=dev-libs/skalibs-2.11.1.0:= )
+RDEPEND=!static? ( =dev-libs/skalibs-2.11*:= )
 SLOT=0
 SRC_URI=https://www.skarnet.org/software/s6-linux-utils/s6-linux-utils-2.5.1.7.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f0d4a4064a2b17e194acc68ca7e341a9
+_md5_=429d14491f810735adb88c52c0fd583a
diff --git a/metadata/md5-cache/sys-apps/s6-linux-utils-2.6.0.0 b/metadata/md5-cache/sys-apps/s6-linux-utils-2.6.0.0
new file mode 100644
index 000000000000..a259b184c2b0
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-linux-utils-2.6.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/skalibs-2.12.0.0:=
+DESCRIPTION=Set of tiny linux utilities
+EAPI=8
+HOMEPAGE=https://www.skarnet.org/software/s6-linux-utils/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-libs/skalibs-2.12.0.0:=
+SLOT=0
+SRC_URI=https://www.skarnet.org/software/s6-linux-utils/s6-linux-utils-2.6.0.0.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=1f41ca37cd9e18842e8b66914278896e
diff --git a/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.4.0 b/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.4.0-r1
similarity index 68%
rename from metadata/md5-cache/sys-apps/s6-portable-utils-2.2.4.0
rename to metadata/md5-cache/sys-apps/s6-portable-utils-2.2.4.0-r1
index 0e236d623e3b..1f62191fcfe3 100644
--- a/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.4.0
+++ b/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.4.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=!static? ( >=dev-libs/skalibs-2.11.2.0:= ) static? ( >=dev-libs/skalibs-2.11.2.0[static-libs] )
+DEPEND=!static? ( =dev-libs/skalibs-2.11*:= ) static? ( =dev-libs/skalibs-2.11*[static-libs] )
 DESCRIPTION=Set of tiny portable unix utilities
 EAPI=8
 HOMEPAGE=https://www.skarnet.org/software/s6-portable-utils/
@@ -7,8 +7,8 @@ INHERIT=toolchain-funcs
 IUSE=static
 KEYWORDS=amd64 ~arm x86
 LICENSE=ISC
-RDEPEND=!static? ( >=dev-libs/skalibs-2.11.2.0:= )
+RDEPEND=!static? ( =dev-libs/skalibs-2.11*:= )
 SLOT=0
 SRC_URI=https://www.skarnet.org/software/s6-portable-utils/s6-portable-utils-2.2.4.0.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d0bbe6ab589df28a1e3dc1ba114789e2
+_md5_=7212c65486b8458752bca17315c18461
diff --git a/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.5.0 b/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.5.0
new file mode 100644
index 000000000000..bfeab1f4ce43
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-portable-utils-2.2.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/skalibs-2.12.0.0:=
+DESCRIPTION=Set of tiny portable unix utilities
+EAPI=8
+HOMEPAGE=https://www.skarnet.org/software/s6-portable-utils/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=>=dev-libs/skalibs-2.12.0.0:=
+SLOT=0
+SRC_URI=https://www.skarnet.org/software/s6-portable-utils/s6-portable-utils-2.2.5.0.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e5b652399baf3f5dfba5916ee407ba8f
diff --git a/metadata/md5-cache/sys-apps/s6-rc-0.5.3.0 b/metadata/md5-cache/sys-apps/s6-rc-0.5.3.0-r1
similarity index 57%
rename from metadata/md5-cache/sys-apps/s6-rc-0.5.3.0
rename to metadata/md5-cache/sys-apps/s6-rc-0.5.3.0-r1
index 333770ec0b9f..c17ccc68d06b 100644
--- a/metadata/md5-cache/sys-apps/s6-rc-0.5.3.0
+++ b/metadata/md5-cache/sys-apps/s6-rc-0.5.3.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst prepare
-DEPEND=>=dev-lang/execline-2.8.2.0:=[static-libs?] >=dev-libs/skalibs-2.11.1.0:=[static-libs?] >=sys-apps/s6-2.11.0.1:=[execline,static-libs?]
+DEPEND=>=dev-lang/execline-2.8.2.0:=[static-libs(-)?] >=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?] >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
 DESCRIPTION=Service manager for the s6 supervision suite
 EAPI=8
 HOMEPAGE=https://www.skarnet.org/software/s6-rc/
@@ -7,9 +7,9 @@ INHERIT=toolchain-funcs
 IUSE=static static-libs
 KEYWORDS=amd64 ~arm x86
 LICENSE=ISC
-RDEPEND=>=dev-lang/execline-2.8.2.0:=[static-libs?] >=dev-libs/skalibs-2.11.1.0:=[static-libs?] >=sys-apps/s6-2.11.0.1:=[execline,static-libs?]
+RDEPEND=>=dev-lang/execline-2.8.2.0:=[static-libs(-)?] >=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?] >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
 REQUIRED_USE=static? ( static-libs )
 SLOT=0/0.5
 SRC_URI=https://www.skarnet.org/software/s6-rc/s6-rc-0.5.3.0.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d1e5176f511257ebdbf54113aad9cc3d
+_md5_=cd165b198a9b80a22495f8657bf1ba1a
diff --git a/metadata/md5-cache/sys-apps/s6-rc-0.5.3.1 b/metadata/md5-cache/sys-apps/s6-rc-0.5.3.1-r1
similarity index 54%
rename from metadata/md5-cache/sys-apps/s6-rc-0.5.3.1
rename to metadata/md5-cache/sys-apps/s6-rc-0.5.3.1-r1
index 90ad4c9ef66a..9e1cfc1c19ff 100644
--- a/metadata/md5-cache/sys-apps/s6-rc-0.5.3.1
+++ b/metadata/md5-cache/sys-apps/s6-rc-0.5.3.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure postinst prepare
-DEPEND=>=dev-lang/execline-2.8.2.0:=[static-libs?] >=dev-libs/skalibs-2.11.1.0:=[static-libs?] >=sys-apps/s6-2.11.0.1:=[execline,static-libs?]
+DEPEND=>=dev-lang/execline-2.8.2.0:=[static-libs(-)?] >=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?] >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
 DESCRIPTION=Service manager for the s6 supervision suite
 EAPI=8
 HOMEPAGE=https://www.skarnet.org/software/s6-rc/
 INHERIT=toolchain-funcs
 IUSE=static static-libs
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=ISC
-RDEPEND=>=dev-lang/execline-2.8.2.0:=[static-libs?] >=dev-libs/skalibs-2.11.1.0:=[static-libs?] >=sys-apps/s6-2.11.0.1:=[execline,static-libs?]
+RDEPEND=>=dev-lang/execline-2.8.2.0:=[static-libs(-)?] >=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?] >=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
 REQUIRED_USE=static? ( static-libs )
 SLOT=0/0.5
 SRC_URI=https://www.skarnet.org/software/s6-rc/s6-rc-0.5.3.1.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0a16958cdaa2e3ec85f5d18938eaf150
+_md5_=cd165b198a9b80a22495f8657bf1ba1a
diff --git a/metadata/md5-cache/sys-apps/s6-rc-0.5.3.2 b/metadata/md5-cache/sys-apps/s6-rc-0.5.3.2
new file mode 100644
index 000000000000..ad5553c68546
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-rc-0.5.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-lang/execline:= dev-libs/skalibs:= sys-apps/s6:=[execline]
+DESCRIPTION=Service manager for the s6 supervision suite
+EAPI=8
+HOMEPAGE=https://www.skarnet.org/software/s6-rc/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=dev-lang/execline:= dev-libs/skalibs:= sys-apps/s6:=[execline]
+SLOT=0/0.5
+SRC_URI=https://www.skarnet.org/software/s6-rc/s6-rc-0.5.3.2.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e9dcbfa943c7f2ad53a306ae638ce56a
diff --git a/metadata/md5-cache/sys-apps/smc-sum-2.8.1.20220506 b/metadata/md5-cache/sys-apps/smc-sum-2.8.1.20220506
new file mode 100644
index 000000000000..0cfbb1096749
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/smc-sum-2.8.1.20220506
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install nofetch postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards
+EAPI=8
+HOMEPAGE=https://www.supermicro.com
+INHERIT=linux-mod
+IUSE=module dist-kernel
+KEYWORDS=-* ~amd64
+LICENSE=supermicro
+RDEPEND=sys-libs/zlib sys-power/iasl module? ( !sys-apps/smc-sum-driver ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RESTRICT=bindist fetch mirror
+SLOT=0
+SRC_URI=sum_2.8.1_Linux_x86_64_20220506.tar.gz
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e0aa21237859e01bb634a81525ed7f0e
diff --git a/metadata/md5-cache/sys-apps/systemd-250.7 b/metadata/md5-cache/sys-apps/systemd-250.7
index 57bdea52ed9a..66c5f665749a 100644
--- a/metadata/md5-cache/sys-apps/systemd-250.7
+++ b/metadata/md5-cache/sys-apps/systemd-250.7
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=http://systemd.io/
 INHERIT=bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +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 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.30: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/libcap: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/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) nat? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0: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(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 hostnamed-fallback? ( acct-group/systemd-hostname sys-apps/dbus-broker ) selinux? ( sec-policy/selinux-base-policy[systemd] sec-policy/selinux-ntp ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v250.7/systemd-stable-250.7.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1d6bf7dea0ab1fab638ef9c85e641114
+_md5_=f91811441e268883d6ee7a3cf54839ed
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-250.7 b/metadata/md5-cache/sys-apps/systemd-utils-250.7
index 07b076ee8c76..5fd4e27bf1d1 100644
--- a/metadata/md5-cache/sys-apps/systemd-utils-250.7
+++ b/metadata/md5-cache/sys-apps/systemd-utils-250.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://systemd.io/
 INHERIT=bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
 IUSE=+acl boot +kmod selinux sysusers +tmpfiles test +udev 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=udev? ( >=sys-fs/udev-init-scripts-34 )
 RDEPEND=selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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/libcap: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/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( !<sys-boot/systemd-boot-250 ) tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) udev? ( acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/hwids[udev] !<sys-fs/udev-250 !sys-fs/eudev ) !sys-apps/systemd
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v250.7.tar.gz -> systemd-stable-250.7.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-250.4.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=52a3e5b9935112b6b65e933364d04ef0
+_md5_=1a6e03c52eb10ce1060e54e6b8ac09d8
diff --git a/metadata/md5-cache/sys-apps/tas-1.6.0.200601-r1 b/metadata/md5-cache/sys-apps/tas-1.7.0.220503
similarity index 90%
rename from metadata/md5-cache/sys-apps/tas-1.6.0.200601-r1
rename to metadata/md5-cache/sys-apps/tas-1.7.0.220503
index 3f4a011b8c38..63e2c965141f 100644
--- a/metadata/md5-cache/sys-apps/tas-1.6.0.200601-r1
+++ b/metadata/md5-cache/sys-apps/tas-1.7.0.220503
@@ -9,6 +9,6 @@ LICENSE=BSD supermicro
 RDEPEND=net-misc/networkmanager sys-apps/ethtool sys-apps/net-tools sys-apps/smartmontools sys-block/storcli sys-devel/bc sys-fs/lsscsi sys-fs/mdadm
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=https://www.supermicro.com/wftp/utility/TAS/TAS_1.6.0_build.200601.zip
+SRC_URI=https://www.supermicro.com/wftp/utility/TAS/TAS_1.7.0_build.220503.zip
 _eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=974e22a918128fbb050de9cd0a8b4b2f
diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-1.22.5 b/metadata/md5-cache/sys-auth/AusweisApp2-1.22.5
deleted file mode 100644
index f8946100c681..000000000000
--- a/metadata/md5-cache/sys-auth/AusweisApp2-1.22.5
+++ /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.22.5.tar.gz -> AusweisApp2-1.22.5.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b4fcf3fe164057457c69e7e045bba198
diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-1.22.7 b/metadata/md5-cache/sys-auth/AusweisApp2-1.22.7
index b2a0d46d4148..bc4065a7355b 100644
--- a/metadata/md5-cache/sys-auth/AusweisApp2-1.22.7
+++ b/metadata/md5-cache/sys-auth/AusweisApp2-1.22.7
@@ -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.22.7.tar.gz -> AusweisApp2-1.22.7.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5132afd7c7cdb78bc9afaeb59da220a7
+_md5_=b4fcf3fe164057457c69e7e045bba198
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 54c4eeabeca3..057a70fc2e5c 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/ssh-import-id-5.11 b/metadata/md5-cache/sys-auth/ssh-import-id-5.11
index a4b758a2009d..e2fb62e3b13f 100644
--- a/metadata/md5-cache/sys-auth/ssh-import-id-5.11
+++ b/metadata/md5-cache/sys-auth/ssh-import-id-5.11
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://launchpad.net/ssh-import-id
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://launchpad.net/ssh-import-id/trunk/5.11/+download/ssh-import-id-5.11.tar.gz
 _eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ee3e9272d2ff698be1f95dc4a2069730
+_md5_=a3807639755b70474999224007d9e1a4
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 0504bea0758b..0daed172cc12 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/grub-2.06-r2 b/metadata/md5-cache/sys-boot/grub-2.06-r2
index 97adcd3a96fa..ae7d77f51340 100644
--- a/metadata/md5-cache/sys-boot/grub-2.06-r2
+++ b/metadata/md5-cache/sys-boot/grub-2.06-r2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/grub/
 INHERIT=autotools bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
 IUSE=device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs grub_platforms_coreboot grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_emu grub_platforms_ieee1275 grub_platforms_loongson grub_platforms_multiboot grub_platforms_qemu grub_platforms_qemu-mips grub_platforms_pc grub_platforms_uboot grub_platforms_xen grub_platforms_xen-32 grub_platforms_xen-pvh
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86
 LICENSE=GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )
 RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 nls? ( sys-devel/gettext )
 REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) grub_platforms_ieee1275? ( fonts ) grub_platforms_loongson? ( fonts )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2/2.06-r2
 SRC_URI=mirror://gnu/grub/grub-2.06.tar.xz https://dev.gentoo.org/~floppym/dist/grub-2.06-backports-r1.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d327c722b249546aed4e7682212f9499
+_md5_=69082a1276ac244890a622d3904e4e8a
diff --git a/metadata/md5-cache/sys-boot/plymouth-22.02.122-r1 b/metadata/md5-cache/sys-boot/plymouth-22.02.122-r1
index a35c650fcb06..5a7a99102edf 100644
--- a/metadata/md5-cache/sys-boot/plymouth-22.02.122-r1
+++ b/metadata/md5-cache/sys-boot/plymouth-22.02.122-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://cgit.freedesktop.org/plymouth/
 INHERIT=flag-o-matic autotools readme.gentoo-r1 systemd
 IUSE=debug +drm +gtk +pango +split-usr static-libs +udev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16:= drm? ( x11-libs/libdrm ) gtk? ( dev-libs/glib:2 >=x11-libs/gtk+-3.14:3 x11-libs/cairo ) pango? ( >=x11-libs/pango-1.21 ) udev? ( virtual/udev ) !<sys-kernel/dracut-0.37-r3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png https://www.freedesktop.org/software/plymouth/releases/plymouth-22.02.122.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d7b274c180cad029f5bd1e282d40f735
+_md5_=43cd21bf9bec599e69afc9eef91319f1
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index c54ff6ac2c2b..3698947a425b 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.26.0 b/metadata/md5-cache/sys-cluster/minikube-1.26.0
new file mode 100644
index 000000000000..c1c1ee0339e8
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/minikube-1.26.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-go/go-bindata >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile configure install postinst unpack
+DEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
+DESCRIPTION=Single Node Kubernetes Cluster
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
+INHERIT=bash-completion-r1 go-module toolchain-funcs
+IUSE=hardened libvirt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT MPL-2.0 WTFPL-2 ZLIB || ( LGPL-3+ GPL-2 ) || ( Apache-2.0 LGPL-3+ ) || ( Apache-2.0 CC-BY-4.0 )
+RDEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/zmedico/minikube/archive/refs/tags/v1.26.0-vendor.tar.gz -> minikube-1.26.0-vendor.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=f498febab9e3b8593ecf223c82c94ad7
diff --git a/metadata/md5-cache/sys-cluster/zetcd-0.0.4-r2 b/metadata/md5-cache/sys-cluster/zetcd-0.0.4-r2
index b523f4142045..55f786d498de 100644
--- a/metadata/md5-cache/sys-cluster/zetcd-0.0.4-r2
+++ b/metadata/md5-cache/sys-cluster/zetcd-0.0.4-r2
@@ -1,14 +1,15 @@
 BDEPEND=>=dev-lang/go-1.10
 DEFINED_PHASES=compile install test unpack
 DEPEND=acct-group/zetcd acct-user/zetcd
-DESCRIPTION=A ZooKeeper personality for etcd
+DESCRIPTION=ZooKeeper personality for etcd
 EAPI=7
-HOMEPAGE=https://github.com/coreos/zetcd
+HOMEPAGE=https://github.com/etcd-io/zetcd
+INHERIT=golang-build golang-vcs-snapshot
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=acct-group/zetcd acct-user/zetcd
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/coreos/zetcd/archive/v0.0.4.tar.gz -> zetcd-0.0.4.tar.gz https://github.com/coreos/etcd/archive/714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz -> github.com-coreos-etcd-714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz https://github.com/grpc/grpc-go/archive/777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz -> github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/go-genproto/archive/ee236bd376b077c7a89f260c026c4735b195e459.tar.gz -> github.com-google-go-genproto-ee236bd376b077c7a89f260c026c4735b195e459.tar.gz
+SRC_URI=https://github.com/etcd-io/zetcd/archive/v0.0.4.tar.gz -> zetcd-0.0.4.tar.gz https://github.com/etcd-io/etcd/archive/714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz -> github.com-etcd-io-etcd-714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz https://github.com/grpc/grpc-go/archive/777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz -> github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/go-genproto/archive/ee236bd376b077c7a89f260c026c4735b195e459.tar.gz -> github.com-google-go-genproto-ee236bd376b077c7a89f260c026c4735b195e459.tar.gz
 _eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-build	0bd4f7f8de6ac61b4224cb690c5ea321	golang-vcs-snapshot	6864f899c6843043ba23620fcd4a908c
-_md5_=fce77c50a374f61b3252d0c9a384cd9c
+_md5_=bc8ef4eaa597d0aa8ea3f5950e8e9462
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 428b114965f2..2050f8a5cad3 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 b/metadata/md5-cache/sys-devel/clang-14.0.6
new file mode 100644
index 000000000000..25eff30aef30
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-14.0.6
@@ -0,0 +1,18 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-util/cmake-3.16 doc? ( python_single_target_python3_8? ( dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) 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(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( sec-keys/openpgp-keys-llvm ) dev-python/sphinx >=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-14.0.6:14=[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-14.0.6[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.6[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.6[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.6[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.6[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.6[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.6[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.6[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.6[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.6[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.6[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.6[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.6[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.6[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.6[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.6[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.6[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.6[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.6[llvm_targets_M68k] ) !!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
+IUSE=debug default-compiler-rt default-libcxx default-lld doc llvm-libunwind +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_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_M68k 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_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-14.0.6 default-compiler-rt? ( =sys-libs/compiler-rt-14.0.6* llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) default-libcxx? ( >=sys-libs/libcxx-14.0.6 ) default-lld? ( sys-devel/lld )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ~sys-devel/llvm-14.0.6:14=[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-14.0.6[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.6[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.6[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.6[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.6[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.6[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.6[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.6[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.6[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.6[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.6[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.6[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.6[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.6[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.6[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.6[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.6[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.6[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.6[llvm_targets_M68k] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai 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_M68k )
+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 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	e68bb6ac1b36c6eeced323c0334f1a4f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0fb747109d824a9b5955bf9f5e89ed97
diff --git a/metadata/md5-cache/sys-devel/clang-common-14.0.6 b/metadata/md5-cache/sys-devel/clang-common-14.0.6
new file mode 100644
index 000000000000..b6284fca5ff3
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-14.0.6
@@ -0,0 +1,14 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-llvm ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of clang
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=bash-completion-r1 llvm.org
+IUSE=verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+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	e68bb6ac1b36c6eeced323c0334f1a4f	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=156cbfa79cb956aace89e7e0b27e9dc5
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-14.0.6 b/metadata/md5-cache/sys-devel/clang-runtime-14.0.6
new file mode 100644
index 000000000000..b2d1c9b03512
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-14.0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta-ebuild for clang runtime libraries
+EAPI=8
+HOMEPAGE=https://clang.llvm.org/
+INHERIT=multilib-build
+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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=metapackage
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-14.0.6:14.0.6[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-14.0.6:14.0.6[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-14.0.6[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-14.0.6[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=14.0.6
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=3353e9fe517fac80acb5afa4d991bc21
diff --git a/metadata/md5-cache/sys-devel/gcc-10.3.1_p20220623 b/metadata/md5-cache/sys-devel/gcc-10.3.1_p20220623
new file mode 100644
index 000000000000..ee312d014831
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.1_p20220623
@@ -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 )
+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=https://gcc.gnu.org/pub/gcc/snapshots/10-20220623/gcc-10-20220623.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	188f28f3e9da4303e9274b13b440346d	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=372a6a3a76996803465660964b693dc9
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220624 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220624
new file mode 100644
index 000000000000..026569b412e2
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220624
@@ -0,0 +1,16 @@
+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 ) valgrind? ( dev-util/valgrind )
+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=7
+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
+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=11
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220624/gcc-11-20220624.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	188f28f3e9da4303e9274b13b440346d	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=6629110b910032790e6cc6a9bc558008
diff --git a/metadata/md5-cache/sys-devel/lld-14.0.6 b/metadata/md5-cache/sys-devel/lld-14.0.6
new file mode 100644
index 000000000000..6e9a0099ceb8
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-14.0.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 ~dev-python/lit-14.0.6[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 ~dev-python/lit-14.0.6[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 ~dev-python/lit-14.0.6[python_targets_python3_8(-)] ) ) ) verify-sig? ( sec-keys/openpgp-keys-llvm ) >=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-14.0.6 !!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
+IUSE=debug test test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=~sys-devel/llvm-14.0.6
+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	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	e68bb6ac1b36c6eeced323c0334f1a4f	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5648920ee7a80bb97e22600a9fee308d
diff --git a/metadata/md5-cache/sys-devel/llvm-14.0.6 b/metadata/md5-cache/sys-devel/llvm-14.0.6
new file mode 100644
index 000000000000..51b5a9ae32ff
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-14.0.6
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-14.0.6.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ) ) libffi? ( virtual/pkgconfig ) test? ( sys-apps/which ) verify-sig? ( sec-keys/openpgp-keys-llvm ) dev-python/sphinx >=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(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) 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(-)?] ) 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
+IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai 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_M68k 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 ~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 binutils-plugin? ( >=sys-devel/llvmgold-14 )
+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(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) 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(-)?] ) !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_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_M68k )
+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 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm.org	e68bb6ac1b36c6eeced323c0334f1a4f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0a32ed79f19006e0ddcae4e2bfe6b329
diff --git a/metadata/md5-cache/sys-devel/llvm-common-14.0.6 b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
new file mode 100644
index 000000000000..851f4456543c
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
@@ -0,0 +1,14 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-llvm ) 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 ~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-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	e68bb6ac1b36c6eeced323c0334f1a4f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=ed021fba4e89582498067e8128d00dea
diff --git a/metadata/md5-cache/sys-devel/parity-2.0.1 b/metadata/md5-cache/sys-devel/parity-2.0.1
index a043b9e91567..8c3ae8f73d80 100644
--- a/metadata/md5-cache/sys-devel/parity-2.0.1
+++ b/metadata/md5-cache/sys-devel/parity-2.0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure postinst
 DESCRIPTION=A POSIX to native Win32 Cross-Compiler Tool (requires Visual Studio)
 EAPI=7
-HOMEPAGE=https://github.com/mduft/parity
+HOMEPAGE=https://github.com/ssi-schaefer/parity
 IUSE=+vcx64 +vcx86 vc8_0 vc9_0 +vc10_0 +vc11_0 +vc12_0 +vc14_0 +vc15 +vc16
 KEYWORDS=~x64-cygwin
 LICENSE=LGPL-3
 SLOT=0
-SRC_URI=https://github.com/mduft/parity/releases/download/2.0.1/parity-2.0.1.tar.bz2
-_md5_=ba1a94d4177635ff7ce63e721f6db423
+SRC_URI=https://github.com/ssi-schaefer/parity/releases/download/2.0.1/parity-2.0.1.tar.bz2
+_md5_=0473eb58abcb6f6c7d0ea649adcc921a
diff --git a/metadata/md5-cache/sys-devel/parity-9999 b/metadata/md5-cache/sys-devel/parity-9999
deleted file mode 100644
index 6e3aa00727ab..000000000000
--- a/metadata/md5-cache/sys-devel/parity-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/confix sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure postinst prepare unpack
-DESCRIPTION=A POSIX to native Win32 Cross-Compiler Tool (requires Visual Studio)
-EAPI=7
-HOMEPAGE=https://github.com/mduft/parity
-INHERIT=autotools git-r3
-IUSE=+vcx64 +vcx86 vc8_0 vc9_0 +vc10_0 +vc11_0 +vc12_0 +vc14_0 +vc15 +vc16
-LICENSE=LGPL-3
-PROPERTIES=live
-SLOT=0
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ba1a94d4177635ff7ce63e721f6db423
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 646c8872c7e5..2f5649ed570b 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/lvm2-2.02.188-r2 b/metadata/md5-cache/sys-fs/lvm2-2.02.188-r3
similarity index 98%
rename from metadata/md5-cache/sys-fs/lvm2-2.02.188-r2
rename to metadata/md5-cache/sys-fs/lvm2-2.02.188-r3
index b087a9fb3df7..4d23f113f3b2 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.188-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.188-r3
@@ -13,4 +13,4 @@ REQUIRED_USE=device-mapper-only? ( !lvm2create-initrd !sanlock !thin ) static? (
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.188.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.188.tgz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d56d38fa0740fdc9afb445e49780a372
+_md5_=7fe1a06d7b8e0844efcb52b5f2c4431e
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.03.14-r1 b/metadata/md5-cache/sys-fs/lvm2-2.03.14-r2
similarity index 98%
rename from metadata/md5-cache/sys-fs/lvm2-2.03.14-r1
rename to metadata/md5-cache/sys-fs/lvm2-2.03.14-r2
index e58d35aba1b3..7e149f646555 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.03.14-r1
+++ b/metadata/md5-cache/sys-fs/lvm2-2.03.14-r2
@@ -13,4 +13,4 @@ REQUIRED_USE=device-mapper-only? ( !lvm2create-initrd !sanlock !thin ) static? (
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.03.14.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.03.14.tgz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	f3a0a3964e2028a140c181f00eea9712	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=12fe54f65c7942a44664c5e5c41de5c3
+_md5_=a1b6c9e7d723f5288d49bfbe22d7b91a
diff --git a/metadata/md5-cache/sys-fs/mergerfs-2.33.4 b/metadata/md5-cache/sys-fs/mergerfs-2.33.4
index 57b5878b923c..13dbdc3ae5dd 100644
--- a/metadata/md5-cache/sys-fs/mergerfs-2.33.4
+++ b/metadata/md5-cache/sys-fs/mergerfs-2.33.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/trapexit/mergerfs
 INHERIT=toolchain-funcs
 IUSE=+xattr
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC LGPL-2.1
 RDEPEND=xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=https://github.com/trapexit/mergerfs/archive/2.33.4.tar.gz -> mergerfs-2.33.4.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5692172c0e6921f6471376cd09e16eb6
+_md5_=e469fcb0bb9d0e95c4daafe417bf40fb
diff --git a/metadata/md5-cache/sys-fs/mergerfs-2.33.5 b/metadata/md5-cache/sys-fs/mergerfs-2.33.5
new file mode 100644
index 000000000000..d4733a470a4f
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/mergerfs-2.33.5
@@ -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 ~x86
+LICENSE=ISC LGPL-2.1
+RDEPEND=xattr? ( sys-apps/attr )
+SLOT=0
+SRC_URI=https://github.com/trapexit/mergerfs/archive/2.33.5.tar.gz -> mergerfs-2.33.5.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=5692172c0e6921f6471376cd09e16eb6
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index cfd8403a85c0..d493a9e3e578 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.285 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.285
new file mode 100644
index 000000000000..3cac20d487aa
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.285
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+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 ~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.285
+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-296.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-296.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-296.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-296.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-296.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-296.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-296.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-296.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-296.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=9ba899e3e8e021713e59a697a5acb7b8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.249 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.249
new file mode 100644
index 000000000000..85e06071992a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.249
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+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 ~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.249
+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-248.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-248.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-248.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-248.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-248.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-248.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-248.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-248.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-248.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=888fe135c6024a2fe62ebb00e24beebe
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.320 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.320
new file mode 100644
index 000000000000..b9706d23f2b2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.320
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 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 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+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.9.320
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-323.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-323.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-323.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-323.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-323.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-323.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-323.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-323.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-323.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=13580e31fb738820ff595381372d9da7
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.19_rc3 b/metadata/md5-cache/sys-kernel/linux-headers-5.19_rc3
new file mode 100644
index 000000000000..410d718ecbac
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.19_rc3
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils dev-lang/perl
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Linux system headers
+EAPI=7
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
+INHERIT=kernel-2
+IUSE=headers-only
+KEYWORDS=~loong
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-kernel/linux-headers/gentoo-headers-5.18-1.tar.xz https://dev.gentoo.org/~xen0n/distfiles/sys-kernel/linux-headers/linux-headers-5.19_rc3-only-arch-and-headers.patch.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e197541b3c6ac10cf68b9a24384bde5f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.284 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.285
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.14.284
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.14.285
index 578532e7f926..a6836fec2681 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.284
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.285
@@ -9,7 +9,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.284
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.284.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.285
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.285.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.248 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.249
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.19.248
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.19.249
index 6c50be60dd77..9e1503c2add8 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.248
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.249
@@ -9,7 +9,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.248
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.248.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.249
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.249.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.319 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.320
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.9.319
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.9.320
index 5bdff805c1f5..896f6e43ed7b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.319
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.320
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2 linux-firmware
 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.9.319
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.319.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
+SLOT=4.9.320
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.320.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index e2a2a93da821..3786159559a5 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 b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6
new file mode 100644
index 000000000000..ed84510a21e9
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/lit-9.0.1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/lit-9.0.1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/lit-9.0.1[python_targets_python3_8(-)] ) ) =sys-devel/clang-14.0.6*:14 ) !test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) verify-sig? ( sec-keys/openpgp-keys-llvm ) >=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-6 !!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 ~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=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.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	e68bb6ac1b36c6eeced323c0334f1a4f	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=356732da67065da41a0050a558182f57
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
new file mode 100644
index 000000000000..094f5d5b17f0
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/lit-5[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/lit-5[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/lit-5[python_targets_python3_8(-)] ) ) =sys-devel/clang-14.0.6*:14 sys-libs/compiler-rt:14.0.6 ) !test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) verify-sig? ( sec-keys/openpgp-keys-llvm ) >=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-6 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 ~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=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.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	e68bb6ac1b36c6eeced323c0334f1a4f	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=cfde77317289bae47903d57290a6add5
diff --git a/metadata/md5-cache/sys-libs/ldb-2.3.3 b/metadata/md5-cache/sys-libs/ldb-2.3.3
index efebff6f36c2..a5112ef51803 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.3.3
+++ b/metadata/md5-cache/sys-libs/ldb-2.3.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://ldb.samba.org
 INHERIT=python-single-r1 waf-utils multilib-minimal
 IUSE=doc ldap +lmdb python test python_single_target_python3_8 python_single_target_python3_9 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 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-3
 RDEPEND=dev-libs/libbsd[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/popt[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-util/cmocka-1.1.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(-)?] >=sys-libs/talloc-2.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(-)?] >=sys-libs/tdb-1.4.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(-)?] >=sys-libs/tevent-0.10.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(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[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? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) test? ( python )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.3.3
 SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.3.3.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
-_md5_=396b7950ffdb03dcb155891e2b5195a6
+_md5_=4d0b64391334f783ad05a61c143a82fc
diff --git a/metadata/md5-cache/sys-libs/ldb-2.4.2-r1 b/metadata/md5-cache/sys-libs/ldb-2.4.2-r1
index 16634428d23b..2a624e12efa2 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.4.2-r1
+++ b/metadata/md5-cache/sys-libs/ldb-2.4.2-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://ldb.samba.org
 INHERIT=python-single-r1 waf-utils multilib-minimal
 IUSE=doc ldap +lmdb python test python_single_target_python3_8 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-3
 RDEPEND=dev-libs/libbsd[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/popt[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-util/cmocka-1.1.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(-)?] >=sys-libs/talloc-2.3.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(-)?] >=sys-libs/tdb-1.4.4[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/tevent-0.11.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(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[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? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) test? ( python )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.4.2
 SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.4.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
-_md5_=0a663a10c5525c00e1b83041a67b2b3c
+_md5_=c6985d29ffc8256e9dab6c45be01d749
diff --git a/metadata/md5-cache/sys-libs/ldb-2.4.3 b/metadata/md5-cache/sys-libs/ldb-2.4.3
new file mode 100644
index 000000000000..6cdcec86b55d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ldb-2.4.3
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) dev-libs/libxslt virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/libbsd[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/popt[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-util/cmocka-1.1.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(-)?] >=sys-libs/talloc-2.3.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(-)?] >=sys-libs/tdb-1.4.4[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/tevent-0.11.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(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[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? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) virtual/libcrypt
+DESCRIPTION=LDAP-like embedded database
+EAPI=7
+HOMEPAGE=https://ldb.samba.org
+INHERIT=python-single-r1 waf-utils multilib-minimal
+IUSE=doc ldap +lmdb python test python_single_target_python3_8 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-libs/libbsd[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/popt[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-util/cmocka-1.1.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(-)?] >=sys-libs/talloc-2.3.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(-)?] >=sys-libs/tdb-1.4.4[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/tevent-0.11.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(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[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? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) test? ( python )
+RESTRICT=!test? ( test )
+SLOT=0/2.4.3
+SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.4.3.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
+_md5_=0a663a10c5525c00e1b83041a67b2b3c
diff --git a/metadata/md5-cache/sys-libs/ldb-2.5.1 b/metadata/md5-cache/sys-libs/ldb-2.5.1
new file mode 100644
index 000000000000..e8a766f7402e
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ldb-2.5.1
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) dev-libs/libxslt virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/libbsd[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/popt[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-util/cmocka-1.1.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(-)?] >=sys-libs/talloc-2.3.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(-)?] >=sys-libs/tdb-1.4.6[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/tevent-0.11.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(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[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? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) virtual/libcrypt
+DESCRIPTION=LDAP-like embedded database
+EAPI=7
+HOMEPAGE=https://ldb.samba.org
+INHERIT=python-single-r1 waf-utils multilib-minimal
+IUSE=doc ldap +lmdb python test python_single_target_python3_8 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-libs/libbsd[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/popt[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-util/cmocka-1.1.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(-)?] >=sys-libs/talloc-2.3.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(-)?] >=sys-libs/tdb-1.4.6[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/tevent-0.11.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(-)?] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[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? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) test? ( python )
+RESTRICT=!test? ( test )
+SLOT=0/2.5.1
+SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.5.1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
+_md5_=e914a474fcece25a23b8d54d84d2b53c
diff --git a/metadata/md5-cache/sys-libs/libapparmor-3.0.1 b/metadata/md5-cache/sys-libs/libapparmor-3.0.1
deleted file mode 100644
index f4d3d71c951a..000000000000
--- a/metadata/md5-cache/sys-libs/libapparmor-3.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive sys-devel/bison sys-devel/flex doc? ( dev-lang/perl ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=perl? ( dev-lang/perl:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
-DESCRIPTION=Library to support AppArmor userspace utilities
-EAPI=7
-HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
-INHERIT=autotools distutils-r1 perl-functions
-IUSE=doc +perl +python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=perl? ( dev-lang/perl:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/3.0/3.0.1/+download/apparmor-3.0.1.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b93ba9e440104dd9d05cf987beb3bac7
diff --git a/metadata/md5-cache/sys-libs/libapparmor-3.0.3 b/metadata/md5-cache/sys-libs/libapparmor-3.0.3
deleted file mode 100644
index 529270e8298c..000000000000
--- a/metadata/md5-cache/sys-libs/libapparmor-3.0.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive sys-devel/bison sys-devel/flex doc? ( dev-lang/perl ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=perl? ( dev-lang/perl:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
-DESCRIPTION=Library to support AppArmor userspace utilities
-EAPI=8
-HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
-INHERIT=autotools distutils-r1 perl-functions
-IUSE=doc +perl +python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=perl? ( dev-lang/perl:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/3.0/3.0.3/+download/apparmor-3.0.3.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	distutils-r1	10a93585889c3ca7651cbcd2ee831e47	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d35974089499db85e64bbfbe12b8ddf0
diff --git a/metadata/md5-cache/sys-libs/libcxx-14.0.6 b/metadata/md5-cache/sys-libs/libcxx-14.0.6
new file mode 100644
index 000000000000..025bd9083cb2
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-14.0.6
@@ -0,0 +1,17 @@
+BDEPEND=!test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) test? ( >=dev-util/cmake-3.16 >=sys-devel/clang-3.9.0 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) verify-sig? ( sec-keys/openpgp-keys-llvm ) >=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=libcxxabi? ( ~sys-libs/libcxxabi-14.0.6[libunwind=,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-6 !!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 llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+libcxxabi +libunwind 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 ~riscv ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-14.0.6[libunwind=,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=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.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	e68bb6ac1b36c6eeced323c0334f1a4f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3abf6587f33af4029188a8b3c12eea3b
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6 b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
new file mode 100644
index 000000000000..c4e04f43a771
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
@@ -0,0 +1,16 @@
+BDEPEND=!test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) test? ( >=sys-devel/clang-3.9.0 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) verify-sig? ( sec-keys/openpgp-keys-llvm ) >=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=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-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(-)?] >=sys-libs/llvm-libunwind-3.9.0-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(-)?] ) ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=8
+HOMEPAGE=https://libcxxabi.llvm.org/
+INHERIT=cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+libunwind 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 ~riscv ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-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(-)?] >=sys-libs/llvm-libunwind-3.9.0-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 ) !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	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	e68bb6ac1b36c6eeced323c0334f1a4f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=03d30d915d64e6d3c7a10f863108ceca
diff --git a/metadata/md5-cache/sys-libs/libomp-14.0.6 b/metadata/md5-cache/sys-libs/libomp-14.0.6
new file mode 100644
index 000000000000..d294b7412a1b
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-14.0.6
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) sys-devel/clang ) verify-sig? ( sec-keys/openpgp-keys-llvm ) >=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=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? ( virtual/libelf:=[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/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-14.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) ) !!sys-devel/llvm:0
+DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
+EAPI=8
+HOMEPAGE=https://openmp.llvm.org
+INHERIT=cmake-multilib linux-info llvm llvm.org python-any-r1
+IUSE=cuda debug 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
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=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? ( virtual/libelf:=[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/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-14.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+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 )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	e68bb6ac1b36c6eeced323c0334f1a4f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0e28429a759aa5f4d717c9936cca9dfc
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.5.4-r1 b/metadata/md5-cache/sys-libs/libseccomp-2.5.4-r1
new file mode 100644
index 000000000000..92b9d01fa8d7
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libseccomp-2.5.4-r1
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-kernel/linux-headers-5.15 python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) dev-util/gperf python? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-kernel/linux-headers-5.15 python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
+DESCRIPTION=high level interface to Linux seccomp filter
+EAPI=7
+HOMEPAGE=https://github.com/seccomp/libseccomp
+INHERIT=distutils-r1 multilib-minimal
+IUSE=experimental-loong python static-libs test python_targets_python3_8 python_targets_python3_9 python_targets_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=-* ~loong
+LICENSE=LGPL-2.1
+RDEPEND=>=sys-kernel/linux-headers-5.15 python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.5.4/libseccomp-2.5.4.tar.gz experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/libseccomp-2.5.4-loongarch64-20220622.patch.xz )
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=841aea062227c81d7f66ceb44b02e34b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6 b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6
new file mode 100644
index 000000000000..de0775bc7a5b
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6
@@ -0,0 +1,16 @@
+BDEPEND=!test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) test? ( >=sys-devel/clang-3.9.0 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) verify-sig? ( sec-keys/openpgp-keys-llvm ) >=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-6 !!sys-devel/llvm:0
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=8
+HOMEPAGE=https://github.com/llvm-mirror/libunwind
+INHERIT=cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+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	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	e68bb6ac1b36c6eeced323c0334f1a4f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c5630e19e6637170dd234fc809f01db9
diff --git a/metadata/md5-cache/sys-libs/talloc-2.3.4 b/metadata/md5-cache/sys-libs/talloc-2.3.4
new file mode 100644
index 000000000000..c3f04eb50050
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/talloc-2.3.4
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) dev-libs/libxslt sys-devel/gettext
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[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? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) )
+DESCRIPTION=Samba talloc library
+EAPI=7
+HOMEPAGE=https://talloc.samba.org/
+INHERIT=waf-utils python-single-r1 multilib-minimal
+IUSE=compat +python python_single_target_python3_8 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris
+LICENSE=GPL-3 LGPL-3+ LGPL-2
+RDEPEND=!elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[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? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.3.4.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
+_md5_=2e79fa88418b7dabd8ba73daad7eec6c
diff --git a/metadata/md5-cache/sys-libs/tdb-1.4.7 b/metadata/md5-cache/sys-libs/tdb-1.4.7
new file mode 100644
index 000000000000..2839026ae8e7
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/tdb-1.4.7
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) app-text/docbook-xml-dtd:4.2
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libbsd[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? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) ) virtual/libcrypt
+DESCRIPTION=Simple database API
+EAPI=7
+HOMEPAGE=https://tdb.samba.org/
+INHERIT=waf-utils multilib-minimal python-single-r1
+IUSE=python 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_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/libbsd[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? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://samba.org/ftp/tdb/tdb-1.4.7.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
+_md5_=b69dfbc4a414e59b56625211ae305103
diff --git a/metadata/md5-cache/sys-libs/tevent-0.12.1 b/metadata/md5-cache/sys-libs/tevent-0.12.1
new file mode 100644
index 000000000000..7349749024ae
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/tevent-0.12.1
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libbsd[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/talloc-2.3.4[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? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) >=dev-util/cmocka-1.1.3 elibc_glibc? ( net-libs/libtirpc[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-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) )
+DESCRIPTION=Samba tevent library
+EAPI=7
+HOMEPAGE=https://tevent.samba.org/
+INHERIT=waf-utils multilib-minimal python-single-r1
+IUSE=python 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_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/libbsd[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/talloc-2.3.4[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? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://samba.org/ftp/tevent/tevent-0.12.1.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
+_md5_=9dfd58df4093c59eff9ff834813eefe9
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.12-r2 b/metadata/md5-cache/sys-libs/zlib-1.2.12-r2
index c730a1f8331f..08f894beb2c4 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.2.12-r2
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.12-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://zlib.net/
 INHERIT=autotools multilib-minimal usr-ldscript verify-sig
 IUSE=minizip 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 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 ~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=ZLIB
 RDEPEND=!sys-libs/zlib-ng[compat]
 SLOT=0/1
 SRC_URI=https://zlib.net/zlib-1.2.12.tar.gz https://zlib.net/fossils/zlib-1.2.12.tar.gz https://www.gzip.org/zlib/zlib-1.2.12.tar.gz https://www.zlib.net/current/beta/zlib-1.2.12.tar.gz verify-sig? ( https://zlib.net/zlib-1.2.12.tar.gz.asc ) elibc_Cygwin? ( https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> zlib-1.2.11-cygwin-gzopen_w.patch https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> zlib-1.2.7-cygwin-minizip.patch )
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=3504b0e1c834160efd567fd0573d1099
+_md5_=27d37b2fdecb30386cb00ab65b95a381
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 77f3a82d99c5..1431c15d2a28 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/cron-0-r2 b/metadata/md5-cache/virtual/cron-0-r3
similarity index 84%
rename from metadata/md5-cache/virtual/cron-0-r2
rename to metadata/md5-cache/virtual/cron-0-r3
index dda55b46d911..35ec30d049e0 100644
--- a/metadata/md5-cache/virtual/cron-0-r2
+++ b/metadata/md5-cache/virtual/cron-0-r3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for cron
-EAPI=6
+EAPI=7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 RDEPEND=|| ( sys-process/cronie sys-process/bcron sys-process/dcron sys-process/fcron sys-process/systemd-cron )
 SLOT=0
-_md5_=c0b5fab1e144309024f791552e3c8223
+_md5_=196c2f5487349600468faaaa0d173d8e
diff --git a/metadata/md5-cache/virtual/fortran-0 b/metadata/md5-cache/virtual/fortran-0-r1
similarity index 100%
rename from metadata/md5-cache/virtual/fortran-0
rename to metadata/md5-cache/virtual/fortran-0-r1
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.103.0-r2 b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.103.0-r2
index 6182c6ad2913..0927a2a77ce7 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.103.0-r2
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.103.0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Bzip2
 EAPI=8
-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
+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
 RDEPEND=|| ( =dev-lang/perl-5.36* =dev-lang/perl-5.34.1-r3 ~perl-core/Compress-Raw-Bzip2-2.103.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Bzip2-2.103.0 !>perl-core/Compress-Raw-Bzip2-2.103.0-r999
 SLOT=0
-_md5_=f6e9c372356d925164fa97e46c5f6e98
+_md5_=6a5dc455789391669a3a9356a2150b91
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.103.0-r1 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.103.0-r1
index b008f386c9ea..59a7ec8f8c34 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.103.0-r1
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.103.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Zlib
 EAPI=8
-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
+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
 RDEPEND=|| ( =dev-lang/perl-5.34.1-r3 ~perl-core/Compress-Raw-Zlib-2.103.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Zlib-2.103.0 !>perl-core/Compress-Raw-Zlib-2.103.0-r999
 SLOT=0
-_md5_=854f09af0a14d0bdec52e754b763e7d5
+_md5_=98a04a07fe9af7ca7b4edaa8d93b528f
diff --git a/metadata/md5-cache/virtual/perl-IO-Compress-2.103.0-r1 b/metadata/md5-cache/virtual/perl-IO-Compress-2.103.0-r1
index 8ea7f519e50f..052f6685826e 100644
--- a/metadata/md5-cache/virtual/perl-IO-Compress-2.103.0-r1
+++ b/metadata/md5-cache/virtual/perl-IO-Compress-2.103.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Compress
 EAPI=8
-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
+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
 RDEPEND=|| ( =dev-lang/perl-5.34.1-r3 ~perl-core/IO-Compress-2.103.0 ) dev-lang/perl:= !<perl-core/IO-Compress-2.103.0 !>perl-core/IO-Compress-2.103.0-r999 >=virtual/perl-Compress-Raw-Zlib-2.103.0 >=virtual/perl-Compress-Raw-Bzip2-2.103.0
 SLOT=0
-_md5_=71ce2ca08f678d3bb897798f05bafb7b
+_md5_=edff49dbc28d273595d56d5023c3435f
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.203.130 b/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.203.130
index 6a2b62e2935a..47d8e8a2d1e7 100644
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.203.130
+++ b/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.203.130
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-CoreList
 EAPI=8
-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
+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
 RDEPEND=|| ( =dev-lang/perl-5.34.1* ~perl-core/Module-CoreList-5.202.203.130 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.202.203.130 !>perl-core/Module-CoreList-5.202.203.130-r999
 SLOT=0
-_md5_=b895eefaf605e073fc308678602287ab
+_md5_=a2cdf076902dd672f35d270dd4b64088
diff --git a/metadata/md5-cache/virtual/rust-1.61.0 b/metadata/md5-cache/virtual/rust-1.61.0
index b7e1dac919d0..b413413e5081 100644
--- a/metadata/md5-cache/virtual/rust-1.61.0
+++ b/metadata/md5-cache/virtual/rust-1.61.0
@@ -3,8 +3,8 @@ DESCRIPTION=Virtual for Rust language compiler
 EAPI=8
 INHERIT=multilib-build
 IUSE=rustfmt 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 ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 RDEPEND=|| ( ~dev-lang/rust-1.61.0[rustfmt?,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-lang/rust-bin-1.61.0[rustfmt?,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
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1c9deb328374cd413bae3bb59e47d114
+_md5_=fb68fad3d1521c2ec4e2facfb0af9ebc
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index dc3e1c68bbf4..d2fa626bef43 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/hugo-0.98.0 b/metadata/md5-cache/www-apps/hugo-0.101.0
similarity index 70%
rename from metadata/md5-cache/www-apps/hugo-0.98.0
rename to metadata/md5-cache/www-apps/hugo-0.101.0
index 4f92aeae2f46..1c20219e6ef7 100644
--- a/metadata/md5-cache/www-apps/hugo-0.98.0
+++ b/metadata/md5-cache/www-apps/hugo-0.101.0
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-lang/go-1.18 test? ( dev-python/docutils dev-ruby/asciidoctor test-full? ( app-text/pandoc ) ) >=dev-lang/go-1.16 app-arch/unzip
+BDEPEND=>=dev-lang/go-1.18 test? ( dev-python/docutils dev-ruby/asciidoctor virtual/pandoc ) >=dev-lang/go-1.16 app-arch/unzip
 DEFINED_PHASES=compile configure install test unpack
 DEPEND=media-libs/libwebp:= sass? ( dev-libs/libsass:= )
 DESCRIPTION=Fast static HTML and CSS website generator
 EAPI=8
 HOMEPAGE=https://gohugo.io https://github.com/gohugoio/hugo
 INHERIT=go-module bash-completion-r1
-IUSE=doc +sass test test-full
+IUSE=doc +sass test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 MIT Unlicense
 RDEPEND=media-libs/libwebp:= sass? ( dev-libs/libsass:= )
 RESTRICT=!test? ( test ) strip
 SLOT=0
-SRC_URI=https://github.com/gohugoio/hugo/archive/v0.98.0.tar.gz -> hugo-0.98.0.tar.gz https://tastytea.de/files/gentoo/hugo-0.98.0-vendor.tar.xz
+SRC_URI=https://github.com/gohugoio/hugo/archive/v0.101.0.tar.gz -> hugo-0.101.0.tar.gz https://tastytea.de/files/gentoo/hugo-0.101.0-vendor.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5ec7f9001a5d52e5c42edf23f3d74c77
+_md5_=e65ef61e1274ff4f9bb77df192890787
diff --git a/metadata/md5-cache/www-apps/hugo-0.99.1 b/metadata/md5-cache/www-apps/hugo-0.99.1
index 0215f234b700..ca900ad1c863 100644
--- a/metadata/md5-cache/www-apps/hugo-0.99.1
+++ b/metadata/md5-cache/www-apps/hugo-0.99.1
@@ -1,11 +1,11 @@
-BDEPEND=>=dev-lang/go-1.18 test? ( dev-python/docutils dev-ruby/asciidoctor test-full? ( app-text/pandoc ) ) >=dev-lang/go-1.16 app-arch/unzip
+BDEPEND=>=dev-lang/go-1.18 test? ( dev-python/docutils dev-ruby/asciidoctor virtual/pandoc ) >=dev-lang/go-1.16 app-arch/unzip
 DEFINED_PHASES=compile configure install test unpack
 DEPEND=media-libs/libwebp:= sass? ( dev-libs/libsass:= )
 DESCRIPTION=Fast static HTML and CSS website generator
 EAPI=8
 HOMEPAGE=https://gohugo.io https://github.com/gohugoio/hugo
 INHERIT=go-module bash-completion-r1
-IUSE=doc +sass test test-full
+IUSE=doc +sass test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 MIT Unlicense
 RDEPEND=media-libs/libwebp:= sass? ( dev-libs/libsass:= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) strip
 SLOT=0
 SRC_URI=https://github.com/gohugoio/hugo/archive/v0.99.1.tar.gz -> hugo-0.99.1.tar.gz https://tastytea.de/files/gentoo/hugo-0.99.1-vendor.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=67c862b2829c7a6b27444c45df5a4758
+_md5_=c6502cbd713566821a945c3e03f0b69e
diff --git a/metadata/md5-cache/www-apps/nikola-8.2.2 b/metadata/md5-cache/www-apps/nikola-8.2.2-r1
similarity index 61%
rename from metadata/md5-cache/www-apps/nikola-8.2.2
rename to metadata/md5-cache/www-apps/nikola-8.2.2-r1
index bfef52be1a5d..bcfcefb34a4b 100644
--- a/metadata/md5-cache/www-apps/nikola-8.2.2
+++ b/metadata/md5-cache/www-apps/nikola-8.2.2-r1
@@ -1,17 +1,17 @@
 BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=>=dev-python/docutils-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=A static website and blog generator
 EAPI=8
 HOMEPAGE=https://getnikola.com/
-INHERIT=distutils-r1
-IUSE=charts hyphenation ipython jinja server watchdog webmedia python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+INHERIT=distutils-r1 optfeature
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~riscv
 LICENSE=MIT Apache-2.0 CC0-1.0 public-domain
-RDEPEND=>=dev-python/docutils-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/doit-0.32[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-3.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mako-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/natsort-3.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/piexif-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyRSS2Gen-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/unidecode-0.04.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/yapsy-1.11.223[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] charts? ( >=dev-python/pygal-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) hyphenation? ( >=dev-python/pyphen-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ipython? ( >=dev-python/ipython-2.0.0[notebook,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) jinja? ( >=dev-python/jinja-2.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) server? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) watchdog? ( >=dev-python/watchdog-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) webmedia? ( >=dev-python/micawber-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=server? ( watchdog ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/docutils-0.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/doit-0.32[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-3.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mako-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/natsort-3.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/piexif-1.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PyRSS2Gen-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/unidecode-0.04.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/yapsy-1.11.223[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cloudpickle[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-8.2.2.tar.gz
-_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=83d4f99ca9997e4a8ed6993ba825ce70
+_eclasses_=distutils-r1	10a93585889c3ca7651cbcd2ee831e47	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a826c10f5663857bdd10c3f6b3f654c1
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 0a6273860296..8b1d739088c6 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/firefox-101.0.1 b/metadata/md5-cache/www-client/firefox-101.0.1
deleted file mode 100644
index bca86e66b03a..000000000000
--- a/metadata/md5-cache/www-client/firefox-101.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.9-r1:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.59.0 || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.78 >=dev-libs/nspr-4.32 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[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb:= x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-0.9.3:= >=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-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0: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= ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0
-DESCRIPTION=Firefox Web Browser
-EAPI=8
-HOMEPAGE=https://www.mozilla.com/firefox
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.78 >=dev-libs/nspr-4.32 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[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb:= x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-0.9.3:= >=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-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0: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= ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) !www-client/firefox:0 !www-client/firefox:esr jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) screencast? ( wayland )
-SLOT=rapid
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/101.0.1/source/firefox-101.0.1.source.tar.xz -> firefox-101.0.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-101-patches-05j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-101-patches-05j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-101-patches-05j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-101-patches-05j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/af.xpi -> firefox-101.0.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ar.xpi -> firefox-101.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ast.xpi -> firefox-101.0.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/be.xpi -> firefox-101.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bg.xpi -> firefox-101.0.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/br.xpi -> firefox-101.0.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ca.xpi -> firefox-101.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cak.xpi -> firefox-101.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cs.xpi -> firefox-101.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cy.xpi -> firefox-101.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/da.xpi -> firefox-101.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/de.xpi -> firefox-101.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-101.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/el.xpi -> firefox-101.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-101.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-101.0.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-101.0.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-101.0.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/et.xpi -> firefox-101.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/eu.xpi -> firefox-101.0.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fi.xpi -> firefox-101.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fr.xpi -> firefox-101.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-101.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-101.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gd.xpi -> firefox-101.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gl.xpi -> firefox-101.0.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/he.xpi -> firefox-101.0.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hr.xpi -> firefox-101.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-101.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hu.xpi -> firefox-101.0.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/id.xpi -> firefox-101.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/is.xpi -> firefox-101.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/it.xpi -> firefox-101.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ja.xpi -> firefox-101.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ka.xpi -> firefox-101.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kab.xpi -> firefox-101.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kk.xpi -> firefox-101.0.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ko.xpi -> firefox-101.0.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lt.xpi -> firefox-101.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lv.xpi -> firefox-101.0.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ms.xpi -> firefox-101.0.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-101.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nl.xpi -> firefox-101.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-101.0.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-101.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pl.xpi -> firefox-101.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-101.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-101.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/rm.xpi -> firefox-101.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ro.xpi -> firefox-101.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ru.xpi -> firefox-101.0.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sk.xpi -> firefox-101.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sl.xpi -> firefox-101.0.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sq.xpi -> firefox-101.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sr.xpi -> firefox-101.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-101.0.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/th.xpi -> firefox-101.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/tr.xpi -> firefox-101.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/uk.xpi -> firefox-101.0.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/uz.xpi -> firefox-101.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/vi.xpi -> firefox-101.0.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-101.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-101.0.1-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ach.xpi -> firefox-101.0.1-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/an.xpi -> firefox-101.0.1-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/az.xpi -> firefox-101.0.1-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bn.xpi -> firefox-101.0.1-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bs.xpi -> firefox-101.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-101.0.1-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/eo.xpi -> firefox-101.0.1-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-101.0.1-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-101.0.1-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fa.xpi -> firefox-101.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ff.xpi -> firefox-101.0.1-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gn.xpi -> firefox-101.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-101.0.1-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-101.0.1-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-101.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ia.xpi -> firefox-101.0.1-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/km.xpi -> firefox-101.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kn.xpi -> firefox-101.0.1-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lij.xpi -> firefox-101.0.1-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/mk.xpi -> firefox-101.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/mr.xpi -> firefox-101.0.1-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/my.xpi -> firefox-101.0.1-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-101.0.1-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/oc.xpi -> firefox-101.0.1-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sco.xpi -> firefox-101.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/si.xpi -> firefox-101.0.1-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/son.xpi -> firefox-101.0.1-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/szl.xpi -> firefox-101.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ta.xpi -> firefox-101.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/te.xpi -> firefox-101.0.1-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/tl.xpi -> firefox-101.0.1-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/trs.xpi -> firefox-101.0.1-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ur.xpi -> firefox-101.0.1-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/xh.xpi -> firefox-101.0.1-xh.xpi )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=876837b352a0702a0fbef2b6684d6085
diff --git a/metadata/md5-cache/www-client/firefox-101.0.1-r10 b/metadata/md5-cache/www-client/firefox-101.0.1-r10
deleted file mode 100644
index 7cdbcccd6bb3..000000000000
--- a/metadata/md5-cache/www-client/firefox-101.0.1-r10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.9-r1:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.59.0 || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-libs/glib:2 dev-libs/atk dev-libs/expat dev-libs/libffi:= >=dev-libs/nss-3.78 >=dev-libs/nspr-4.32 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 ) 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-0.9.3:= >=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-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0: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? ( 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:= ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) X? ( x11-libs/libICE x11-libs/libSM ) !!sys-devel/llvm:0
-DESCRIPTION=Firefox Web Browser
-EAPI=8
-HOMEPAGE=https://www.mozilla.com/firefox
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi geckodriver +gmp-autoupdate screencast +X l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/glib:2 dev-libs/atk dev-libs/expat dev-libs/libffi:= >=dev-libs/nss-3.78 >=dev-libs/nspr-4.32 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 ) 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-0.9.3:= >=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-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0: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? ( 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:= ) !www-client/firefox:0 !www-client/firefox:esr jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) || ( X wayland ) pgo? ( X ) screencast? ( wayland )
-SLOT=rapid
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/101.0.1/source/firefox-101.0.1.source.tar.xz -> firefox-101.0.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-101-patches-05jwl.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-101-patches-05jwl.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-101-patches-05jwl.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-101-patches-05jwl.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/af.xpi -> firefox-101.0.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ar.xpi -> firefox-101.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ast.xpi -> firefox-101.0.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/be.xpi -> firefox-101.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bg.xpi -> firefox-101.0.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/br.xpi -> firefox-101.0.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ca.xpi -> firefox-101.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cak.xpi -> firefox-101.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cs.xpi -> firefox-101.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/cy.xpi -> firefox-101.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/da.xpi -> firefox-101.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/de.xpi -> firefox-101.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-101.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/el.xpi -> firefox-101.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-101.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-101.0.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-101.0.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-101.0.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/et.xpi -> firefox-101.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/eu.xpi -> firefox-101.0.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fi.xpi -> firefox-101.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fr.xpi -> firefox-101.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-101.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-101.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gd.xpi -> firefox-101.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gl.xpi -> firefox-101.0.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/he.xpi -> firefox-101.0.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hr.xpi -> firefox-101.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-101.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hu.xpi -> firefox-101.0.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/id.xpi -> firefox-101.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/is.xpi -> firefox-101.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/it.xpi -> firefox-101.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ja.xpi -> firefox-101.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ka.xpi -> firefox-101.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kab.xpi -> firefox-101.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kk.xpi -> firefox-101.0.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ko.xpi -> firefox-101.0.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lt.xpi -> firefox-101.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lv.xpi -> firefox-101.0.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ms.xpi -> firefox-101.0.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-101.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nl.xpi -> firefox-101.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-101.0.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-101.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pl.xpi -> firefox-101.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-101.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-101.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/rm.xpi -> firefox-101.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ro.xpi -> firefox-101.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ru.xpi -> firefox-101.0.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sk.xpi -> firefox-101.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sl.xpi -> firefox-101.0.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sq.xpi -> firefox-101.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sr.xpi -> firefox-101.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-101.0.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/th.xpi -> firefox-101.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/tr.xpi -> firefox-101.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/uk.xpi -> firefox-101.0.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/uz.xpi -> firefox-101.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/vi.xpi -> firefox-101.0.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-101.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-101.0.1-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ach.xpi -> firefox-101.0.1-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/an.xpi -> firefox-101.0.1-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/az.xpi -> firefox-101.0.1-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bn.xpi -> firefox-101.0.1-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/bs.xpi -> firefox-101.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-101.0.1-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/eo.xpi -> firefox-101.0.1-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-101.0.1-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-101.0.1-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/fa.xpi -> firefox-101.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ff.xpi -> firefox-101.0.1-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gn.xpi -> firefox-101.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-101.0.1-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-101.0.1-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-101.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ia.xpi -> firefox-101.0.1-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/km.xpi -> firefox-101.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/kn.xpi -> firefox-101.0.1-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/lij.xpi -> firefox-101.0.1-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/mk.xpi -> firefox-101.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/mr.xpi -> firefox-101.0.1-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/my.xpi -> firefox-101.0.1-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-101.0.1-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/oc.xpi -> firefox-101.0.1-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/sco.xpi -> firefox-101.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/si.xpi -> firefox-101.0.1-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/son.xpi -> firefox-101.0.1-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/szl.xpi -> firefox-101.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ta.xpi -> firefox-101.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/te.xpi -> firefox-101.0.1-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/tl.xpi -> firefox-101.0.1-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/trs.xpi -> firefox-101.0.1-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/ur.xpi -> firefox-101.0.1-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/101.0.1/linux-x86_64/xpi/xh.xpi -> firefox-101.0.1-xh.xpi )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=23b9a6be82bf48a5d9811c8b3dbd5b84
diff --git a/metadata/md5-cache/www-client/links-2.26-r1 b/metadata/md5-cache/www-client/links-2.26-r1
index d10f71f57ee3..3edf6696ccb5 100644
--- a/metadata/md5-cache/www-client/links-2.26-r1
+++ b/metadata/md5-cache/www-client/links-2.26-r1
@@ -7,11 +7,11 @@ HOMEPAGE=http://links.twibright.com/
 IDEPEND=X? ( dev-util/desktop-file-utils )
 INHERIT=autotools desktop toolchain-funcs xdg-utils
 IUSE=brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode webp X zlib zstd
-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 ~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 ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/libbsd brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) freetype? ( media-libs/fontconfig media-libs/freetype ) gpm? ( sys-libs/gpm ) jpeg? ( media-libs/libjpeg-turbo:= ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm media-libs/libjpeg-turbo:= ) lzip? ( app-arch/lzip ) lzma? ( app-arch/xz-utils ) ssl? ( dev-libs/openssl:0= ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp:= ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
 REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
 SLOT=2
 SRC_URI=http://links.twibright.com/download/links-2.26.tar.bz2
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c2c45a9b09d1a44e0188aa63d8701548
+_md5_=4b3a8e7f171c5e1ee30a94731864c20e
diff --git a/metadata/md5-cache/www-client/vivaldi-5.3.2679.58 b/metadata/md5-cache/www-client/vivaldi-5.3.2679.58
index 88a6f8e4e4f6..9339ff37dc4f 100644
--- a/metadata/md5-cache/www-client/vivaldi-5.3.2679.58
+++ b/metadata/md5-cache/www-client/vivaldi-5.3.2679.58
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://vivaldi.com/
 INHERIT=chromium-2 desktop unpacker xdg
 IUSE=proprietary-codecs widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64
+KEYWORDS=-* amd64 ~arm ~arm64
 LICENSE=Vivaldi
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:102 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.58-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.58-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.58-1_arm64.deb )
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c91ac2d27bf30f3918339336bb7d010d
+_md5_=ed712b79f613228d67574e054165cf53
diff --git a/metadata/md5-cache/www-client/vivaldi-5.3.2679.55 b/metadata/md5-cache/www-client/vivaldi-5.3.2679.61
similarity index 88%
rename from metadata/md5-cache/www-client/vivaldi-5.3.2679.55
rename to metadata/md5-cache/www-client/vivaldi-5.3.2679.61
index 70b22731900f..64d4872a92c2 100644
--- a/metadata/md5-cache/www-client/vivaldi-5.3.2679.55
+++ b/metadata/md5-cache/www-client/vivaldi-5.3.2679.61
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://vivaldi.com/
 INHERIT=chromium-2 desktop unpacker xdg
 IUSE=proprietary-codecs widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 ~arm ~arm64
+KEYWORDS=-* ~amd64 ~arm ~arm64
 LICENSE=Vivaldi
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:102 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.55-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.55-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.55-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.61-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.61-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_5.3.2679.61-1_arm64.deb )
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ed712b79f613228d67574e054165cf53
+_md5_=c91ac2d27bf30f3918339336bb7d010d
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2704.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2712.3
similarity index 93%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2704.3
rename to metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2712.3
index dccdad5ecf3b..9f23d7783863 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2704.3
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2712.3
@@ -9,6 +9,6 @@ LICENSE=Vivaldi
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:102 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2704.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2704.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2704.3-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2712.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2712.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.4.2712.3-1_arm64.deb )
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c91ac2d27bf30f3918339336bb7d010d
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 98b642c3a044..5088548f0cd5 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/apache-2.4.54 b/metadata/md5-cache/www-servers/apache-2.4.54
index 81eeb88dfe29..db17f79bffb9 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.54
+++ b/metadata/md5-cache/www-servers/apache-2.4.54
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://httpd.apache.org/
 INHERIT=apache-2 systemd tmpfiles toolchain-funcs
 IUSE=lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ssl debug doc gdbm ldap selinux ssl static suexec +suexec-caps suexec-syslog split-usr threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_auth_form apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authn_socache apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers +apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_lua apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_hcheck apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_http2 apache2_modules_proxy_fcgi apache2_modules_proxy_uwsgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_session apache2_modules_session_cookie apache2_modules_session_crypto apache2_modules_session_dbd apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_socache_memcache apache2_modules_socache_shmcb apache2_modules_speling apache2_modules_status apache2_modules_substitute systemd apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.54
 RDEPEND=dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( 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 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) virtual/tmpfiles
@@ -14,4 +14,4 @@ REQUIRED_USE=apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !t
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.54.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
 _eclasses_=apache-2	7f8f655013bcf05aba273b10f94032bc	autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	user	6d5286606283893a6f21db7860e5cc6c	user-info	69a1ed744ec33cf2c910ff2bd6084d11	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fe1c371c2eaca89ea92c83ec5094b605
+_md5_=d33da540dd8361a4f45ecc9f630a7c27
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index f4d902fdae6b..5967ef5aaeaa 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xcb-proto-1.14.1 b/metadata/md5-cache/x11-base/xcb-proto-1.14.1
deleted file mode 100644
index b97e821bf03e..000000000000
--- a/metadata/md5-cache/x11-base/xcb-proto-1.14.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/libxml2 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DESCRIPTION=X C-language Bindings protocol headers
-EAPI=7
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto
-INHERIT=python-r1 xorg-3
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_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=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/proto/xcb-proto-1.14.1.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	d2463997f7fda5cfc20b4c390039a361
-_md5_=dc9d84dfc39d887cd524b2b75335ddf0
diff --git a/metadata/md5-cache/x11-base/xcb-proto-1.15 b/metadata/md5-cache/x11-base/xcb-proto-1.15
index fec6967ff4f6..d80ee061e901 100644
--- a/metadata/md5-cache/x11-base/xcb-proto-1.15
+++ b/metadata/md5-cache/x11-base/xcb-proto-1.15
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto
 INHERIT=python-r1 xorg-3
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_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=~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
+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=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/proto/xcb-proto-1.15.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	d2463997f7fda5cfc20b4c390039a361
-_md5_=804eca157656bca52cc61d71851fb654
+_md5_=9d9d56b67584aace01b7e5e59fee480b
diff --git a/metadata/md5-cache/x11-base/xcb-proto-1.15.1 b/metadata/md5-cache/x11-base/xcb-proto-1.15.1
deleted file mode 100644
index 934219ae8992..000000000000
--- a/metadata/md5-cache/x11-base/xcb-proto-1.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) dev-libs/libxml2 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DESCRIPTION=X C-language Bindings protocol headers
-EAPI=7
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto
-INHERIT=python-r1 xorg-3
-IUSE=python_targets_python3_8 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
-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=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/proto/xcb-proto-1.15.1.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	d2463997f7fda5cfc20b4c390039a361
-_md5_=721f5ae746e6a17284bc50e42b0e641c
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.1 b/metadata/md5-cache/x11-base/xwayland-22.1.1
deleted file mode 100644
index 0e7a6e6d1fc1..000000000000
--- a/metadata/md5-cache/x11-base/xwayland-22.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-base/xorg-proto >=x11-libs/xtrans-1.3.5
-DESCRIPTION=Standalone X server running under Wayland
-EAPI=7
-HOMEPAGE=https://wayland.freedesktop.org/xserver.html
-INHERIT=meson
-IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=519aa5e1976cf181b4f624caadf46611
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index ea881ce57936..a4b0254bdbfa 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.0
deleted file mode 100644
index 40f478e723bc..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
-DEPEND=>=dev-libs/libinput-1.11.0:0= >=x11-base/xorg-proto-2021.5 x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
-DESCRIPTION=X.org input driver based on libinput
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput
-INHERIT=linux-info xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libinput-1.11.0:0= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-1.2.0.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	d2463997f7fda5cfc20b4c390039a361
-_md5_=682e541d02894fc674cdb9f5e907f009
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index bbf180cb730f..860596536847 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/gtksourceview-3.24.11 b/metadata/md5-cache/x11-libs/gtksourceview-3.24.11
deleted file mode 100644
index 0706218b05cd..000000000000
--- a/metadata/md5-cache/x11-libs/gtksourceview-3.24.11
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.4 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] dev-lang/vala:0.54[vapigen(+)] dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DESCRIPTION=A text widget implementing syntax highlighting and other features
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
-INHERIT=gnome2 vala virtualx
-IUSE=glade +introspection +vala test
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=3.0/3
-SRC_URI=mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.11.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3551d3b52ddc00722267fd3271b853d9
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-3.24.11-r1 b/metadata/md5-cache/x11-libs/gtksourceview-3.24.11-r1
new file mode 100644
index 000000000000..a2823e2afaed
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/gtksourceview-3.24.11-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.4 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] dev-lang/vala:0.54[vapigen(+)] dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+DESCRIPTION=A text widget implementing syntax highlighting and other features
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
+INHERIT=gnome2 vala virtualx
+IUSE=glade +introspection +vala test
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=3.0/3
+SRC_URI=mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.11.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=418e18b10883d18c8a9ab740216ce92f
diff --git a/metadata/md5-cache/x11-libs/libX11-1.8 b/metadata/md5-cache/x11-libs/libX11-1.8
deleted file mode 100644
index 8aec86b6d05d..000000000000
--- a/metadata/md5-cache/x11-libs/libX11-1.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libxcb-1.11.1[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-misc/compose-tables x11-base/xorg-proto x11-libs/xtrans
-DESCRIPTION=X.Org X11 library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
-INHERIT=toolchain-funcs xorg-3
-IUSE=ipv6 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 doc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=MIT
-RDEPEND=>=x11-libs/libxcb-1.11.1[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-misc/compose-tables
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.8.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	d2463997f7fda5cfc20b4c390039a361
-_md5_=d9fde6c758b174631234ae5bd4cba3ec
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.110 b/metadata/md5-cache/x11-libs/libdrm-2.4.110
deleted file mode 100644
index dd55520beb37..000000000000
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.110
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-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(-)?] ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=X.Org libdrm library
-EAPI=7
-HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
-INHERIT=python-any-r1 meson-multilib
-IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind 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 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-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
-SLOT=0
-SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.110.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=078a1c4e3f6c8cfd15fe96295bbdae8d
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.111 b/metadata/md5-cache/x11-libs/libdrm-2.4.111
index e49c4a34071e..61cd800e24fd 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.111
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.111
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
 INHERIT=python-any-r1 meson-multilib
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware valgrind 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 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-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
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.111.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8326ce5de3625e4193674a489c74c461
+_md5_=9126e1c59a38b99bdf171f3dfb3af42b
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.14 b/metadata/md5-cache/x11-libs/libxcb-1.14
deleted file mode 100644
index 3be29d1bc67c..000000000000
--- a/metadata/md5-cache/x11-libs/libxcb-1.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] >=dev-lang/python-3.9.9-r1:3.9[xml] >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] >=x11-base/xcb-proto-1.14[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen[dot] ) test? ( dev-libs/libxslt ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libXau-1.0.7-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(-)?] >=x11-libs/libXdmcp-1.1.1-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(-)?] >=x11-base/xcb-proto-1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elibc_Darwin? ( dev-libs/libpthread-stubs ) test? ( dev-libs/check[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=X C-language Bindings library
-EAPI=7
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb
-INHERIT=python-any-r1 xorg-3
-IUSE=doc selinux test +xkb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=x11-libs/libXau-1.0.7-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(-)?] >=x11-libs/libXdmcp-1.1.1-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/1.12
-SRC_URI=https://www.x.org/releases/individual/lib/libxcb-1.14.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	d2463997f7fda5cfc20b4c390039a361
-_md5_=7d9afe92c4429f4afac4c996356d3072
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.15 b/metadata/md5-cache/x11-libs/libxcb-1.15
index 3464c41f751d..6cccad355653 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.15
+++ b/metadata/md5-cache/x11-libs/libxcb-1.15
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb
 INHERIT=python-any-r1 xorg-3
 IUSE=doc selinux test +xkb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-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
+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=>=x11-libs/libXau-1.0.7-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(-)?] >=x11-libs/libXdmcp-1.1.1-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/1.12
 SRC_URI=https://www.x.org/releases/individual/lib/libxcb-1.15.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	d2463997f7fda5cfc20b4c390039a361
-_md5_=53a5dc92fc47e54bd2f7045fc43e54b0
+_md5_=9df05b6e2d28f66544f5a8b41d1a7824
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-1.4.0 b/metadata/md5-cache/x11-libs/libxkbcommon-1.4.0
deleted file mode 100644
index f0738e7ead38..000000000000
--- a/metadata/md5-cache/x11-libs/libxkbcommon-1.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/bison doc? ( app-doc/doxygen ) test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install setup test
-DEPEND=X? ( >=x11-libs/libxcb-1.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(-)?,xkb] ) wayland? ( >=dev-libs/wayland-1.2.0 ) dev-libs/libxml2[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-misc/compose-tables X? ( x11-base/xorg-proto ) wayland? ( >=dev-libs/wayland-protocols-1.12 )
-DESCRIPTION=keymap handling library for toolkits and window systems
-EAPI=8
-HOMEPAGE=https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/
-INHERIT=meson-multilib python-any-r1 virtualx
-IUSE=doc static-libs test tools wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=X? ( >=x11-libs/libxcb-1.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(-)?,xkb] ) wayland? ( >=dev-libs/wayland-1.2.0 ) dev-libs/libxml2[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-misc/compose-tables
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://xkbcommon.org/download/libxkbcommon-1.4.0.tar.xz
-_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=17e3cb3db5caf922ddd34829e100903a
diff --git a/metadata/md5-cache/x11-libs/spread-sheet-widget-0.7 b/metadata/md5-cache/x11-libs/spread-sheet-widget-0.7
index 912f6d0f2896..23c234f007a4 100644
--- a/metadata/md5-cache/x11-libs/spread-sheet-widget-0.7
+++ b/metadata/md5-cache/x11-libs/spread-sheet-widget-0.7
@@ -3,9 +3,9 @@ DEPEND=dev-libs/glib x11-libs/gtk+:3
 DESCRIPTION=GNU Spread Sheet Widget
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/ssw/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-0.7.tar.gz
-_md5_=6270c57d310ad2b54ff0c7669dc55785
+_md5_=6823d712a191aeae9d967cacd53cb71f
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index c0c81fe2ac1b..ac10e240c19b 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/bbppp-0.2.5-r1 b/metadata/md5-cache/x11-misc/bbppp-0.2.5-r1
index cff432e27c91..6641ae378d42 100644
--- a/metadata/md5-cache/x11-misc/bbppp-0.2.5-r1
+++ b/metadata/md5-cache/x11-misc/bbppp-0.2.5-r1
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install postinst prepare
-DEPEND=x11-libs/libX11
+DEPEND=x11-libs/libX11 elibc_musl? ( net-libs/ppp-defs )
 DESCRIPTION=blackbox ppp frontend/monitor
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/bbtools/
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 media-fonts/font-adobe-100dpi
 SLOT=0
 SRC_URI=mirror://sourceforge/bbtools/bbppp/bbppp-0.2.5/bbppp-0.2.5.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f556e9c2c2f28c2c652f9eac5514377d
+_md5_=37cf238d0bb5bdda611e642eead4b1f5
diff --git a/metadata/md5-cache/x11-misc/compose-tables-1.8 b/metadata/md5-cache/x11-misc/compose-tables-1.8
deleted file mode 100644
index 22aa33ebdd3e..000000000000
--- a/metadata/md5-cache/x11-misc/compose-tables-1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1 x11-libs/xtrans
-DESCRIPTION=X.Org Compose Key tables from libX11
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/compose-tables
-INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=MIT
-RDEPEND=!<x11-libs/libX11-1.7.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.8.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	d2463997f7fda5cfc20b4c390039a361
-_md5_=f5dd1b069b42221ab4c4c0f0ea229e49
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.35.1 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.35.1
deleted file mode 100644
index 890200044ab2..000000000000
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.35.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-lang/perl dev-libs/libxslt sys-devel/gettext >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DESCRIPTION=X keyboard configuration database
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
-INHERIT=meson python-any-r1
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.35.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4a892ae8e20bf93d390dbc7095317eb7
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.36 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.36
index 1f78884dee2a..b89c80d1fba7 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.36
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.36
@@ -4,9 +4,9 @@ DESCRIPTION=X keyboard configuration database
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
 INHERIT=meson python-any-r1
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.36.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5fc4a830917f65107d6d6036bd0d07e7
+_md5_=af8b063819b46b5af38bf7bbc5e1291c
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index a3be0455d523..b67d4355b042 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/purple-libnotify-plus-2.99.1 b/metadata/md5-cache/x11-plugins/purple-libnotify-plus-2.99.1
index d59855be0932..4c94b7d43571 100644
--- a/metadata/md5-cache/x11-plugins/purple-libnotify-plus-2.99.1
+++ b/metadata/md5-cache/x11-plugins/purple-libnotify-plus-2.99.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=prepare
 DEPEND=net-im/pidgin >=net-im/purple-events-0.99.1 x11-libs/gdk-pixbuf >=x11-libs/libnotify-0.7.0
 DESCRIPTION=Provide libnotify interface to Pidgin and Finch
 EAPI=7
-HOMEPAGE=http://purple-libnotify-plus.sardemff7.net/
+HOMEPAGE=https://github.com/sardemff7/purple-libnotify-plus
 INHERIT=autotools
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
@@ -11,4 +11,4 @@ RDEPEND=net-im/pidgin >=net-im/purple-events-0.99.1 x11-libs/gdk-pixbuf >=x11-li
 SLOT=0
 SRC_URI=https://github.com/sardemff7/purple-libnotify-plus/archive/v2.99.1.tar.gz -> purple-libnotify-plus-2.99.1.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=49cca381ca361d1e2f387f6580c54976
+_md5_=802ca4403ea73f70ef69b5668a4c6bed
diff --git a/metadata/md5-cache/x11-plugins/wmnet-1.06-r2 b/metadata/md5-cache/x11-plugins/wmnet-1.06-r2
index d4a3fb9ca0d6..6b1f06a25caa 100644
--- a/metadata/md5-cache/x11-plugins/wmnet-1.06-r2
+++ b/metadata/md5-cache/x11-plugins/wmnet-1.06-r2
@@ -1,6 +1,6 @@
 BDEPEND=x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 app-text/rman
 DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libX11 x11-libs/libXext
+DEPEND=x11-libs/libX11 x11-libs/libXext elibc_musl? ( net-libs/ppp-defs )
 DESCRIPTION=WMnet is a dock.app network monitor
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/wmnet
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmnet-1.06.tar.gz mirror://gentoo/wmnet-1.06-misc.patch.bz2
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9abf52adf7b92da148c45bc9dbf5baf8
+_md5_=24ce75923b9d3c8a949f1254b3228a4f
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 2c52e001da2f..bd6b5fd0029b 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/cwm-7.1 b/metadata/md5-cache/x11-wm/cwm-7.1
new file mode 100644
index 000000000000..9c2b2c03b32f
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/cwm-7.1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXrandr
+DESCRIPTION=OpenBSD fork of calmwm, a clean and lightweight window manager
+EAPI=8
+HOMEPAGE=https://github.com/leahneukirchen/cwm https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+INHERIT=desktop toolchain-funcs
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=ISC
+RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXrandr
+SLOT=0
+SRC_URI=https://github.com/leahneukirchen/cwm/archive/v7.1.tar.gz -> cwm-7.1.tar.gz
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=1aa70dd648b9592a684da3d1a5766831
diff --git a/metadata/md5-cache/x11-wm/cwm-9999 b/metadata/md5-cache/x11-wm/cwm-9999
index d04325094ed4..cac74e4ff4bd 100644
--- a/metadata/md5-cache/x11-wm/cwm-9999
+++ b/metadata/md5-cache/x11-wm/cwm-9999
@@ -1,13 +1,13 @@
 BDEPEND=sys-devel/bison virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
+DEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXrandr
 DESCRIPTION=OpenBSD fork of calmwm, a clean and lightweight window manager
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/leahneukirchen/cwm https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
 INHERIT=desktop toolchain-funcs git-r3
 LICENSE=ISC
 PROPERTIES=live
-RDEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
+RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXrandr
 SLOT=0
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3a9fae011137eec18d59807450b0727a
+_md5_=1aa70dd648b9592a684da3d1a5766831
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index ad9444a9a836..ec144131391f 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 17528 BLAKE2B d9231e54893c496e7d93671affd023bace9eabe8a3df2a22e31994addce35c17bf9b6d58612cb0592614d9061cda9b5ff59c9663749d31fd54c1516697af64e3 SHA512 12f7f26ceb887fedd096de54a33efe48f24504d2886e22e6ed743973248dc8c2e7df8ef0007d3872cf34823edb7df22e41994f2f1ca9c215ea4914c5ca96242f
-TIMESTAMP 2022-06-23T07:09:37Z
+TIMESTAMP 2022-06-25T16:39:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmK0EbFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmK3OktfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBGJBAArwuJ3xtdwiVZoByrCYg4FEbwuEC2XtHIx8GGcX2LA31dAk3s+xUJJrqO
-rIzv3iXKcAqGP06VX0RBhHZwdDGJ0ufLK8t6swaiFFxSjfebuj8GjrCSsqK5NAWY
-EgfAem+JSXzofawQAYyzjNGs8d2yrVjNMcsydkv3lCc1VVXokNjYIHa9JrZCJJ5j
-TqAlr1jQuFChoZ5Thit5jV/64UbhLcLP3xQ4+JUWI2jAR2dXUuypdBrVT2HKBGx/
-Zkic6HS3tizK6A4sMQC6xsiUvOILzE1d0bvvU9QltChmXnzmCRGG8xVZmYJpRofK
-atCF0gx6W8F4nZcGeqpa5ZWITiz9le/cDS1+eBQYoidQPJZMYgm53FBxERtV/OJu
-usgtp5Ws7CKg7Cw+7vs5YKTsHrBymPnX1FbOxxftScD1CYwcfENPfkyZQ13s7R2A
-K4q86rz/ilISFOpX5FrOvmMjN0nfghsc3WdHUgsdwketMBtS2SVgmFEeB2YtzP2t
-x33ve3hj3H3YL8nI/oPqoo5wDxt4baxIylEna09iIlLjmQ+te7G3u2wPYoDpXjLT
-J+/d5ICRncbIb5su5BEaD+jy6c5X3rTt5/WxBp3w2U2ZbF5WES/RTsnHtSmdfgyb
-fAVEB79qU4xToa4zHLk8wk/a0Uh5kthmRSTY3/6tD/57Fr9PmZc=
-=NEa1
+klDxOg/8CrlAJH1mMQ/BFOndLTtx0lF0ug3dD+rGPmeSjv83tg3COOOy2ktaU/D6
+BmU3pp1H/Pf7R7oYVG4DPGG33eVnnqH5/EyCowKEyd31V7UVPrUyNvI/sfP3w1b3
+y7q9fJ4msrw5YiIkX9fnt/vwCJ0s6v6VJ2hL1PppvNM+Q3BVVvyItbhRfQFdgFG7
+1MgrfrJuFz9vYvmbbWzDUZytQa2ON2Bwnx9x3wxo0QZDHNAlGlVqHk2dEG0PohP5
+cfz/LNhbJiWSfN/Xpm14+2reko+nuNIkOI8faR0YFt/dVXD2FM3ikhERaEB8Sn34
+PT2rBJ1nS41sR2dRhOXR6c0GB87wlTp2Wyi0dCjJox5xTdUFFs8hdJHTONcZT60P
+sp2qhQZFeT+gFEyJUXmTZ2J9T3J1jOEy/6MqgRcDQrAFzbCeTrvHDlHcj8qZwWjA
+MKHDKrhgwMPgo1cug+f+dJKbGjJCmdfNv/c6qUeMPPhBrRodCiRjuv+UxxIlEpdR
+u9LmrQOU6PvbtcBauaI6YsH4n4pP7xdhhiF6f0NSo+XiRAi6oid9XmCDSKCI03tI
+09aLPR6T6mXG9lq2u/98Ager2BtszjTc7QDEGEC72/qTzbfD/zIgJGW1Tw5VOyHP
+z2F26IPrBnKH86PfRfeuqYsFHnXI3GJRlwr2aDLoxPa1D7dYT5g=
+=Xci6
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4e18c9f2c1dd..23669e13a1d3 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 23 Jun 2022 07:09:34 +0000
+Sat, 25 Jun 2022 16:39:36 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e1f7079da0f8..aa0c65be032a 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jun 23 07:09:33 AM UTC 2022
+Sat Jun 25 04:39:36 PM UTC 2022
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index a8829920f98e..59178d46d79d 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -920,6 +920,7 @@
 2108101209 ./app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild
 2205260840 ./app-accessibility/speech-dispatcher/speech-dispatcher-0.11.1.ebuild
 2105100939 ./app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
+2206250310 ./app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
 2012231444 ./app-accessibility/speechd-el/speechd-el-2.8.ebuild
 1811120209 ./app-accessibility/sphinx2/sphinx2-0.6.ebuild
 2204071839 ./app-accessibility/yasr/yasr-0.6.9-r1.ebuild
@@ -950,7 +951,7 @@
 2206212210 ./app-admin/ansible/ansible-5.9.0.ebuild
 2206212210 ./app-admin/ansible/ansible-6.0.0.ebuild
 2205161540 ./app-admin/apache-tools/apache-tools-2.4.53-r1.ebuild
-2206081640 ./app-admin/apache-tools/apache-tools-2.4.54.ebuild
+2206241740 ./app-admin/apache-tools/apache-tools-2.4.54.ebuild
 2012311940 ./app-admin/apachetop/apachetop-0.19.7.ebuild
 2106302209 ./app-admin/apg/apg-2.3.0b_p20150129-r1.ebuild
 2012311940 ./app-admin/augeas/augeas-1.11.0-r1.ebuild
@@ -962,6 +963,9 @@
 2206191140 ./app-admin/awscli/awscli-1.25.7.ebuild
 2206210810 ./app-admin/awscli/awscli-1.25.13.ebuild
 2206220940 ./app-admin/awscli/awscli-1.25.14.ebuild
+2206231040 ./app-admin/awscli/awscli-1.25.15.ebuild
+2206240840 ./app-admin/awscli/awscli-1.25.16.ebuild
+2206250840 ./app-admin/awscli/awscli-1.25.17.ebuild
 1912012209 ./app-admin/bastille/bastille-3.0.9-r2.ebuild
 2202200440 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.30.0.ebuild
 2204121639 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.32.1.ebuild
@@ -986,6 +990,7 @@
 2108181740 ./app-admin/conserver/conserver-8.2.6-r3.ebuild
 2205160140 ./app-admin/consul-replicate/consul-replicate-0.4.0_p20211027.ebuild
 2205160110 ./app-admin/consul-template/consul-template-0.29.0.ebuild
+2206251910 ./app-admin/consul-template/consul-template-0.29.1.ebuild
 2205160040 ./app-admin/consul/consul-1.12.0.ebuild
 2205160040 ./app-admin/consul/consul-1.9.17.ebuild
 2205270410 ./app-admin/consul/consul-1.12.1.ebuild
@@ -1013,6 +1018,7 @@
 2204210039 ./app-admin/emacs-updater/emacs-updater-1.16.ebuild
 2203200240 ./app-admin/entr/entr-5.0.ebuild
 2203200240 ./app-admin/entr/entr-5.1.ebuild
+2206250310 ./app-admin/entr/entr-5.2.ebuild
 2104060140 ./app-admin/eselect/eselect-1.4.17.ebuild
 2012161539 ./app-admin/eselect/eselect-9999.ebuild
 2204290540 ./app-admin/eselect/eselect-1.4.20.ebuild
@@ -1162,7 +1168,7 @@
 2205150310 ./app-admin/radmind/radmind-1.15.4-r1.ebuild
 2012231444 ./app-admin/ranpwd/ranpwd-1.2.ebuild
 2107052310 ./app-admin/rasdaemon/rasdaemon-0.6.7.ebuild
-2201252309 ./app-admin/rasdaemon/rasdaemon-0.6.7-r1.ebuild
+2206240540 ./app-admin/rasdaemon/rasdaemon-0.6.7-r1.ebuild
 2009180509 ./app-admin/rcm/rcm-1.3.4.ebuild
 2205132310 ./app-admin/rcm/rcm-1.3.5.ebuild
 2009051939 ./app-admin/restart-services/restart-services-0.15.2.ebuild
@@ -1194,10 +1200,9 @@
 2203312010 ./app-admin/salt/salt-3002.8.ebuild
 2203311940 ./app-admin/salt/salt-3003.4-r1.ebuild
 2205311040 ./app-admin/salt/salt-3004.1-r4.ebuild
-2107050640 ./app-admin/selint/selint-1.1.0.ebuild
-2107050640 ./app-admin/selint/selint-1.2.0.ebuild
-2201312309 ./app-admin/selint/selint-1.2.1.ebuild
-2201312309 ./app-admin/selint/selint-9999.ebuild
+2206240710 ./app-admin/selint/selint-1.2.0.ebuild
+2206240710 ./app-admin/selint/selint-1.2.1.ebuild
+2206240710 ./app-admin/selint/selint-9999.ebuild
 2205160240 ./app-admin/serf/serf-0.9.8.ebuild
 2204110709 ./app-admin/setools/setools-4.4.0-r2.ebuild
 2204120512 ./app-admin/setools/setools-4.4.0-r3.ebuild
@@ -1501,8 +1506,7 @@
 2110300109 ./app-benchmarks/geekbench/geekbench-2.4.3-r1.ebuild
 2110300109 ./app-benchmarks/geekbench/geekbench-3.4.2-r1.ebuild
 2110300109 ./app-benchmarks/geekbench/geekbench-4.4.1-r1.ebuild
-2202031810 ./app-benchmarks/geekbench/geekbench-5.4.4.ebuild
-2205190010 ./app-benchmarks/geekbench/geekbench-5.4.5.ebuild
+2206251740 ./app-benchmarks/geekbench/geekbench-5.4.5.ebuild
 2005100339 ./app-benchmarks/hey/hey-0.1.2.ebuild
 2105012139 ./app-benchmarks/httperf/httperf-0.9.1_p20181111-r1.ebuild
 2105011739 ./app-benchmarks/httperf/httperf-0.9.1_p20181111.ebuild
@@ -1518,7 +1522,7 @@
 1808310239 ./app-benchmarks/pipebench/pipebench-0.40-r2.ebuild
 2205061840 ./app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
 2112052209 ./app-benchmarks/siege/siege-4.1.0.ebuild
-2205081440 ./app-benchmarks/stress-ng/stress-ng-0.14.01.ebuild
+2206251740 ./app-benchmarks/stress-ng/stress-ng-0.14.02.ebuild
 2205080540 ./app-benchmarks/stress/stress-1.0.5.ebuild
 2202100610 ./app-benchmarks/sysbench/sysbench-1.0.20-r101.ebuild
 1702282250 ./app-benchmarks/tiobench/tiobench-0.4.2.ebuild
@@ -1714,6 +1718,7 @@
 2205141540 ./app-crypt/libscrypt/libscrypt-1.22.ebuild
 2206161940 ./app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
 2201041339 ./app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
+2206251340 ./app-crypt/libu2f-host/libu2f-host-1.1.10-r1.ebuild
 2111192109 ./app-crypt/libu2f-server/libu2f-server-1.1.0-r2.ebuild
 2012231444 ./app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
 2006081709 ./app-crypt/loop-aes-losetup/loop-aes-losetup-2.35.2.ebuild
@@ -1825,6 +1830,7 @@
 2205191010 ./app-dicts/aspell-csb/aspell-csb-0.02.0-r1.ebuild
 2205191010 ./app-dicts/aspell-cy/aspell-cy-0.50.3-r1.ebuild
 2205191010 ./app-dicts/aspell-da/aspell-da-1.7.42-r1.ebuild
+2206251740 ./app-dicts/aspell-da/aspell-da-4.0.ebuild
 2205191010 ./app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r2.ebuild
 2205191010 ./app-dicts/aspell-de/aspell-de-20161207.7.0-r1.ebuild
 2205191010 ./app-dicts/aspell-el/aspell-el-0.08.0-r1.ebuild
@@ -1878,6 +1884,7 @@
 2205191010 ./app-dicts/aspell-or/aspell-or-0.03.1-r1.ebuild
 2205191010 ./app-dicts/aspell-pa/aspell-pa-0.01.1-r1.ebuild
 2205191010 ./app-dicts/aspell-pl/aspell-pl-6.0.20210731.0-r1.ebuild
+2206251740 ./app-dicts/aspell-pl/aspell-pl-6.0.20220601.0.ebuild
 2205191010 ./app-dicts/aspell-pt-br/aspell-pt-br-20131030.12.0-r1.ebuild
 2205191010 ./app-dicts/aspell-pt/aspell-pt-20220304.ebuild
 2205191010 ./app-dicts/aspell-qu/aspell-qu-0.02.0-r1.ebuild
@@ -2761,6 +2768,7 @@
 2104122109 ./app-emacs/dropdown-list/dropdown-list-20120329.ebuild
 1910161309 ./app-emacs/dts-mode/dts-mode-0.1.0_pre20161103.ebuild
 2104221839 ./app-emacs/dts-mode/dts-mode-0.1.1.ebuild
+2206231110 ./app-emacs/dts-mode/dts-mode-1.0.ebuild
 2204171140 ./app-emacs/ebuild-mode/ebuild-mode-1.56.ebuild
 2206031440 ./app-emacs/ebuild-mode/ebuild-mode-1.60.ebuild
 2107131039 ./app-emacs/ebuild-run-mode/ebuild-run-mode-20210713.ebuild
@@ -2838,6 +2846,7 @@
 2110101909 ./app-emacs/libegit2/libegit2-0.0.20200515-r1.ebuild
 1910022239 ./app-emacs/lookup/lookup-1.99.96_pre20180209.ebuild
 2204260010 ./app-emacs/lsp-mode/lsp-mode-8.0.0-r1.ebuild
+2206231910 ./app-emacs/lsp-mode/lsp-mode-8.0.0_p20220620.ebuild
 2111091009 ./app-emacs/lsp-ui/lsp-ui-8.0.0.ebuild
 2204210039 ./app-emacs/lua-mode/lua-mode-20201010.ebuild
 2204210039 ./app-emacs/lua-mode/lua-mode-20210802.ebuild
@@ -3146,6 +3155,7 @@
 2205260210 ./app-emacs/biblio/biblio-0.2_p20210418.ebuild
 2205241540 ./app-emacs/ebib/ebib-2.35.1_p20220501.ebuild
 2206170511 ./app-emacs/ebib/ebib-2.36.1.ebuild
+2206231110 ./app-emacs/ebib/ebib-2.38.ebuild
 2205241540 ./app-emacs/parsebib/parsebib-3.1.ebuild
 2205241540 ./app-emacs/with-simulated-input/with-simulated-input-3.0.ebuild
 2205310340 ./app-emacs/assess/assess-0.6.ebuild
@@ -3157,6 +3167,8 @@
 2206030310 ./app-emacs/raku-mode/raku-mode-0.2.1_p20211121.ebuild
 2206051940 ./app-emacs/git-modes/git-modes-1.4.0.ebuild
 2206191510 ./app-emacs/corfu/corfu-0.25.ebuild
+2206251640 ./app-emacs/demap/demap-1.4.0.ebuild
+2206232010 ./app-emacs/web-mode/web-mode-17.2.1.ebuild
 2201021453 ./app-emulation/aqemu/aqemu-0.9.2-r2.ebuild
 2204170010 ./app-emulation/aranym/aranym-1.1.0.ebuild
 1912171039 ./app-emulation/bochs/bochs-2.6.10.ebuild
@@ -3202,7 +3214,8 @@
 2110231809 ./app-emulation/ganeti-os-noop/ganeti-os-noop-0.2.ebuild
 2105041639 ./app-emulation/genymotion-bin/genymotion-bin-3.2.1.ebuild
 2201131910 ./app-emulation/glean/glean-1.18.2.ebuild
-2201131910 ./app-emulation/glean/glean-1.19.0.ebuild
+2206240540 ./app-emulation/glean/glean-1.19.0.ebuild
+2206240540 ./app-emulation/glean/glean-1.23.0.ebuild
 2204132240 ./app-emulation/grub-xen-host/grub-xen-host-1.0-r1.ebuild
 2206051910 ./app-emulation/grub-xen-host/grub-xen-host-1.0-r2.ebuild
 2204101309 ./app-emulation/guestfs-tools/guestfs-tools-1.48.0.ebuild
@@ -3225,7 +3238,7 @@
 2205051040 ./app-emulation/libvirt/libvirt-8.2.0.ebuild
 2205311110 ./app-emulation/libvirt/libvirt-8.3.0.ebuild
 2205311110 ./app-emulation/libvirt/libvirt-9999.ebuild
-2206030640 ./app-emulation/libvirt/libvirt-8.4.0.ebuild
+2206250010 ./app-emulation/libvirt/libvirt-8.4.0.ebuild
 2110131109 ./app-emulation/nemu/nemu-2.5.0-r1.ebuild
 2206041740 ./app-emulation/open-vm-tools/open-vm-tools-11.3.5_p18557794.ebuild
 2206041740 ./app-emulation/open-vm-tools/open-vm-tools-12.0.5_p19716617.ebuild
@@ -3254,7 +3267,7 @@
 2205191540 ./app-emulation/spice-protocol/spice-protocol-0.14.4.ebuild
 2203100240 ./app-emulation/spice-vdagent/spice-vdagent-0.19.0-r1.ebuild
 2203100240 ./app-emulation/spice-vdagent/spice-vdagent-0.21.0.ebuild
-2206121110 ./app-emulation/spice-vdagent/spice-vdagent-0.22.1.ebuild
+2206241240 ./app-emulation/spice-vdagent/spice-vdagent-0.22.1.ebuild
 2112272040 ./app-emulation/spice/spice-0.14.3-r1.ebuild
 2206081210 ./app-emulation/spice/spice-0.15.0.ebuild
 2206071140 ./app-emulation/spice/spice-9999.ebuild
@@ -3344,6 +3357,7 @@
 2112121309 ./app-eselect/eselect-gradle/eselect-gradle-0.2-r1.ebuild
 2204291110 ./app-eselect/eselect-iptables/eselect-iptables-20220320.ebuild
 2205020010 ./app-eselect/eselect-java/eselect-java-0.4.3.ebuild
+2206241410 ./app-eselect/eselect-java/eselect-java-0.5.0.ebuild
 2205140940 ./app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild
 1911031739 ./app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild
 2204290540 ./app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
@@ -3368,7 +3382,7 @@
 2111171139 ./app-eselect/eselect-ruby/eselect-ruby-20191222.ebuild
 2107210239 ./app-eselect/eselect-ruby/eselect-ruby-20201225.ebuild
 2205081810 ./app-eselect/eselect-ruby/eselect-ruby-20220313.ebuild
-2205311810 ./app-eselect/eselect-rust/eselect-rust-20210703.ebuild
+2206250840 ./app-eselect/eselect-rust/eselect-rust-20210703.ebuild
 2111292209 ./app-eselect/eselect-scala/eselect-scala-0.1.1-r1.ebuild
 2112210709 ./app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild
 2008091909 ./app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.2.ebuild
@@ -3451,8 +3465,7 @@
 2205190840 ./app-i18n/fcitx/fcitx-4.2.9.8.ebuild
 2106250239 ./app-i18n/freewnn/freewnn-1.1.1_alpha22-r1.ebuild
 2109291739 ./app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild
-2111291639 ./app-i18n/ibus-anthy/ibus-anthy-1.5.13.ebuild
-2202011709 ./app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild
+2206241610 ./app-i18n/ibus-anthy/ibus-anthy-1.5.14.ebuild
 2110310939 ./app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
 2110171709 ./app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild
 2109171709 ./app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild
@@ -3461,6 +3474,7 @@
 1708231827 ./app-i18n/ibus-input-pad/ibus-input-pad-1.4.99_pre20140916.ebuild
 2110141609 ./app-i18n/ibus-kkc/ibus-kkc-1.5.22_p20170607.ebuild
 2201301339 ./app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild
+2206240240 ./app-i18n/ibus-libpinyin/ibus-libpinyin-1.12.1.ebuild
 2111270940 ./app-i18n/ibus-m17n/ibus-m17n-1.4.8.ebuild
 2202101709 ./app-i18n/ibus-m17n/ibus-m17n-1.4.9.ebuild
 2201301339 ./app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild
@@ -3476,7 +3490,7 @@
 2206201610 ./app-i18n/ibus-table/ibus-table-1.16.9.ebuild
 2206081740 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.15.25.ebuild
 2206081740 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.0.ebuild
-2206201610 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.3.ebuild
+2206241610 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.16.5.ebuild
 2111181639 ./app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild
 2112132239 ./app-i18n/ibus/ibus-1.5.25-r1.ebuild
 2205311240 ./app-i18n/ibus/ibus-1.5.26-r1.ebuild
@@ -3506,6 +3520,7 @@
 2110141609 ./app-i18n/libkkc/libkkc-9999.ebuild
 1906221309 ./app-i18n/libpinyin/libpinyin-2.3.0.ebuild
 2011162309 ./app-i18n/libpinyin/libpinyin-9999.ebuild
+2206240240 ./app-i18n/libpinyin/libpinyin-2.6.2.ebuild
 2201301339 ./app-i18n/librime-lua/librime-lua-20211030072627.ebuild
 2201301339 ./app-i18n/librime-lua/librime-lua-99999999999999.ebuild
 2202280409 ./app-i18n/librime/librime-1.7.3-r1.ebuild
@@ -3523,13 +3538,11 @@
 1808291609 ./app-i18n/nabi/nabi-1.0.0.ebuild
 2109262109 ./app-i18n/nkf/nkf-2.1.5.ebuild
 2202012209 ./app-i18n/nkf/nkf-2.1.4.ebuild
-2201301339 ./app-i18n/opencc/opencc-1.0.5.ebuild
 2201291839 ./app-i18n/opencc/opencc-9999.ebuild
-2205171610 ./app-i18n/opencc/opencc-1.1.2.ebuild
 2206140040 ./app-i18n/opencc/opencc-1.1.3.ebuild
 2107041709 ./app-i18n/poedit/poedit-2.2.4.ebuild
 2107041709 ./app-i18n/poedit/poedit-2.3.1.ebuild
-2104120442 ./app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
+2206231840 ./app-i18n/pyzy/pyzy-0.1.0-r3.ebuild
 2009161509 ./app-i18n/qkc/qkc-1.00.ebuild
 2004121309 ./app-i18n/rime-data/rime-data-0.38.20180515.ebuild
 2104212209 ./app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
@@ -3582,6 +3595,7 @@
 2110191809 ./app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
 2105022239 ./app-i18n/yaskkserv/yaskkserv-1.1.1-r1.ebuild
 2110141609 ./app-i18n/yaskkserv2/yaskkserv2-0.1.1-r1.ebuild
+2206241610 ./app-i18n/yaskkserv2/yaskkserv2-0.1.3.ebuild
 2111051739 ./app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild
 2111031609 ./app-i18n/zinnia/zinnia-0.06-r3.ebuild
 2103052109 ./app-laptop/dispad/dispad-0.3.1-r1.ebuild
@@ -3619,7 +3633,7 @@
 2109012010 ./app-metrics/blackbox_exporter/blackbox_exporter-0.19.0.ebuild
 2206200513 ./app-metrics/blackbox_exporter/blackbox_exporter-0.21.1.ebuild
 2201030639 ./app-metrics/burrow_exporter/burrow_exporter-0.0.6-r2.ebuild
-2206071812 ./app-metrics/collectd/collectd-5.12.0-r7.ebuild
+2206251740 ./app-metrics/collectd/collectd-5.12.0-r7.ebuild
 2009130839 ./app-metrics/consul_exporter/consul_exporter-0.7.1.ebuild
 2004061709 ./app-metrics/dnsmasq_exporter/dnsmasq_exporter-0.2.0-r1.ebuild
 2203200640 ./app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.3.0.ebuild
@@ -3909,27 +3923,9 @@
 2205140210 ./app-misc/neofetch/neofetch-7.1.0-r1.ebuild
 2205140210 ./app-misc/neofetch/neofetch-7.1.0.ebuild
 2205140210 ./app-misc/neofetch/neofetch-9999.ebuild
-1808150909 ./app-misc/nnn/nnn-1.9.ebuild
-1810252109 ./app-misc/nnn/nnn-2.0.ebuild
-1811241209 ./app-misc/nnn/nnn-2.1.ebuild
-1901051539 ./app-misc/nnn/nnn-2.2.ebuild
-1902221209 ./app-misc/nnn/nnn-2.3.ebuild
-1903281009 ./app-misc/nnn/nnn-2.4.ebuild
-1907251339 ./app-misc/nnn/nnn-2.5.ebuild
-1908071139 ./app-misc/nnn/nnn-2.6.ebuild
-1910121009 ./app-misc/nnn/nnn-2.7.ebuild
-1912131209 ./app-misc/nnn/nnn-2.8.1.ebuild
-2001161239 ./app-misc/nnn/nnn-2.9.ebuild
-2002231509 ./app-misc/nnn/nnn-3.0.ebuild
-2004151909 ./app-misc/nnn/nnn-3.1.ebuild
-2005281909 ./app-misc/nnn/nnn-3.2.ebuild
-2007241708 ./app-misc/nnn/nnn-3.3.ebuild
-2010030839 ./app-misc/nnn/nnn-3.4.ebuild
-2011191109 ./app-misc/nnn/nnn-3.5.ebuild
-2104230039 ./app-misc/nnn/nnn-3.6.ebuild
 2104230039 ./app-misc/nnn/nnn-4.0.ebuild
 2111201739 ./app-misc/nnn/nnn-4.3.ebuild
-2205062210 ./app-misc/nnn/nnn-4.5.ebuild
+2206240710 ./app-misc/nnn/nnn-4.5.ebuild
 2011051039 ./app-misc/no-more-secrets/no-more-secrets-0.3.3.ebuild
 2011051039 ./app-misc/no-more-secrets/no-more-secrets-9999.ebuild
 2204190010 ./app-misc/notary/notary-0.7.0.ebuild
@@ -3951,6 +3947,7 @@
 2201041339 ./app-misc/pax-utils/pax-utils-1.3.3.ebuild
 2204290540 ./app-misc/pax-utils/pax-utils-1.3.4.ebuild
 2112201239 ./app-misc/pdfpc/pdfpc-4.5.0.ebuild
+2206241110 ./app-misc/pdfpc/pdfpc-4.5.0-r1.ebuild
 1702282250 ./app-misc/perltrash/perltrash-0.3-r1.ebuild
 2109012010 ./app-misc/pet/pet-0.3.6-r1.ebuild
 2112201439 ./app-misc/pet/pet-0.4.0.ebuild
@@ -4014,7 +4011,7 @@
 2205051340 ./app-misc/screenfetch/screenfetch-3.9.1-r1.ebuild
 2205051340 ./app-misc/screenfetch/screenfetch-9999.ebuild
 2012311940 ./app-misc/screenie/screenie-20120406.ebuild
-2204161740 ./app-misc/scrub/scrub-2.6.1.ebuild
+2206250010 ./app-misc/scrub/scrub-2.6.1.ebuild
 1807111209 ./app-misc/selecta/selecta-0.0.7.ebuild
 1807111209 ./app-misc/selecta/selecta-9999.ebuild
 2112252040 ./app-misc/siglo/siglo-0.9.6.ebuild
@@ -4201,7 +4198,7 @@
 1612040405 ./app-office/worklog-assistant-bin/worklog-assistant-bin-2.1.3580.ebuild
 2205152210 ./app-office/wps-office/wps-office-11.1.0.10976.ebuild
 2206112110 ./app-office/wps-office/wps-office-11.1.0.11664.ebuild
-2206091440 ./app-office/kalendar/kalendar-22.04.2.ebuild
+2206240810 ./app-office/kalendar/kalendar-22.04.2.ebuild
 2111111509 ./app-officeext/barcode/barcode-1.3.5.0-r1.ebuild
 1905201439 ./app-officeext/ct2n/ct2n-1.5.0.ebuild
 2111111509 ./app-officeext/dmaths/dmaths-3.4.9.0-r1.ebuild
@@ -4265,10 +4262,7 @@
 2206051040 ./app-portage/gentoopm/gentoopm-9999.ebuild
 1902251309 ./app-portage/golop/golop-9999.ebuild
 2112121739 ./app-portage/golop/golop-0.2.1.ebuild
-2108020539 ./app-portage/gpyutils/gpyutils-0.6.1.ebuild
-2205171010 ./app-portage/gpyutils/gpyutils-0.7.1.ebuild
-2205271810 ./app-portage/gpyutils/gpyutils-0.8.1.ebuild
-2205280910 ./app-portage/gpyutils/gpyutils-0.8.2.ebuild
+2206251140 ./app-portage/gpyutils/gpyutils-0.8.2.ebuild
 2109241439 ./app-portage/grs/grs-0.7.ebuild
 2109241439 ./app-portage/grs/grs-9999.ebuild
 2202041539 ./app-portage/gs-elpa/gs-elpa-0.2.1.ebuild
@@ -4278,6 +4272,7 @@
 2012231444 ./app-portage/hackport/hackport-9999.ebuild
 2205010610 ./app-portage/iwdevtools/iwdevtools-0.10.1-r2.ebuild
 2206192340 ./app-portage/iwdevtools/iwdevtools-9999.ebuild
+2206241010 ./app-portage/iwdevtools/iwdevtools-0.11.0.ebuild
 2105041239 ./app-portage/java-ebuilder/java-ebuilder-0.5.1-r1.ebuild
 2105041239 ./app-portage/java-ebuilder/java-ebuilder-9999.ebuild
 2106061039 ./app-portage/kuroneko/kuroneko-0.1.0.ebuild
@@ -4300,6 +4295,7 @@
 2206081010 ./app-portage/mgorny-dev-scripts/mgorny-dev-scripts-19.ebuild
 2205191040 ./app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
 2205312240 ./app-portage/mirrorselect/mirrorselect-9999.ebuild
+2206232340 ./app-portage/mirrorselect/mirrorselect-2.3.0.ebuild
 2204271440 ./app-portage/nattka/nattka-0.3.1.ebuild
 2104031909 ./app-portage/no-distcc-env/no-distcc-env-9999.ebuild
 2101310343 ./app-portage/overlint/overlint-0.5.3-r2.ebuild
@@ -4418,7 +4414,7 @@
 2203121539 ./app-shells/starship/starship-1.3.0.ebuild
 2204210309 ./app-shells/starship/starship-1.4.2.ebuild
 2205171010 ./app-shells/starship/starship-1.5.4.ebuild
-2205200440 ./app-shells/starship/starship-1.6.3.ebuild
+2206241140 ./app-shells/starship/starship-1.6.3.ebuild
 2202091140 ./app-shells/tcsh/tcsh-6.22.02-r1.ebuild
 2202091140 ./app-shells/tcsh/tcsh-6.22.04-r1.ebuild
 2202091140 ./app-shells/tcsh/tcsh-6.23.02.ebuild
@@ -4525,7 +4521,7 @@
 2110070609 ./app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
 2110070609 ./app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
 2205171640 ./app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
-2204291110 ./app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+2206232340 ./app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r3.ebuild
 2104060140 ./app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
 2107250639 ./app-text/docx2txt/docx2txt-1.4.ebuild
 2201012339 ./app-text/dos2unix/dos2unix-7.4.2.ebuild
@@ -4711,7 +4707,7 @@
 2001220109 ./app-text/pspdftool/pspdftool-0.03.ebuild
 2203200240 ./app-text/pspresent/pspresent-1.3-r1.ebuild
 2104161439 ./app-text/pstotext/pstotext-1.9-r4.ebuild
-2206211940 ./app-text/psutils/psutils-1.17-r4.ebuild
+2206240010 ./app-text/psutils/psutils-1.17-r5.ebuild
 2110291639 ./app-text/pytextile/pytextile-4.0.1.ebuild
 2101310343 ./app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
 2107191739 ./app-text/qpdf/qpdf-10.3.2.ebuild
@@ -5087,7 +5083,7 @@
 2206020710 ./app-vim/yankring/yankring-19.0-r1.ebuild
 1908291509 ./app-vim/zenburn/zenburn-2.25.ebuild
 2004032241 ./app-vim/zoomwin/zoomwin-24-r1.ebuild
-2206221440 ./app-vim/vspec/vspec-1.9.2.ebuild
+2206250010 ./app-vim/vspec/vspec-1.9.2.ebuild
 2204251840 ./app-xemacs/ada/ada-1.16.ebuild
 2112210709 ./app-xemacs/apel/apel-1.36.ebuild
 2204251840 ./app-xemacs/auctex/auctex-1.58.ebuild
@@ -5601,7 +5597,6 @@
 2108150239 ./dev-db/spatialite/spatialite-5.0.1-r1.ebuild
 2204081039 ./dev-db/sqlcipher/sqlcipher-4.5.1.ebuild
 2205190540 ./dev-db/sqlcl-bin/sqlcl-bin-22.1.1.131.0820.ebuild
-2101091409 ./dev-db/sqldeveloper/sqldeveloper-4.2.0.17.089.1709.ebuild
 2203162040 ./dev-db/sqldeveloper/sqldeveloper-21.4.3.063.0100.ebuild
 2205151110 ./dev-db/sqlite/sqlite-3.38.2.ebuild
 2206031440 ./dev-db/sqlite/sqlite-3.38.3.ebuild
@@ -5692,7 +5687,8 @@
 2009162139 ./dev-embedded/picprog/picprog-1.9.1.ebuild
 1911101539 ./dev-embedded/pista/pista-0.70.ebuild
 2201131510 ./dev-embedded/pk2cmd/pk2cmd-1.20-r1.ebuild
-2205021210 ./dev-embedded/platformio/platformio-5.2.5-r1.ebuild
+2206250540 ./dev-embedded/platformio/platformio-5.2.5-r2.ebuild
+2206250610 ./dev-embedded/platformio/platformio-6.0.2.ebuild
 2110051009 ./dev-embedded/ponyprog/ponyprog-3.1.2.ebuild
 2205021540 ./dev-embedded/ponyprog/ponyprog-3.1.3.ebuild
 2010062339 ./dev-embedded/powersoftplus-libftdi/powersoftplus-libftdi-0.1.8-r1.ebuild
@@ -6828,8 +6824,8 @@
 2112260340 ./dev-java/jackcess/jackcess-4.0.0.ebuild
 2202111409 ./dev-java/jackrabbit-webdav/jackrabbit-webdav-2.10.1-r2.ebuild
 2203312140 ./dev-java/jackrabbit-webdav/jackrabbit-webdav-2.21.7-r1.ebuild
-2205241840 ./dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild
 2206091040 ./dev-java/jackson-annotations/jackson-annotations-2.13.2-r1.ebuild
+2206241140 ./dev-java/jackson-annotations/jackson-annotations-2.13.3.ebuild
 2204150940 ./dev-java/jacl/jacl-1.4.1-r2.ebuild
 2108270839 ./dev-java/jai-imageio-core/jai-imageio-core-1.4.0.ebuild
 2108270839 ./dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
@@ -7058,15 +7054,15 @@
 2203061209 ./dev-java/msv/msv-20130601.ebuild
 2205131040 ./dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild
 2205101010 ./dev-java/woodstox-core/woodstox-core-6.2.8-r1.ebuild
-2205241840 ./dev-java/jackson-core/jackson-core-2.13.3.ebuild
 2206091040 ./dev-java/jackson-core/jackson-core-2.13.2-r1.ebuild
-2205241840 ./dev-java/jackson-databind/jackson-databind-2.13.3.ebuild
+2206241140 ./dev-java/jackson-core/jackson-core-2.13.3.ebuild
 2206091040 ./dev-java/jackson-databind/jackson-databind-2.13.2.2.ebuild
-2205241840 ./dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
+2206241140 ./dev-java/jackson-databind/jackson-databind-2.13.3.ebuild
 2206091040 ./dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.2-r1.ebuild
-2205241840 ./dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
+2206241140 ./dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.13.3.ebuild
 2206091040 ./dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.2-r1.ebuild
 2206201110 ./dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3-r1.ebuild
+2206241140 ./dev-java/jackson-module-jakarta-xmlbind/jackson-module-jakarta-xmlbind-2.13.3.ebuild
 2203170512 ./dev-java/jakarta-json-api/jakarta-json-api-1.1.6.ebuild
 2203170512 ./dev-java/jol-core/jol-core-0.16.ebuild
 2203121309 ./dev-java/kafka-clients/kafka-clients-1.1.1.ebuild
@@ -7074,9 +7070,9 @@
 2203121839 ./dev-java/lmax-disruptor/lmax-disruptor-3.4.4.ebuild
 2205101010 ./dev-java/conversant-disruptor/conversant-disruptor-1.2.19-r1.ebuild
 2206201110 ./dev-java/conversant-disruptor/conversant-disruptor-1.2.20.ebuild
-2205241840 ./dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild
 2206091040 ./dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.2-r1.ebuild
 2206201110 ./dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3-r1.ebuild
+2206241140 ./dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.13.3.ebuild
 2203170340 ./dev-java/jboss-jms-api/jboss-jms-api-1.0.1.ebuild
 2203170340 ./dev-java/jctools-core/jctools-core-2.0.2.ebuild
 2206201110 ./dev-java/jctools-core/jctools-core-3.1.0.ebuild
@@ -7097,7 +7093,6 @@
 2206031210 ./dev-java/byte-buddy/byte-buddy-1.12.10.ebuild
 2206171610 ./dev-java/byte-buddy/byte-buddy-1.12.8.ebuild
 2206171610 ./dev-java/findbugs-annotations/findbugs-annotations-3.0.1.ebuild
-2205152210 ./dev-java/janino/janino-3.1.6.ebuild
 2206231010 ./dev-java/janino/janino-3.1.7.ebuild
 2206171610 ./dev-java/logback-classic/logback-classic-1.2.11.ebuild
 2206171610 ./dev-java/logback-core/logback-core-1.2.11.ebuild
@@ -7114,8 +7109,7 @@
 2206201110 ./dev-java/stringprep/stringprep-1.1.ebuild
 2206191140 ./dev-lang/R/R-4.2.0.ebuild
 2205160340 ./dev-lang/abs/abs-2.6.0.ebuild
-2205241040 ./dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.3.ebuild
-2205241040 ./dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.4.ebuild
+2206242340 ./dev-lang/ammonite-repl-bin/ammonite-repl-bin-2.5.4.ebuild
 2009200209 ./dev-lang/bas/bas-2.4.ebuild
 2110281039 ./dev-lang/bff/bff-1.0.7.ebuild
 2008141139 ./dev-lang/c-intercal/c-intercal-31.0.ebuild
@@ -7143,12 +7137,13 @@
 2205051740 ./dev-lang/erlang/erlang-24.3.4.ebuild
 2205182010 ./dev-lang/erlang/erlang-25.0.ebuild
 1702282250 ./dev-lang/esco/esco-0.512.ebuild
-2205220940 ./dev-lang/execline/execline-2.8.3.0.ebuild
+2206250910 ./dev-lang/execline/execline-2.8.3.0-r1.ebuild
+2206250910 ./dev-lang/execline/execline-2.9.0.0.ebuild
 2006111539 ./dev-lang/f2c/f2c-20100827-r1.ebuild
 2105140339 ./dev-lang/ferite/ferite-1.1.17-r1.ebuild
 2110170409 ./dev-lang/fpc/fpc-3.2.2.ebuild
 2112290109 ./dev-lang/gdl/gdl-1.0.0_rc3-r1.ebuild
-2206161940 ./dev-lang/gforth/gforth-0.7.3-r2.ebuild
+2206232310 ./dev-lang/gforth/gforth-0.7.3-r2.ebuild
 2201051309 ./dev-lang/ghc/ghc-8.10.4-r1.ebuild
 2201051309 ./dev-lang/ghc/ghc-8.10.5-r1.ebuild
 2201051309 ./dev-lang/ghc/ghc-8.10.6.ebuild
@@ -7261,7 +7256,7 @@
 2204222109 ./dev-lang/perl/perl-5.34.0-r9.ebuild
 2204222109 ./dev-lang/perl/perl-5.34.1-r2.ebuild
 2206080140 ./dev-lang/perl/perl-5.36.0.ebuild
-2206091110 ./dev-lang/perl/perl-5.34.1-r3.ebuild
+2206241240 ./dev-lang/perl/perl-5.34.1-r3.ebuild
 2206220940 ./dev-lang/php/php-7.4.30.ebuild
 2206220940 ./dev-lang/php/php-8.0.20.ebuild
 2206220940 ./dev-lang/php/php-8.1.7.ebuild
@@ -7275,9 +7270,9 @@
 2205190210 ./dev-lang/python/python-3.9.12.ebuild
 2206071110 ./dev-lang/python/python-2.7.18_p15.ebuild
 2206180040 ./dev-lang/python/python-3.11.0_beta3.ebuild
-2206180210 ./dev-lang/python/python-3.9.13.ebuild
-2206222210 ./dev-lang/python/python-3.10.5.ebuild
 2206221510 ./dev-lang/python/python-3.8.13_p2.ebuild
+2206241010 ./dev-lang/python/python-3.10.5.ebuild
+2206251010 ./dev-lang/python/python-3.9.13.ebuild
 2205210910 ./dev-lang/qu-prolog/qu-prolog-10.6.ebuild
 2111290409 ./dev-lang/rakudo/rakudo-2021.06.ebuild
 2111290409 ./dev-lang/rakudo/rakudo-2021.08.ebuild
@@ -7290,12 +7285,12 @@
 2205081810 ./dev-lang/ruby/ruby-2.7.6.ebuild
 2205081940 ./dev-lang/ruby/ruby-3.0.4.ebuild
 2205081940 ./dev-lang/ruby/ruby-3.1.2-r1.ebuild
-2205242310 ./dev-lang/rust-bin/rust-bin-1.61.0.ebuild
 2205311810 ./dev-lang/rust-bin/rust-bin-1.59.0.ebuild
 2206101010 ./dev-lang/rust-bin/rust-bin-1.60.0.ebuild
+2206250840 ./dev-lang/rust-bin/rust-bin-1.61.0.ebuild
 2205242040 ./dev-lang/rust/rust-1.59.0.ebuild
-2206010640 ./dev-lang/rust/rust-1.61.0-r1.ebuild
 2206101010 ./dev-lang/rust/rust-1.60.0.ebuild
+2206250910 ./dev-lang/rust/rust-1.61.0-r1.ebuild
 2108180339 ./dev-lang/sassc/sassc-3.6.2.ebuild
 2107120939 ./dev-lang/scala-bin/scala-bin-2.13.6.ebuild
 2112261540 ./dev-lang/scala/scala-2.12.4.ebuild
@@ -7482,7 +7477,7 @@
 2206041040 ./dev-libs/efl/efl-1.26.2.ebuild
 2204090610 ./dev-libs/elfutils/elfutils-0.185.ebuild
 2204090610 ./dev-libs/elfutils/elfutils-0.186.ebuild
-2205010512 ./dev-libs/elfutils/elfutils-0.187.ebuild
+2206241040 ./dev-libs/elfutils/elfutils-0.187.ebuild
 2201071639 ./dev-libs/ell/ell-9999.ebuild
 2204252240 ./dev-libs/ell/ell-0.49.ebuild
 2205271010 ./dev-libs/ell/ell-0.50.ebuild
@@ -7496,7 +7491,7 @@
 2103191609 ./dev-libs/fddl/fddl-20111124-r1.ebuild
 1704052014 ./dev-libs/ferrisloki/ferrisloki-3.0.13-r2.ebuild
 2202171409 ./dev-libs/ffcall/ffcall-2.1.ebuild
-2205150110 ./dev-libs/ffcall/ffcall-2.4.ebuild
+2206232310 ./dev-libs/ffcall/ffcall-2.4.ebuild
 2206172110 ./dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild
 2206222141 ./dev-libs/flatbuffers/flatbuffers-2.0.6-r1.ebuild
 2205280910 ./dev-libs/folks/folks-0.15.5.ebuild
@@ -7515,9 +7510,9 @@
 2112061839 ./dev-libs/girara/girara-0.3.6.ebuild
 2206021510 ./dev-libs/girara/girara-0.3.7.ebuild
 2205312110 ./dev-libs/gjs/gjs-1.64.5.ebuild
-2205311240 ./dev-libs/gjs/gjs-1.72.0.ebuild
-2205302140 ./dev-libs/glib/glib-2.72.2.ebuild
+2206240810 ./dev-libs/gjs/gjs-1.72.0.ebuild
 2205311240 ./dev-libs/glib/glib-2.72.1.ebuild
+2206251140 ./dev-libs/glib/glib-2.72.2.ebuild
 2204140710 ./dev-libs/gmime/gmime-2.6.23-r1.ebuild
 2205311240 ./dev-libs/gmime/gmime-3.2.11.ebuild
 2206042110 ./dev-libs/gmime/gmime-3.2.12.ebuild
@@ -7565,13 +7560,11 @@
 2104060140 ./dev-libs/iniparser/iniparser-3.1-r2.ebuild
 2104060140 ./dev-libs/iniparser/iniparser-4.1.ebuild
 2008201709 ./dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild
-2205140310 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.18.23063-r1.ebuild
-2205140310 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.19.23136-r1.ebuild
-2205211710 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.17.23034-r1.ebuild
-2205211710 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.20.23198.ebuild
 2205280140 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.21.23269.ebuild
 2206051810 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.22.23355.ebuild
 2206112040 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.23.23405.ebuild
+2206251740 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.20.23198.ebuild
+2206251740 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild
 2205041140 ./dev-libs/isl/isl-0.24-r2.ebuild
 2004032241 ./dev-libs/ivykis/ivykis-0.42.4.ebuild
 2104060140 ./dev-libs/jansson/jansson-2.13.1-r1.ebuild
@@ -7609,7 +7602,7 @@
 2205110840 ./dev-libs/leatherman/leatherman-1.12.7.ebuild
 2204120009 ./dev-libs/level-zero/level-zero-1.7.15.ebuild
 2205130040 ./dev-libs/level-zero/level-zero-1.8.0.ebuild
-2205211710 ./dev-libs/level-zero/level-zero-1.8.1.ebuild
+2206251740 ./dev-libs/level-zero/level-zero-1.8.1.ebuild
 2202050009 ./dev-libs/leveldb/leveldb-1.20.ebuild
 2202042339 ./dev-libs/leveldb/leveldb-1.23-r3.ebuild
 2206192210 ./dev-libs/libIDL/libIDL-0.8.14-r3.ebuild
@@ -7635,7 +7628,6 @@
 2205131740 ./dev-libs/libbson/libbson-1.18.0.ebuild
 2007050339 ./dev-libs/libbulletml/libbulletml-0.0.6.ebuild
 2202021039 ./dev-libs/libburn/libburn-1.5.4.ebuild
-2112241110 ./dev-libs/libbytesize/libbytesize-2.5.ebuild
 2205260840 ./dev-libs/libbytesize/libbytesize-2.7.ebuild
 2205261010 ./dev-libs/libbytesize/libbytesize-2.6.ebuild
 2206020340 ./dev-libs/libcbor/libcbor-0.9.0.ebuild
@@ -7654,6 +7646,7 @@
 2204301040 ./dev-libs/libclc/libclc-14.0.3.ebuild
 2206042310 ./dev-libs/libclc/libclc-14.0.4.ebuild
 2206111440 ./dev-libs/libclc/libclc-14.0.5.ebuild
+2206251640 ./dev-libs/libclc/libclc-14.0.6.ebuild
 2104161439 ./dev-libs/libclthreads/libclthreads-2.4.2.ebuild
 2205190840 ./dev-libs/libconfig/libconfig-1.7.3.ebuild
 2205171110 ./dev-libs/libcroco/libcroco-0.6.13-r1.ebuild
@@ -7983,7 +7976,6 @@
 2205041140 ./dev-libs/lzo/lzo-2.10.ebuild
 2111291139 ./dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
 2104031909 ./dev-libs/maloc/maloc-1.5-r1.ebuild
-2201291839 ./dev-libs/marisa/marisa-0.2.5.ebuild
 2201291839 ./dev-libs/marisa/marisa-9999.ebuild
 2206230740 ./dev-libs/marisa/marisa-0.2.6.ebuild
 2202280239 ./dev-libs/mathjax/mathjax-2.7.7.ebuild
@@ -8012,10 +8004,11 @@
 2205170840 ./dev-libs/npth/npth-1.6-r1.ebuild
 2203222209 ./dev-libs/nsgenbind/nsgenbind-0.8-r1.ebuild
 2205260410 ./dev-libs/nspr/nspr-4.33.ebuild
-2206171110 ./dev-libs/nspr/nspr-4.34.ebuild
+2206251840 ./dev-libs/nspr/nspr-4.34.ebuild
 2201190139 ./dev-libs/nss-pem/nss-pem-1.0.8.ebuild
 2206041440 ./dev-libs/nss/nss-3.68.4.ebuild
 2206171110 ./dev-libs/nss/nss-3.79-r1.ebuild
+2206251240 ./dev-libs/nss/nss-3.80.ebuild
 2103071339 ./dev-libs/nsync/nsync-1.20.1.ebuild
 2106210210 ./dev-libs/nsync/nsync-1.24.0.ebuild
 2205070310 ./dev-libs/ntl/ntl-11.5.1-r1.ebuild
@@ -8065,7 +8058,7 @@
 2203200310 ./dev-libs/pmdk/pmdk-1.9.2.ebuild
 2201031109 ./dev-libs/pocl/pocl-1.8-r2.ebuild
 2202150009 ./dev-libs/poco/poco-1.10.1.ebuild
-2205102310 ./dev-libs/poco/poco-1.11.2.ebuild
+2206231240 ./dev-libs/poco/poco-1.11.2-r1.ebuild
 2204290540 ./dev-libs/popt/popt-1.18.ebuild
 2203040040 ./dev-libs/ppl/ppl-1.2-r4.ebuild
 2202030009 ./dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild
@@ -8081,7 +8074,7 @@
 2202281039 ./dev-libs/pugixml/pugixml-1.12.ebuild
 2006040939 ./dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild
 2005212208 ./dev-libs/qoauth/qoauth-2.0.1_pre20160315-r3.ebuild
-2202080810 ./dev-libs/qqwing/qqwing-1.3.4.ebuild
+2206232340 ./dev-libs/qqwing/qqwing-1.3.4-r1.ebuild
 2111040909 ./dev-libs/qtcompress/qtcompress-0_p20180513.ebuild
 2112110140 ./dev-libs/qtkeychain/qtkeychain-0.13.2.ebuild
 2201251910 ./dev-libs/quazip/quazip-1.2.ebuild
@@ -8162,6 +8155,7 @@
 2109071839 ./dev-libs/satyr/satyr-0.38.ebuild
 2112212139 ./dev-libs/satyr/satyr-0.39.ebuild
 2202271339 ./dev-libs/sdformat/sdformat-9.7.0.ebuild
+2206231440 ./dev-libs/sdformat/sdformat-9.8.0.ebuild
 2112211239 ./dev-libs/serd/serd-0.30.10.ebuild
 2205291010 ./dev-libs/serd/serd-0.30.12.ebuild
 2202111809 ./dev-libs/serdisplib/serdisplib-2.02-r2.ebuild
@@ -8172,6 +8166,7 @@
 2206161910 ./dev-libs/simdjson/simdjson-2.0.4.ebuild
 2109072009 ./dev-libs/sink/sink-0.8.0-r3.ebuild
 2205220940 ./dev-libs/skalibs/skalibs-2.11.2.0.ebuild
+2206250910 ./dev-libs/skalibs/skalibs-2.12.0.1.ebuild
 2203200410 ./dev-libs/snowball-stemmer/snowball-stemmer-2.1.0-r1.ebuild
 2205251240 ./dev-libs/snowball-stemmer/snowball-stemmer-2.2.0.ebuild
 2205191340 ./dev-libs/softhsm/softhsm-2.6.1-r2.ebuild
@@ -8249,8 +8244,9 @@
 2205132210 ./dev-libs/wayland-protocols/wayland-protocols-1.25.ebuild
 2205090610 ./dev-libs/wayland/wayland-1.20.0.ebuild
 2205090610 ./dev-libs/wayland/wayland-9999.ebuild
-2202060209 ./dev-libs/weston/weston-9999.ebuild
 2205280810 ./dev-libs/weston/weston-10.0.0.ebuild
+2206241240 ./dev-libs/weston/weston-10.0.1.ebuild
+2206241240 ./dev-libs/weston/weston-9999.ebuild
 2002182239 ./dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild
 2107072239 ./dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
 2206212340 ./dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild
@@ -8302,8 +8298,7 @@
 2202181739 ./dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild
 2202150009 ./dev-libs/tllist/tllist-1.0.5.ebuild
 2203131439 ./dev-libs/teakra/teakra-20220224.ebuild
-2204232139 ./dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123-r1.ebuild
-2205140310 ./dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220512.ebuild
+2206251740 ./dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220512.ebuild
 2205130040 ./dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.1.0-r1.ebuild
 2205130040 ./dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.2.0-r1.ebuild
 2205130040 ./dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.3.0-r1.ebuild
@@ -8323,7 +8318,7 @@
 2205260840 ./dev-libs/FBGEMM/FBGEMM-2022.01.13.ebuild
 2205272040 ./dev-libs/libnop/libnop-2021.11.03.ebuild
 2206072340 ./dev-libs/linux-syscall-support/linux-syscall-support-2021.05.03.ebuild
-2206140910 ./dev-libs/tlsh/tlsh-4.8.2.ebuild
+2206241240 ./dev-libs/tlsh/tlsh-4.8.2.ebuild
 2206170210 ./dev-libs/libtraceevent/libtraceevent-1.5.2-r1.ebuild
 2206162010 ./dev-libs/libtracefs/libtracefs-1.3.1.ebuild
 2206200940 ./dev-libs/pocketfft/pocketfft-2021.11.23.ebuild
@@ -8500,7 +8495,7 @@
 2203040040 ./dev-ml/dune/dune-2.8.4.ebuild
 2204201509 ./dev-ml/dune/dune-2.9.3-r2.ebuild
 2204190039 ./dev-ml/duration/duration-0.1.3.ebuild
-2104210539 ./dev-ml/easy-format/easy-format-1.2.0.ebuild
+2206241640 ./dev-ml/easy-format/easy-format-1.2.0.ebuild
 2203040040 ./dev-ml/extlib/extlib-1.7.7.ebuild
 2204190039 ./dev-ml/extlib/extlib-1.7.8.ebuild
 2203040040 ./dev-ml/facile/facile-1.1.3.ebuild
@@ -8542,6 +8537,7 @@
 2204301040 ./dev-ml/llvm-ocaml/llvm-ocaml-14.0.3.ebuild
 2205292310 ./dev-ml/llvm-ocaml/llvm-ocaml-14.0.4.ebuild
 2206111440 ./dev-ml/llvm-ocaml/llvm-ocaml-14.0.5.ebuild
+2206251640 ./dev-ml/llvm-ocaml/llvm-ocaml-14.0.6.ebuild
 2204190039 ./dev-ml/logs/logs-0.7.0-r1.ebuild
 2201100109 ./dev-ml/luv/luv-0.5.10-r3.ebuild
 2204190039 ./dev-ml/luv/luv-0.5.11.ebuild
@@ -11294,11 +11290,17 @@
 2206191140 ./dev-python/boto3/boto3-1.24.7.ebuild
 2206210810 ./dev-python/boto3/boto3-1.24.13.ebuild
 2206220940 ./dev-python/boto3/boto3-1.24.14.ebuild
+2206231040 ./dev-python/boto3/boto3-1.24.15.ebuild
+2206240840 ./dev-python/boto3/boto3-1.24.16.ebuild
+2206250840 ./dev-python/boto3/boto3-1.24.17.ebuild
 2205211010 ./dev-python/botocore/botocore-9999.ebuild
 2206181010 ./dev-python/botocore/botocore-1.27.12.ebuild
 2206191140 ./dev-python/botocore/botocore-1.27.7.ebuild
 2206210810 ./dev-python/botocore/botocore-1.27.13.ebuild
 2206220940 ./dev-python/botocore/botocore-1.27.14.ebuild
+2206231040 ./dev-python/botocore/botocore-1.27.15.ebuild
+2206240840 ./dev-python/botocore/botocore-1.27.16.ebuild
+2206250840 ./dev-python/botocore/botocore-1.27.17.ebuild
 2206030910 ./dev-python/bottle/bottle-0.12.21.ebuild
 2206111010 ./dev-python/bottleneck/bottleneck-1.3.4.ebuild
 2203301440 ./dev-python/bpython/bpython-0.22.1.ebuild
@@ -11327,7 +11329,7 @@
 2206061413 ./dev-python/cbor2/cbor2-5.4.3.ebuild
 2206010511 ./dev-python/cchardet/cchardet-2.1.7.ebuild
 2203210210 ./dev-python/cerberus/cerberus-1.3.2.ebuild
-2206161210 ./dev-python/cerberus/cerberus-1.3.4-r1.ebuild
+2206250010 ./dev-python/cerberus/cerberus-1.3.4-r1.ebuild
 2206100640 ./dev-python/certifi/certifi-3021.3.16-r2.ebuild
 2206141040 ./dev-python/cffi/cffi-1.15.0-r1.ebuild
 2205301410 ./dev-python/cfgv/cfgv-3.3.1.ebuild
@@ -11343,15 +11345,12 @@
 2205111210 ./dev-python/charset_normalizer/charset_normalizer-2.0.12.ebuild
 2206200940 ./dev-python/charset_normalizer/charset_normalizer-2.1.0.ebuild
 2201111840 ./dev-python/chart-studio/chart-studio-1.1.0.ebuild
-2204092309 ./dev-python/cheetah3/cheetah3-3.2.6.ebuild
 2206222141 ./dev-python/cheetah3/cheetah3-3.2.6_p2.ebuild
 2206220940 ./dev-python/cheroot/cheroot-8.6.0-r1.ebuild
-2202010139 ./dev-python/cherrypy/cherrypy-18.6.1.ebuild
 2206230910 ./dev-python/cherrypy/cherrypy-18.6.1-r1.ebuild
 2205252110 ./dev-python/chump/chump-1.6.0-r2.ebuild
 2110222039 ./dev-python/citeproc-py/citeproc-py-0.6.0.ebuild
-2105111209 ./dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild
-2205252110 ./dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild
+2206251240 ./dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild
 2109100440 ./dev-python/clang-python/clang-python-12.0.1.ebuild
 2203110309 ./dev-python/clang-python/clang-python-13.0.1.ebuild
 2204150310 ./dev-python/clang-python/clang-python-14.0.1.ebuild
@@ -11359,6 +11358,7 @@
 2204301040 ./dev-python/clang-python/clang-python-14.0.3.ebuild
 2206042310 ./dev-python/clang-python/clang-python-14.0.4.ebuild
 2206111440 ./dev-python/clang-python/clang-python-14.0.5.ebuild
+2206251640 ./dev-python/clang-python/clang-python-14.0.6.ebuild
 2203252323 ./dev-python/cleo/cleo-0.8.1.ebuild
 2205252110 ./dev-python/cli_helpers/cli_helpers-2.2.1.ebuild
 2205252110 ./dev-python/cli_helpers/cli_helpers-9999.ebuild
@@ -11430,12 +11430,12 @@
 2205270940 ./dev-python/dask/dask-2022.05.2.ebuild
 2206061240 ./dev-python/dask/dask-2022.05.0.ebuild
 2206120910 ./dev-python/dask/dask-2022.6.0.ebuild
+2206242340 ./dev-python/dask/dask-2022.6.1.ebuild
 2108082339 ./dev-python/dbfread/dbfread-2.0.7.ebuild
 2206171140 ./dev-python/dbfread/dbfread-2.0.7-r1.ebuild
 2205241940 ./dev-python/dbus-python/dbus-python-1.2.18.ebuild
 2206221840 ./dev-python/dbutils/dbutils-3.0.2.ebuild
-2205161740 ./dev-python/ddt/ddt-1.4.4.ebuild
-2205240940 ./dev-python/ddt/ddt-1.5.0.ebuild
+2206241440 ./dev-python/ddt/ddt-1.5.0.ebuild
 2205281910 ./dev-python/debtcollector/debtcollector-2.5.0.ebuild
 2205251240 ./dev-python/debugpy/debugpy-1.5.1.ebuild
 2206101740 ./dev-python/debugpy/debugpy-1.6.0.ebuild
@@ -11457,7 +11457,7 @@
 2202100210 ./dev-python/dissononce/dissononce-0.34.3-r2.ebuild
 2205010512 ./dev-python/distlib/distlib-0.3.4-r1.ebuild
 2206121510 ./dev-python/distlib/distlib-0.3.4-r2.ebuild
-2205161910 ./dev-python/distro/distro-1.7.0.ebuild
+2206251210 ./dev-python/distro/distro-1.7.0.ebuild
 2107170109 ./dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
 2206131040 ./dev-python/dj-database-url/dj-database-url-0.5.0-r1.ebuild
 2206131040 ./dev-python/dj-email-url/dj-email-url-1.0.5.ebuild
@@ -11495,7 +11495,6 @@
 2206221010 ./dev-python/doc8/doc8-0.11.2.ebuild
 2112130639 ./dev-python/docker-py/docker-py-5.0.3.ebuild
 2108071439 ./dev-python/dockerpty/dockerpty-0.4.1-r1.ebuild
-2107241839 ./dev-python/docopt/docopt-0.6.2-r4.ebuild
 2206222210 ./dev-python/docopt/docopt-0.6.2-r5.ebuild
 2202271539 ./dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2-r1.ebuild
 2106041309 ./dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -11539,7 +11538,6 @@
 2206100640 ./dev-python/execnet/execnet-1.9.0-r1.ebuild
 2205080740 ./dev-python/executing/executing-0.8.3.ebuild
 2108071439 ./dev-python/expects/expects-0.9.0.ebuild
-2202021039 ./dev-python/extras/extras-1.0.0-r1.ebuild
 2206230940 ./dev-python/extras/extras-1.0.0-r2.ebuild
 2111042039 ./dev-python/eyeD3/eyeD3-0.9.6.ebuild
 2205311340 ./dev-python/eyeD3/eyeD3-0.9.6-r1.ebuild
@@ -11623,6 +11621,7 @@
 2206061240 ./dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
 2204191209 ./dev-python/git-review/git-review-9999.ebuild
 2205212040 ./dev-python/git-review/git-review-2.3.0.ebuild
+2206240540 ./dev-python/git-review/git-review-2.3.1.ebuild
 2205290010 ./dev-python/gitdb/gitdb-4.0.9-r1.ebuild
 2203092340 ./dev-python/github3/github3-3.2.0.ebuild
 2206021840 ./dev-python/glob2/glob2-0.7-r1.ebuild
@@ -11653,6 +11652,7 @@
 2112200809 ./dev-python/grpcio-tools/grpcio-tools-1.43.0.ebuild
 2202041239 ./dev-python/grpcio/grpcio-1.43.0.ebuild
 2204161910 ./dev-python/gsd/gsd-2.5.2.ebuild
+2206231040 ./dev-python/gsd/gsd-2.5.3.ebuild
 2206010940 ./dev-python/gssapi/gssapi-1.7.3-r1.ebuild
 2206010940 ./dev-python/gssapi/gssapi-1.7.3.ebuild
 2205280440 ./dev-python/gst-python/gst-python-1.20.2.ebuild
@@ -11662,8 +11662,7 @@
 2205010512 ./dev-python/h2/h2-3.2.0.ebuild
 2205121940 ./dev-python/h2/h2-3.2.0-r1.ebuild
 2205121940 ./dev-python/h2/h2-4.1.0-r1.ebuild
-2205251040 ./dev-python/h5py/h5py-3.7.0.ebuild
-2205302310 ./dev-python/h5py/h5py-3.6.0.ebuild
+2206251240 ./dev-python/h5py/h5py-3.7.0.ebuild
 2206162010 ./dev-python/happybase/happybase-1.2.0.ebuild
 2109182039 ./dev-python/hcloud-python/hcloud-python-1.16.0.ebuild
 2205171540 ./dev-python/helpdev/helpdev-0.7.1.ebuild
@@ -11679,16 +11678,15 @@
 2206122140 ./dev-python/http-parser/http-parser-0.9.0-r1.ebuild
 2201291809 ./dev-python/httpauth/httpauth-0.3-r1.ebuild
 2205131440 ./dev-python/httpbin/httpbin-0.7.0-r5.ebuild
-2205151040 ./dev-python/httpcore/httpcore-0.14.7-r1.ebuild
 2206220940 ./dev-python/httpcore/httpcore-0.15.0.ebuild
 2205181340 ./dev-python/httplib2/httplib2-0.20.4.ebuild
 2206161240 ./dev-python/httpretty/httpretty-1.1.4-r1.ebuild
-2205151440 ./dev-python/httpx/httpx-0.22.0-r3.ebuild
 2206221510 ./dev-python/httpx/httpx-0.23.0.ebuild
 2206122140 ./dev-python/huawei-lte-api/huawei-lte-api-1.6.ebuild
 2109180139 ./dev-python/humanfriendly/humanfriendly-10.0.ebuild
 2206122140 ./dev-python/humanize/humanize-4.1.0.ebuild
 2206192010 ./dev-python/humanize/humanize-4.2.0.ebuild
+2206232240 ./dev-python/humanize/humanize-4.2.1.ebuild
 2109240940 ./dev-python/hvac/hvac-0.11.2.ebuild
 2205010512 ./dev-python/hyperframe/hyperframe-5.2.0.ebuild
 2205121940 ./dev-python/hyperframe/hyperframe-5.2.0-r1.ebuild
@@ -11699,6 +11697,7 @@
 2206121510 ./dev-python/hypothesis/hypothesis-6.46.9.ebuild
 2206150040 ./dev-python/hypothesis/hypothesis-6.47.2.ebuild
 2206202110 ./dev-python/hypothesis/hypothesis-6.47.3.ebuild
+2206242010 ./dev-python/hypothesis/hypothesis-6.47.4.ebuild
 2112210709 ./dev-python/icalendar/icalendar-4.0.9.ebuild
 2205311040 ./dev-python/identify/identify-2.5.1.ebuild
 2206121510 ./dev-python/idna/idna-3.3-r1.ebuild
@@ -11711,10 +11710,8 @@
 2206210910 ./dev-python/imapclient/imapclient-2.2.0-r1.ebuild
 2203302210 ./dev-python/iminuit/iminuit-2.11.2.ebuild
 2206212040 ./dev-python/iminuit/iminuit-2.12.0.ebuild
-2205182140 ./dev-python/immutables/immutables-0.17.ebuild
-2206231010 ./dev-python/immutables/immutables-0.18.ebuild
-2206021140 ./dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
-2206021140 ./dev-python/importlib_metadata/importlib_metadata-4.11.4.ebuild
+2206241010 ./dev-python/immutables/immutables-0.18.ebuild
+2206241440 ./dev-python/importlib_metadata/importlib_metadata-4.11.4.ebuild
 2206021140 ./dev-python/importlib_resources/importlib_resources-5.7.1.ebuild
 2206160940 ./dev-python/importlib_resources/importlib_resources-5.8.0.ebuild
 2109031039 ./dev-python/imread/imread-0.7.3-r1.ebuild
@@ -11752,6 +11749,7 @@
 2206140910 ./dev-python/ipython/ipython-8.3.0-r1.ebuild
 2203151509 ./dev-python/ipython_genutils/ipython_genutils-0.2.0-r3.ebuild
 2204161140 ./dev-python/ipywidgets/ipywidgets-7.7.0.ebuild
+2206231040 ./dev-python/ipywidgets/ipywidgets-7.7.1.ebuild
 2206021140 ./dev-python/irc/irc-20.0.0-r1.ebuild
 2205121740 ./dev-python/iso8601/iso8601-1.0.2-r1.ebuild
 2206121610 ./dev-python/isodate/isodate-0.6.1-r1.ebuild
@@ -11821,6 +11819,7 @@
 2206210910 ./dev-python/jupyter_packaging/jupyter_packaging-0.12.2.ebuild
 2206080840 ./dev-python/jupyter_server/jupyter_server-1.17.1.ebuild
 2206141040 ./dev-python/jupyter_server/jupyter_server-1.17.0.ebuild
+2206232240 ./dev-python/jupyter_server/jupyter_server-1.18.0.ebuild
 2202212209 ./dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.5.ebuild
 2205021410 ./dev-python/jupyterlab-lsp/jupyterlab-lsp-3.10.1.ebuild
 2206101740 ./dev-python/jupyterlab/jupyterlab-3.4.3.ebuild
@@ -11830,14 +11829,11 @@
 2206161240 ./dev-python/k5test/k5test-0.10.1-r1.ebuild
 2108021009 ./dev-python/kafka-python/kafka-python-2.0.2.ebuild
 2206161240 ./dev-python/kaitaistruct/kaitaistruct-0.9-r1.ebuild
-2105232039 ./dev-python/kaptan/kaptan-0.5.12-r1.ebuild
-2205242210 ./dev-python/kaptan/kaptan-0.5.12-r2.ebuild
+2206251210 ./dev-python/kaptan/kaptan-0.5.12-r2.ebuild
 2205190610 ./dev-python/kazoo/kazoo-2.8.0.ebuild
 2205131710 ./dev-python/kconfiglib/kconfiglib-14.1.0-r1.ebuild
 2206161310 ./dev-python/keep/keep-2.10.1-r1.ebuild
-2205022310 ./dev-python/keyring/keyring-23.5.0.ebuild
-2206021140 ./dev-python/keyring/keyring-23.5.1.ebuild
-2206082310 ./dev-python/keyring/keyring-23.6.0.ebuild
+2206241210 ./dev-python/keyring/keyring-23.6.0.ebuild
 2204012040 ./dev-python/keystoneauth/keystoneauth-4.5.0.ebuild
 2205290040 ./dev-python/keystoneauth/keystoneauth-4.6.0.ebuild
 2206211940 ./dev-python/kiwisolver/kiwisolver-1.4.3.ebuild
@@ -11877,6 +11873,7 @@
 2204301040 ./dev-python/lit/lit-14.0.3.ebuild
 2206042310 ./dev-python/lit/lit-14.0.4.ebuild
 2206111440 ./dev-python/lit/lit-14.0.5.ebuild
+2206251640 ./dev-python/lit/lit-14.0.6.ebuild
 2205171540 ./dev-python/livereload/livereload-2.6.3.ebuild
 2107132209 ./dev-python/llfuse/llfuse-1.4.1.ebuild
 2206011040 ./dev-python/llfuse/llfuse-1.4.2.ebuild
@@ -11893,14 +11890,13 @@
 2204161110 ./dev-python/lunr/lunr-0.6.2.ebuild
 2205111510 ./dev-python/lxml/lxml-4.8.0-r1.ebuild
 2206010840 ./dev-python/lxml/lxml-4.9.0-r1.ebuild
-2204192009 ./dev-python/lz4/lz4-4.0.0.ebuild
-2206231010 ./dev-python/lz4/lz4-4.0.1.ebuild
+2206231140 ./dev-python/lz4/lz4-4.0.1.ebuild
 2206031140 ./dev-python/m2crypto/m2crypto-0.38.0.ebuild
-2205010512 ./dev-python/m2r/m2r-0.2.1.ebuild
 2205131240 ./dev-python/mako/mako-1.2.0.ebuild
-2109121140 ./dev-python/mamba/mamba-0.11.2.ebuild
+2206241640 ./dev-python/mamba/mamba-0.11.2.ebuild
 2206122240 ./dev-python/mando/mando-0.7.1.ebuild
 2206161310 ./dev-python/manuel/manuel-1.11.2.ebuild
+2206242340 ./dev-python/manuel/manuel-1.12.4.ebuild
 2206161210 ./dev-python/markdown/markdown-3.3.7.ebuild
 2206220940 ./dev-python/markdown2/markdown2-2.4.3.ebuild
 2112222239 ./dev-python/markups/markups-3.1.3.ebuild
@@ -11914,8 +11910,7 @@
 2206031310 ./dev-python/matterhook/matterhook-0.2-r2.ebuild
 2110260909 ./dev-python/mccabe/mccabe-0.6.1-r2.ebuild
 2206170210 ./dev-python/mccabe/mccabe-0.7.0.ebuild
-2109091841 ./dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
-2205241610 ./dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild
+2206251210 ./dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild
 2203170309 ./dev-python/mecab-python/mecab-python-0.996-r1.ebuild
 2206011040 ./dev-python/mechanize/mechanize-0.4.8.ebuild
 2206221640 ./dev-python/mediafile/mediafile-0.9.0-r1.ebuild
@@ -11929,29 +11924,24 @@
 2205292240 ./dev-python/mimerender/mimerender-0.6.0-r1.ebuild
 2203151509 ./dev-python/minidb/minidb-2.0.6.ebuild
 2108060109 ./dev-python/minimock/minimock-1.3.0.ebuild
+2206240840 ./dev-python/minimock/minimock-1.3.0-r1.ebuild
 2112190139 ./dev-python/miniupnpc/miniupnpc-2.2.3.ebuild
 2205200511 ./dev-python/misaka/misaka-2.1.1-r1.ebuild
 2206121610 ./dev-python/mistune/mistune-2.0.2-r1.ebuild
 2205241610 ./dev-python/mkautodoc/mkautodoc-0.1.0-r1.ebuild
-2109091909 ./dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
-2205241610 ./dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild
-2109091909 ./dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
-2205241610 ./dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild
+2206251210 ./dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild
+2206251210 ./dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild
 2206221010 ./dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild
 2205241610 ./dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3-r1.ebuild
-2204100940 ./dev-python/mkdocs-material/mkdocs-material-8.2.8.ebuild
-2205241610 ./dev-python/mkdocs-material/mkdocs-material-8.2.15.ebuild
-2206011240 ./dev-python/mkdocs-material/mkdocs-material-8.2.16.ebuild
 2206072240 ./dev-python/mkdocs-material/mkdocs-material-8.3.3.ebuild
 2206112210 ./dev-python/mkdocs-material/mkdocs-material-8.3.4.ebuild
 2206170940 ./dev-python/mkdocs-material/mkdocs-material-8.3.6.ebuild
 2206222010 ./dev-python/mkdocs-material/mkdocs-material-8.3.7.ebuild
-2111212209 ./dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild
-2112260340 ./dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r1.ebuild
-2205241610 ./dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild
+2206251210 ./dev-python/mkdocs-material/mkdocs-material-8.2.16.ebuild
+2206242340 ./dev-python/mkdocs-material/mkdocs-material-8.3.8.ebuild
+2206251210 ./dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild
 2206061240 ./dev-python/mkdocs-redirects/mkdocs-redirects-1.0.4-r1.ebuild
-2204092009 ./dev-python/mkdocs/mkdocs-1.3.0.ebuild
-2205241610 ./dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
+2206251210 ./dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
 2107151109 ./dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild
 2107151109 ./dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild
 2205241610 ./dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.0.3.ebuild
@@ -11960,22 +11950,19 @@
 2206100640 ./dev-python/mock/mock-4.0.3-r1.ebuild
 2203250209 ./dev-python/mongomock/mongomock-4.0.0.ebuild
 2206100640 ./dev-python/more-itertools/more-itertools-8.13.0.ebuild
-2205242210 ./dev-python/moto/moto-3.1.10.ebuild
-2205271240 ./dev-python/moto/moto-3.1.9.ebuild
-2205301040 ./dev-python/moto/moto-3.1.11.ebuild
-2206051240 ./dev-python/moto/moto-3.1.12.ebuild
 2206131040 ./dev-python/moto/moto-3.1.13.ebuild
 2206192210 ./dev-python/moto/moto-3.1.14.ebuild
+2206251210 ./dev-python/moto/moto-3.1.12.ebuild
 2202100210 ./dev-python/mpdlcd/mpdlcd-0.5.2-r1.ebuild
 2202151809 ./dev-python/mpi4py/mpi4py-3.1.3.ebuild
 2111220639 ./dev-python/mpmath/mpmath-1.2.1.ebuild
 2206221340 ./dev-python/msgpack/msgpack-1.0.4.ebuild
 2205171540 ./dev-python/mss/mss-6.1.0.ebuild
 2205131940 ./dev-python/multidict/multidict-6.0.2.ebuild
-2205010512 ./dev-python/munch/munch-2.5.0-r1.ebuild
-2205240940 ./dev-python/munch/munch-2.5.0-r2.ebuild
+2206241210 ./dev-python/munch/munch-2.5.0-r2.ebuild
 2206221640 ./dev-python/munkres/munkres-1.1.4-r1.ebuild
 2201281510 ./dev-python/mygpoclient/mygpoclient-1.8.ebuild
+2206240840 ./dev-python/mygpoclient/mygpoclient-1.9.ebuild
 2205071240 ./dev-python/mypy/mypy-0.942.ebuild
 2205261240 ./dev-python/mypy/mypy-0.960.ebuild
 2205311410 ./dev-python/mypy/mypy-0.950.ebuild
@@ -11983,6 +11970,7 @@
 2205010512 ./dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
 2112182139 ./dev-python/mysql-connector-python/mysql-connector-python-8.0.27.ebuild
 2204272340 ./dev-python/mysqlclient/mysqlclient-2.1.0.ebuild
+2206231040 ./dev-python/mysqlclient/mysqlclient-2.1.1.ebuild
 2202081310 ./dev-python/nagiosplugin/nagiosplugin-1.3.3.ebuild
 2205161740 ./dev-python/natsort/natsort-8.1.0.ebuild
 2107172139 ./dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild
@@ -12021,14 +12009,16 @@
 2107121909 ./dev-python/ntlm-auth/ntlm-auth-1.5.0.ebuild
 2105291139 ./dev-python/ntplib/ntplib-0.4.0.ebuild
 2206080840 ./dev-python/nuitka/nuitka-0.8.4.ebuild
+2206232240 ./dev-python/nuitka/nuitka-0.9.ebuild
 2202141139 ./dev-python/numexpr/numexpr-2.8.1.ebuild
-2205241640 ./dev-python/numexpr/numexpr-2.8.1-r1.ebuild
+2206240710 ./dev-python/numexpr/numexpr-2.8.1-r1.ebuild
 2201061939 ./dev-python/numpy/numpy-1.22.0-r1.ebuild
 2201150040 ./dev-python/numpy/numpy-1.22.1.ebuild
 2201260939 ./dev-python/numpy/numpy-1.21.5.ebuild
 2202140239 ./dev-python/numpy/numpy-1.22.2.ebuild
 2205220940 ./dev-python/numpy/numpy-1.22.3.ebuild
 2205231140 ./dev-python/numpy/numpy-1.22.4.ebuild
+2206231040 ./dev-python/numpy/numpy-1.23.0.ebuild
 2205271240 ./dev-python/numpydoc/numpydoc-1.3.1.ebuild
 2206101140 ./dev-python/numpydoc/numpydoc-1.4.0.ebuild
 2203312110 ./dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild
@@ -12057,6 +12047,7 @@
 2205281910 ./dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
 2206131040 ./dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild
 2206181010 ./dev-python/oslo-utils/oslo-utils-5.0.0.ebuild
+2206232240 ./dev-python/oslo-utils/oslo-utils-6.0.0.ebuild
 2205290910 ./dev-python/oslotest/oslotest-4.5.0-r2.ebuild
 2204091009 ./dev-python/osrf_pycommon/osrf_pycommon-2.0.2.ebuild
 2205271240 ./dev-python/outcome/outcome-1.1.0-r1.ebuild
@@ -12072,6 +12063,7 @@
 2112112340 ./dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.2.ebuild
 2107152139 ./dev-python/pandas-datareader/pandas-datareader-0.10.0.ebuild
 2205171240 ./dev-python/pandas/pandas-1.4.2.ebuild
+2206232240 ./dev-python/pandas/pandas-1.4.3.ebuild
 2203070310 ./dev-python/pandocfilters/pandocfilters-1.5.0.ebuild
 2105081609 ./dev-python/parallax/parallax-1.0.6.ebuild
 2205010512 ./dev-python/parameterized/parameterized-0.8.1-r1.ebuild
@@ -12125,15 +12117,12 @@
 2206101140 ./dev-python/pikepdf/pikepdf-5.1.5.ebuild
 2206182010 ./dev-python/pikepdf/pikepdf-5.1.3.ebuild
 2106052109 ./dev-python/pilkit/pilkit-2.0.ebuild
-2206212110 ./dev-python/pillow/pillow-9.0.1-r1.ebuild
-2206230940 ./dev-python/pillow/pillow-9.1.1.ebuild
+2206241240 ./dev-python/pillow/pillow-9.1.1.ebuild
 2206121610 ./dev-python/pip/pip-22.1.2.ebuild
 2206072210 ./dev-python/pipenv/pipenv-2022.6.7.ebuild
 2206151310 ./dev-python/pivy/pivy-0.6.7.ebuild
 2205230940 ./dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild
-2205010512 ./dev-python/pkginfo/pkginfo-1.8.2.ebuild
-2205240940 ./dev-python/pkginfo/pkginfo-1.8.2-r1.ebuild
-2206082310 ./dev-python/pkginfo/pkginfo-1.8.3.ebuild
+2206241210 ./dev-python/pkginfo/pkginfo-1.8.3.ebuild
 2206140040 ./dev-python/platformdirs/platformdirs-2.5.2.ebuild
 2111281840 ./dev-python/plotly-geo/plotly-geo-1.0.0.ebuild
 2108242209 ./dev-python/plotly/plotly-5.2.2.ebuild
@@ -12178,7 +12167,7 @@
 2110211709 ./dev-python/prov/prov-2.0.0.ebuild
 2203151640 ./dev-python/pslab-python/pslab-python-2.5.0.ebuild
 2205111810 ./dev-python/psutil/psutil-5.9.0.ebuild
-2206231010 ./dev-python/psutil/psutil-5.9.1.ebuild
+2206231140 ./dev-python/psutil/psutil-5.9.1.ebuild
 2110241039 ./dev-python/psycopg/psycopg-2.8.6-r1.ebuild
 2202020339 ./dev-python/psycopg/psycopg-2.9.3.ebuild
 2206041110 ./dev-python/psycopg/psycopg-3.0.14.ebuild
@@ -12229,18 +12218,17 @@
 2206010940 ./dev-python/pycountry/pycountry-22.3.5.ebuild
 2206121610 ./dev-python/pycparser/pycparser-2.21-r1.ebuild
 2205162310 ./dev-python/pycryptodome/pycryptodome-3.14.1.ebuild
+2206231040 ./dev-python/pycryptodome/pycryptodome-3.15.0.ebuild
 2111042339 ./dev-python/pycson/pycson-0.8-r1.ebuild
 2205241240 ./dev-python/pycson/pycson-0.8-r2.ebuild
-2206052110 ./dev-python/pycson/pycson-0.8-r3.ebuild
+2206232210 ./dev-python/pycson/pycson-0.8-r3.ebuild
 2205311310 ./dev-python/pycuda/pycuda-2021.1.ebuild
 2203181240 ./dev-python/pycups/pycups-2.0.1-r1.ebuild
 2107030009 ./dev-python/pycurl-requests/pycurl-requests-0.2.1.ebuild
 2206120940 ./dev-python/pycurl/pycurl-7.45.1.ebuild
 2206170210 ./dev-python/pycurl/pycurl-7.44.1-r1.ebuild
 2107130939 ./dev-python/pycxx/pycxx-7.1.5.ebuild
-2205011510 ./dev-python/pydantic/pydantic-1.9.0-r2.ebuild
-2205112110 ./dev-python/pydantic/pydantic-1.9.0-r4.ebuild
-2206150040 ./dev-python/pydantic/pydantic-1.9.1.ebuild
+2206241240 ./dev-python/pydantic/pydantic-1.9.1.ebuild
 2205171540 ./dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.7.2.ebuild
 2205202110 ./dev-python/pydbus/pydbus-0.6.0.ebuild
 2205141440 ./dev-python/pydecomp/pydecomp-0.3-r3.ebuild
@@ -12255,7 +12243,6 @@
 2204260610 ./dev-python/pyenchant/pyenchant-3.2.2.ebuild
 2205261140 ./dev-python/pyenchant/pyenchant-3.2.2-r1.ebuild
 2205240940 ./dev-python/pyfakefs/pyfakefs-4.5.6.ebuild
-2103041309 ./dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
 2206222141 ./dev-python/pyflakes/pyflakes-2.4.0-r1.ebuild
 2105281739 ./dev-python/pyformance/pyformance-0.4-r1.ebuild
 2111281810 ./dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
@@ -12264,8 +12251,8 @@
 2106011509 ./dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r2.ebuild
 2206151440 ./dev-python/pyghmi/pyghmi-1.5.47.ebuild
 2206222040 ./dev-python/pyghmi/pyghmi-1.5.48.ebuild
-2205170010 ./dev-python/pygit2/pygit2-1.9.1.ebuild
-2205251040 ./dev-python/pygit2/pygit2-1.9.2.ebuild
+2206242340 ./dev-python/pyghmi/pyghmi-1.5.49.ebuild
+2206251210 ./dev-python/pygit2/pygit2-1.9.2.ebuild
 2206161310 ./dev-python/pyglet/pyglet-1.5.26.ebuild
 2105242309 ./dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
 2205311040 ./dev-python/pygments/pygments-2.12.0-r1.ebuild
@@ -12384,7 +12371,7 @@
 2205111610 ./dev-python/pytest-check/pytest-check-1.0.5.ebuild
 2205142110 ./dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild
 2205010512 ./dev-python/pytest-cov/pytest-cov-3.0.0-r1.ebuild
-2206100640 ./dev-python/pytest-datadir/pytest-datadir-1.3.1-r1.ebuild
+2206241910 ./dev-python/pytest-datadir/pytest-datadir-1.3.1-r1.ebuild
 2206161310 ./dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild
 2201012139 ./dev-python/pytest-django/pytest-django-4.5.2.ebuild
 2206161310 ./dev-python/pytest-env/pytest-env-0.6.2-r1.ebuild
@@ -12398,18 +12385,19 @@
 2205271240 ./dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29.ebuild
 2106111409 ./dev-python/pytest-html/pytest-html-3.1.1.ebuild
 2205131440 ./dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild
-2205151440 ./dev-python/pytest-httpx/pytest-httpx-0.20.0.ebuild
 2206222210 ./dev-python/pytest-httpx/pytest-httpx-0.21.0.ebuild
 2205171540 ./dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
 2205150710 ./dev-python/pytest-localftpserver/pytest-localftpserver-1.1.3.ebuild
 2206212140 ./dev-python/pytest-localserver/pytest-localserver-0.6.0-r1.ebuild
 2203271240 ./dev-python/pytest-metadata/pytest-metadata-2.0.1.ebuild
 2205110010 ./dev-python/pytest-mock/pytest-mock-3.7.0.ebuild
+2206250840 ./dev-python/pytest-mock/pytest-mock-3.8.1.ebuild
 2205171540 ./dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
 2206051940 ./dev-python/pytest-plus/pytest-plus-0.2-r1.ebuild
 2109101040 ./dev-python/pytest-pylint/pytest-pylint-0.18.0.ebuild
 2206082240 ./dev-python/pytest-qt/pytest-qt-4.0.2-r1.ebuild
-2205171540 ./dev-python/pytest-regressions/pytest-regressions-2.3.1.ebuild
+2206240840 ./dev-python/pytest-qt/pytest-qt-4.1.0.ebuild
+2206241910 ./dev-python/pytest-regressions/pytest-regressions-2.3.1.ebuild
 2206131040 ./dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2-r1.ebuild
 2203310510 ./dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1-r1.ebuild
 2205311040 ./dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild
@@ -12561,7 +12549,7 @@
 2201300139 ./dev-python/pyzmq/pyzmq-22.1.0.ebuild
 2206101310 ./dev-python/pyzmq/pyzmq-23.1.0.ebuild
 2206202040 ./dev-python/pyzmq/pyzmq-23.2.0.ebuild
-2206222210 ./dev-python/pyzmq/pyzmq-23.0.0.ebuild
+2206231140 ./dev-python/pyzmq/pyzmq-23.0.0.ebuild
 2206011410 ./dev-python/pyzotero/pyzotero-1.5.4.ebuild
 2201082109 ./dev-python/qdarkstyle/qdarkstyle-3.0.3.ebuild
 2206082240 ./dev-python/qdarkstyle/qdarkstyle-3.1.ebuild
@@ -12620,8 +12608,8 @@
 2206011040 ./dev-python/requests-oauthlib/requests-oauthlib-1.3.1.ebuild
 2206212210 ./dev-python/requests-toolbelt/requests-toolbelt-0.9.1-r1.ebuild
 2206220940 ./dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r2.ebuild
-2206161240 ./dev-python/requests/requests-2.27.1-r1.ebuild
 2206220210 ./dev-python/requests/requests-2.28.0-r1.ebuild
+2206240910 ./dev-python/requests/requests-2.27.1-r2.ebuild
 2201170839 ./dev-python/requests_download/requests_download-0.1.2.ebuild
 2205292210 ./dev-python/requests_download/requests_download-0.1.2-r1.ebuild
 2204151140 ./dev-python/requests_pkcs12/requests_pkcs12-1.14.ebuild
@@ -12639,19 +12627,18 @@
 2205111740 ./dev-python/rfc3986-validator/rfc3986-validator-0.1.1-r1.ebuild
 2206161210 ./dev-python/rfc3986/rfc3986-2.0.0-r1.ebuild
 2205111740 ./dev-python/rfc3987/rfc3987-1.3.8-r2.ebuild
-2205251040 ./dev-python/rich/rich-12.4.4.ebuild
-2205271240 ./dev-python/rich/rich-12.4.1.ebuild
+2206241210 ./dev-python/rich/rich-12.4.4.ebuild
 2105062209 ./dev-python/roman/roman-3.3.ebuild
 2205292210 ./dev-python/roman/roman-3.3-r1.ebuild
 2205151410 ./dev-python/rope/rope-1.0.0.ebuild
 2205261140 ./dev-python/rope/rope-1.1.1.ebuild
-2206222040 ./dev-python/rope/rope-1.2.0.ebuild
+2206250010 ./dev-python/rope/rope-1.2.0.ebuild
 2109101009 ./dev-python/ropemode/ropemode-0.5.ebuild
 2109231739 ./dev-python/rosdistro/rosdistro-0.8.3.ebuild
 2109231739 ./dev-python/rosdistro/rosdistro-9999.ebuild
 2203191710 ./dev-python/rospkg/rospkg-1.4.0.ebuild
 2203191710 ./dev-python/rospkg/rospkg-9999.ebuild
-2206212210 ./dev-python/routes/routes-2.5.1-r1.ebuild
+2206241510 ./dev-python/routes/routes-2.5.1-r2.ebuild
 2105231239 ./dev-python/rply/rply-0.7.8.ebuild
 2201291909 ./dev-python/rpy/rpy-3.4.5.ebuild
 2205151140 ./dev-python/rpyc/rpyc-5.1.0.ebuild
@@ -12672,9 +12659,9 @@
 2202141139 ./dev-python/scikit-build/scikit-build-0.12.0.ebuild
 2205281410 ./dev-python/scikit-build/scikit-build-0.14.1.ebuild
 2206131410 ./dev-python/scikit-build/scikit-build-0.15.0.ebuild
-2205171440 ./dev-python/scipy/scipy-1.8.0.ebuild
 2206121210 ./dev-python/scipy/scipy-1.9.9999.ebuild
-2206221640 ./dev-python/scipy/scipy-1.8.1.ebuild
+2206231210 ./dev-python/scipy/scipy-1.8.1.ebuild
+2206250440 ./dev-python/scipy/scipy-1.9.0_rc1.ebuild
 2206131040 ./dev-python/scripttest/scripttest-1.3.0-r2.ebuild
 2205181810 ./dev-python/scrypt/scrypt-0.8.20.ebuild
 2110202239 ./dev-python/seaborn/seaborn-0.11.2.ebuild
@@ -12699,13 +12686,14 @@
 2206200940 ./dev-python/setuptools/setuptools-62.6.0.ebuild
 2205271240 ./dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
 2206221110 ./dev-python/setuptools_scm/setuptools_scm-7.0.1-r1.ebuild
+2206231040 ./dev-python/setuptools_scm/setuptools_scm-7.0.2.ebuild
 2206161310 ./dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r5.ebuild
 2206220940 ./dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.2.ebuild
 2108181109 ./dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild
 2201301639 ./dev-python/sexpdata/sexpdata-0.0.3-r2.ebuild
 2206212110 ./dev-python/sgmllib3k/sgmllib3k-1.0.0-r1.ebuild
 2206161240 ./dev-python/sh/sh-1.14.2-r1.ebuild
-2206161940 ./dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
+2206250210 ./dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
 2205310940 ./dev-python/signature_dispatch/signature_dispatch-1.0.0-r1.ebuild
 2205201540 ./dev-python/simplebayes/simplebayes-1.5.8.ebuild
 2202180039 ./dev-python/simpleeval/simpleeval-0.9.12.ebuild
@@ -12743,8 +12731,8 @@
 2206052010 ./dev-python/soupsieve/soupsieve-2.3.2_p1.ebuild
 2206221340 ./dev-python/speaklater/speaklater-1.4.ebuild
 2108120640 ./dev-python/speg/speg-0.3-r2.ebuild
-2205241240 ./dev-python/speg/speg-0.3-r3.ebuild
 2206061140 ./dev-python/speg/speg-0.3_p20180819-r1.ebuild
+2206232210 ./dev-python/speg/speg-0.3-r3.ebuild
 2204260511 ./dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
 2205220511 ./dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.1.ebuild
 2206041010 ./dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.2.ebuild
@@ -12793,7 +12781,7 @@
 2206061413 ./dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.3.ebuild
 2206192140 ./dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.1.ebuild
 2205171540 ./dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
-2205141610 ./dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
+2206241510 ./dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r2.ebuild
 2206011410 ./dev-python/sphobjinv/sphobjinv-2.2.2.ebuild
 2201282210 ./dev-python/spur/spur-0.3.22.ebuild
 2206110810 ./dev-python/spyder-kernels/spyder-kernels-2.3.1-r2.ebuild
@@ -12803,6 +12791,8 @@
 2112212110 ./dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.1.1.ebuild
 2206011040 ./dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild
 2206051240 ./dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild
+2206232240 ./dev-python/sqlalchemy/sqlalchemy-1.4.38.ebuild
+2206242340 ./dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
 2205161640 ./dev-python/sqlitedict/sqlitedict-2.0.0.ebuild
 2205181740 ./dev-python/sqlparse/sqlparse-0.4.2.ebuild
 2201291509 ./dev-python/ssh2-python/ssh2-python-0.27.0.ebuild
@@ -12835,7 +12825,6 @@
 2204050839 ./dev-python/symengine/symengine-0.9.2.ebuild
 2205041810 ./dev-python/symengine/symengine-0.9.2-r1.ebuild
 2204101210 ./dev-python/sympy/sympy-1.10.1.ebuild
-2105231239 ./dev-python/tabulate/tabulate-0.8.9.ebuild
 2206221110 ./dev-python/tabulate/tabulate-0.8.10.ebuild
 2206222210 ./dev-python/tabulate/tabulate-0.8.9-r1.ebuild
 2206070940 ./dev-python/tagpy/tagpy-2018.1-r3.ebuild
@@ -12847,7 +12836,6 @@
 2206030910 ./dev-python/tempest/tempest-31.0.0.ebuild
 2109100139 ./dev-python/tempita/tempita-0.5.3-r3.ebuild
 2206161310 ./dev-python/tempora/tempora-5.0.1.ebuild
-2109231839 ./dev-python/tenacity/tenacity-8.0.1.ebuild
 2206222210 ./dev-python/tenacity/tenacity-8.0.1-r1.ebuild
 2205121640 ./dev-python/termcolor/termcolor-1.1.0-r3.ebuild
 2206161210 ./dev-python/terminado/terminado-0.15.0.ebuild
@@ -12881,8 +12869,7 @@
 2202041239 ./dev-python/tomli/tomli-1.2.3.ebuild
 2205100010 ./dev-python/tomli/tomli-2.0.1.ebuild
 2206081111 ./dev-python/tomli/tomli-2.0.1-r1.ebuild
-2205111310 ./dev-python/tomlkit/tomlkit-0.10.2.ebuild
-2205251040 ./dev-python/tomlkit/tomlkit-0.11.0.ebuild
+2206241210 ./dev-python/tomlkit/tomlkit-0.11.0.ebuild
 2206171440 ./dev-python/toolz/toolz-0.11.2-r1.ebuild
 2205162210 ./dev-python/toposort/toposort-1.7-r1.ebuild
 2206011040 ./dev-python/towncrier/towncrier-21.9.0.ebuild
@@ -12910,7 +12897,6 @@
 2203141339 ./dev-python/txrequests/txrequests-0.9.6.ebuild
 2205010512 ./dev-python/typed-ast/typed-ast-1.4.3.ebuild
 2206221940 ./dev-python/typed-ast/typed-ast-1.5.4.ebuild
-2205111610 ./dev-python/typeguard/typeguard-2.13.3.ebuild
 2206231010 ./dev-python/typeguard/typeguard-2.13.3-r1.ebuild
 2205311040 ./dev-python/typing-extensions/typing-extensions-4.2.0.ebuild
 2206212140 ./dev-python/typogrify/typogrify-2.0.7-r1.ebuild
@@ -12938,6 +12924,7 @@
 2110202239 ./dev-python/urwidtrees/urwidtrees-1.0.3.ebuild
 2206221640 ./dev-python/utidylib/utidylib-0.8.ebuild
 2205151440 ./dev-python/uvicorn/uvicorn-0.17.6.ebuild
+2206240840 ./dev-python/uvicorn/uvicorn-0.18.1.ebuild
 2109200939 ./dev-python/uvloop/uvloop-0.15.3.ebuild
 2111191509 ./dev-python/uvloop/uvloop-0.15.3-r1.ebuild
 2112041209 ./dev-python/uvloop/uvloop-0.16.0.ebuild
@@ -12970,7 +12957,7 @@
 2206181010 ./dev-python/warlock/warlock-2.0.1.ebuild
 2206110840 ./dev-python/watchdog/watchdog-2.1.9.ebuild
 2206170240 ./dev-python/watchdog/watchdog-2.1.8.ebuild
-2206051240 ./dev-python/watchgod/watchgod-0.8.2.ebuild
+2206242140 ./dev-python/watchgod/watchgod-0.8.2-r1.ebuild
 2205171540 ./dev-python/wcmatch/wcmatch-8.3.ebuild
 2205310940 ./dev-python/wcmatch/wcmatch-8.4.ebuild
 2205161810 ./dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
@@ -12993,6 +12980,7 @@
 2205231540 ./dev-python/whisper/whisper-1.1.10.ebuild
 2206170210 ./dev-python/whoosh/whoosh-2.7.4-r2.ebuild
 2204161140 ./dev-python/widgetsnbextension/widgetsnbextension-3.6.0.ebuild
+2206231040 ./dev-python/widgetsnbextension/widgetsnbextension-3.6.1.ebuild
 2206171340 ./dev-python/wrapt/wrapt-1.14.1.ebuild
 2107051639 ./dev-python/ws4py/ws4py-0.5.1-r1.ebuild
 2107051639 ./dev-python/ws4py/ws4py-9999.ebuild
@@ -13006,14 +12994,14 @@
 2106052209 ./dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
 2204182110 ./dev-python/wxpython/wxpython-4.0.7-r1.ebuild
 2205061140 ./dev-python/xarray/xarray-2022.3.0.ebuild
-2202141139 ./dev-python/xcffib/xcffib-0.11.1.ebuild
-2205241710 ./dev-python/xcffib/xcffib-0.11.1-r1.ebuild
+2206251210 ./dev-python/xcffib/xcffib-0.11.1-r1.ebuild
 2203261409 ./dev-python/xdoctest/xdoctest-1.0.0.ebuild
 2205191040 ./dev-python/xlrd/xlrd-2.0.1-r1.ebuild
 2205191040 ./dev-python/xlsxwriter/xlsxwriter-3.0.3.ebuild
 2205191040 ./dev-python/xlwt/xlwt-1.3.0-r2.ebuild
 2206112210 ./dev-python/xmlschema/xmlschema-1.11.2.ebuild
 2206161240 ./dev-python/xmlschema/xmlschema-1.11.1.ebuild
+2206242340 ./dev-python/xmlschema/xmlschema-1.11.3.ebuild
 2206100740 ./dev-python/xmltodict/xmltodict-0.13.0-r1.ebuild
 2205162310 ./dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
 2205191040 ./dev-python/xxhash/xxhash-3.0.0.ebuild
@@ -13046,13 +13034,11 @@
 2206161340 ./dev-python/ukkonen/ukkonen-1.0.1-r1.ebuild
 2205240940 ./dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
 2204011140 ./dev-python/pytest-markdown/pytest-markdown-1.0.2.ebuild
-2112260340 ./dev-python/csscompressor/csscompressor-0.9.5.ebuild
-2205241610 ./dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild
+2206250010 ./dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild
 2203101110 ./dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.1.ebuild
 2111281840 ./dev-python/simpervisor/simpervisor-0.4.ebuild
 2206200240 ./dev-python/boltons/boltons-21.0.0-r1.ebuild
 2206052010 ./dev-python/patatt/patatt-0.4.9-r1.ebuild
-2112110110 ./dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.2.ebuild
 2201271240 ./dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.3.ebuild
 2205241610 ./dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.4.ebuild
 2206222010 ./dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild
@@ -13076,19 +13062,18 @@
 2206160940 ./dev-python/stack_data/stack_data-0.3.0.ebuild
 2205271240 ./dev-python/installer/installer-0.5.1.ebuild
 2206081111 ./dev-python/installer/installer-0.5.1-r1.ebuild
-2206082310 ./dev-python/pdm-pep517/pdm-pep517-0.12.7.ebuild
+2206250010 ./dev-python/pdm-pep517/pdm-pep517-0.12.7.ebuild
 2205121710 ./dev-python/poetry-core/poetry-core-1.0.8.ebuild
 2205150940 ./dev-python/socksio/socksio-1.0.0.ebuild
 2202271539 ./dev-python/python3-xapp/python3-xapp-2.2.1-r1.ebuild
-2205292240 ./dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
-2205292240 ./dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
-2205151140 ./dev-python/mdurl/mdurl-0.1.1.ebuild
+2206241910 ./dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
+2206241910 ./dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
+2206241910 ./dev-python/mdurl/mdurl-0.1.1.ebuild
 2205292240 ./dev-python/myst_parser/myst_parser-0.17.2.ebuild
-2206171640 ./dev-python/myst_parser/myst_parser-0.18.0.ebuild
+2206241910 ./dev-python/myst_parser/myst_parser-0.18.0.ebuild
 2203121409 ./dev-python/picobox/picobox-2.2.0.ebuild
-2205292240 ./dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
+2206241910 ./dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
 2206220840 ./dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
-2204270740 ./dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0-r1.ebuild
 2203121409 ./dev-python/sphinxemoji/sphinxemoji-0.2.0.ebuild
 2205151140 ./dev-python/nptyping/nptyping-2.0.1.ebuild
 2206021010 ./dev-python/nptyping/nptyping-2.1.1.ebuild
@@ -13114,23 +13099,21 @@
 2206191810 ./dev-python/pyfuse3/pyfuse3-3.2.1-r2.ebuild
 2203021839 ./dev-python/jupyter_kernel_test/jupyter_kernel_test-0.4.3.ebuild
 2206081210 ./dev-python/sphinx-autoapi/sphinx-autoapi-1.8.4.ebuild
-2205171010 ./dev-python/boolean-py/boolean-py-4.0.ebuild
-2205171010 ./dev-python/license-expression/license-expression-30.0.0.ebuild
+2206250010 ./dev-python/boolean-py/boolean-py-4.0.ebuild
+2206250010 ./dev-python/license-expression/license-expression-30.0.0.ebuild
 2205111440 ./dev-python/nspektr/nspektr-0.3.0.ebuild
 2206101140 ./dev-python/nspektr/nspektr-0.4.0.ebuild
 2206111440 ./dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
 2203211209 ./dev-python/textX/textX-3.0.0.ebuild
-2204100539 ./dev-python/uri_template/uri_template-1.1.0.ebuild
-2205111740 ./dev-python/uri_template/uri_template-1.2.0.ebuild
+2206242140 ./dev-python/uri_template/uri_template-1.2.0-r1.ebuild
 2205120010 ./dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
 2206161310 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.5.0.ebuild
-2205062310 ./dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
-2205100110 ./dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0.ebuild
-2205301710 ./dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
+2206251210 ./dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
 2205301710 ./dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild
-2205062310 ./dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild
-2205240940 ./dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r2.ebuild
+2206251210 ./dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r2.ebuild
 2205191240 ./dev-python/ini2toml/ini2toml-0.10.ebuild
+2206250840 ./dev-python/ini2toml/ini2toml-0.11-r1.ebuild
+2206250840 ./dev-python/ini2toml/ini2toml-0.11.ebuild
 2204051709 ./dev-python/itunespy/itunespy-1.6-r1.ebuild
 2206051940 ./dev-python/pyDes/pyDes-2.0.1.ebuild
 2204041909 ./dev-python/simber/simber-0.2.4.ebuild
@@ -13150,13 +13133,12 @@
 2206160940 ./dev-python/hatchling/hatchling-1.3.1.ebuild
 2204251910 ./dev-python/pystache/pystache-0.6.0.ebuild
 2205192010 ./dev-python/pyeclib/pyeclib-1.6.1.ebuild
-2206221010 ./dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
-2206221010 ./dev-python/flit_scm/flit_scm-1.6.2.ebuild
+2206240140 ./dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
+2206240140 ./dev-python/flit_scm/flit_scm-1.6.2.ebuild
 2206090610 ./dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
-2206090610 ./dev-python/dirty-equals/dirty-equals-0.4.ebuild
+2206241510 ./dev-python/dirty-equals/dirty-equals-0.4-r1.ebuild
 2206121110 ./dev-python/tpm2-pytss/tpm2-pytss-1.1.0.ebuild
-2206090610 ./dev-python/watchfiles/watchfiles-0.14.1.ebuild
-2206200240 ./dev-python/watchfiles/watchfiles-0.15.0.ebuild
+2206242140 ./dev-python/watchfiles/watchfiles-0.15.0-r1.ebuild
 2206080240 ./dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
 2205271410 ./dev-python/lark/lark-1.1.2.ebuild
 2205132340 ./dev-python/python-pam/python-pam-2.0.2-r1.ebuild
@@ -13170,16 +13152,18 @@
 2206212340 ./dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild
 2205200440 ./dev-python/pathvalidate/pathvalidate-2.5.0.ebuild
 2205282010 ./dev-python/tcolorpy/tcolorpy-0.1.2.ebuild
-2205211010 ./dev-python/kgb/kgb-7.0-r1.ebuild
-2205211010 ./dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
+2206250010 ./dev-python/kgb/kgb-7.0-r1.ebuild
+2206250010 ./dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
 2205242210 ./dev-python/openapi-schema-validator/openapi-schema-validator-0.2.3.ebuild
-2205242210 ./dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild
+2206251210 ./dev-python/openapi-schema-validator/openapi-schema-validator-0.3.0.ebuild
+2206251210 ./dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild
 2206131040 ./dev-python/versioningit/versioningit-2.0.0.ebuild
 2206071310 ./dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r1.ebuild
 2206121210 ./dev-python/meson-python/meson-python-0.5.0-r1.ebuild
-2206221510 ./dev-python/meson-python/meson-python-0.6.0.ebuild
+2206250440 ./dev-python/meson-python/meson-python-0.6.0-r1.ebuild
 2206171640 ./dev-python/sphinx-pytest/sphinx-pytest-0.0.3.ebuild
-2206140910 ./dev-python/tlsh/tlsh-4.8.2.ebuild
+2206240840 ./dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild
+2206241240 ./dev-python/tlsh/tlsh-4.8.2.ebuild
 2206101740 ./dev-python/check-manifest/check-manifest-0.48.ebuild
 2206101740 ./dev-python/dictpath/dictpath-0.1.3.ebuild
 2206141040 ./dev-python/jaraco-test/jaraco-test-5.1.0.ebuild
@@ -13187,7 +13171,11 @@
 2206120940 ./dev-python/pyproject-metadata/pyproject-metadata-0.5.0.ebuild
 2206161940 ./dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild
 2206171540 ./dev-python/qpageview/qpageview-0.6.2.ebuild
-2206222040 ./dev-python/pytoolconfig/pytoolconfig-1.1.2.ebuild
+2206250010 ./dev-python/pytoolconfig/pytoolconfig-1.1.2.ebuild
+2206251440 ./dev-python/calver/calver-2021.7.30.ebuild
+2206250840 ./dev-python/configupdater/configupdater-3.1.ebuild
+2206250840 ./dev-python/pyproject-fmt/pyproject-fmt-0.3.3.ebuild
+2206251440 ./dev-python/trove-classifiers/trove-classifiers-2022.6.23.ebuild
 2206181910 ./dev-qt/assistant/assistant-5.15.4.ebuild
 2206191540 ./dev-qt/assistant/assistant-5.15.5.ebuild
 2206181910 ./dev-qt/designer/designer-5.15.4.ebuild
@@ -13242,7 +13230,7 @@
 2206200210 ./dev-qt/qtimageformats/qtimageformats-5.15.4-r1.ebuild
 2206191540 ./dev-qt/qtimageformats/qtimageformats-5.15.5.ebuild
 2206141640 ./dev-qt/qtlocation/qtlocation-5.15.4.ebuild
-2206191540 ./dev-qt/qtlocation/qtlocation-5.15.5.ebuild
+2206240810 ./dev-qt/qtlocation/qtlocation-5.15.5.ebuild
 2110291639 ./dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20171024.ebuild
 2206181910 ./dev-qt/qtmultimedia/qtmultimedia-5.15.4-r1.ebuild
 2206191540 ./dev-qt/qtmultimedia/qtmultimedia-5.15.5.ebuild
@@ -13330,8 +13318,9 @@
 2109241339 ./dev-ros/ament_cmake_copyright/ament_cmake_copyright-9999.ebuild
 2203152010 ./dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.12.1.ebuild
 2109241339 ./dev-ros/ament_cmake_core/ament_cmake_core-1.1.4.ebuild
-2109241339 ./dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
 2203152010 ./dev-ros/ament_cmake_core/ament_cmake_core-1.3.0.ebuild
+2206231440 ./dev-ros/ament_cmake_core/ament_cmake_core-1.3.0-r1.ebuild
+2206231440 ./dev-ros/ament_cmake_core/ament_cmake_core-9999.ebuild
 2109241339 ./dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.11.2.ebuild
 2109241339 ./dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-9999.ebuild
 2203152010 ./dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.12.1.ebuild
@@ -14696,7 +14685,7 @@
 2007270539 ./dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild
 2008221109 ./dev-ruby/climate_control/climate_control-0.2.0.ebuild
 2205070940 ./dev-ruby/climate_control/climate_control-1.0.1.ebuild
-2204021210 ./dev-ruby/cliver/cliver-0.3.2-r1.ebuild
+2206251210 ./dev-ruby/cliver/cliver-0.3.2-r1.ebuild
 2203191510 ./dev-ruby/cmdparse/cmdparse-3.0.7-r1.ebuild
 2104060140 ./dev-ruby/coderay/coderay-1.1.2.ebuild
 2108030109 ./dev-ruby/coderay/coderay-1.1.3-r1.ebuild
@@ -14799,8 +14788,6 @@
 2111111009 ./dev-ruby/em-websocket/em-websocket-0.5.3.ebuild
 2205061210 ./dev-ruby/equalizer/equalizer-0.0.11-r1.ebuild
 2205061210 ./dev-ruby/equatable/equatable-0.7.0.ebuild
-2109080039 ./dev-ruby/erubi/erubi-1.10.0.ebuild
-2004220039 ./dev-ruby/erubi/erubi-1.9.0.ebuild
 2205061210 ./dev-ruby/erubi/erubi-1.10.0-r1.ebuild
 2111241610 ./dev-ruby/erubis/erubis-2.7.0-r3.ebuild
 2203201310 ./dev-ruby/erubis/erubis-2.7.0-r4.ebuild
@@ -14837,6 +14824,7 @@
 2206181210 ./dev-ruby/fast_gettext/fast_gettext-1.8.0-r1.ebuild
 2203070710 ./dev-ruby/fast_xs/fast_xs-0.8.0-r3.ebuild
 2002230909 ./dev-ruby/fattr/fattr-2.4.0.ebuild
+2206251210 ./dev-ruby/fattr/fattr-2.4.0-r1.ebuild
 2205061140 ./dev-ruby/fcgi/fcgi-0.9.2.1-r2.ebuild
 2110310909 ./dev-ruby/ferret/ferret-0.11.8.7-r1.ebuild
 2110091039 ./dev-ruby/ffaker/ffaker-2.20.0.ebuild
@@ -14857,7 +14845,7 @@
 2205061140 ./dev-ruby/forgery/forgery-0.8.1.ebuild
 2205061140 ./dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r2.ebuild
 2101062139 ./dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild
-2204061909 ./dev-ruby/fuubar/fuubar-2.5.1.ebuild
+2206251210 ./dev-ruby/fuubar/fuubar-2.5.1.ebuild
 2206181210 ./dev-ruby/gettext-setup/gettext-setup-0.34-r2.ebuild
 2106111109 ./dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.8.1.ebuild
 2206110940 ./dev-ruby/gh/gh-0.18.0-r1.ebuild
@@ -14871,7 +14859,6 @@
 2205061040 ./dev-ruby/gnuplot/gnuplot-2.6.2-r3.ebuild
 2103131039 ./dev-ruby/google-protobuf/google-protobuf-3.14.0.ebuild
 2204100809 ./dev-ruby/google-protobuf/google-protobuf-3.19.3.ebuild
-2202170139 ./dev-ruby/gpgme/gpgme-2.0.20-r2.ebuild
 2205061040 ./dev-ruby/gpgme/gpgme-2.0.20-r3.ebuild
 2110200339 ./dev-ruby/gruff/gruff-0.14.0.ebuild
 2204190839 ./dev-ruby/gruff/gruff-0.15.0.ebuild
@@ -14894,7 +14881,7 @@
 2206161940 ./dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild
 2206161940 ./dev-ruby/hiera-eyaml/hiera-eyaml-3.2.2.ebuild
 2204021110 ./dev-ruby/hiera/hiera-3.8.0.ebuild
-2204200839 ./dev-ruby/hiera/hiera-3.9.0.ebuild
+2206240540 ./dev-ruby/hiera/hiera-3.9.0.ebuild
 2104100939 ./dev-ruby/highline/highline-2.0.3.ebuild
 2205061010 ./dev-ruby/highline/highline-2.0.3-r1.ebuild
 2107091109 ./dev-ruby/hipchat/hipchat-1.6.0.ebuild
@@ -14903,18 +14890,16 @@
 2101062139 ./dev-ruby/hitimes/hitimes-2.0.0.ebuild
 2205061010 ./dev-ruby/hitimes/hitimes-2.0.0-r1.ebuild
 2112260340 ./dev-ruby/hocon/hocon-1.3.1.ebuild
-2205061010 ./dev-ruby/hocon/hocon-1.3.1-r1.ebuild
+2206240540 ./dev-ruby/hocon/hocon-1.3.1-r1.ebuild
 2108030109 ./dev-ruby/hoe/hoe-3.21.0.ebuild
 2205270910 ./dev-ruby/hoe/hoe-3.23.1.ebuild
 2203070710 ./dev-ruby/hpricot/hpricot-0.8.6-r6.ebuild
 2204080839 ./dev-ruby/html2haml/html2haml-2.2.0-r1.ebuild
 2204231109 ./dev-ruby/htmlentities/htmlentities-4.3.4-r1.ebuild
-2005200909 ./dev-ruby/http-accept/http-accept-1.7.0.ebuild
-2001261139 ./dev-ruby/http-accept/http-accept-2.1.1.ebuild
 2204231109 ./dev-ruby/http-accept/http-accept-2.1.1-r1.ebuild
+2206251110 ./dev-ruby/http-accept/http-accept-1.7.0.ebuild
 2205081810 ./dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
 2205260940 ./dev-ruby/http-cookie/http-cookie-1.0.5.ebuild
-2005231239 ./dev-ruby/http-form_data/http-form_data-2.2.0.ebuild
 2204021210 ./dev-ruby/http-form_data/http-form_data-2.3.0.ebuild
 2102140909 ./dev-ruby/http-parser/http-parser-1.2.3.ebuild
 2205061010 ./dev-ruby/http-parser/http-parser-1.2.3-r1.ebuild
@@ -14956,7 +14941,6 @@
 2111171139 ./dev-ruby/json/json-2.5.1-r1.ebuild
 2205081810 ./dev-ruby/json/json-2.6.1.ebuild
 2205180810 ./dev-ruby/json/json-2.6.2.ebuild
-2005230839 ./dev-ruby/json_schema/json_schema-0.20.8.ebuild
 2204081239 ./dev-ruby/json_schema/json_schema-0.20.9.ebuild
 2108232109 ./dev-ruby/jwt/jwt-2.2.3.ebuild
 2110091039 ./dev-ruby/jwt/jwt-2.3.0.ebuild
@@ -15009,7 +14993,6 @@
 2205011210 ./dev-ruby/mab/mab-0.0.3-r2.ebuild
 2104021439 ./dev-ruby/magic/magic-0.2.9-r1.ebuild
 2204241040 ./dev-ruby/magic/magic-0.2.9-r2.ebuild
-2101062139 ./dev-ruby/mail/mail-2.7.1.ebuild
 2206131140 ./dev-ruby/mail/mail-2.7.1-r1.ebuild
 2110240839 ./dev-ruby/maildir/maildir-2.2.3.ebuild
 2103270939 ./dev-ruby/marcel/marcel-0.3.3-r1.ebuild
@@ -15050,7 +15033,6 @@
 2201081509 ./dev-ruby/mini_portile2/mini_portile2-2.7.1.ebuild
 2202121839 ./dev-ruby/mini_portile2/mini_portile2-2.6.1.ebuild
 2205081810 ./dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild
-2012202239 ./dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild
 2206131140 ./dev-ruby/minispec-metadata/minispec-metadata-3.3.1-r1.ebuild
 2202121839 ./dev-ruby/minitar/minitar-0.9.ebuild
 2205081810 ./dev-ruby/minitar/minitar-0.9-r1.ebuild
@@ -15078,13 +15060,13 @@
 2008081009 ./dev-ruby/mqtt/mqtt-0.5.0.ebuild
 2203171009 ./dev-ruby/msgpack/msgpack-1.4.5.ebuild
 2204091109 ./dev-ruby/msgpack/msgpack-1.5.1.ebuild
-2205280910 ./dev-ruby/msgpack/msgpack-1.5.2.ebuild
+2206251210 ./dev-ruby/msgpack/msgpack-1.5.2.ebuild
 2104060140 ./dev-ruby/multi_json/multi_json-1.14.1.ebuild
 2203222209 ./dev-ruby/multi_json/multi_json-1.15.0.ebuild
 2205081810 ./dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild
 2205211240 ./dev-ruby/multi_test/multi_test-1.1.0.ebuild
 2006261739 ./dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild
-2206121141 ./dev-ruby/multi_xml/multi_xml-0.6.0-r2.ebuild
+2206251040 ./dev-ruby/multi_xml/multi_xml-0.6.0-r2.ebuild
 2205011240 ./dev-ruby/multipart-post/multipart-post-2.1.1-r1.ebuild
 2206050840 ./dev-ruby/multipart-post/multipart-post-2.2.0.ebuild
 2206100810 ./dev-ruby/multipart-post/multipart-post-2.2.2.ebuild
@@ -15115,9 +15097,8 @@
 2109280409 ./dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild
 2203140939 ./dev-ruby/net-ssh/net-ssh-6.1.0-r2.ebuild
 2107211339 ./dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
-2205081810 ./dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
+2206250940 ./dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
 2205011210 ./dev-ruby/netrc/netrc-0.11.0-r1.ebuild
-2008030839 ./dev-ruby/network_interface/network_interface-0.0.2.ebuild
 2205011210 ./dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild
 2206121141 ./dev-ruby/niceogiri/niceogiri-1.1.2-r1.ebuild
 2102041109 ./dev-ruby/nio4r/nio4r-2.5.4.ebuild
@@ -15127,7 +15108,6 @@
 2201151010 ./dev-ruby/ntlm-http/ntlm-http-0.1.1-r3.ebuild
 2205010940 ./dev-ruby/oauth/oauth-0.5.8.ebuild
 2205050910 ./dev-ruby/oauth/oauth-0.5.10.ebuild
-2104161439 ./dev-ruby/oauth2/oauth2-1.4.4.ebuild
 2205081040 ./dev-ruby/oauth2/oauth2-1.4.7.ebuild
 2205081040 ./dev-ruby/octokit/octokit-4.22.0.ebuild
 2205280910 ./dev-ruby/octokit/octokit-4.23.0.ebuild
@@ -15136,7 +15116,6 @@
 2107071109 ./dev-ruby/omniauth/omniauth-2.0.4.ebuild
 2204140810 ./dev-ruby/omniauth/omniauth-2.1.0.ebuild
 2205081940 ./dev-ruby/open4/open4-1.3.4-r1.ebuild
-2008011209 ./dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild
 2205010940 ./dev-ruby/openssl-ccm/openssl-ccm-1.2.2-r1.ebuild
 2205010940 ./dev-ruby/optimist/optimist-3.0.1.ebuild
 2205010940 ./dev-ruby/optionable/optionable-0.2.0-r1.ebuild
@@ -15155,10 +15134,10 @@
 2103172309 ./dev-ruby/paramesan/paramesan-1.0.1.ebuild
 2204100910 ./dev-ruby/paramesan/paramesan-1.0.1-r1.ebuild
 2010161239 ./dev-ruby/parser/parser-2.7.2.0-r1.ebuild
-2112101010 ./dev-ruby/parser/parser-3.0.3.2.ebuild
-2201081509 ./dev-ruby/parser/parser-3.1.0.0.ebuild
-2202222209 ./dev-ruby/parser/parser-3.1.1.0.ebuild
-2204130910 ./dev-ruby/parser/parser-3.1.2.0.ebuild
+2206251240 ./dev-ruby/parser/parser-3.0.3.2.ebuild
+2206251240 ./dev-ruby/parser/parser-3.1.0.0.ebuild
+2206251240 ./dev-ruby/parser/parser-3.1.1.0.ebuild
+2206251240 ./dev-ruby/parser/parser-3.1.2.0.ebuild
 2205130940 ./dev-ruby/pastel/pastel-0.8.0.ebuild
 2204100809 ./dev-ruby/path_expander/path_expander-1.1.0.ebuild
 2103111239 ./dev-ruby/pathutil/pathutil-0.16.2.ebuild
@@ -15175,6 +15154,7 @@
 2101062139 ./dev-ruby/pg/pg-1.2.2.ebuild
 2111080609 ./dev-ruby/pg/pg-1.2.3.ebuild
 2204301240 ./dev-ruby/pg/pg-1.3.5.ebuild
+2206241310 ./dev-ruby/pg/pg-1.4.1.ebuild
 2204301240 ./dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r3.ebuild
 2012150609 ./dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
 2108030109 ./dev-ruby/pkg-config/pkg-config-1.4.6.ebuild
@@ -15213,16 +15193,13 @@
 2111221739 ./dev-ruby/rack-openid/rack-openid-1.4.2-r1.ebuild
 2206040910 ./dev-ruby/rack-protection/rack-protection-2.2.0.ebuild
 2109080039 ./dev-ruby/rack-test/rack-test-1.1.0.ebuild
-2203201310 ./dev-ruby/rack-test/rack-test-1.1.0-r1.ebuild
+2206241310 ./dev-ruby/rack-test/rack-test-1.1.0-r1.ebuild
 2205081810 ./dev-ruby/rack/rack-2.2.3.ebuild
 2206030940 ./dev-ruby/rack/rack-2.2.3.1.ebuild
 2204040909 ./dev-ruby/radius/radius-0.7.5-r1.ebuild
-2109080039 ./dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
 2206100810 ./dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r2.ebuild
-2012202239 ./dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild
-2108190940 ./dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.1.ebuild
 2206100810 ./dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.2.ebuild
-2206100810 ./dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.3.ebuild
+2206241310 ./dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.3.ebuild
 2204271140 ./dev-ruby/rails/rails-6.1.5.1.ebuild
 2204271410 ./dev-ruby/rails/rails-7.0.2.4.ebuild
 2205140910 ./dev-ruby/rails/rails-5.2.8.ebuild
@@ -15251,7 +15228,6 @@
 2203201310 ./dev-ruby/rash_alt/rash_alt-0.4.12.ebuild
 2110300839 ./dev-ruby/rb-gsl/rb-gsl-2.1.0.2-r1.ebuild
 2205081810 ./dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
-2007261839 ./dev-ruby/rb-readline/rb-readline-0.5.5.ebuild
 2204230840 ./dev-ruby/rb-readline/rb-readline-0.5.5-r1.ebuild
 2204230840 ./dev-ruby/rbnacl/rbnacl-7.1.1.ebuild
 2204091109 ./dev-ruby/rbpdf-font/rbpdf-font-1.19.1-r1.ebuild
@@ -15282,14 +15258,14 @@
 2109081939 ./dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
 2204261810 ./dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild
 2101062139 ./dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild
-2204130840 ./dev-ruby/redcloth/redcloth-4.3.2-r4.ebuild
+2206241310 ./dev-ruby/redcloth/redcloth-4.3.2-r4.ebuild
 2008221109 ./dev-ruby/redis/redis-4.1.4.ebuild
 2204231109 ./dev-ruby/ref/ref-2.0.0-r1.ebuild
 2003061039 ./dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild
 2012202239 ./dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
-2205100810 ./dev-ruby/regexp_parser/regexp_parser-2.4.0.ebuild
 2205290940 ./dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild
 2205290940 ./dev-ruby/regexp_parser/regexp_parser-2.5.0.ebuild
+2206241110 ./dev-ruby/regexp_parser/regexp_parser-2.4.0.ebuild
 2204021210 ./dev-ruby/regexp_property_values/regexp_property_values-1.2.0.ebuild
 2204081239 ./dev-ruby/regexp_property_values/regexp_property_values-1.3.0.ebuild
 2104080909 ./dev-ruby/request_store/request_store-1.5.0.ebuild
@@ -15314,7 +15290,6 @@
 2203291910 ./dev-ruby/roadie/roadie-4.0.0.ebuild
 2204122039 ./dev-ruby/roadie/roadie-5.0.0.ebuild
 2205170840 ./dev-ruby/roadie/roadie-5.0.1.ebuild
-2007261239 ./dev-ruby/robots/robots-0.10.1-r2.ebuild
 2204231309 ./dev-ruby/robots/robots-0.10.1-r3.ebuild
 2109290039 ./dev-ruby/rotp/rotp-6.2.0.ebuild
 2110030209 ./dev-ruby/rouge/rouge-3.26.0.ebuild
@@ -15331,20 +15306,16 @@
 2205281910 ./dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild
 2203291910 ./dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.2.0.ebuild
 2109102140 ./dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
-2104122109 ./dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
 2201281040 ./dev-ruby/rspec-core/rspec-core-3.10.2.ebuild
 2205081810 ./dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
 2205081810 ./dev-ruby/rspec-core/rspec-core-3.11.0.ebuild
 2108030109 ./dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
-2104122109 ./dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild
 2201150940 ./dev-ruby/rspec-expectations/rspec-expectations-3.10.2.ebuild
 2205081810 ./dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
 2205081810 ./dev-ruby/rspec-expectations/rspec-expectations-3.11.0.ebuild
 2205081810 ./dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild
-2112260340 ./dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0.ebuild
 2204231309 ./dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0-r1.ebuild
 2108030109 ./dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
-2104122109 ./dev-ruby/rspec-mocks/rspec-mocks-3.9.1.ebuild
 2202061009 ./dev-ruby/rspec-mocks/rspec-mocks-3.10.3.ebuild
 2203310910 ./dev-ruby/rspec-mocks/rspec-mocks-3.11.0.ebuild
 2205081810 ./dev-ruby/rspec-mocks/rspec-mocks-2.99.2-r1.ebuild
@@ -15359,10 +15330,8 @@
 2204231309 ./dev-ruby/rspec-stubbed_env/rspec-stubbed_env-1.0.0.ebuild
 2108030109 ./dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
 2111031010 ./dev-ruby/rspec-support/rspec-support-3.10.3.ebuild
-2104122109 ./dev-ruby/rspec-support/rspec-support-3.9.4.ebuild
 2205081810 ./dev-ruby/rspec-support/rspec-support-3.11.0.ebuild
 2109102140 ./dev-ruby/rspec/rspec-3.10.0.ebuild
-2104122109 ./dev-ruby/rspec/rspec-3.9.0.ebuild
 2205081810 ./dev-ruby/rspec/rspec-2.99.0.ebuild
 2205081810 ./dev-ruby/rspec/rspec-3.11.0.ebuild
 2204061909 ./dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
@@ -15402,7 +15371,6 @@
 2103140439 ./dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.4.3.ebuild
 2103140439 ./dev-ruby/ruby-gtksourceview4/ruby-gtksourceview4-3.4.3.ebuild
 2205261410 ./dev-ruby/ruby-hmac/ruby-hmac-0.4.0-r2.ebuild
-2203230410 ./dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r2.ebuild
 2204241040 ./dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r3.ebuild
 2103140439 ./dev-ruby/ruby-libsecret/ruby-libsecret-3.4.3.ebuild
 2204241040 ./dev-ruby/ruby-macho/ruby-macho-2.5.1.ebuild
@@ -15416,7 +15384,7 @@
 2201150940 ./dev-ruby/ruby-oembed/ruby-oembed-0.16.1.ebuild
 2204221010 ./dev-ruby/ruby-ole/ruby-ole-1.2.12.2-r1.ebuild
 2012150609 ./dev-ruby/ruby-opengl/ruby-opengl-0.10.0.ebuild
-2204241040 ./dev-ruby/ruby-opengl/ruby-opengl-0.10.0-r1.ebuild
+2206241040 ./dev-ruby/ruby-opengl/ruby-opengl-0.10.0-r1.ebuild
 2204241040 ./dev-ruby/ruby-openid/ruby-openid-2.9.2.ebuild
 2203222209 ./dev-ruby/ruby-pango/ruby-pango-3.4.3.ebuild
 2203222209 ./dev-ruby/ruby-poppler/ruby-poppler-3.4.3.ebuild
@@ -15444,7 +15412,6 @@
 2204231309 ./dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild
 2107200839 ./dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
 2111222239 ./dev-ruby/ruby_gntp/ruby_gntp-0.3.4-r1.ebuild
-2101062139 ./dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
 2112070940 ./dev-ruby/ruby_parser/ruby_parser-3.18.1.ebuild
 2204100809 ./dev-ruby/ruby_parser/ruby_parser-3.19.1.ebuild
 2009081509 ./dev-ruby/ruby_smb/ruby_smb-1.1.0.ebuild
@@ -15534,6 +15501,7 @@
 2101062139 ./dev-ruby/sprockets/sprockets-3.7.2.ebuild
 2205151110 ./dev-ruby/sprockets/sprockets-3.7.2-r2.ebuild
 2206131140 ./dev-ruby/sprockets/sprockets-4.0.2.ebuild
+2206250940 ./dev-ruby/sprockets/sprockets-4.1.0.ebuild
 2204221010 ./dev-ruby/spy/spy-1.0.2.ebuild
 2204221010 ./dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild
 2206140810 ./dev-ruby/sqlite3/sqlite3-1.4.3.ebuild
@@ -15579,7 +15547,7 @@
 2204171010 ./dev-ruby/tilt/tilt-2.0.10-r1.ebuild
 2203191010 ./dev-ruby/timecop/timecop-0.9.4.ebuild
 2205081810 ./dev-ruby/timecop/timecop-0.9.5.ebuild
-2204060909 ./dev-ruby/timers/timers-4.3.3.ebuild
+2206251210 ./dev-ruby/timers/timers-4.3.3.ebuild
 2110030209 ./dev-ruby/tins/tins-1.29.1.ebuild
 2204171010 ./dev-ruby/tins/tins-1.31.0.ebuild
 2205100810 ./dev-ruby/tins/tins-1.31.1.ebuild
@@ -15618,7 +15586,7 @@
 2204191509 ./dev-ruby/tzinfo/tzinfo-1.2.9.ebuild
 2205081810 ./dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
 2204171010 ./dev-ruby/uconv/uconv-0.6.1-r3.ebuild
-2206131140 ./dev-ruby/uglifier/uglifier-4.2.0-r1.ebuild
+2206250940 ./dev-ruby/uglifier/uglifier-4.2.0-r1.ebuild
 2107030940 ./dev-ruby/ultraviolet/ultraviolet-1.0.1-r1.ebuild
 2205081810 ./dev-ruby/unf/unf-0.1.4-r1.ebuild
 2108111739 ./dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild
@@ -15627,6 +15595,7 @@
 2205260910 ./dev-ruby/unf_ext/unf_ext-0.0.8.2.ebuild
 2204171010 ./dev-ruby/unicode-display_width/unicode-display_width-2.1.0.ebuild
 2205151210 ./dev-ruby/unicode-display_width/unicode-display_width-1.7.0.ebuild
+2206250940 ./dev-ruby/unicode-display_width/unicode-display_width-2.2.0.ebuild
 2205081810 ./dev-ruby/unindent/unindent-1.0-r1.ebuild
 2206121141 ./dev-ruby/uuidtools/uuidtools-2.2.0.ebuild
 2109280409 ./dev-ruby/vagrant_cloud/vagrant_cloud-3.0.2.ebuild
@@ -15671,7 +15640,6 @@
 2110040409 ./dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
 2205081810 ./dev-ruby/zeitwerk/zeitwerk-2.5.4.ebuild
 2206140810 ./dev-ruby/zeitwerk/zeitwerk-2.6.0.ebuild
-2101062139 ./dev-ruby/zentest/zentest-4.12.0.ebuild
 2206200940 ./dev-ruby/zentest/zentest-4.12.1.ebuild
 2202262209 ./dev-ruby/benchmark-ips/benchmark-ips-2.9.2.ebuild
 2203140939 ./dev-ruby/benchmark-ips/benchmark-ips-2.10.0.ebuild
@@ -16007,8 +15975,8 @@
 2205302240 ./dev-util/buildbot/buildbot-9999.ebuild
 2101011509 ./dev-util/bustle/bustle-0.8.0.ebuild
 2205032210 ./dev-util/byacc/byacc-20220128.ebuild
-2107031009 ./dev-util/cargo-audit/cargo-audit-0.15.0.ebuild
-2110072009 ./dev-util/cargo-audit/cargo-audit-0.15.2.ebuild
+2206242140 ./dev-util/cargo-audit/cargo-audit-0.15.2-r1.ebuild
+2206242140 ./dev-util/cargo-audit/cargo-audit-0.17.0.ebuild
 2108182309 ./dev-util/cargo-c/cargo-c-0.6.2-r1.ebuild
 2112241010 ./dev-util/cargo-c/cargo-c-0.9.6.ebuild
 2112252110 ./dev-util/cargo-c/cargo-c-0.9.5.ebuild
@@ -16164,7 +16132,7 @@
 2204142310 ./dev-util/diffoscope/diffoscope-207.ebuild
 2206081111 ./dev-util/diffoscope/diffoscope-214-r1.ebuild
 2206121141 ./dev-util/diffoscope/diffoscope-214.ebuild
-2206140910 ./dev-util/diffoscope/diffoscope-216.ebuild
+2206241240 ./dev-util/diffoscope/diffoscope-216.ebuild
 2104060140 ./dev-util/diffstat/diffstat-1.63.ebuild
 2202111709 ./dev-util/diffstat/diffstat-1.64.ebuild
 2206051040 ./dev-util/diffuse/diffuse-0.7.5.ebuild
@@ -16191,6 +16159,7 @@
 2205170654 ./dev-util/ebuildtester/ebuildtester-0.1.35.ebuild
 2205231940 ./dev-util/ebuildtester/ebuildtester-0.1.37.ebuild
 2206212010 ./dev-util/ebuildtester/ebuildtester-41.ebuild
+2206231240 ./dev-util/ebuildtester/ebuildtester-42.ebuild
 2001191639 ./dev-util/edb-debugger/edb-debugger-9999.ebuild
 2205070740 ./dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
 2201212139 ./dev-util/edi/edi-0.8.0-r1.ebuild
@@ -16208,8 +16177,8 @@
 2108050609 ./dev-util/fuzz/fuzz-0.6-r2.ebuild
 2105242309 ./dev-util/gcovr/gcovr-4.2.ebuild
 2206161940 ./dev-util/gcovr/gcovr-5.1.ebuild
-2205302140 ./dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild
 2205311240 ./dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild
+2206251140 ./dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild
 2206161210 ./dev-util/geany-plugins/geany-plugins-1.38-r1.ebuild
 2106301339 ./dev-util/geany/geany-1.37.1.ebuild
 2110101739 ./dev-util/geany/geany-9999.ebuild
@@ -16225,8 +16194,8 @@
 2206221810 ./dev-util/github-cli/github-cli-2.12.1.ebuild
 2010270609 ./dev-util/gitlab-ci-linter/gitlab-ci-linter-2.2.0.ebuild
 2202090410 ./dev-util/glade/glade-3.38.2-r1.ebuild
-2205302140 ./dev-util/glib-utils/glib-utils-2.72.2.ebuild
 2205311240 ./dev-util/glib-utils/glib-utils-2.72.1.ebuild
+2206251140 ./dev-util/glib-utils/glib-utils-2.72.2.ebuild
 2008111809 ./dev-util/global/global-6.6.4.ebuild
 2206011740 ./dev-util/glslang/glslang-1.3.211.ebuild
 2206122310 ./dev-util/glslang/glslang-9999.ebuild
@@ -16240,6 +16209,7 @@
 2110280209 ./dev-util/google-perftools/google-perftools-2.9.1-r2.ebuild
 2001211409 ./dev-util/gource/gource-0.51.ebuild
 2204241610 ./dev-util/gource/gource-0.52.ebuild
+2206241210 ./dev-util/gource/gource-0.53.ebuild
 2204291110 ./dev-util/gperf/gperf-3.1.ebuild
 2101310343 ./dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
 2110171539 ./dev-util/gprof2dot/gprof2dot-2021.02.21-r1.ebuild
@@ -16267,7 +16237,7 @@
 2201241810 ./dev-util/hip/hip-4.3.0-r1.ebuild
 2203060009 ./dev-util/hip/hip-4.3.0-r2.ebuild
 2206221610 ./dev-util/hip/hip-5.0.2-r2.ebuild
-2202071309 ./dev-util/howdoi/howdoi-2.0.19.ebuild
+2206241140 ./dev-util/howdoi/howdoi-2.0.19.ebuild
 2002230040 ./dev-util/huc/huc-0.1-r1.ebuild
 2104161439 ./dev-util/hxd/hxd-0.70.02-r2.ebuild
 2011172009 ./dev-util/hxtools/hxtools-20201116.ebuild
@@ -16279,10 +16249,7 @@
 2201071309 ./dev-util/include-what-you-use/include-what-you-use-0.17.ebuild
 2204081139 ./dev-util/include-what-you-use/include-what-you-use-0.18.ebuild
 2204200309 ./dev-util/indent/indent-2.2.12.ebuild
-2205190010 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11222_p20220518.ebuild
-2205280140 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11279_p20220528.ebuild
-2206072340 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11104.ebuild
-2206112040 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11378.ebuild
+2206251740 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11378.ebuild
 2205250010 ./dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.6.0.ebuild
 2104231439 ./dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r3.ebuild
 2206211940 ./dev-util/intltool/intltool-0.51.0-r3.ebuild
@@ -16294,6 +16261,7 @@
 2205061010 ./dev-util/jenkins-bin/jenkins-bin-2.332.3.ebuild
 2206230910 ./dev-util/jenkins-bin/jenkins-bin-2.332.4.ebuild
 2206230910 ./dev-util/jenkins-bin/jenkins-bin-2.356.ebuild
+2206250940 ./dev-util/jenkins-bin/jenkins-bin-2.346.1.ebuild
 2205160610 ./dev-util/jfrog-cli/jfrog-cli-1.35.3.ebuild
 2206020640 ./dev-util/jfrog-cli/jfrog-cli-2.18.2.ebuild
 2206190140 ./dev-util/jfrog-cli/jfrog-cli-2.19.0.ebuild
@@ -16330,6 +16298,7 @@
 2204301040 ./dev-util/lldb/lldb-14.0.3.ebuild
 2206042310 ./dev-util/lldb/lldb-14.0.4.ebuild
 2206111440 ./dev-util/lldb/lldb-14.0.5.ebuild
+2206251640 ./dev-util/lldb/lldb-14.0.6.ebuild
 2203200410 ./dev-util/lockrun/lockrun-20120508-r1.ebuild
 1911050009 ./dev-util/lsuio/lsuio-0.2.0-r1.ebuild
 2111252139 ./dev-util/ltrace/ltrace-0.7.3.6.1.ebuild
@@ -16451,8 +16420,8 @@
 2205081810 ./dev-util/ragel/ragel-7.0.4-r2.ebuild
 2104180939 ./dev-util/rats/rats-2.4.ebuild
 2201221309 ./dev-util/rbtools/rbtools-2.0.1.ebuild
-2205220840 ./dev-util/rbtools/rbtools-3.1.ebuild
 2206170810 ./dev-util/rbtools/rbtools-3.1.1.ebuild
+2206250010 ./dev-util/rbtools/rbtools-3.1.ebuild
 2105101839 ./dev-util/re2c/re2c-2.1.1-r1.ebuild
 2204291110 ./dev-util/re2c/re2c-2.2.ebuild
 2202081410 ./dev-util/rebar-bin/rebar-bin-3.18.0.ebuild
@@ -16500,7 +16469,7 @@
 2201290940 ./dev-util/rosinstall/rosinstall-9999.ebuild
 2102150339 ./dev-util/rosinstall_generator/rosinstall_generator-0.1.22-r1.ebuild
 2102150339 ./dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
-2109221009 ./dev-util/rpmdevtools/rpmdevtools-9.5.ebuild
+2206241210 ./dev-util/rpmdevtools/rpmdevtools-9.5.ebuild
 2109271209 ./dev-util/rr/rr-5.5.0.ebuild
 2201052239 ./dev-util/rt-tests/rt-tests-2.3.ebuild
 2106150109 ./dev-util/rustup/rustup-1.24.3.ebuild
@@ -16684,6 +16653,8 @@
 2206222141 ./dev-util/rocprofiler/rocprofiler-4.3.0.ebuild
 2206222141 ./dev-util/rocprofiler/rocprofiler-5.0.2.ebuild
 2206171740 ./dev-util/bootconfig/bootconfig-5.18.ebuild
+2206240040 ./dev-util/kube-linter/kube-linter-0.3.0.ebuild
+2206232040 ./dev-util/kubeval/kubeval-0.16.1.ebuild
 2105162309 ./dev-vcs/bfg/bfg-1.13.0.ebuild
 2109252009 ./dev-vcs/breezy/breezy-3.2.1-r1.ebuild
 2012231444 ./dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
@@ -16995,7 +16966,7 @@
 2203110239 ./games-arcade/rockdodger/rockdodger-1.1.4.ebuild
 2006072209 ./games-arcade/rocksndiamonds/rocksndiamonds-4.1.4.1.ebuild
 1804242238 ./games-arcade/sable/sable-1.0-r1.ebuild
-2102282309 ./games-arcade/savagewheels/savagewheels-1.6.1-r2.ebuild
+2206241640 ./games-arcade/savagewheels/savagewheels-1.6.1-r2.ebuild
 2203200310 ./games-arcade/sdb/sdb-1.0.2-r2.ebuild
 1910111911 ./games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r2.ebuild
 2108190409 ./games-arcade/sdlroids/sdlroids-1.3.4-r5.ebuild
@@ -17218,6 +17189,7 @@
 2112250210 ./games-engines/stratagus/stratagus-3.2.0.ebuild
 2204021210 ./games-engines/xzip/xzip-1.8.2-r3.ebuild
 2204021210 ./games-engines/zoom/zoom-1.1.5-r1.ebuild
+2206250040 ./games-engines/scrap-engine/scrap-engine-1.2.0.ebuild
 2011152309 ./games-fps/alienarena/alienarena-7.66.ebuild
 2105162139 ./games-fps/avp/avp-20150214-r1.ebuild
 2105030009 ./games-fps/blackshades/blackshades-20070723-r1.ebuild
@@ -17225,10 +17197,8 @@
 2109122339 ./games-fps/darkplaces/darkplaces-20140513-r2.ebuild
 2005172009 ./games-fps/doom-data/doom-data-1.9.ebuild
 2206080240 ./games-fps/doomsday/doomsday-2.3.1.ebuild
-2101110239 ./games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild
-2203200310 ./games-fps/eduke32/eduke32-20211202.9831.ebuild
-2203200310 ./games-fps/eduke32/eduke32-20220204.9957.ebuild
-2204240039 ./games-fps/eduke32/eduke32-20220422.10033.ebuild
+2206251740 ./games-fps/duke3d-data/duke3d-data-1.0-r5.ebuild
+2206251810 ./games-fps/eduke32/eduke32-20220422.10033.ebuild
 2201221309 ./games-fps/etqw-bin/etqw-bin-1.5-r4.ebuild
 2201221309 ./games-fps/etqw-data/etqw-data-1.0-r1.ebuild
 2201221309 ./games-fps/etqw-demo/etqw-demo-2.0_p1-r4.ebuild
@@ -17550,9 +17520,9 @@
 2204020140 ./games-rpg/the-longest-journey-hd-fmv/the-longest-journey-hd-fmv-1.1.ebuild
 2204020140 ./games-rpg/the-longest-journey-hd/the-longest-journey-hd-1.02.ebuild
 2204140710 ./games-rpg/the-longest-journey/the-longest-journey-142.24607.ebuild
-2204091809 ./games-server/bedrock-server/bedrock-server-1.18.12.01-r2.ebuild
-2205141440 ./games-server/bedrock-server/bedrock-server-1.18.33.02.ebuild
-2206072340 ./games-server/bedrock-server/bedrock-server-1.19.1.01.ebuild
+2206250110 ./games-rpg/pokete/pokete-0.7.3.ebuild
+2206251740 ./games-server/bedrock-server/bedrock-server-1.19.1.01.ebuild
+2206251740 ./games-server/bedrock-server/bedrock-server-1.19.2.02.ebuild
 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
@@ -17606,7 +17576,7 @@
 2201240039 ./games-sports/trophy/trophy-2.0.4.ebuild
 2104120539 ./games-sports/ultimatestunts/ultimatestunts-0.7.7-r1.ebuild
 2012011639 ./games-sports/xmoto/xmoto-0.6.1-r100.ebuild
-2203100140 ./games-sports/skatebird/skatebird-12.ebuild
+2206251140 ./games-sports/skatebird/skatebird-14.ebuild
 2202070739 ./games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
 2206070410 ./games-strategy/0ad/0ad-0.0.25b_alpha-r1.ebuild
 2206081111 ./games-strategy/augustus/augustus-3.0.1.ebuild
@@ -17762,6 +17732,7 @@
 2206011710 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2.ebuild
 2205280910 ./gnome-base/gnome-shell/gnome-shell-42.1.ebuild
 2205291810 ./gnome-base/gnome-shell/gnome-shell-42.2.ebuild
+2206240710 ./gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
 2202080810 ./gnome-base/gnome/gnome-40.0.ebuild
 2205311240 ./gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild
 2205271340 ./gnome-base/gvfs/gvfs-1.50.2.ebuild
@@ -17808,7 +17779,6 @@
 2203081540 ./gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild
 2205290410 ./gnome-extra/gnome-contacts/gnome-contacts-42.0.ebuild
 1912081509 ./gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild
-2202220239 ./gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild
 2105291209 ./gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.38.1.ebuild
 2205200540 ./gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild
 2205280440 ./gnome-extra/gnome-logs/gnome-logs-42.0.ebuild
@@ -18030,8 +18000,9 @@
 2205260910 ./gui-libs/wlroots/wlroots-9999.ebuild
 2201181539 ./gui-libs/wpebackend-fdo/wpebackend-fdo-1.12.0.ebuild
 2205170910 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.4.0.ebuild
-2205220410 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.5.0.ebuild
 2205220410 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
+2206240540 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.5.0.ebuild
+2206240540 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-0.6.0.ebuild
 2202140409 ./gui-libs/egl-gbm/egl-gbm-1.1.0.ebuild
 2205280910 ./gui-libs/libadwaita/libadwaita-1.1.1.ebuild
 2206011910 ./gui-libs/libadwaita/libadwaita-1.1.2.ebuild
@@ -18209,7 +18180,7 @@
 2204222140 ./kde-apps/kdepim-addons/kdepim-addons-21.12.3.ebuild
 2206091440 ./kde-apps/kdepim-addons/kdepim-addons-22.04.2.ebuild
 2204222140 ./kde-apps/kdepim-meta/kdepim-meta-21.12.3.ebuild
-2206091440 ./kde-apps/kdepim-meta/kdepim-meta-22.04.2.ebuild
+2206240810 ./kde-apps/kdepim-meta/kdepim-meta-22.04.2.ebuild
 2204222140 ./kde-apps/kdepim-runtime/kdepim-runtime-21.12.3.ebuild
 2206091440 ./kde-apps/kdepim-runtime/kdepim-runtime-22.04.2.ebuild
 2204222140 ./kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-21.12.3.ebuild
@@ -18869,6 +18840,7 @@
 2203230410 ./mail-client/alpine/alpine-2.25-r1.ebuild
 2205261610 ./mail-client/alpine/alpine-2.25-r2.ebuild
 2206100610 ./mail-client/alpine/alpine-2.25-r3.ebuild
+2206250810 ./mail-client/alpine/alpine-2.26.ebuild
 2203230410 ./mail-client/balsa/balsa-2.6.3-r1.ebuild
 2101040639 ./mail-client/bower/bower-0.12.ebuild
 2204301140 ./mail-client/claws-mail/claws-mail-3.18.0-r3.ebuild
@@ -18883,7 +18855,7 @@
 2203040410 ./mail-client/hap/hap-3.7-r1.ebuild
 2010101909 ./mail-client/kube/kube-0.7.0-r1.ebuild
 2107021539 ./mail-client/mailx-support/mailx-support-20060102-r2.ebuild
-2203200310 ./mail-client/mailx/mailx-8.1.2.20180807.ebuild
+2206240710 ./mail-client/mailx/mailx-8.1.2.20180807.ebuild
 2104291509 ./mail-client/mutt-wizard/mutt-wizard-3.2.1-r1.ebuild
 2104291509 ./mail-client/mutt-wizard/mutt-wizard-9999.ebuild
 2204290210 ./mail-client/mutt/mutt-2.2.3.ebuild
@@ -19091,7 +19063,7 @@
 2112051039 ./media-fonts/fira-code/fira-code-6.1.ebuild
 2112081340 ./media-fonts/fira-code/fira-code-5.2.ebuild
 2205100440 ./media-fonts/fira-code/fira-code-6.2.ebuild
-2205100440 ./media-fonts/fira-mono/fira-mono-4.202.ebuild
+2206241610 ./media-fonts/fira-mono/fira-mono-4.202.ebuild
 2205100440 ./media-fonts/fira-sans/fira-sans-4.202.ebuild
 2205251140 ./media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild
 2205081810 ./media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild
@@ -19546,6 +19518,7 @@
 2205050110 ./media-gfx/prusaslicer/prusaslicer-2.4.2.ebuild
 2205091210 ./media-gfx/prusaslicer/prusaslicer-2.4.2_p20220506.ebuild
 2206100640 ./media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild
+2206240140 ./media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620.ebuild
 1812252339 ./media-gfx/psftools/psftools-1.0.10.ebuild
 2205301040 ./media-gfx/pstoedit/pstoedit-3.75.ebuild
 2110021639 ./media-gfx/qimgv/qimgv-1.0.2.ebuild
@@ -19604,7 +19577,7 @@
 2112081340 ./media-gfx/xli/xli-1.17.0-r5.ebuild
 2101061739 ./media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
 2112011009 ./media-gfx/xpaint/xpaint-3.1.4.ebuild
-2106301339 ./media-gfx/xsane/xsane-0.999-r3.ebuild
+2206232340 ./media-gfx/xsane/xsane-0.999-r4.ebuild
 2012311940 ./media-gfx/xv/xv-3.10a-r19.ebuild
 2104192239 ./media-gfx/xzgv/xzgv-0.9.1.ebuild
 2010031709 ./media-gfx/yafaray/yafaray-3.4.1.ebuild
@@ -19643,9 +19616,6 @@
 2101070439 ./media-libs/alure/alure-1.2-r2.ebuild
 2109230909 ./media-libs/ampache_browser/ampache_browser-1.0.3.ebuild
 2108211209 ./media-libs/aribb24/aribb24-1.0.3-r2.ebuild
-2107250309 ./media-libs/assimp/assimp-5.0.1.ebuild
-2203211239 ./media-libs/assimp/assimp-5.2.2.ebuild
-2204291110 ./media-libs/assimp/assimp-5.2.3.ebuild
 2206221940 ./media-libs/assimp/assimp-5.2.4.ebuild
 2206220940 ./media-libs/aubio/aubio-0.4.9-r2.ebuild
 2205171740 ./media-libs/audiofile/audiofile-0.3.6-r4.ebuild
@@ -19664,9 +19634,9 @@
 2202140039 ./media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
 2205290440 ./media-libs/clutter-gst/clutter-gst-3.0.27-r2.ebuild
 2206211940 ./media-libs/clutter-gtk/clutter-gtk-1.8.4-r1.ebuild
-2111230440 ./media-libs/clutter/clutter-1.26.4.ebuild
+2206232340 ./media-libs/clutter/clutter-1.26.4-r1.ebuild
 2202070739 ./media-libs/codec2/codec2-1.0.3.ebuild
-2202140039 ./media-libs/cogl/cogl-1.22.8-r1.ebuild
+2206232340 ./media-libs/cogl/cogl-1.22.8-r2.ebuild
 2112080640 ./media-libs/coin/coin-4.0.0.ebuild
 2205140710 ./media-libs/compface/compface-1.5.2.ebuild
 2201100039 ./media-libs/ctl/ctl-1.5.2-r2.ebuild
@@ -19733,9 +19703,9 @@
 2106250109 ./media-libs/glu/glu-9999.ebuild
 2205140710 ./media-libs/glu/glu-9.0.2.ebuild
 2202271709 ./media-libs/glyr/glyr-1.0.10-r1.ebuild
-2204232139 ./media-libs/gmmlib/gmmlib-22.1.2.ebuild
-2204232139 ./media-libs/gmmlib/gmmlib-9999.ebuild
-2205140210 ./media-libs/gmmlib/gmmlib-22.1.3.ebuild
+2206251740 ./media-libs/gmmlib/gmmlib-22.1.3.ebuild
+2206251740 ./media-libs/gmmlib/gmmlib-22.1.4.ebuild
+2206251740 ./media-libs/gmmlib/gmmlib-9999.ebuild
 2105311239 ./media-libs/gnonlin/gnonlin-1.4.0-r1.ebuild
 2205311240 ./media-libs/graphene/graphene-1.10.8.ebuild
 2201241810 ./media-libs/grilo/grilo-0.3.14.ebuild
@@ -19754,8 +19724,8 @@
 2205081440 ./media-libs/hamlib/hamlib-4.3.1.ebuild
 2205081440 ./media-libs/hamlib/hamlib-4.4.ebuild
 2203250639 ./media-libs/harfbuzz/harfbuzz-9999.ebuild
-2205210040 ./media-libs/harfbuzz/harfbuzz-4.3.0.ebuild
 2206190210 ./media-libs/harfbuzz/harfbuzz-4.2.1.ebuild
+2206251140 ./media-libs/harfbuzz/harfbuzz-4.3.0.ebuild
 1911150539 ./media-libs/icc-profiles-basiccolor-printing2009/icc-profiles-basiccolor-printing2009-1.2.0.ebuild
 1911150609 ./media-libs/icc-profiles-openicc/icc-profiles-openicc-1.3.1.ebuild
 2011261339 ./media-libs/icclib/icclib-2.14.ebuild
@@ -20039,14 +20009,9 @@
 2205012040 ./media-libs/lv2/lv2-1.18.2.ebuild
 2205290940 ./media-libs/lv2/lv2-1.18.4.ebuild
 2009231339 ./media-libs/lvtk/lvtk-1.2.0-r1.ebuild
-2205062010 ./media-libs/mesa/mesa-21.3.8.ebuild
-2205192340 ./media-libs/mesa/mesa-22.0.4.ebuild
-2205190110 ./media-libs/mesa/mesa-22.1.0.ebuild
-2205280440 ./media-libs/mesa/mesa-22.0.3.ebuild
-2206020110 ./media-libs/mesa/mesa-22.1.1.ebuild
 2206020110 ./media-libs/mesa/mesa-9999.ebuild
-2206171010 ./media-libs/mesa/mesa-22.0.5.ebuild
 2206162140 ./media-libs/mesa/mesa-22.1.2.ebuild
+2206241410 ./media-libs/mesa/mesa-22.0.5.ebuild
 2204101640 ./media-libs/mlt/mlt-7.4.0.ebuild
 2204290740 ./media-libs/mlt/mlt-7.6.0.ebuild
 2206230740 ./media-libs/mlt/mlt-7.8.0.ebuild
@@ -20066,6 +20031,7 @@
 2110310910 ./media-libs/oidn/oidn-1.4.1-r1.ebuild
 2206071140 ./media-libs/oidn/oidn-1.4.2.ebuild
 2205251440 ./media-libs/openal/openal-1.22.0.ebuild
+2206251210 ./media-libs/openal/openal-1.22.1.ebuild
 2104180939 ./media-libs/opencollada/opencollada-1.6.68.ebuild
 2205071040 ./media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
 2206060441 ./media-libs/opencolorio/opencolorio-2.1.2.ebuild
@@ -20122,6 +20088,7 @@
 2204101640 ./media-libs/rtaudio/rtaudio-5.2.0.ebuild
 2203061110 ./media-libs/rubberband/rubberband-2.0.2.ebuild
 2108210139 ./media-libs/sbc/sbc-1.5.ebuild
+2206251240 ./media-libs/sbc/sbc-2.0.ebuild
 2108250339 ./media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
 2108211209 ./media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
 2104070939 ./media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -20147,7 +20114,9 @@
 2205190840 ./media-libs/soxr/soxr-0.1.3-r1.ebuild
 2202191640 ./media-libs/spandsp/spandsp-0.0.6-r1.ebuild
 2205260840 ./media-libs/speex/speex-1.2.0-r2.ebuild
+2206251240 ./media-libs/speex/speex-1.2.1.ebuild
 2205190840 ./media-libs/speexdsp/speexdsp-1.2.0.ebuild
+2206251240 ./media-libs/speexdsp/speexdsp-1.2.1.ebuild
 2112181509 ./media-libs/sratom/sratom-0.6.8.ebuild
 2205291010 ./media-libs/sratom/sratom-0.6.10.ebuild
 2002112051 ./media-libs/stimg/stimg-0.1.0.ebuild
@@ -20239,7 +20208,6 @@
 2206151740 ./media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild
 2204141010 ./media-libs/sdl_audiolib/sdl_audiolib-0_pre20220410.ebuild
 2204141010 ./media-libs/sdl_audiolib/sdl_audiolib-9999.ebuild
-2205122140 ./media-libs/mesa-amber/mesa-amber-21.3.8.ebuild
 2206122240 ./media-libs/mesa-amber/mesa-amber-21.3.9.ebuild
 2205160840 ./media-libs/librtprocess/librtprocess-0.12.0.ebuild
 2205221110 ./media-libs/libxmp/libxmp-9999.ebuild
@@ -20581,6 +20549,7 @@
 2203200240 ./media-plugins/tap-plugins/tap-plugins-1.0.1.ebuild
 2203200240 ./media-plugins/tap-plugins/tap-plugins-9999.ebuild
 2203212239 ./media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r1.ebuild
+2206242010 ./media-plugins/vamp-aubio-plugins/vamp-aubio-plugins-0.5.1-r2.ebuild
 2203100240 ./media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.6.6.20121204.ebuild
 2110221139 ./media-plugins/vco-plugins/vco-plugins-0.3.0-r1.ebuild
 2108181339 ./media-plugins/vdr-actuator/vdr-actuator-1.2.1.ebuild
@@ -20725,13 +20694,9 @@
 2205081510 ./media-radio/fldigi/fldigi-4.1.22.ebuild
 2106172209 ./media-radio/flmsg/flmsg-4.0.17-r1.ebuild
 2204280210 ./media-radio/flmsg/flmsg-4.0.19-r1.ebuild
-2110142009 ./media-radio/flrig/flrig-1.4.2.ebuild
-2112231339 ./media-radio/flrig/flrig-1.4.3.ebuild
-2202072210 ./media-radio/flrig/flrig-1.4.4.ebuild
 2205291740 ./media-radio/flrig/flrig-1.4.5.ebuild
 2106190039 ./media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-1.0.ebuild
 2106190039 ./media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-9999.ebuild
-2104282139 ./media-radio/gpredict/gpredict-2.3.ebuild
 2205311210 ./media-radio/gpredict/gpredict-2.3-r1.ebuild
 2106240909 ./media-radio/grig/grig-0.8.1-r1.ebuild
 2106190039 ./media-radio/ibp/ibp-0.21-r2.ebuild
@@ -20806,9 +20771,8 @@
 2105091539 ./media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
 2203100240 ./media-sound/bristol/bristol-0.60.11-r2.ebuild
 2107231039 ./media-sound/brutefir/brutefir-1.0o.ebuild
-2203081640 ./media-sound/cadence/cadence-0.9.1-r2.ebuild
-2206182110 ./media-sound/cadence/cadence-0.9.2.ebuild
 2206182110 ./media-sound/cadence/cadence-9999.ebuild
+2206251210 ./media-sound/cadence/cadence-0.9.2.ebuild
 2205091040 ./media-sound/cantata/cantata-2.5.0.ebuild
 2110221139 ./media-sound/cd-discid/cd-discid-1.4-r1.ebuild
 2108100310 ./media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
@@ -20923,7 +20887,7 @@
 2206070910 ./media-sound/jack2/jack2-9999.ebuild
 2105091109 ./media-sound/jack_capture/jack_capture-0.9.73-r1.ebuild
 2104200039 ./media-sound/jack_capture/jack_capture-9999.ebuild
-2102082039 ./media-sound/jalv/jalv-1.6.6.ebuild
+2206251240 ./media-sound/jalv/jalv-1.6.6.ebuild
 2008082339 ./media-sound/jamin/jamin-0.98.9_pre20170111.ebuild
 1911101439 ./media-sound/justeport/justeport-0.2.ebuild
 2201221309 ./media-sound/kid3/kid3-3.9.1.ebuild
@@ -20933,11 +20897,12 @@
 2205301010 ./media-sound/kmidimon/kmidimon-1.3.0.ebuild
 2205190840 ./media-sound/lame/lame-3.100-r3.ebuild
 2108211209 ./media-sound/lash/lash-0.5.4-r4.ebuild
+2206251240 ./media-sound/lash/lash-0.5.4-r5.ebuild
 2202240439 ./media-sound/lilypond/lilypond-2.22.0-r1.ebuild
 2202240439 ./media-sound/lilypond/lilypond-2.22.1-r1.ebuild
 2202240439 ./media-sound/lilypond/lilypond-2.23.0-r1.ebuild
 2202240439 ./media-sound/lilypond/lilypond-2.23.2-r1.ebuild
-2202240439 ./media-sound/lilypond/lilypond-9999.ebuild
+2206251540 ./media-sound/lilypond/lilypond-9999.ebuild
 1810041839 ./media-sound/lingot/lingot-1.0.1.ebuild
 2110170409 ./media-sound/linuxsampler/linuxsampler-2.2.0.ebuild
 2110170409 ./media-sound/linuxsampler/linuxsampler-9999.ebuild
@@ -20957,9 +20922,10 @@
 2008241039 ./media-sound/mhwaveedit/mhwaveedit-1.4.24.ebuild
 2106070939 ./media-sound/mikmod/mikmod-3.2.8.ebuild
 2112130539 ./media-sound/milkytracker/milkytracker-1.03.00.ebuild
-2108170039 ./media-sound/mixxx/mixxx-9999.ebuild
-2206161940 ./media-sound/mixxx/mixxx-2.3.2.ebuild
-2206161940 ./media-sound/mixxx/mixxx-2.3.9999.ebuild
+2206251610 ./media-sound/mixxx/mixxx-2.3.2.ebuild
+2206251610 ./media-sound/mixxx/mixxx-2.3.3.ebuild
+2206251610 ./media-sound/mixxx/mixxx-2.3.9999.ebuild
+2206251610 ./media-sound/mixxx/mixxx-9999.ebuild
 1906221809 ./media-sound/mmix/mmix-0.3-r1.ebuild
 2108170039 ./media-sound/moc/moc-2.5.2-r3.ebuild
 2112210710 ./media-sound/moc/moc-2.6_alpha3-r5.ebuild
@@ -21029,7 +20995,6 @@
 2107180040 ./media-sound/pamix/pamix-9999.ebuild
 2202210410 ./media-sound/paprefs/paprefs-1.2-r1.ebuild
 2203081640 ./media-sound/pasystray/pasystray-0.8.0-r1.ebuild
-2105010009 ./media-sound/patchage/patchage-1.0.4.ebuild
 2206081210 ./media-sound/patchage/patchage-1.0.6.ebuild
 2108210239 ./media-sound/pavucontrol-qt/pavucontrol-qt-0.17.0.ebuild
 2204151640 ./media-sound/pavucontrol-qt/pavucontrol-qt-1.0.0.ebuild
@@ -21160,6 +21125,7 @@
 2202100210 ./media-sound/teamspeak-client/teamspeak-client-5.0.0_beta68.ebuild
 2204222340 ./media-sound/teamspeak-client/teamspeak-client-3.5.6-r6.ebuild
 2202100210 ./media-sound/teamspeak-server/teamspeak-server-3.13.6-r1.ebuild
+2206251740 ./media-sound/teamspeak-server/teamspeak-server-3.13.7.ebuild
 1810131209 ./media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r2.ebuild
 2110291439 ./media-sound/terminatorx/terminatorx-4.1.0.ebuild
 2001171409 ./media-sound/timemachine/timemachine-0.3.4.ebuild
@@ -21213,8 +21179,8 @@
 2101020239 ./media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
 2201271210 ./media-sound/zynaddsubfx/zynaddsubfx-3.0.6.ebuild
 2204250040 ./media-sound/cava/cava-0.8.2.ebuild
-2206201510 ./media-sound/denonavr-cli/denonavr-cli-1.ebuild
 2206210810 ./media-sound/denonavr-cli/denonavr-cli-2.ebuild
+2206251040 ./media-sound/denonavr-cli/denonavr-cli-3.ebuild
 2108190439 ./media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
 2101060224 ./media-tv/dtv-scan-tables/dtv-scan-tables-0_p20171003.ebuild
 2101060224 ./media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild
@@ -21750,8 +21716,8 @@
 2001081409 ./net-analyzer/odhcploc/odhcploc-20111021-r1.ebuild
 2104032209 ./net-analyzer/oinkmaster/oinkmaster-2.0.ebuild
 2203202209 ./net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
-2203202209 ./net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
 2203202209 ./net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
+2206250010 ./net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
 2104130209 ./net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild
 2104130209 ./net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
 2104130209 ./net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild
@@ -21827,10 +21793,8 @@
 2108110340 ./net-analyzer/ssldump/ssldump-1.4.ebuild
 2205280610 ./net-analyzer/ssldump/ssldump-1.5.ebuild
 2202251339 ./net-analyzer/sslscan/sslscan-2.0.11.ebuild
-2202251139 ./net-analyzer/sslscan/sslscan-2.0.12.ebuild
-2203161009 ./net-analyzer/sslscan/sslscan-2.0.12-r1.ebuild
-2204040909 ./net-analyzer/sslscan/sslscan-2.0.13.ebuild
-2206171510 ./net-analyzer/sslscan/sslscan-2.0.13-r1.ebuild
+2206251640 ./net-analyzer/sslscan/sslscan-2.0.13-r1.ebuild
+2206250940 ./net-analyzer/sslscan/sslscan-2.0.14.ebuild
 2201040239 ./net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
 2205271010 ./net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
 2205271010 ./net-analyzer/sslsplit/sslsplit-9999.ebuild
@@ -21978,6 +21942,7 @@
 2109212039 ./net-dns/dnsdist/dnsdist-1.6.1.ebuild
 2201221709 ./net-dns/dnsdist/dnsdist-1.7.0.ebuild
 2206080610 ./net-dns/dnsdist/dnsdist-1.7.1.ebuild
+2206251210 ./net-dns/dnsdist/dnsdist-1.7.2.ebuild
 2103050239 ./net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild
 2108090109 ./net-dns/dnsmasq/dnsmasq-2.85.ebuild
 2109150409 ./net-dns/dnsmasq/dnsmasq-2.86.ebuild
@@ -22029,7 +21994,8 @@
 2012311940 ./net-dns/rbldnsd/rbldnsd-0.998b-r2.ebuild
 2105152109 ./net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
 2202061109 ./net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild
-2201281110 ./net-dns/s6-dns/s6-dns-2.3.5.3.ebuild
+2206250910 ./net-dns/s6-dns/s6-dns-2.3.5.3-r1.ebuild
+2206250910 ./net-dns/s6-dns/s6-dns-2.3.5.4.ebuild
 2103050209 ./net-dns/totd/totd-1.5.1.ebuild
 2112241410 ./net-dns/unbound/unbound-1.13.1-r3.ebuild
 2203270340 ./net-dns/unbound/unbound-1.13.2-r1.ebuild
@@ -22080,6 +22046,7 @@
 2101310343 ./net-fs/btfs/btfs-2.23.ebuild
 2205220710 ./net-fs/btfs/btfs-2.24.ebuild
 2205110410 ./net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild
+2206240840 ./net-fs/cifs-utils/cifs-utils-6.15.ebuild
 2101061809 ./net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild
 2202111109 ./net-fs/cvmfs/cvmfs-2.8.2.ebuild
 2202111109 ./net-fs/cvmfs/cvmfs-2.9.0.ebuild
@@ -22101,12 +22068,13 @@
 2203082340 ./net-fs/s3fs/s3fs-1.91.ebuild
 2203091040 ./net-fs/s3fs/s3fs-1.89.ebuild
 2205140410 ./net-fs/samba/samba-4.14.12-r3.ebuild
-2205140410 ./net-fs/samba/samba-4.14.13.ebuild
 2205140410 ./net-fs/samba/samba-4.15.4-r3.ebuild
 2205140410 ./net-fs/samba/samba-4.15.6-r1.ebuild
-2205140410 ./net-fs/samba/samba-4.15.7.ebuild
 2205140410 ./net-fs/samba/samba-4.16.0-r1.ebuild
-2205140410 ./net-fs/samba/samba-4.16.1.ebuild
+2206251210 ./net-fs/samba/samba-4.14.13.ebuild
+2206251210 ./net-fs/samba/samba-4.15.7.ebuild
+2206240840 ./net-fs/samba/samba-4.16.1.ebuild
+2206241110 ./net-fs/samba/samba-4.16.2.ebuild
 2101312209 ./net-fs/smbnetfs/smbnetfs-0.6.3.ebuild
 2012311940 ./net-fs/sshfs/sshfs-3.7.0.ebuild
 2110270739 ./net-fs/sshfs/sshfs-3.7.1.ebuild
@@ -22118,7 +22086,7 @@
 2204222040 ./net-ftp/filezilla/filezilla-3.58.0.ebuild
 2206021910 ./net-ftp/filezilla/filezilla-3.60.1.ebuild
 2107120039 ./net-ftp/frox/frox-0.7.18-r8.ebuild
-2204101709 ./net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
+2206250810 ./net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
 2202100210 ./net-ftp/ftpbase/ftpbase-0.01-r6.ebuild
 2202170109 ./net-ftp/gftp/gftp-2.0.19-r3.ebuild
 2205100140 ./net-ftp/gftp/gftp-2.9.1b.ebuild
@@ -22196,7 +22164,7 @@
 2107041710 ./net-im/psi/psi-1.5.ebuild
 2107041710 ./net-im/psi/psi-9999.ebuild
 2003170039 ./net-im/psimedia/psimedia-9999.ebuild
-2103261739 ./net-im/purple-events/purple-events-0.99.1.ebuild
+2206241640 ./net-im/purple-events/purple-events-0.99.1.ebuild
 2111252340 ./net-im/qtox/qtox-1.17.3.ebuild
 2201220339 ./net-im/qtox/qtox-1.17.4.ebuild
 2201220339 ./net-im/qtox/qtox-9999.ebuild
@@ -22271,8 +22239,8 @@
 2008300809 ./net-irc/ircstats/ircstats-1.2.ebuild
 2204291140 ./net-irc/irker/irker-2.22.ebuild
 2201041239 ./net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r2.ebuild
-2008300409 ./net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
-2206121410 ./net-irc/irssi-xmpp/irssi-xmpp-0.54-r1.ebuild
+2206241640 ./net-irc/irssi-xmpp/irssi-xmpp-0.54-r1.ebuild
+2206241640 ./net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
 2205191040 ./net-irc/irssi/irssi-1.2.3.ebuild
 2206121410 ./net-irc/irssi/irssi-1.4.1.ebuild
 2206120840 ./net-irc/irssi/irssi-9999.ebuild
@@ -22511,8 +22479,9 @@
 2206210810 ./net-libs/libproxy/libproxy-0.4.18.ebuild
 2203250139 ./net-libs/libpsl/libpsl-0.21.0.ebuild
 2205171610 ./net-libs/libpsl/libpsl-0.21.1.ebuild
-2205241440 ./net-libs/libqmi/libqmi-9999.ebuild
 2205311240 ./net-libs/libqmi/libqmi-1.30.6.ebuild
+2206241840 ./net-libs/libqmi/libqmi-1.30.8.ebuild
+2206241840 ./net-libs/libqmi/libqmi-9999.ebuild
 2205131410 ./net-libs/libquotient/libquotient-0.6.11-r1.ebuild
 2206060940 ./net-libs/librouteros/librouteros-1.1.2-r1.ebuild
 2206110110 ./net-libs/librouteros/librouteros-1.1.3.ebuild
@@ -22555,7 +22524,7 @@
 2202260039 ./net-libs/libwebsockets/libwebsockets-4.3.1.ebuild
 2205202210 ./net-libs/libwebsockets/libwebsockets-4.3.2.ebuild
 2205050240 ./net-libs/libyang/libyang-2.0.164.ebuild
-2205202210 ./net-libs/libyang/libyang-2.0.194.ebuild
+2206241140 ./net-libs/libyang/libyang-2.0.194.ebuild
 2202080810 ./net-libs/libzapojit/libzapojit-0.0.3-r1.ebuild
 2104161439 ./net-libs/liquid-dsp/liquid-dsp-1.3.2.ebuild
 2104161439 ./net-libs/liquid-dsp/liquid-dsp-9999.ebuild
@@ -22574,12 +22543,12 @@
 2203121509 ./net-libs/nativebiginteger/nativebiginteger-1.6.1.ebuild
 2205241810 ./net-libs/nativebiginteger/nativebiginteger-1.7.0.ebuild
 2202111539 ./net-libs/neon/neon-0.32.2.ebuild
-2102011639 ./net-libs/net6/net6-1.3.14-r2.ebuild
+2206241640 ./net-libs/net6/net6-1.3.14-r2.ebuild
 2111292309 ./net-libs/netwib/netwib-5.39.0.ebuild
 2110281809 ./net-libs/nghttp2/nghttp2-1.45.1-r1.ebuild
-2110191540 ./net-libs/nghttp2/nghttp2-1.46.0.ebuild
 2110191540 ./net-libs/nghttp2/nghttp2-9999.ebuild
-2204290540 ./net-libs/nghttp2/nghttp2-1.47.0.ebuild
+2206251210 ./net-libs/nghttp2/nghttp2-1.47.0.ebuild
+2206241310 ./net-libs/nghttp2/nghttp2-1.48.0.ebuild
 2104161439 ./net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
 2104161439 ./net-libs/nghttp3/nghttp3-9999.ebuild
 2104161439 ./net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
@@ -22615,7 +22584,7 @@
 2003110009 ./net-libs/qxmpp/qxmpp-9999.ebuild
 2204251610 ./net-libs/qxmpp/qxmpp-1.4.0.ebuild
 2111100039 ./net-libs/rabbitmq-c/rabbitmq-c-0.11.0.ebuild
-2105210409 ./net-libs/rest/rest-0.8.1.ebuild
+2206232340 ./net-libs/rest/rest-0.8.1-r1.ebuild
 2204130011 ./net-libs/rpc2/rpc2-2.14.ebuild
 2104060140 ./net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
 2205191040 ./net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3.ebuild
@@ -22664,7 +22633,8 @@
 2201040239 ./net-libs/zeromq/zeromq-4.3.3-r1.ebuild
 2201291739 ./net-libs/zeromq/zeromq-4.3.4-r1.ebuild
 2202270339 ./net-libs/zmqpp/zmqpp-4.2.0-r1.ebuild
-2206082210 ./net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild
+2206251840 ./net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild
+2206251810 ./net-libs/ppp-defs/ppp-defs-0.ebuild
 2103052339 ./net-mail/altermime/altermime-0.3.11.ebuild
 2206072340 ./net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
 2111260110 ./net-mail/asmail/asmail-2.1-r2.ebuild
@@ -22686,8 +22656,8 @@
 2203230239 ./net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild
 2203230239 ./net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild
 2205102010 ./net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
-2203230239 ./net-mail/dbmail/dbmail-3.2.3-r5.ebuild
-2203230239 ./net-mail/dbmail/dbmail-3.2.5-r2.ebuild
+2206250740 ./net-mail/dbmail/dbmail-3.2.3-r5.ebuild
+2206250740 ./net-mail/dbmail/dbmail-3.2.5-r2.ebuild
 2104161439 ./net-mail/dot-forward/dot-forward-0.71-r4.ebuild
 2205191710 ./net-mail/dovecot/dovecot-2.3.18-r1.ebuild
 2206141710 ./net-mail/dovecot/dovecot-2.3.19.1.ebuild
@@ -22818,9 +22788,8 @@
 2108291210 ./net-misc/autossh/autossh-1.4g.ebuild
 1911110039 ./net-misc/autoupnp/autoupnp-0.4.7.ebuild
 1911110039 ./net-misc/autoupnp/autoupnp-9999.ebuild
-2105021539 ./net-misc/axel/axel-2.17.8.ebuild
-2105021539 ./net-misc/axel/axel-2.17.9.ebuild
 2204031609 ./net-misc/axel/axel-2.17.10.ebuild
+2206240010 ./net-misc/axel/axel-2.17.11.ebuild
 2002230040 ./net-misc/babeld/babeld-1.8.2.ebuild
 2002230040 ./net-misc/babeld/babeld-1.9.1.ebuild
 2202260609 ./net-misc/balance/balance-3.57-r1.ebuild
@@ -22893,6 +22862,7 @@
 2204240039 ./net-misc/dropbear/dropbear-2022.82.ebuild
 2206091110 ./net-misc/dropbox-cli/dropbox-cli-2022.ebuild
 2206132010 ./net-misc/dropbox/dropbox-150.4.5000.ebuild
+2206231640 ./net-misc/dropbox/dropbox-151.4.4304.ebuild
 2203141940 ./net-misc/econnman/econnman-1.1_p20160305.ebuild
 2203260309 ./net-misc/efax/efax-0.9a_p19_p1.ebuild
 2205282210 ./net-misc/electron-cash/electron-cash-4.2.10.ebuild
@@ -23080,9 +23050,9 @@
 1910051539 ./net-misc/netsed/netsed-0.01b-r1.ebuild
 2007201209 ./net-misc/netsed/netsed-1.3.ebuild
 2104040109 ./net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
-2206200310 ./net-misc/networkmanager/networkmanager-1.36.4.ebuild
-2206200310 ./net-misc/networkmanager/networkmanager-1.38.0.ebuild
-2206200310 ./net-misc/networkmanager/networkmanager-1.38.2.ebuild
+2206251810 ./net-misc/networkmanager/networkmanager-1.36.4.ebuild
+2206251810 ./net-misc/networkmanager/networkmanager-1.38.0.ebuild
+2206251810 ./net-misc/networkmanager/networkmanager-1.38.2.ebuild
 2203312110 ./net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild
 2205121740 ./net-misc/nextcloud-client/nextcloud-client-3.5.0.ebuild
 2205171240 ./net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild
@@ -23116,6 +23086,7 @@
 1806111939 ./net-misc/openr2/openr2-1.3.0.ebuild
 2205202140 ./net-misc/openssh/openssh-8.9_p1-r2.ebuild
 2205202140 ./net-misc/openssh/openssh-9.0_p1-r1.ebuild
+2206240140 ./net-misc/openssh/openssh-9.0_p1-r2.ebuild
 2107310240 ./net-misc/openvswitch/openvswitch-2.15.0.ebuild
 2201190139 ./net-misc/owncloud-client/owncloud-client-2.10.0.6519.ebuild
 2206111310 ./net-misc/owncloud-client/owncloud-client-2.10.1.7389.ebuild
@@ -23186,7 +23157,8 @@
 2104031909 ./net-misc/s3cmd/s3cmd-2.1.0.ebuild
 2111151810 ./net-misc/s3cmd/s3cmd-2.2.0.ebuild
 2108260210 ./net-misc/s4cmd/s4cmd-2.1.0.ebuild
-2201281110 ./net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
+2206250910 ./net-misc/s6-networking/s6-networking-2.5.1.0-r1.ebuild
+2206250910 ./net-misc/s6-networking/s6-networking-2.5.1.1.ebuild
 2107120039 ./net-misc/samplicator/samplicator-1.3.6-r1.ebuild
 2107120039 ./net-misc/samplicator/samplicator-1.3.8_rc1-r1.ebuild
 2203260309 ./net-misc/scponly/scponly-4.8-r7.ebuild
@@ -23255,7 +23227,7 @@
 2201022309 ./net-misc/suite3270/suite3270-4.0_p14.ebuild
 2201022339 ./net-misc/suite3270/suite3270-4.1_p11.ebuild
 2205050240 ./net-misc/sysrepo/sysrepo-2.1.42.ebuild
-2205202210 ./net-misc/sysrepo/sysrepo-2.1.64.ebuild
+2206241140 ./net-misc/sysrepo/sysrepo-2.1.64.ebuild
 1805290208 ./net-misc/taptap/taptap-1.0.ebuild
 2009150309 ./net-misc/taylor-uucp/taylor-uucp-1.07-r4.ebuild
 2009071139 ./net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild
@@ -23300,8 +23272,8 @@
 2206181840 ./net-misc/websocat/websocat-1.10.0.ebuild
 2205160310 ./net-misc/websocketd/websocketd-0.4.1.ebuild
 2201170709 ./net-misc/wget/wget-1.21.2.ebuild
-2205220940 ./net-misc/wget/wget-1.21.3.ebuild
 2206090440 ./net-misc/wget/wget-1.21.3-r1.ebuild
+2206241440 ./net-misc/wget/wget-1.21.3.ebuild
 2202170040 ./net-misc/wget2/wget2-2.0.0-r1.ebuild
 2204101840 ./net-misc/wget2/wget2-9999.ebuild
 2205271740 ./net-misc/wget2/wget2-2.0.1.ebuild
@@ -23313,9 +23285,10 @@
 2104151309 ./net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
 2203230339 ./net-misc/x2goclient/x2goclient-4.1.2.2-r1.ebuild
 2109262309 ./net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
-2112202210 ./net-misc/xmrig/xmrig-9999.ebuild
 2203151540 ./net-misc/xmrig/xmrig-6.16.4.ebuild
 2205212040 ./net-misc/xmrig/xmrig-6.17.0.ebuild
+2206231810 ./net-misc/xmrig/xmrig-6.18.0.ebuild
+2206231810 ./net-misc/xmrig/xmrig-9999.ebuild
 2104161439 ./net-misc/yandex-disk/yandex-disk-0.1.5.1039_p1.ebuild
 2204041439 ./net-misc/yandex-disk/yandex-disk-0.1.6.1074_p1.ebuild
 2202042140 ./net-misc/you-get/you-get-0.4.1555.ebuild
@@ -23627,8 +23600,7 @@
 2004261409 ./net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0-r1.ebuild
 2204090041 ./net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.6.ebuild
 2205102310 ./net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.0.ebuild
-2202100210 ./net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.5.2-r1.ebuild
-2205230240 ./net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.6.0.ebuild
+2206251740 ./net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.6.0.ebuild
 2205280440 ./net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.8.ebuild
 1911091712 ./net-vpn/nstx/nstx-1.1_beta6-r3.ebuild
 2106280109 ./net-vpn/ocserv/ocserv-1.0.1-r1.ebuild
@@ -23643,7 +23615,7 @@
 2204130011 ./net-vpn/openvpn/openvpn-2.5.2-r2.ebuild
 2204130011 ./net-vpn/openvpn/openvpn-9999.ebuild
 2206061010 ./net-vpn/openvpn/openvpn-2.5.6.ebuild
-2008111439 ./net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
+2206251810 ./net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
 2204081539 ./net-vpn/protonvpn-cli/protonvpn-cli-2.2.11-r1.ebuild
 2206011640 ./net-vpn/riseup-vpn/riseup-vpn-0.21.11.ebuild
 2203230410 ./net-vpn/strongswan/strongswan-5.9.2-r3.ebuild
@@ -23701,6 +23673,7 @@
 2110011839 ./net-wireless/gnuradio/gnuradio-3.8.4.0.ebuild
 2206100910 ./net-wireless/gnuradio/gnuradio-3.8.5.0.ebuild
 2206100910 ./net-wireless/gnuradio/gnuradio-9999.ebuild
+2206251240 ./net-wireless/gnuradio/gnuradio-3.8.5.0-r1.ebuild
 2203110039 ./net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild
 2205010110 ./net-wireless/gqrx-scanner/gqrx-scanner-1.0.2.ebuild
 2110072010 ./net-wireless/gqrx/gqrx-2.14.6.ebuild
@@ -24195,9 +24168,8 @@
 2108222309 ./sci-biology/velvet/velvet-1.2.10.ebuild
 2108222309 ./sci-biology/wise/wise-2.4.0_alpha-r1.ebuild
 1702282250 ./sci-biology/yass/yass-1.14-r2.ebuild
-2110190609 ./sci-calculators/bc-gh/bc-gh-5.1.1.ebuild
-2111101409 ./sci-calculators/bc-gh/bc-gh-5.2.0.ebuild
 2111280340 ./sci-calculators/bc-gh/bc-gh-5.2.1.ebuild
+2206241610 ./sci-calculators/bc-gh/bc-gh-5.3.3.ebuild
 2204260910 ./sci-calculators/calcoo/calcoo-1.3.18-r1.ebuild
 2106222139 ./sci-calculators/datamash/datamash-1.7-r1.ebuild
 2104181709 ./sci-calculators/galculator/galculator-2.1.4-r2.ebuild
@@ -24313,9 +24285,8 @@
 2010241909 ./sci-electronics/fasthenry/fasthenry-3.0.20.07.17.ebuild
 1702282250 ./sci-electronics/freehdl/freehdl-0.0.8.ebuild
 2102241939 ./sci-electronics/fritzing/fritzing-0.9.4-r2.ebuild
-2201281040 ./sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild
-2203022109 ./sci-electronics/gazebo/gazebo-11.10.1.ebuild
 2204211439 ./sci-electronics/gazebo/gazebo-11.10.2.ebuild
+2206231440 ./sci-electronics/gazebo/gazebo-11.11.0.ebuild
 2003201239 ./sci-electronics/geda-suite/geda-suite-20171223-r1.ebuild
 2111190309 ./sci-electronics/geda/geda-1.9.2-r1.ebuild
 2203031340 ./sci-electronics/geda/geda-1.10.2-r1.ebuild
@@ -24645,7 +24616,7 @@
 2205030540 ./sci-libs/hdf5/hdf5-1.12.1.ebuild
 2206010310 ./sci-libs/hdf5/hdf5-1.12.2-r1.ebuild
 2206140910 ./sci-libs/hdf5/hdf5-1.12.2-r2.ebuild
-2206212240 ./sci-libs/hdf5/hdf5-1.12.2-r3.ebuild
+2206251040 ./sci-libs/hdf5/hdf5-1.12.2-r4.ebuild
 2101241109 ./sci-libs/hipCUB/hipCUB-4.0.0-r1.ebuild
 2205021140 ./sci-libs/hipCUB/hipCUB-4.3.0-r1.ebuild
 2205030910 ./sci-libs/hipCUB/hipCUB-5.0.2.ebuild
@@ -25029,7 +25000,7 @@
 2203021209 ./sci-mathematics/psmt2-frontend/psmt2-frontend-0.4.0.ebuild
 2101310343 ./sci-mathematics/pspp/pspp-1.2.0-r1.ebuild
 2101310343 ./sci-mathematics/pspp/pspp-1.4.1.ebuild
-2206070940 ./sci-mathematics/pspp/pspp-1.6.0.ebuild
+2206241140 ./sci-mathematics/pspp/pspp-1.6.0.ebuild
 2107172140 ./sci-mathematics/relational/relational-2.5-r2.ebuild
 2206011440 ./sci-mathematics/rkward/rkward-0.7.4.ebuild
 1912080309 ./sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild
@@ -25196,7 +25167,6 @@
 2104290509 ./sci-visualization/xgraph/xgraph-12.1-r4.ebuild
 2005211239 ./sci-visualization/xyscan/xyscan-4.3.0.ebuild
 2005211239 ./sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild
-2012081009 ./sec-policy/apparmor-profiles/apparmor-profiles-3.0.1.ebuild
 2111120539 ./sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild
 2206171010 ./sec-policy/apparmor-profiles/apparmor-profiles-3.0.3.ebuild
 2206170440 ./sec-policy/apparmor-profiles/apparmor-profiles-3.0.4.ebuild
@@ -26205,10 +26175,8 @@
 2203141909 ./sys-apps/agedu/agedu-20211129.ebuild
 2111062339 ./sys-apps/apmd/apmd-3.2.2_p14-r2.ebuild
 2206200513 ./sys-apps/apmd/apmd-3.2.2_p14-r3.ebuild
-2203050310 ./sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
 2206171010 ./sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
 2206170440 ./sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
-2203050310 ./sys-apps/apparmor/apparmor-3.0.1.ebuild
 2206171010 ./sys-apps/apparmor/apparmor-3.0.3.ebuild
 2206170440 ./sys-apps/apparmor/apparmor-3.0.4.ebuild
 2008051909 ./sys-apps/apply-default-acl/apply-default-acl-0.4.4.ebuild
@@ -26524,7 +26492,7 @@
 1911082039 ./sys-apps/paxctld/paxctld-1.2.3.ebuild
 2009042009 ./sys-apps/paxctld/paxctld-1.2.5.ebuild
 2205250040 ./sys-apps/pciutils/pciutils-3.8.0.ebuild
-2206200240 ./sys-apps/pciutils/pciutils-3.8.0-r1.ebuild
+2206240840 ./sys-apps/pciutils/pciutils-3.8.0-r1.ebuild
 2205252010 ./sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
 2205311040 ./sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild
 2206121440 ./sys-apps/pcsc-lite/pcsc-lite-1.9.8.ebuild
@@ -26539,7 +26507,8 @@
 2205181410 ./sys-apps/plocate/plocate-1.1.15.ebuild
 2206060310 ./sys-apps/plocate/plocate-1.1.16.ebuild
 2107310840 ./sys-apps/pmount-gui/pmount-gui-0_pre20130806.ebuild
-2101060709 ./sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
+2206250740 ./sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
+2206250740 ./sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild
 2202100210 ./sys-apps/pnputils/pnputils-0.1-r1.ebuild
 2201030239 ./sys-apps/policycoreutils/policycoreutils-3.3.ebuild
 2206040410 ./sys-apps/policycoreutils/policycoreutils-3.4.ebuild
@@ -26581,12 +26550,17 @@
 2205160710 ./sys-apps/rootlesskit/rootlesskit-0.14.2.ebuild
 2104060140 ./sys-apps/s390-tools/s390-tools-2.9.0.ebuild
 2204200309 ./sys-apps/s390-tools/s390-tools-2.12.0.ebuild
-2205220940 ./sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
-2204241310 ./sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
-2205220940 ./sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild
-2204241310 ./sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
-2205241010 ./sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
-2205220940 ./sys-apps/s6/s6-2.11.1.0.ebuild
+2206250910 ./sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild
+2206250910 ./sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
+2206250910 ./sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7-r1.ebuild
+2206250910 ./sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
+2206250910 ./sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0-r1.ebuild
+2206250910 ./sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
+2206250910 ./sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
+2206250910 ./sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild
+2206250910 ./sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
+2206250910 ./sys-apps/s6/s6-2.11.1.0-r1.ebuild
+2206250910 ./sys-apps/s6/s6-2.11.1.1.ebuild
 2107171439 ./sys-apps/salinfo/salinfo-1.2.ebuild
 2110010939 ./sys-apps/sandbox/sandbox-2.24.ebuild
 2110220209 ./sys-apps/sandbox/sandbox-2.25.ebuild
@@ -26615,6 +26589,7 @@
 2205051310 ./sys-apps/smartmontools/smartmontools-7.3.ebuild
 2205051310 ./sys-apps/smartmontools/smartmontools-9999.ebuild
 2204131640 ./sys-apps/smc-sum/smc-sum-2.8.0.20220126.ebuild
+2206251740 ./sys-apps/smc-sum/smc-sum-2.8.1.20220506.ebuild
 2204131640 ./sys-apps/smcipmitool/smcipmitool-2.26.0.220209.ebuild
 2104161439 ./sys-apps/sparc-utils/sparc-utils-1.9-r6.ebuild
 2107171439 ./sys-apps/sparc-utils/sparc-utils-1.9-r7.ebuild
@@ -26631,14 +26606,14 @@
 2206040540 ./sys-apps/systemd-tmpfiles/systemd-tmpfiles-250.ebuild
 2206081640 ./sys-apps/systemd/systemd-250.4-r2.ebuild
 2206141840 ./sys-apps/systemd/systemd-250.6.ebuild
-2206141840 ./sys-apps/systemd/systemd-250.7.ebuild
 2206141840 ./sys-apps/systemd/systemd-251.2.ebuild
 2206141840 ./sys-apps/systemd/systemd-9999.ebuild
+2206251310 ./sys-apps/systemd/systemd-250.7.ebuild
 2201040640 ./sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
 2204291110 ./sys-apps/sysvinit/sysvinit-3.03.ebuild
 2204270710 ./sys-apps/sysvinit/sysvinit-3.04.ebuild
 2205040710 ./sys-apps/sysvinit/sysvinit-3.01.ebuild
-2202100210 ./sys-apps/tas/tas-1.6.0.200601-r1.ebuild
+2206251740 ./sys-apps/tas/tas-1.7.0.220503.ebuild
 2205131540 ./sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild
 2205300610 ./sys-apps/texinfo/texinfo-6.8.ebuild
 2104111709 ./sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
@@ -26697,12 +26672,11 @@
 2202011339 ./sys-apps/uutils/uutils-0.0.12.ebuild
 2204041539 ./sys-apps/uutils/uutils-0.0.13.ebuild
 2206141840 ./sys-apps/systemd-utils/systemd-utils-250.6.ebuild
-2206141840 ./sys-apps/systemd-utils/systemd-utils-250.7.ebuild
+2206251310 ./sys-apps/systemd-utils/systemd-utils-250.7.ebuild
 2206092310 ./sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.1.ebuild
 2206010010 ./sys-apps/eless/eless-0.7.ebuild
 2202121739 ./sys-auth/AusweisApp2/AusweisApp2-9999.ebuild
-2205150340 ./sys-auth/AusweisApp2/AusweisApp2-1.22.5.ebuild
-2205232040 ./sys-auth/AusweisApp2/AusweisApp2-1.22.7.ebuild
+2206251740 ./sys-auth/AusweisApp2/AusweisApp2-1.22.7.ebuild
 2203120309 ./sys-auth/docker_auth/docker_auth-1.9.0.ebuild
 2106102139 ./sys-auth/elogind/elogind-246.10-r1.ebuild
 2205170840 ./sys-auth/elogind/elogind-246.10-r2.ebuild
@@ -26783,7 +26757,7 @@
 2204100239 ./sys-auth/yubico-piv-tool/yubico-piv-tool-2.3.0.ebuild
 2108012139 ./sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.25.ebuild
 2206090240 ./sys-auth/solo1/solo1-0.1.1.ebuild
-2206150040 ./sys-auth/ssh-import-id/ssh-import-id-5.11.ebuild
+2206251210 ./sys-auth/ssh-import-id/ssh-import-id-5.11.ebuild
 2204080009 ./sys-block/aoetools/aoetools-37.ebuild
 2202100210 ./sys-block/arcconf/arcconf-2.01.22270-r2.ebuild
 2202100210 ./sys-block/arcconf/arcconf-3.07.23971-r1.ebuild
@@ -26905,7 +26879,7 @@
 2205310010 ./sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild
 2112150809 ./sys-boot/grub/grub-2.06-r1.ebuild
 2206202110 ./sys-boot/grub/grub-9999.ebuild
-2206230840 ./sys-boot/grub/grub-2.06-r2.ebuild
+2206251340 ./sys-boot/grub/grub-2.06-r2.ebuild
 2204222110 ./sys-boot/lilo/lilo-24.2-r1.ebuild
 1911100139 ./sys-boot/makebootfat/makebootfat-1.4.ebuild
 2105131709 ./sys-boot/mbr-gpt/mbr-gpt-0.0.1-r1.ebuild
@@ -26927,8 +26901,8 @@
 2006061709 ./sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.3.ebuild
 2204180640 ./sys-boot/plymouth/plymouth-0.9.5-r2.ebuild
 2204180640 ./sys-boot/plymouth/plymouth-0.9.6_pre20211225-r1.ebuild
-2204180640 ./sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
 2204180640 ./sys-boot/plymouth/plymouth-9999.ebuild
+2206240540 ./sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
 2011230809 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
 2204061009 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20220328.ebuild
 2204092309 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20211118.ebuild
@@ -27075,6 +27049,7 @@
 2203111139 ./sys-cluster/lmod/lmod-8.6.14.ebuild
 2201240639 ./sys-cluster/minikube/minikube-1.25.1.ebuild
 2202262209 ./sys-cluster/minikube/minikube-1.25.2.ebuild
+2206251910 ./sys-cluster/minikube/minikube-1.26.0.ebuild
 2203040040 ./sys-cluster/mpich/mpich-3.4.3.ebuild
 2201292339 ./sys-cluster/native-mpi/native-mpi-0-r1.ebuild
 2206141040 ./sys-cluster/nomad/nomad-1.2.6.ebuild
@@ -27112,7 +27087,7 @@
 2102281509 ./sys-cluster/ucx/ucx-1.9.0.ebuild
 2106071139 ./sys-cluster/vzctl/vzctl-4.9.4.ebuild
 2102202239 ./sys-cluster/wulfware/wulfware-2.6.0.ebuild
-2107152309 ./sys-cluster/zetcd/zetcd-0.0.4-r2.ebuild
+2206241640 ./sys-cluster/zetcd/zetcd-0.0.4-r2.ebuild
 2205181510 ./sys-cluster/zookeeper-bin/zookeeper-bin-3.7.1.ebuild
 2205181510 ./sys-cluster/zookeeper-bin/zookeeper-bin-3.8.0.ebuild
 1909230009 ./sys-cluster/zookeepercli/zookeepercli-1.0.12.ebuild
@@ -27166,6 +27141,7 @@
 2204301640 ./sys-devel/clang-common/clang-common-15.0.0.9999.ebuild
 2206042310 ./sys-devel/clang-common/clang-common-14.0.4.ebuild
 2206111440 ./sys-devel/clang-common/clang-common-14.0.5.ebuild
+2206251640 ./sys-devel/clang-common/clang-common-14.0.6.ebuild
 2109110940 ./sys-devel/clang-runtime/clang-runtime-12.0.1.ebuild
 2204150310 ./sys-devel/clang-runtime/clang-runtime-14.0.1.ebuild
 2204212010 ./sys-devel/clang-runtime/clang-runtime-13.0.1.ebuild
@@ -27173,6 +27149,7 @@
 2204301040 ./sys-devel/clang-runtime/clang-runtime-14.0.3.ebuild
 2206042310 ./sys-devel/clang-runtime/clang-runtime-14.0.4.ebuild
 2206111440 ./sys-devel/clang-runtime/clang-runtime-14.0.5.ebuild
+2206251640 ./sys-devel/clang-runtime/clang-runtime-14.0.6.ebuild
 2206220743 ./sys-devel/clang/clang-12.0.1.ebuild
 2206220743 ./sys-devel/clang/clang-13.0.1.ebuild
 2206220743 ./sys-devel/clang/clang-14.0.1-r1.ebuild
@@ -27180,6 +27157,7 @@
 2206220743 ./sys-devel/clang/clang-14.0.4.ebuild
 2206220743 ./sys-devel/clang/clang-14.0.5.ebuild
 2206220743 ./sys-devel/clang/clang-15.0.0.9999.ebuild
+2206251640 ./sys-devel/clang/clang-14.0.6.ebuild
 2204141010 ./sys-devel/cons/cons-2.3.0-r1.ebuild
 2202010909 ./sys-devel/crossdev/crossdev-20211121.ebuild
 2203262340 ./sys-devel/crossdev/crossdev-20220205.ebuild
@@ -27222,6 +27200,8 @@
 2206190440 ./sys-devel/gcc/gcc-12.1.1_p20220618.ebuild
 2206220640 ./sys-devel/gcc/gcc-10.3.1_p20220621.ebuild
 2206220640 ./sys-devel/gcc/gcc-13.0.0_pre20220619.ebuild
+2206250310 ./sys-devel/gcc/gcc-10.3.1_p20220623.ebuild
+2206250440 ./sys-devel/gcc/gcc-11.3.1_p20220624.ebuild
 2104161439 ./sys-devel/gdb-apple/gdb-apple-1752.ebuild
 2206121640 ./sys-devel/gdb/gdb-11.2.ebuild
 2206121640 ./sys-devel/gdb/gdb-12.1.ebuild
@@ -27248,6 +27228,7 @@
 2204301040 ./sys-devel/lld/lld-14.0.3.ebuild
 2206042310 ./sys-devel/lld/lld-14.0.4.ebuild
 2206111440 ./sys-devel/lld/lld-14.0.5.ebuild
+2206251640 ./sys-devel/lld/lld-14.0.6.ebuild
 2109110940 ./sys-devel/llvm-common/llvm-common-12.0.1.ebuild
 2204150310 ./sys-devel/llvm-common/llvm-common-14.0.1.ebuild
 2204212010 ./sys-devel/llvm-common/llvm-common-13.0.1.ebuild
@@ -27255,6 +27236,7 @@
 2204301040 ./sys-devel/llvm-common/llvm-common-14.0.3.ebuild
 2206042310 ./sys-devel/llvm-common/llvm-common-14.0.4.ebuild
 2206111440 ./sys-devel/llvm-common/llvm-common-14.0.5.ebuild
+2206251640 ./sys-devel/llvm-common/llvm-common-14.0.6.ebuild
 2109202139 ./sys-devel/llvm-roc/llvm-roc-3.10.0.ebuild
 2109202139 ./sys-devel/llvm-roc/llvm-roc-3.7.0-r1.ebuild
 2109202139 ./sys-devel/llvm-roc/llvm-roc-3.8.0.ebuild
@@ -27275,6 +27257,7 @@
 2206220743 ./sys-devel/llvm/llvm-14.0.4.ebuild
 2206220743 ./sys-devel/llvm/llvm-14.0.5.ebuild
 2206220743 ./sys-devel/llvm/llvm-15.0.0.9999.ebuild
+2206251640 ./sys-devel/llvm/llvm-14.0.6.ebuild
 2109110910 ./sys-devel/llvmgold/llvmgold-12.ebuild
 2202030039 ./sys-devel/llvmgold/llvmgold-13-r1.ebuild
 2204271540 ./sys-devel/llvmgold/llvmgold-15.ebuild
@@ -27287,8 +27270,7 @@
 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
-2104231009 ./sys-devel/parity/parity-2.0.1.ebuild
-2104231009 ./sys-devel/parity/parity-9999.ebuild
+2206241640 ./sys-devel/parity/parity-2.0.1.ebuild
 2204290540 ./sys-devel/patch/patch-2.7.6-r4.ebuild
 2009152309 ./sys-devel/pmake/pmake-1.111.3.3.ebuild
 2006040939 ./sys-devel/qconf/qconf-2.5.ebuild
@@ -27483,8 +27465,8 @@
 2205191440 ./sys-fs/lsscsi/lsscsi-0.32.ebuild
 2107260939 ./sys-fs/lufis/lufis-0.3-r1.ebuild
 1911072009 ./sys-fs/lufs/lufs-0.9.7-r4.ebuild
-2204241840 ./sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
-2206170140 ./sys-fs/lvm2/lvm2-2.03.14-r1.ebuild
+2206241940 ./sys-fs/lvm2/lvm2-2.02.188-r3.ebuild
+2206241940 ./sys-fs/lvm2/lvm2-2.03.14-r2.ebuild
 2205221140 ./sys-fs/lxcfs/lxcfs-4.0.12.ebuild
 2206141740 ./sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild
 2204080009 ./sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
@@ -27494,7 +27476,8 @@
 2103131509 ./sys-fs/mergerfs/mergerfs-2.32.3.ebuild
 2112310209 ./sys-fs/mergerfs/mergerfs-2.33.3.ebuild
 2201211309 ./sys-fs/mergerfs/mergerfs-2.33.1.ebuild
-2203280240 ./sys-fs/mergerfs/mergerfs-2.33.4.ebuild
+2206241040 ./sys-fs/mergerfs/mergerfs-2.33.4.ebuild
+2206240010 ./sys-fs/mergerfs/mergerfs-2.33.5.ebuild
 2104192239 ./sys-fs/mhddfs/mhddfs-0.1.39-r2.ebuild
 2108170039 ./sys-fs/mp3fs/mp3fs-0.91-r2.ebuild
 2108170039 ./sys-fs/mp3fs/mp3fs-1.1.1-r1.ebuild
@@ -27633,6 +27616,9 @@
 2206221640 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.49.ebuild
 2206221640 ./sys-kernel/gentoo-sources/gentoo-sources-5.18.6.ebuild
 2206221740 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.200.ebuild
+2206251410 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.285.ebuild
+2206251410 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.249.ebuild
+2206251410 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.320.ebuild
 2206061542 ./sys-kernel/git-sources/git-sources-5.19_rc1.ebuild
 2206130340 ./sys-kernel/git-sources/git-sources-5.19_rc2.ebuild
 2206200040 ./sys-kernel/git-sources/git-sources-5.19_rc3.ebuild
@@ -27667,6 +27653,7 @@
 2205150410 ./sys-kernel/linux-headers/linux-headers-4.9-r1.ebuild
 2205250340 ./sys-kernel/linux-headers/linux-headers-5.18.ebuild
 2206060140 ./sys-kernel/linux-headers/linux-headers-5.18-r1.ebuild
+2206251210 ./sys-kernel/linux-headers/linux-headers-5.19_rc3.ebuild
 2109300209 ./sys-kernel/linux-next/linux-next-9999.ebuild
 2201290510 ./sys-kernel/mips-sources/mips-sources-4.14.263.ebuild
 2201290510 ./sys-kernel/mips-sources/mips-sources-4.19.226.ebuild
@@ -27699,14 +27686,14 @@
 2206222310 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.15.49.ebuild
 2206222310 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.18.6.ebuild
 2206222310 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.200.ebuild
-2206161510 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.284.ebuild
-2206161510 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.248.ebuild
-2206161510 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.319.ebuild
 2206142040 ./sys-kernel/vanilla-sources/vanilla-sources-5.17.15.ebuild
 2206221610 ./sys-kernel/vanilla-sources/vanilla-sources-5.10.124.ebuild
 2206221610 ./sys-kernel/vanilla-sources/vanilla-sources-5.15.49.ebuild
 2206221610 ./sys-kernel/vanilla-sources/vanilla-sources-5.18.6.ebuild
 2206221610 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.200.ebuild
+2206251340 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.285.ebuild
+2206251340 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.249.ebuild
+2206251340 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.320.ebuild
 2201310039 ./sys-kernel/zen-sources/zen-sources-5.15.10.ebuild
 2206170210 ./sys-kernel/zen-sources/zen-sources-5.18.3.ebuild
 2101091409 ./sys-libs/argp-standalone/argp-standalone-1.3-r2.ebuild
@@ -27726,6 +27713,7 @@
 2205060010 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild
 2206042310 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.4.ebuild
 2206111440 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.5.ebuild
+2206251640 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild
 2109110940 ./sys-libs/compiler-rt/compiler-rt-12.0.1.ebuild
 2204212010 ./sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild
 2204212309 ./sys-libs/compiler-rt/compiler-rt-14.0.1.ebuild
@@ -27733,6 +27721,7 @@
 2206230410 ./sys-libs/compiler-rt/compiler-rt-14.0.4.ebuild
 2206230410 ./sys-libs/compiler-rt/compiler-rt-14.0.5.ebuild
 2206230410 ./sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild
+2206251640 ./sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild
 2205050610 ./sys-libs/cracklib/cracklib-2.9.7.ebuild
 2112131739 ./sys-libs/csu/csu-85-r1.ebuild
 2111271610 ./sys-libs/cygwin-crypt/cygwin-crypt-1.4-r1.ebuild
@@ -27771,12 +27760,12 @@
 2206091440 ./sys-libs/kpmcore/kpmcore-22.04.2.ebuild
 2203230410 ./sys-libs/ldb/ldb-2.3.2-r1.ebuild
 2203230410 ./sys-libs/ldb/ldb-2.4.1-r1.ebuild
-2203230410 ./sys-libs/ldb/ldb-2.4.2-r1.ebuild
 2203230410 ./sys-libs/ldb/ldb-2.5.0-r1.ebuild
-2205052310 ./sys-libs/ldb/ldb-2.3.3.ebuild
+2206251210 ./sys-libs/ldb/ldb-2.3.3.ebuild
+2206251210 ./sys-libs/ldb/ldb-2.4.2-r1.ebuild
+2206241110 ./sys-libs/ldb/ldb-2.4.3.ebuild
+2206241110 ./sys-libs/ldb/ldb-2.5.1.ebuild
 2205060310 ./sys-libs/libaal/libaal-1.0.7-r2.ebuild
-2202100940 ./sys-libs/libapparmor/libapparmor-3.0.1.ebuild
-2202100940 ./sys-libs/libapparmor/libapparmor-3.0.3.ebuild
 2206170440 ./sys-libs/libapparmor/libapparmor-3.0.3-r1.ebuild
 2206170440 ./sys-libs/libapparmor/libapparmor-3.0.4.ebuild
 2205190840 ./sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild
@@ -27794,6 +27783,7 @@
 2204301040 ./sys-libs/libcxx/libcxx-14.0.3.ebuild
 2206042310 ./sys-libs/libcxx/libcxx-14.0.4.ebuild
 2206111440 ./sys-libs/libcxx/libcxx-14.0.5.ebuild
+2206251640 ./sys-libs/libcxx/libcxx-14.0.6.ebuild
 2201040239 ./sys-libs/libcxxabi/libcxxabi-12.0.1.ebuild
 2204150310 ./sys-libs/libcxxabi/libcxxabi-14.0.1.ebuild
 2204212010 ./sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild
@@ -27801,6 +27791,7 @@
 2204301040 ./sys-libs/libcxxabi/libcxxabi-14.0.3.ebuild
 2206042310 ./sys-libs/libcxxabi/libcxxabi-14.0.4.ebuild
 2206111440 ./sys-libs/libcxxabi/libcxxabi-14.0.5.ebuild
+2206251640 ./sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild
 2111210639 ./sys-libs/libfaketime/libfaketime-0.9.6-r4.ebuild
 2205191240 ./sys-libs/libfaketime/libfaketime-0.9.9.ebuild
 2205071040 ./sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
@@ -27815,11 +27806,13 @@
 2204301040 ./sys-libs/libomp/libomp-14.0.3.ebuild
 2206042310 ./sys-libs/libomp/libomp-14.0.4.ebuild
 2206111440 ./sys-libs/libomp/libomp-14.0.5.ebuild
+2206251640 ./sys-libs/libomp/libomp-14.0.6.ebuild
 2203081540 ./sys-libs/libosinfo/libosinfo-1.10.0.ebuild
 2205190840 ./sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
 2111150410 ./sys-libs/librtas/librtas-2.0.2-r2.ebuild
 2204212339 ./sys-libs/libseccomp/libseccomp-9999.ebuild
 2206021040 ./sys-libs/libseccomp/libseccomp-2.5.4.ebuild
+2206240840 ./sys-libs/libseccomp/libseccomp-2.5.4-r1.ebuild
 2112280439 ./sys-libs/libselinux/libselinux-3.3.ebuild
 2206040410 ./sys-libs/libselinux/libselinux-3.4.ebuild
 2206040410 ./sys-libs/libselinux/libselinux-9999.ebuild
@@ -27855,6 +27848,7 @@
 2204301040 ./sys-libs/llvm-libunwind/llvm-libunwind-14.0.3.ebuild
 2206042310 ./sys-libs/llvm-libunwind/llvm-libunwind-14.0.4.ebuild
 2206111440 ./sys-libs/llvm-libunwind/llvm-libunwind-14.0.5.ebuild
+2206251640 ./sys-libs/llvm-libunwind/llvm-libunwind-14.0.6.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.0.3-r1.ebuild
@@ -27899,11 +27893,14 @@
 2205100440 ./sys-libs/slang/slang-2.3.2.ebuild
 2201022110 ./sys-libs/talloc/talloc-2.3.2.ebuild
 2202180810 ./sys-libs/talloc/talloc-2.3.3.ebuild
+2206241110 ./sys-libs/talloc/talloc-2.3.4.ebuild
 2201022110 ./sys-libs/tdb/tdb-1.4.5.ebuild
 2205190840 ./sys-libs/tdb/tdb-1.4.6.ebuild
+2206241110 ./sys-libs/tdb/tdb-1.4.7.ebuild
 2201040239 ./sys-libs/tevent/tevent-0.10.2.ebuild
 2202180810 ./sys-libs/tevent/tevent-0.11.0.ebuild
 2205031310 ./sys-libs/tevent/tevent-0.12.0.ebuild
+2206241110 ./sys-libs/tevent/tevent-0.12.1.ebuild
 2201022110 ./sys-libs/timezone-data/timezone-data-2021a-r1.ebuild
 2202232309 ./sys-libs/timezone-data/timezone-data-2021e.ebuild
 2204290540 ./sys-libs/timezone-data/timezone-data-2022a.ebuild
@@ -27913,7 +27910,7 @@
 2201010740 ./sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
 2204042339 ./sys-libs/zlib/zlib-1.2.11-r4.ebuild
 2204042339 ./sys-libs/zlib/zlib-1.2.11-r5.ebuild
-2206091110 ./sys-libs/zlib/zlib-1.2.12-r2.ebuild
+2206241240 ./sys-libs/zlib/zlib-1.2.12-r2.ebuild
 2111231810 ./sys-libs/basu/basu-0.2.0.ebuild
 2201312339 ./sys-libs/basu/basu-0.2.0-r1.ebuild
 2202071410 ./sys-libs/libucontext/libucontext-1.1-r1.ebuild
@@ -28066,7 +28063,7 @@
 2205010512 ./virtual/cblas/cblas-3.8.ebuild
 2108190539 ./virtual/checkpassword/checkpassword-0-r1.ebuild
 2205150110 ./virtual/commonlisp/commonlisp-0.ebuild
-2201242240 ./virtual/cron/cron-0-r2.ebuild
+2206232340 ./virtual/cron/cron-0-r3.ebuild
 2107210539 ./virtual/daemontools/daemontools-0.ebuild
 2204291110 ./virtual/dev-manager/dev-manager-0-r2.ebuild
 2206162240 ./virtual/dist-kernel/dist-kernel-5.18.5.ebuild
@@ -28082,7 +28079,7 @@
 2202122309 ./virtual/dotnet-sdk/dotnet-sdk-3.1.ebuild
 2204290540 ./virtual/editor/editor-0-r3.ebuild
 2107121709 ./virtual/fam/fam-0-r1.ebuild
-2205010512 ./virtual/fortran/fortran-0.ebuild
+2206232340 ./virtual/fortran/fortran-0-r1.ebuild
 2205260840 ./virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r4.ebuild
 2205140710 ./virtual/glu/glu-9.0-r2.ebuild
 2101040639 ./virtual/gnustep-back/gnustep-back-0.28.0.ebuild
@@ -28153,10 +28150,10 @@
 2205220110 ./virtual/perl-CPAN/perl-CPAN-2.330.0.ebuild
 2205220110 ./virtual/perl-Carp/perl-Carp-1.520.0-r2.ebuild
 2204171710 ./virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.101.0-r1.ebuild
-2206091110 ./virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.103.0-r2.ebuild
+2206241240 ./virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.103.0-r2.ebuild
 2204171710 ./virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.101.0-r1.ebuild
 2205220110 ./virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.105.0.ebuild
-2206091110 ./virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.103.0-r1.ebuild
+2206241240 ./virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.103.0-r1.ebuild
 2204290540 ./virtual/perl-DB_File/perl-DB_File-1.855.0.ebuild
 2205222210 ./virtual/perl-DB_File/perl-DB_File-1.857.0.ebuild
 2204290540 ./virtual/perl-Data-Dumper/perl-Data-Dumper-2.179.0.ebuild
@@ -28193,7 +28190,7 @@
 2205240040 ./virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.450.0-r1.ebuild
 2204171710 ./virtual/perl-IO-Compress/perl-IO-Compress-2.102.0-r1.ebuild
 2205240040 ./virtual/perl-IO-Compress/perl-IO-Compress-2.106.0.ebuild
-2206091110 ./virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r1.ebuild
+2206241240 ./virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r1.ebuild
 2205240040 ./virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.410.0-r1.ebuild
 2205240040 ./virtual/perl-IO-Zlib/perl-IO-Zlib-1.110.0-r1.ebuild
 2204290540 ./virtual/perl-IO/perl-IO-1.460.0.ebuild
@@ -28215,7 +28212,7 @@
 2205250440 ./virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r12.ebuild
 2204150910 ./virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.105.200.ebuild
 2205280440 ./virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.205.200-r1.ebuild
-2206120040 ./virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.203.130.ebuild
+2206241240 ./virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.203.130.ebuild
 2205252240 ./virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.740.0-r1.ebuild
 2205252240 ./virtual/perl-Module-Load/perl-Module-Load-0.360.0-r2.ebuild
 2205252240 ./virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r15.ebuild
@@ -28289,9 +28286,9 @@
 2205081840 ./virtual/rubygems/rubygems-15.ebuild
 2205081940 ./virtual/rubygems/rubygems-16.ebuild
 2205081810 ./virtual/rubygems/rubygems-17.ebuild
-2205242310 ./virtual/rust/rust-1.61.0.ebuild
 2205311810 ./virtual/rust/rust-1.59.0.ebuild
 2206101010 ./virtual/rust/rust-1.60.0.ebuild
+2206250840 ./virtual/rust/rust-1.61.0.ebuild
 2205010512 ./virtual/secret-service/secret-service-0.ebuild
 2204291110 ./virtual/service-manager/service-manager-1.ebuild
 2203222209 ./virtual/skkserv/skkserv-0-r1.ebuild
@@ -28393,8 +28390,8 @@
 2104191209 ./www-apps/gitit/gitit-0.13.0.0-r1.ebuild
 2205192140 ./www-apps/grafana-bin/grafana-bin-7.5.16.ebuild
 2205192140 ./www-apps/grafana-bin/grafana-bin-8.5.3.ebuild
-2205050740 ./www-apps/hugo/hugo-0.98.0.ebuild
-2206062340 ./www-apps/hugo/hugo-0.99.1.ebuild
+2206250610 ./www-apps/hugo/hugo-0.101.0.ebuild
+2206250610 ./www-apps/hugo/hugo-0.99.1.ebuild
 2112292039 ./www-apps/icingaweb2-module-director/icingaweb2-module-director-9999.ebuild
 2203032139 ./www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.1.ebuild
 2107052310 ./www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild
@@ -28453,7 +28450,7 @@
 2205220110 ./www-apps/nextcloud/nextcloud-22.2.8.ebuild
 2205220110 ./www-apps/nextcloud/nextcloud-24.0.1.ebuild
 2206042310 ./www-apps/nextcloud/nextcloud-23.0.5.ebuild
-2206221640 ./www-apps/nikola/nikola-8.2.2.ebuild
+2206231310 ./www-apps/nikola/nikola-8.2.2-r1.ebuild
 2205200540 ./www-apps/novnc/novnc-1.2.0.ebuild
 2205200540 ./www-apps/novnc/novnc-9999.ebuild
 2206111210 ./www-apps/owncloud/owncloud-10.10.0.ebuild
@@ -28504,16 +28501,14 @@
 2206010840 ./www-client/firefox-bin/firefox-bin-91.10.0.ebuild
 2206090910 ./www-client/firefox-bin/firefox-bin-101.0.1.ebuild
 2206092140 ./www-client/firefox/firefox-91.10.0.ebuild
-2206151440 ./www-client/firefox/firefox-101.0.1-r10.ebuild
-2206151440 ./www-client/firefox/firefox-101.0.1.ebuild
 2206202240 ./www-client/firefox/firefox-101.0.1-r11.ebuild
 2206172140 ./www-client/google-chrome-beta/google-chrome-beta-103.0.5060.53.ebuild
 2206191210 ./www-client/google-chrome-unstable/google-chrome-unstable-104.0.5112.12.ebuild
 2206220540 ./www-client/google-chrome/google-chrome-103.0.5060.53.ebuild
 2104302139 ./www-client/httrack/httrack-3.49.2-r2.ebuild
 2110241209 ./www-client/jd/jd-2.8.9_p150226-r2.ebuild
-2205261010 ./www-client/links/links-2.26-r1.ebuild
 2205302240 ./www-client/links/links-2.27.ebuild
+2206250840 ./www-client/links/links-2.26-r1.ebuild
 2101180039 ./www-client/luakit/luakit-2.2.1-r100.ebuild
 2107200640 ./www-client/luakit/luakit-9999.ebuild
 2112272110 ./www-client/luakit/luakit-2.3.ebuild
@@ -28554,10 +28549,10 @@
 2009241739 ./www-client/surfraw/surfraw-99999.ebuild
 2106222139 ./www-client/uget/uget-2.2.1-r1.ebuild
 2105292209 ./www-client/uget/uget-9999.ebuild
-2206160140 ./www-client/vivaldi-snapshot/vivaldi-snapshot-5.4.2704.3.ebuild
 2206181040 ./www-client/vivaldi-snapshot/vivaldi-snapshot-5.4.2707.2.ebuild
-2206181040 ./www-client/vivaldi/vivaldi-5.3.2679.55.ebuild
-2206181040 ./www-client/vivaldi/vivaldi-5.3.2679.58.ebuild
+2206240040 ./www-client/vivaldi-snapshot/vivaldi-snapshot-5.4.2712.3.ebuild
+2206240040 ./www-client/vivaldi/vivaldi-5.3.2679.58.ebuild
+2206240040 ./www-client/vivaldi/vivaldi-5.3.2679.61.ebuild
 2107170109 ./www-client/w3m/w3m-0.5.3_p20210102.ebuild
 2205090840 ./www-client/w3m/w3m-0.5.3_p20220216.ebuild
 2205140410 ./www-client/w3m/w3m-0.5.3_p20220429.ebuild
@@ -28602,7 +28597,7 @@
 2203201310 ./www-servers/adsf/adsf-1.4.6-r1.ebuild
 2203181040 ./www-servers/apache/apache-2.4.53.ebuild
 2204121110 ./www-servers/apache/apache-2.4.53-r1.ebuild
-2206081640 ./www-servers/apache/apache-2.4.54.ebuild
+2206241740 ./www-servers/apache/apache-2.4.54.ebuild
 2001051839 ./www-servers/boa/boa-0.94.14_rc21-r2.ebuild
 2206030540 ./www-servers/caddy/caddy-2.5.1.ebuild
 2108131639 ./www-servers/civetweb/civetweb-1.12.ebuild
@@ -28752,10 +28747,8 @@
 2111180209 ./x11-apps/xwd/xwd-1.0.8.ebuild
 2110220439 ./x11-apps/xwininfo/xwininfo-1.1.5.ebuild
 2110220439 ./x11-apps/xwud/xwud-1.0.5-r1.ebuild
-2201011839 ./x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
-2206161940 ./x11-base/xcb-proto/xcb-proto-1.15.1.ebuild
-2206171010 ./x11-base/xcb-proto/xcb-proto-1.15.ebuild
 2206172140 ./x11-base/xcb-proto/xcb-proto-1.15.2.ebuild
+2206241410 ./x11-base/xcb-proto/xcb-proto-1.15.ebuild
 2104060140 ./x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
 2205081040 ./x11-base/xorg-drivers/xorg-drivers-21.1.ebuild
 2205081040 ./x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -28767,7 +28760,6 @@
 2206101040 ./x11-base/xorg-server/xorg-server-21.1.3-r3.ebuild
 2110220439 ./x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
 2205171210 ./x11-base/xwayland/xwayland-9999.ebuild
-2205280440 ./x11-base/xwayland/xwayland-22.1.1.ebuild
 2206171010 ./x11-base/xwayland/xwayland-22.1.2.ebuild
 2204040610 ./x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.ebuild
 2206122010 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.151.ebuild
@@ -28778,7 +28770,6 @@
 2205260840 ./x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
 2205251910 ./x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
 2205251910 ./x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
-2205131610 ./x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.0.ebuild
 2206171010 ./x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.1.ebuild
 2012231444 ./x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild
 2205260840 ./x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
@@ -28839,15 +28830,14 @@
 2009272109 ./x11-libs/gtkglext/gtkglext-1.2.0-r5.ebuild
 2112130909 ./x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild
 2104041709 ./x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
-2110291639 ./x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
 2111060743 ./x11-libs/gtksourceview/gtksourceview-4.8.2.ebuild
+2206232340 ./x11-libs/gtksourceview/gtksourceview-3.24.11-r1.ebuild
 2105021839 ./x11-libs/libFS/libFS-1.0.8.ebuild
 2002101739 ./x11-libs/libGLw/libGLw-8.0.0-r1.ebuild
 2205080640 ./x11-libs/libICE/libICE-1.0.10-r1.ebuild
 1907011039 ./x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild
 2007152009 ./x11-libs/libQGLViewer/libQGLViewer-2.7.2.ebuild
 2205080640 ./x11-libs/libSM/libSM-1.2.3-r1.ebuild
-2204300340 ./x11-libs/libX11/libX11-1.8.ebuild
 2205280440 ./x11-libs/libX11/libX11-1.7.5.ebuild
 2206122240 ./x11-libs/libX11/libX11-1.8.1.ebuild
 2205181110 ./x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
@@ -28884,9 +28874,8 @@
 2202100210 ./x11-libs/libdlo/libdlo-0.1.2-r2.ebuild
 2205100440 ./x11-libs/libdmx/libdmx-1.1.4.ebuild
 2203110039 ./x11-libs/libdockapp/libdockapp-0.7.3.ebuild
-2205280440 ./x11-libs/libdrm/libdrm-2.4.110.ebuild
 2206041540 ./x11-libs/libdrm/libdrm-9999.ebuild
-2206171010 ./x11-libs/libdrm/libdrm-2.4.111.ebuild
+2206241410 ./x11-libs/libdrm/libdrm-2.4.111.ebuild
 2109010039 ./x11-libs/libfakeXinerama/libfakeXinerama-0.1.0.ebuild
 2111230440 ./x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
 2205251440 ./x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
@@ -28925,12 +28914,10 @@
 2203262039 ./x11-libs/libvdpau/libvdpau-1.5.ebuild
 2104150839 ./x11-libs/libwnck/libwnck-2.31.0-r1.ebuild
 2203160010 ./x11-libs/libwnck/libwnck-40.1.ebuild
-2201011839 ./x11-libs/libxcb/libxcb-1.14.ebuild
-2206171010 ./x11-libs/libxcb/libxcb-1.15.ebuild
 2206172140 ./x11-libs/libxcb/libxcb-1.15-r1.ebuild
+2206241410 ./x11-libs/libxcb/libxcb-1.15.ebuild
 2205081040 ./x11-libs/libxcvt/libxcvt-0.1.1.ebuild
 2205081040 ./x11-libs/libxcvt/libxcvt-9999.ebuild
-2205280440 ./x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
 2206171010 ./x11-libs/libxkbcommon/libxkbcommon-1.4.1.ebuild
 2205081040 ./x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
 2105290309 ./x11-libs/libxklavier/libxklavier-5.4.ebuild
@@ -28959,7 +28946,7 @@
 2111080609 ./x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
 2103141909 ./x11-libs/spread-sheet-widget/spread-sheet-widget-0.3-r1.ebuild
 2103141909 ./x11-libs/spread-sheet-widget/spread-sheet-widget-0.6.ebuild
-2206070940 ./x11-libs/spread-sheet-widget/spread-sheet-widget-0.7.ebuild
+2206241140 ./x11-libs/spread-sheet-widget/spread-sheet-widget-0.7.ebuild
 2105211809 ./x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
 2105251739 ./x11-libs/tslib/tslib-1.22.ebuild
 2103060139 ./x11-libs/vte/vte-0.28.2-r209.ebuild
@@ -29005,7 +28992,7 @@
 1910111911 ./x11-misc/bblaunch/bblaunch-0.0.3.ebuild
 2202181810 ./x11-misc/bbmail/bbmail-0.9.3-r2.ebuild
 2202181810 ./x11-misc/bbpager/bbpager-0.4.7-r2.ebuild
-1912242109 ./x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
+2206251810 ./x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
 2104192239 ./x11-misc/bbrun/bbrun-1.6-r1.ebuild
 2202181810 ./x11-misc/bbtime/bbtime-0.1.5-r2.ebuild
 2104192109 ./x11-misc/bbweather/bbweather-0.6.3-r2.ebuild
@@ -29022,7 +29009,6 @@
 2112031609 ./x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild
 2112031609 ./x11-misc/clipnotify/clipnotify-1.0.2.ebuild
 2206172110 ./x11-misc/colord/colord-1.4.6.ebuild
-2205080640 ./x11-misc/compose-tables/compose-tables-1.8.ebuild
 2205280440 ./x11-misc/compose-tables/compose-tables-1.7.5.ebuild
 2206122240 ./x11-misc/compose-tables/compose-tables-1.8.1.ebuild
 2010231439 ./x11-misc/copyq/copyq-3.13.0.ebuild
@@ -29322,9 +29308,8 @@
 1803171138 ./x11-misc/xkblayout-state/xkblayout-state-0_p20180118.ebuild
 1803171138 ./x11-misc/xkblayout-state/xkblayout-state-9999.ebuild
 2203200340 ./x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild
-2205280440 ./x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
 2206041540 ./x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
-2206171010 ./x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
+2206241410 ./x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
 2104151009 ./x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
 2104261409 ./x11-misc/xlockmore/xlockmore-5.66.ebuild
 2203231209 ./x11-misc/xlockmore/xlockmore-5.69.ebuild
@@ -29477,7 +29462,7 @@
 2109091040 ./x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild
 2109091040 ./x11-plugins/pidgintex/pidgintex-1.1.2_p20170107.ebuild
 2008091339 ./x11-plugins/purple-hangouts/purple-hangouts-0_p20200710.ebuild
-2011252124 ./x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
+2206241640 ./x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
 2104042209 ./x11-plugins/vicious/vicious-2.5.0.ebuild
 2205171110 ./x11-plugins/vicious/vicious-2.5.1.ebuild
 2203040410 ./x11-plugins/wmCalClock/wmCalClock-1.25-r3.ebuild
@@ -29558,7 +29543,7 @@
 2203040410 ./x11-plugins/wmmp3/wmmp3-0.12-r1.ebuild
 2006151909 ./x11-plugins/wmnd/wmnd-0.4.18.ebuild
 2203040410 ./x11-plugins/wmnd/wmnd-0.4.17-r1.ebuild
-2203040410 ./x11-plugins/wmnet/wmnet-1.06-r2.ebuild
+2206251810 ./x11-plugins/wmnet/wmnet-1.06-r2.ebuild
 1808251109 ./x11-plugins/wmnetload/wmnetload-1.3-r6.ebuild
 1809152339 ./x11-plugins/wmpager/wmpager-1.2-r2.ebuild
 2203040410 ./x11-plugins/wmpasman/wmpasman-2.2.ebuild
@@ -29813,7 +29798,8 @@
 2107210539 ./x11-wm/bspwm/bspwm-0.9.10.ebuild
 2106070939 ./x11-wm/ctwm/ctwm-4.0.3.ebuild
 2104160539 ./x11-wm/cwm/cwm-6.7.ebuild
-2006281409 ./x11-wm/cwm/cwm-9999.ebuild
+2206231240 ./x11-wm/cwm/cwm-7.1.ebuild
+2206231240 ./x11-wm/cwm/cwm-9999.ebuild
 2203162040 ./x11-wm/dwm/dwm-6.2.ebuild
 2203162040 ./x11-wm/dwm/dwm-6.3.ebuild
 2203162040 ./x11-wm/dwm/dwm-9999.ebuild
@@ -31071,7 +31057,6 @@
 2206121142 metadata/md5-cache/app-accessibility/speech-dispatcher-0.9.1
 2206161940 metadata/md5-cache/app-accessibility/sound-icons-0.1
 2206200610 metadata/md5-cache/app-accessibility/caribou-0.4.21-r5
-2206221910 metadata/md5-cache/app-accessibility/Manifest.gz
 2206221040 metadata/md5-cache/app-accessibility/brltty-6.1
 2206221040 metadata/md5-cache/app-accessibility/brltty-6.1-r1
 2206221040 metadata/md5-cache/app-accessibility/brltty-6.4
@@ -31081,6 +31066,8 @@
 2206220743 metadata/md5-cache/app-accessibility/kontrast-22.04.2
 2206221910 metadata/md5-cache/app-accessibility/powiedz-1.0-r2
 2206221910 metadata/md5-cache/app-accessibility/sphinx2-0.6
+2206250310 metadata/md5-cache/app-accessibility/Manifest.gz
+2206250310 metadata/md5-cache/app-accessibility/speech-tools-2.5.0-r1
 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
@@ -31130,7 +31117,6 @@
 2201061409 metadata/md5-cache/app-admin/gentoo-perl-helpers-0.3.1-r1
 2201181639 metadata/md5-cache/app-admin/gentoo-perl-helpers-0.4.0
 2201182139 metadata/md5-cache/app-admin/tmpreaper-1.6.16
-2201312309 metadata/md5-cache/app-admin/selint-1.2.1
 2202071639 metadata/md5-cache/app-admin/mongo-tools-4.2.17
 2202131939 metadata/md5-cache/app-admin/radmind-1.15.3-r1
 2202141409 metadata/md5-cache/app-admin/mongosh-bin-1.1.9
@@ -31237,15 +31223,11 @@
 2205170654 metadata/md5-cache/app-admin/qpage-3.3
 2205170654 metadata/md5-cache/app-admin/radmind-1.15.4-r1
 2205170654 metadata/md5-cache/app-admin/rasdaemon-0.6.7
-2205170654 metadata/md5-cache/app-admin/rasdaemon-0.6.7-r1
 2205170654 metadata/md5-cache/app-admin/rex-1.13.3
 2205170654 metadata/md5-cache/app-admin/rex-1.13.4
 2205170654 metadata/md5-cache/app-admin/rex-9999
 2205170654 metadata/md5-cache/app-admin/ryzen_monitor-1.0.4-r1
 2205170654 metadata/md5-cache/app-admin/sagan-2.0.1-r6
-2205170654 metadata/md5-cache/app-admin/selint-1.1.0
-2205170654 metadata/md5-cache/app-admin/selint-1.2.0
-2205170654 metadata/md5-cache/app-admin/selint-9999
 2205170654 metadata/md5-cache/app-admin/serf-0.9.8
 2205170654 metadata/md5-cache/app-admin/socklog-2.1.0
 2205170654 metadata/md5-cache/app-admin/sshguard-2.4.2
@@ -31292,7 +31274,6 @@
 2206071015 metadata/md5-cache/app-admin/abrt-2.15.0
 2206071015 metadata/md5-cache/app-admin/abrt-2.15.1
 2206071015 metadata/md5-cache/app-admin/ananicy-2.2.1-r1
-2206081640 metadata/md5-cache/app-admin/apache-tools-2.4.54
 2206080010 metadata/md5-cache/app-admin/doctl-1.76.2
 2206080010 metadata/md5-cache/app-admin/doctl-9999
 2206071015 metadata/md5-cache/app-admin/gentoo-retirement-scripts-1
@@ -31382,7 +31363,6 @@
 2206210810 metadata/md5-cache/app-admin/awscli-1.25.13
 2206201410 metadata/md5-cache/app-admin/exo-1.57.0
 2206212010 metadata/md5-cache/app-admin/vault-1.10.4
-2206222310 metadata/md5-cache/app-admin/Manifest.gz
 2206212210 metadata/md5-cache/app-admin/ansible-5.9.0
 2206212210 metadata/md5-cache/app-admin/ansible-6.0.0
 2206212210 metadata/md5-cache/app-admin/ansible-base-2.12.7
@@ -31425,6 +31405,17 @@
 2206221910 metadata/md5-cache/app-admin/webalizer-2.23.08
 2206221910 metadata/md5-cache/app-admin/whowatch-1.8.6
 2206221910 metadata/md5-cache/app-admin/whowatch-99999
+2206251910 metadata/md5-cache/app-admin/Manifest.gz
+2206241740 metadata/md5-cache/app-admin/apache-tools-2.4.54
+2206231040 metadata/md5-cache/app-admin/awscli-1.25.15
+2206240840 metadata/md5-cache/app-admin/awscli-1.25.16
+2206250840 metadata/md5-cache/app-admin/awscli-1.25.17
+2206251910 metadata/md5-cache/app-admin/consul-template-0.29.1
+2206250310 metadata/md5-cache/app-admin/entr-5.2
+2206240540 metadata/md5-cache/app-admin/rasdaemon-0.6.7-r1
+2206240710 metadata/md5-cache/app-admin/selint-1.2.0
+2206240710 metadata/md5-cache/app-admin/selint-1.2.1
+2206240710 metadata/md5-cache/app-admin/selint-9999
 2205170654 metadata/md5-cache/app-antivirus/clamav-0.103.6
 2206121142 metadata/md5-cache/app-antivirus/fangfrisch-1.5.0
 2206121142 metadata/md5-cache/app-antivirus/fangfrisch-1.5.0-r1
@@ -31657,13 +31648,11 @@
 2110300109 metadata/md5-cache/app-benchmarks/geekbench-2.4.3-r1
 2110300109 metadata/md5-cache/app-benchmarks/geekbench-3.4.2-r1
 2110300109 metadata/md5-cache/app-benchmarks/geekbench-4.4.1-r1
-2202031810 metadata/md5-cache/app-benchmarks/geekbench-5.4.4
 2202100210 metadata/md5-cache/app-benchmarks/cpuburn-1.4a-r4
 2204150511 metadata/md5-cache/app-benchmarks/hey-0.1.2
 2205170654 metadata/md5-cache/app-benchmarks/bashmark-0.6.2
 2205170654 metadata/md5-cache/app-benchmarks/bonnie-2.0.6-r2
 2205170654 metadata/md5-cache/app-benchmarks/dbench-4.0
-2205190010 metadata/md5-cache/app-benchmarks/geekbench-5.4.5
 2205170654 metadata/md5-cache/app-benchmarks/httperf-0.9.1_p20181111
 2205170654 metadata/md5-cache/app-benchmarks/httperf-0.9.1_p20181111-r1
 2205170654 metadata/md5-cache/app-benchmarks/hyperfine-1.11.0
@@ -31678,16 +31667,17 @@
 2205170654 metadata/md5-cache/app-benchmarks/ramspeed-3.5.0-r2
 2205170654 metadata/md5-cache/app-benchmarks/siege-4.1.0
 2205170654 metadata/md5-cache/app-benchmarks/stress-1.0.5
-2205170654 metadata/md5-cache/app-benchmarks/stress-ng-0.14.01
 2205170654 metadata/md5-cache/app-benchmarks/tiobench-0.4.2
 2205170654 metadata/md5-cache/app-benchmarks/tiobench-0.5.0
 2205170654 metadata/md5-cache/app-benchmarks/wrk-4.2.0
 2205242340 metadata/md5-cache/app-benchmarks/pmbw-0.6.3
 2206071015 metadata/md5-cache/app-benchmarks/bootchart2-0.14.9-r1
 2206071015 metadata/md5-cache/app-benchmarks/sysbench-1.0.20-r101
-2206221910 metadata/md5-cache/app-benchmarks/Manifest.gz
 2206221910 metadata/md5-cache/app-benchmarks/filebench-1.4.9.1-r1
 2206221910 metadata/md5-cache/app-benchmarks/pipebench-0.40-r2
+2206251740 metadata/md5-cache/app-benchmarks/Manifest.gz
+2206251740 metadata/md5-cache/app-benchmarks/geekbench-5.4.5
+2206251740 metadata/md5-cache/app-benchmarks/stress-ng-0.14.02
 2105142109 metadata/md5-cache/app-cdr/bashburn-3.1.0-r2
 2102211409 metadata/md5-cache/app-cdr/burncdda-1.8.3-r1
 1910111840 metadata/md5-cache/app-cdr/ccd2iso-0.3
@@ -31946,7 +31936,6 @@
 2206180010 metadata/md5-cache/app-crypt/pinentry-1.2.0-r1
 2206190210 metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
 2206181210 metadata/md5-cache/app-crypt/rhash-1.4.3
-2206221910 metadata/md5-cache/app-crypt/Manifest.gz
 2206221910 metadata/md5-cache/app-crypt/aescrypt-3.14
 2206221910 metadata/md5-cache/app-crypt/ckpass-0.2-r1
 2206221910 metadata/md5-cache/app-crypt/codecrypt-1.8-r2
@@ -31976,6 +31965,8 @@
 2206221910 metadata/md5-cache/app-crypt/yubikey-manager-qt-1.2.2
 2206221910 metadata/md5-cache/app-crypt/yubioath-desktop-5.1.0-r2
 2206220743 metadata/md5-cache/app-crypt/zulucrypt-5.5.0_pre20180223
+2206251340 metadata/md5-cache/app-crypt/Manifest.gz
+2206251340 metadata/md5-cache/app-crypt/libu2f-host-1.1.10-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/eblook-1.6.1
@@ -32563,9 +32554,11 @@
 2205241210 metadata/md5-cache/app-dicts/sword-FreChry-1.0
 2205241210 metadata/md5-cache/app-dicts/sword-KtuVB-3.2
 2206071015 metadata/md5-cache/app-dicts/gnome-dictionary-40.0-r1
-2206221910 metadata/md5-cache/app-dicts/Manifest.gz
 2206220743 metadata/md5-cache/app-dicts/dikt-2s_p1
 2206221910 metadata/md5-cache/app-dicts/verbiste-0.1.47
+2206251740 metadata/md5-cache/app-dicts/Manifest.gz
+2206251740 metadata/md5-cache/app-dicts/aspell-da-4.0
+2206251740 metadata/md5-cache/app-dicts/aspell-pl-6.0.20220601.0
 2107020209 metadata/md5-cache/app-doc/blas-docs-3.1.1
 2104180939 metadata/md5-cache/app-doc/csound-manual-6.15-r1
 2104192309 metadata/md5-cache/app-doc/elisp-manual-18.1.03
@@ -33319,13 +33312,18 @@
 2206191510 metadata/md5-cache/app-emacs/org-mode-9.5.4
 2206191510 metadata/md5-cache/app-emacs/setup-1.3.0
 2206200513 metadata/md5-cache/app-emacs/fsharp-mode-2.0
-2206221910 metadata/md5-cache/app-emacs/Manifest.gz
 2206220010 metadata/md5-cache/app-emacs/compat-28.1.1.3
 2206221910 metadata/md5-cache/app-emacs/emacs-common-1.8
 2206221910 metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5
 2206220743 metadata/md5-cache/app-emacs/libegit2-0.0.20200515-r1
 2206220743 metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
 2206220743 metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618
+2206251640 metadata/md5-cache/app-emacs/Manifest.gz
+2206251640 metadata/md5-cache/app-emacs/demap-1.4.0
+2206231110 metadata/md5-cache/app-emacs/dts-mode-1.0
+2206231110 metadata/md5-cache/app-emacs/ebib-2.38
+2206231910 metadata/md5-cache/app-emacs/lsp-mode-8.0.0_p20220620
+2206232010 metadata/md5-cache/app-emacs/web-mode-17.2.1
 1912171039 metadata/md5-cache/app-emulation/bochs-2.6.10
 2110200512 metadata/md5-cache/app-emulation/bochs-2.7
 1910051539 metadata/md5-cache/app-emulation/dlx-1.0.0
@@ -33422,7 +33420,6 @@
 2206071015 metadata/md5-cache/app-emulation/libvirt-8.1.0
 2206071015 metadata/md5-cache/app-emulation/libvirt-8.2.0
 2206071015 metadata/md5-cache/app-emulation/libvirt-8.3.0
-2206071015 metadata/md5-cache/app-emulation/libvirt-8.4.0
 2206071015 metadata/md5-cache/app-emulation/libvirt-9999
 2206071015 metadata/md5-cache/app-emulation/libvirt-glib-4.0.0
 2206080340 metadata/md5-cache/app-emulation/open-vm-tools-11.3.5_p18557794
@@ -33457,7 +33454,6 @@
 2206121142 metadata/md5-cache/app-emulation/fs-uae-launcher-3.1.66
 2206121142 metadata/md5-cache/app-emulation/fs-uae-launcher-3.1.68
 2206121142 metadata/md5-cache/app-emulation/glean-1.18.2
-2206121142 metadata/md5-cache/app-emulation/glean-1.19.0
 2206110110 metadata/md5-cache/app-emulation/plus42-1.0.6
 2206121142 metadata/md5-cache/app-emulation/protontricks-1.7.0
 2206121142 metadata/md5-cache/app-emulation/protontricks-1.8.1
@@ -33465,7 +33461,6 @@
 2206121142 metadata/md5-cache/app-emulation/qemu-7.0.0-r1
 2206121142 metadata/md5-cache/app-emulation/qemu-7.0.0-r2
 2206121142 metadata/md5-cache/app-emulation/qemu-9999
-2206121110 metadata/md5-cache/app-emulation/spice-vdagent-0.22.1
 2206112210 metadata/md5-cache/app-emulation/vendor-reset-0.1.0
 2206112210 metadata/md5-cache/app-emulation/vendor-reset-9999
 2206121142 metadata/md5-cache/app-emulation/virt-manager-3.2.0-r1
@@ -33480,7 +33475,6 @@
 2206181710 metadata/md5-cache/app-emulation/wine-staging-7.11
 2206181710 metadata/md5-cache/app-emulation/wine-vanilla-7.11
 2206220743 metadata/md5-cache/app-emulation/86Box-3.5
-2206221910 metadata/md5-cache/app-emulation/Manifest.gz
 2206220743 metadata/md5-cache/app-emulation/aqemu-0.9.2-r2
 2206220743 metadata/md5-cache/app-emulation/dynamips-0.2.21
 2206220743 metadata/md5-cache/app-emulation/faudio-21.01
@@ -33498,6 +33492,11 @@
 2206221910 metadata/md5-cache/app-emulation/virtualbox-6.1.32-r2
 2206221910 metadata/md5-cache/app-emulation/virtualbox-6.1.34-r1
 2206221910 metadata/md5-cache/app-emulation/xtrs-4.9d-r5
+2206250010 metadata/md5-cache/app-emulation/Manifest.gz
+2206240540 metadata/md5-cache/app-emulation/glean-1.19.0
+2206240540 metadata/md5-cache/app-emulation/glean-1.23.0
+2206250010 metadata/md5-cache/app-emulation/libvirt-8.4.0
+2206241240 metadata/md5-cache/app-emulation/spice-vdagent-0.22.1
 2104060140 metadata/md5-cache/app-eselect/eselect-awk-0.3
 2107211409 metadata/md5-cache/app-eselect/eselect-blas-0.1
 2104060140 metadata/md5-cache/app-eselect/eselect-cblas-0.1
@@ -33545,11 +33544,12 @@
 2205170654 metadata/md5-cache/app-eselect/eselect-php-9999
 2205191040 metadata/md5-cache/app-eselect/eselect-postgresql-2.4
 2205170654 metadata/md5-cache/app-eselect/eselect-vi-1.2
-2205311810 metadata/md5-cache/app-eselect/eselect-rust-20210703
 2206071015 metadata/md5-cache/app-eselect/eselect-repository-12
-2206211940 metadata/md5-cache/app-eselect/Manifest.gz
 2206211940 metadata/md5-cache/app-eselect/eselect-gnome-shell-extensions-20180306-r1
 2206211940 metadata/md5-cache/app-eselect/eselect-package-manager-20110108-r2
+2206250840 metadata/md5-cache/app-eselect/Manifest.gz
+2206241410 metadata/md5-cache/app-eselect/eselect-java-0.5.0
+2206250840 metadata/md5-cache/app-eselect/eselect-rust-20210703
 2005211139 metadata/md5-cache/app-forensics/examiner-0.5-r3
 1702282309 metadata/md5-cache/app-forensics/scalpel-2.0
 2201061240 metadata/md5-cache/app-forensics/air-2.0.0-r2
@@ -33676,8 +33676,6 @@
 2205170654 metadata/md5-cache/app-i18n/yaskkserv2-0.1.1-r1
 2205170654 metadata/md5-cache/app-i18n/zinnia-0.06-r3
 2205170654 metadata/md5-cache/app-i18n/zinnia-tomoe-0.6.0_p20080911
-2206071015 metadata/md5-cache/app-i18n/ibus-anthy-1.5.13
-2206071015 metadata/md5-cache/app-i18n/ibus-anthy-1.5.14
 2206071015 metadata/md5-cache/app-i18n/ibus-hangul-1.5.4
 2206071015 metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.92-r1
 2206071015 metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r4
@@ -33689,7 +33687,6 @@
 2206071015 metadata/md5-cache/app-i18n/libkkc-data-0.2.7
 2206071015 metadata/md5-cache/app-i18n/mozc-2.26.4220_p20201212102434_p20201219202429
 2206071015 metadata/md5-cache/app-i18n/mozc-9999
-2206071015 metadata/md5-cache/app-i18n/pyzy-0.1.0-r3
 2206071015 metadata/md5-cache/app-i18n/scim-sunpinyin-3.0.0_rc1
 2206081740 metadata/md5-cache/app-i18n/skk-jisyo-201905
 2206081740 metadata/md5-cache/app-i18n/skk-jisyo-202005
@@ -33705,8 +33702,6 @@
 2206121710 metadata/md5-cache/app-i18n/ibus-table-1.16.8
 2206121710 metadata/md5-cache/app-i18n/ibus-table-others-1.3.13
 2206201610 metadata/md5-cache/app-i18n/ibus-table-1.16.9
-2206201610 metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.3
-2206221910 metadata/md5-cache/app-i18n/Manifest.gz
 2206220743 metadata/md5-cache/app-i18n/fcitx-4.2.9.8
 2206220743 metadata/md5-cache/app-i18n/fcitx-4.9999
 2206220743 metadata/md5-cache/app-i18n/fcitx-anthy-0.2.3
@@ -33747,8 +33742,6 @@
 2206220743 metadata/md5-cache/app-i18n/librime-lua-99999999999999
 2206221910 metadata/md5-cache/app-i18n/mecab-skkserv-0.03
 2206221910 metadata/md5-cache/app-i18n/multiskkserv-20100128
-2206220743 metadata/md5-cache/app-i18n/opencc-1.0.5
-2206220743 metadata/md5-cache/app-i18n/opencc-1.1.2
 2206220743 metadata/md5-cache/app-i18n/opencc-1.1.3
 2206220743 metadata/md5-cache/app-i18n/opencc-9999
 2206221910 metadata/md5-cache/app-i18n/scim-1.4.18
@@ -33757,6 +33750,13 @@
 2206220743 metadata/md5-cache/app-i18n/tagainijisho-9999
 2206220743 metadata/md5-cache/app-i18n/uchardet-0.0.7
 2206220743 metadata/md5-cache/app-i18n/uchardet-9999
+2206250040 metadata/md5-cache/app-i18n/Manifest.gz
+2206241610 metadata/md5-cache/app-i18n/ibus-anthy-1.5.14
+2206240240 metadata/md5-cache/app-i18n/ibus-libpinyin-1.12.1
+2206241610 metadata/md5-cache/app-i18n/ibus-typing-booster-2.16.5
+2206240240 metadata/md5-cache/app-i18n/libpinyin-2.6.2
+2206231840 metadata/md5-cache/app-i18n/pyzy-0.1.0-r3
+2206241610 metadata/md5-cache/app-i18n/yaskkserv2-0.1.3
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
 2205170654 metadata/md5-cache/app-laptop/dispad-0.3.1-r1
 2205170654 metadata/md5-cache/app-laptop/hdapsd-20141203-r2
@@ -33833,8 +33833,8 @@
 2206102310 metadata/md5-cache/app-metrics/redis_exporter-1.40.0
 2206182340 metadata/md5-cache/app-metrics/redis_exporter-1.43.0
 2206200513 metadata/md5-cache/app-metrics/blackbox_exporter-0.21.1
-2206221040 metadata/md5-cache/app-metrics/Manifest.gz
-2206221040 metadata/md5-cache/app-metrics/collectd-5.12.0-r7
+2206251740 metadata/md5-cache/app-metrics/Manifest.gz
+2206251740 metadata/md5-cache/app-metrics/collectd-5.12.0-r7
 1806092239 metadata/md5-cache/app-misc/acdctl-1.1-r1
 2104190739 metadata/md5-cache/app-misc/aldo-0.7.7
 1910161339 metadata/md5-cache/app-misc/astrolog-ephemeris-5.40
@@ -33905,7 +33905,6 @@
 2204150511 metadata/md5-cache/app-misc/pet-0.4.0
 2204150511 metadata/md5-cache/app-misc/spire-1.1.0
 2204150511 metadata/md5-cache/app-misc/spire-1.2.0
-2204161740 metadata/md5-cache/app-misc/scrub-2.6.1
 2204190010 metadata/md5-cache/app-misc/cadubi-1.3.4
 2204190010 metadata/md5-cache/app-misc/notary-0.7.0
 2204290540 metadata/md5-cache/app-misc/c_rehash-1.7-r1
@@ -34043,27 +34042,8 @@
 2205170654 metadata/md5-cache/app-misc/muttprint-0.73-r5
 2205170654 metadata/md5-cache/app-misc/mvcase-0.1-r2
 2205170654 metadata/md5-cache/app-misc/mx5000tools-0.1.2-r2
-2205170654 metadata/md5-cache/app-misc/nnn-1.9
-2205170654 metadata/md5-cache/app-misc/nnn-2.0
-2205170654 metadata/md5-cache/app-misc/nnn-2.1
-2205170654 metadata/md5-cache/app-misc/nnn-2.2
-2205170654 metadata/md5-cache/app-misc/nnn-2.3
-2205170654 metadata/md5-cache/app-misc/nnn-2.4
-2205170654 metadata/md5-cache/app-misc/nnn-2.5
-2205170654 metadata/md5-cache/app-misc/nnn-2.6
-2205170654 metadata/md5-cache/app-misc/nnn-2.7
-2205170654 metadata/md5-cache/app-misc/nnn-2.8.1
-2205170654 metadata/md5-cache/app-misc/nnn-2.9
-2205170654 metadata/md5-cache/app-misc/nnn-3.0
-2205170654 metadata/md5-cache/app-misc/nnn-3.1
-2205170654 metadata/md5-cache/app-misc/nnn-3.2
-2205170654 metadata/md5-cache/app-misc/nnn-3.3
-2205170654 metadata/md5-cache/app-misc/nnn-3.4
-2205170654 metadata/md5-cache/app-misc/nnn-3.5
-2205170654 metadata/md5-cache/app-misc/nnn-3.6
 2205170654 metadata/md5-cache/app-misc/nnn-4.0
 2205170654 metadata/md5-cache/app-misc/nnn-4.3
-2205170654 metadata/md5-cache/app-misc/nnn-4.5
 2205170654 metadata/md5-cache/app-misc/no-more-secrets-0.3.3
 2205170654 metadata/md5-cache/app-misc/no-more-secrets-9999
 2205170654 metadata/md5-cache/app-misc/nut-20.1
@@ -34257,7 +34237,6 @@
 2206170240 metadata/md5-cache/app-misc/reptyr-0.9.0
 2206201110 metadata/md5-cache/app-misc/broot-1.13.2
 2206210440 metadata/md5-cache/app-misc/lcd4linux-0.11.0_pre20170527-r7
-2206221910 metadata/md5-cache/app-misc/Manifest.gz
 2206221910 metadata/md5-cache/app-misc/anki-2.1.15-r1
 2206221910 metadata/md5-cache/app-misc/binclock-1.5
 2206221910 metadata/md5-cache/app-misc/boxes-1.1.2-r3
@@ -34299,6 +34278,10 @@
 2206220743 metadata/md5-cache/app-misc/vcontrold-0.98.10
 2206221910 metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
 2206221910 metadata/md5-cache/app-misc/zygrib-8.0.1-r2
+2206250010 metadata/md5-cache/app-misc/Manifest.gz
+2206240710 metadata/md5-cache/app-misc/nnn-4.5
+2206241110 metadata/md5-cache/app-misc/pdfpc-4.5.0-r1
+2206250010 metadata/md5-cache/app-misc/scrub-2.6.1
 2110242009 metadata/md5-cache/app-mobilephone/anyremote-6.5
 1805222109 metadata/md5-cache/app-mobilephone/scmxx-0.9.0
 2203031839 metadata/md5-cache/app-mobilephone/dfu-util-0.11
@@ -34345,7 +34328,6 @@
 2206112110 metadata/md5-cache/app-office/wps-office-11.1.0.11664
 2206141040 metadata/md5-cache/app-office/libreoffice-bin-debug-7.3.3.2-r3
 2206141640 metadata/md5-cache/app-office/libreoffice-l10n-7.3.3.2
-2206221910 metadata/md5-cache/app-office/Manifest.gz
 2206221910 metadata/md5-cache/app-office/abiword-docs-3.0.2
 2206220743 metadata/md5-cache/app-office/calligra-3.2.1-r5
 2206220743 metadata/md5-cache/app-office/calligraplan-3.3.0
@@ -34356,7 +34338,6 @@
 2206220743 metadata/md5-cache/app-office/gnucash-4.4
 2206220743 metadata/md5-cache/app-office/gnucash-4.5
 2206220743 metadata/md5-cache/app-office/gnucash-4.8
-2206220743 metadata/md5-cache/app-office/kalendar-22.04.2
 2206220743 metadata/md5-cache/app-office/kexi-3.2.0-r3
 2206220743 metadata/md5-cache/app-office/kmymoney-5.1.2-r1
 2206220743 metadata/md5-cache/app-office/kraft-0.95
@@ -34380,6 +34361,8 @@
 2206221910 metadata/md5-cache/app-office/texstudio-4.2.2
 2206221910 metadata/md5-cache/app-office/texstudio-9999
 2206221910 metadata/md5-cache/app-office/upwork-5.4.5.1-r1
+2206240810 metadata/md5-cache/app-office/Manifest.gz
+2206240810 metadata/md5-cache/app-office/kalendar-22.04.2
 2204011845 metadata/md5-cache/app-officeext/Manifest.gz
 2204011845 metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
 2204011845 metadata/md5-cache/app-officeext/ct2n-1.5.0
@@ -34468,10 +34451,6 @@
 2206121142 metadata/md5-cache/app-portage/gentoolkit-9999
 2206121142 metadata/md5-cache/app-portage/gentoopm-0.4
 2206121142 metadata/md5-cache/app-portage/gentoopm-9999
-2206121142 metadata/md5-cache/app-portage/gpyutils-0.6.1
-2206121142 metadata/md5-cache/app-portage/gpyutils-0.7.1
-2206121142 metadata/md5-cache/app-portage/gpyutils-0.8.1
-2206121142 metadata/md5-cache/app-portage/gpyutils-0.8.2
 2206121142 metadata/md5-cache/app-portage/grs-0.7
 2206121142 metadata/md5-cache/app-portage/grs-9999
 2206121142 metadata/md5-cache/app-portage/gs-elpa-0.2.1
@@ -34507,7 +34486,6 @@
 2206121142 metadata/md5-cache/app-portage/tatt-9999
 2206160910 metadata/md5-cache/app-portage/portage-utils-0.94.1
 2206192340 metadata/md5-cache/app-portage/iwdevtools-9999
-2206221910 metadata/md5-cache/app-portage/Manifest.gz
 2206221910 metadata/md5-cache/app-portage/elogviewer-3.2
 2206221910 metadata/md5-cache/app-portage/fquery-0.2.3-r1
 2206221910 metadata/md5-cache/app-portage/golop-9999
@@ -34516,6 +34494,10 @@
 2206221040 metadata/md5-cache/app-portage/java-ebuilder-9999
 2206220743 metadata/md5-cache/app-portage/kuroo-1.2.1
 2206220743 metadata/md5-cache/app-portage/kuroo-9999
+2206251440 metadata/md5-cache/app-portage/Manifest.gz
+2206251140 metadata/md5-cache/app-portage/gpyutils-0.8.2
+2206241010 metadata/md5-cache/app-portage/iwdevtools-0.11.0
+2206232340 metadata/md5-cache/app-portage/mirrorselect-2.3.0
 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
@@ -34570,7 +34552,6 @@
 2205170654 metadata/md5-cache/app-shells/starship-1.3.0
 2205170654 metadata/md5-cache/app-shells/starship-1.4.2
 2205171010 metadata/md5-cache/app-shells/starship-1.5.4
-2205200440 metadata/md5-cache/app-shells/starship-1.6.3
 2205170654 metadata/md5-cache/app-shells/tcsh-6.22.04-r1
 2205170654 metadata/md5-cache/app-shells/tcsh-6.23.02
 2205170654 metadata/md5-cache/app-shells/tcsh-6.24.00
@@ -34610,12 +34591,13 @@
 2206172340 metadata/md5-cache/app-shells/bash-9999
 2206190110 metadata/md5-cache/app-shells/nushell-0.64.0
 2206192210 metadata/md5-cache/app-shells/gentoo-bashcomp-20190211-r1
-2206221910 metadata/md5-cache/app-shells/Manifest.gz
 2206220743 metadata/md5-cache/app-shells/fish-3.4.0
 2206220743 metadata/md5-cache/app-shells/fish-3.4.1
 2206220743 metadata/md5-cache/app-shells/fish-9999
 2206220110 metadata/md5-cache/app-shells/pwsh-bin-7.2.5
 2206221910 metadata/md5-cache/app-shells/tcsh-6.22.02-r1
+2206241140 metadata/md5-cache/app-shells/Manifest.gz
+2206241140 metadata/md5-cache/app-shells/starship-1.6.3
 2101061709 metadata/md5-cache/app-text/antixls-0.3b
 2111090809 metadata/md5-cache/app-text/bibclean-3.06
 2108250539 metadata/md5-cache/app-text/catdoc-0.95-r1
@@ -34706,7 +34688,6 @@
 2204291110 metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r3
 2204291110 metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r3
 2204291110 metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r2
-2204291110 metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r2
 2204291110 metadata/md5-cache/app-text/sgml-common-0.6.3-r7
 2205011048 metadata/md5-cache/app-text/chasen-2.4.5
 2205011048 metadata/md5-cache/app-text/grutatxt-2.200.0
@@ -34956,9 +34937,7 @@
 2206202310 metadata/md5-cache/app-text/html2text-2.1.1
 2206202310 metadata/md5-cache/app-text/html2text-9999
 2206211940 metadata/md5-cache/app-text/libepubgen-0.1.1-r1
-2206211940 metadata/md5-cache/app-text/psutils-1.17-r4
 2206211940 metadata/md5-cache/app-text/wv-1.2.9-r3
-2206230840 metadata/md5-cache/app-text/Manifest.gz
 2206221910 metadata/md5-cache/app-text/a2ps-4.14-r6
 2206221910 metadata/md5-cache/app-text/ansifilter-2.18
 2206221910 metadata/md5-cache/app-text/apvlv-0.1.5-r2
@@ -35056,6 +35035,9 @@
 2206221910 metadata/md5-cache/app-text/xpdf-4.04
 2206220040 metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.8-r2
 2206221910 metadata/md5-cache/app-text/zotero-bin-6.0.8
+2206240010 metadata/md5-cache/app-text/Manifest.gz
+2206232340 metadata/md5-cache/app-text/docbook-xsl-stylesheets-1.79.1-r3
+2206240010 metadata/md5-cache/app-text/psutils-1.17-r5
 2203240726 metadata/md5-cache/app-vim/vim-spell-cs-20061021-r1
 2203240726 metadata/md5-cache/app-vim/vim-spell-da-20060116-r1
 2203240726 metadata/md5-cache/app-vim/vim-spell-de-20080213-r1
@@ -35269,9 +35251,9 @@
 2206121142 metadata/md5-cache/app-vim/iris-1.0.0
 2206121142 metadata/md5-cache/app-vim/pyclewn-2.1-r2
 2206121142 metadata/md5-cache/app-vim/pydiction-1.2.3-r2
-2206221440 metadata/md5-cache/app-vim/Manifest.gz
 2206221440 metadata/md5-cache/app-vim/jedi-0.11.0
-2206221440 metadata/md5-cache/app-vim/vspec-1.9.2
+2206250010 metadata/md5-cache/app-vim/Manifest.gz
+2206250010 metadata/md5-cache/app-vim/vspec-1.9.2
 2203240726 metadata/md5-cache/app-xemacs/apel-1.36
 2203240726 metadata/md5-cache/app-xemacs/debug-1.20
 2203240726 metadata/md5-cache/app-xemacs/ecb-1.25
@@ -35746,7 +35728,6 @@
 2206181840 metadata/md5-cache/dev-db/pgxnclient-1.3.2
 2206190140 metadata/md5-cache/dev-db/rqlite-7.5.1
 2206212010 metadata/md5-cache/dev-db/phpmyadmin-5.1.1
-2206221910 metadata/md5-cache/dev-db/Manifest.gz
 2206221040 metadata/md5-cache/dev-db/apgdiff-2.7.0
 2206220743 metadata/md5-cache/dev-db/cpp-driver-2.11.0
 2206221040 metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r3
@@ -35805,7 +35786,6 @@
 2206220743 metadata/md5-cache/dev-db/qt5-sqlcipher-1.0.11-r1
 2206221040 metadata/md5-cache/dev-db/sqlcl-bin-22.1.1.131.0820
 2206221910 metadata/md5-cache/dev-db/sqldeveloper-21.4.3.063.0100
-2206221910 metadata/md5-cache/dev-db/sqldeveloper-4.2.0.17.089.1709
 2206220743 metadata/md5-cache/dev-db/sqlitebrowser-3.12.1
 2206220743 metadata/md5-cache/dev-db/sqlitebrowser-3.12.2
 2206220743 metadata/md5-cache/dev-db/sqlitebrowser-9999
@@ -35818,6 +35798,7 @@
 2206220743 metadata/md5-cache/dev-db/timescaledb-2.7.0
 2206221910 metadata/md5-cache/dev-db/tora-3.2-r1
 2206221910 metadata/md5-cache/dev-db/tora-9999
+2206241610 metadata/md5-cache/dev-db/Manifest.gz
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2205062310 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.407-r1
@@ -35890,11 +35871,9 @@
 2206121142 metadata/md5-cache/dev-embedded/esptool-3.3.1
 2206121142 metadata/md5-cache/dev-embedded/esptool-4.1
 2206121142 metadata/md5-cache/dev-embedded/nodemcu-uploader-1.0.0
-2206121142 metadata/md5-cache/dev-embedded/platformio-5.2.5-r1
 2206121142 metadata/md5-cache/dev-embedded/rpi-eeprom-13.3_p1-r1
 2206121142 metadata/md5-cache/dev-embedded/rpi-eeprom-13.8_p1
 2206161940 metadata/md5-cache/dev-embedded/libftd2xx-1.4.8
-2206221910 metadata/md5-cache/dev-embedded/Manifest.gz
 2206221910 metadata/md5-cache/dev-embedded/arduino-1.8.13
 2206221910 metadata/md5-cache/dev-embedded/arduino-1.8.19
 2206221910 metadata/md5-cache/dev-embedded/arduino-1.8.7
@@ -35908,6 +35887,9 @@
 2206220743 metadata/md5-cache/dev-embedded/stlink-1.7.0
 2206220743 metadata/md5-cache/dev-embedded/stlink-9999
 2206220743 metadata/md5-cache/dev-embedded/usbprog-0.3.0_p20140828-r1
+2206250610 metadata/md5-cache/dev-embedded/Manifest.gz
+2206250540 metadata/md5-cache/dev-embedded/platformio-5.2.5-r2
+2206250610 metadata/md5-cache/dev-embedded/platformio-6.0.2
 2206101310 metadata/md5-cache/dev-erlang/Manifest.gz
 2206101310 metadata/md5-cache/dev-erlang/base64url-1.0.1
 2206101310 metadata/md5-cache/dev-erlang/cache_tab-1.0.29
@@ -36902,7 +36884,6 @@
 2206101310 metadata/md5-cache/dev-java/openjdk-jre-bin-8.332_p09
 2206131210 metadata/md5-cache/dev-java/mill-bin-0.10.4
 2206190840 metadata/md5-cache/dev-java/openjdk-bin-17.0.3_p7
-2206231010 metadata/md5-cache/dev-java/Manifest.gz
 2206221040 metadata/md5-cache/dev-java/angus-activation-1.0.0
 2206221040 metadata/md5-cache/dev-java/animal-sniffer-annotations-1.15-r1
 2206221040 metadata/md5-cache/dev-java/ant-antlr-1.10.9
@@ -37056,18 +37037,12 @@
 2206221040 metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r2
 2206221040 metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7-r1
 2206221040 metadata/md5-cache/dev-java/jackson-annotations-2.13.2-r1
-2206221040 metadata/md5-cache/dev-java/jackson-annotations-2.13.3
 2206221040 metadata/md5-cache/dev-java/jackson-core-2.13.2-r1
-2206221040 metadata/md5-cache/dev-java/jackson-core-2.13.3
 2206221040 metadata/md5-cache/dev-java/jackson-databind-2.13.2.2
-2206221040 metadata/md5-cache/dev-java/jackson-databind-2.13.3
 2206221040 metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.2-r1
-2206221040 metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.3
 2206221040 metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.3-r1
 2206221040 metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.2-r1
-2206221040 metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.3
 2206221040 metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.2-r1
-2206221040 metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3
 2206221040 metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3-r1
 2206221040 metadata/md5-cache/dev-java/jacl-1.4.1-r2
 2206221040 metadata/md5-cache/dev-java/jai-imageio-core-1.4.0
@@ -37085,7 +37060,6 @@
 2206221040 metadata/md5-cache/dev-java/jakarta-xml-soap-api-1.4.2-r1
 2206221040 metadata/md5-cache/dev-java/jakartaee-migration-1.0.0
 2206221040 metadata/md5-cache/dev-java/jal-20031117-r6
-2206221040 metadata/md5-cache/dev-java/janino-3.1.6
 2206231010 metadata/md5-cache/dev-java/janino-3.1.7
 2206221040 metadata/md5-cache/dev-java/jansi-1.13
 2206221040 metadata/md5-cache/dev-java/jansi-2.4.0-r1
@@ -37307,6 +37281,13 @@
 2206221040 metadata/md5-cache/dev-java/xsdlib-20090415-r1
 2206221040 metadata/md5-cache/dev-java/xz-java-1.9
 2206221040 metadata/md5-cache/dev-java/zstd-jni-1.5.0.4
+2206241140 metadata/md5-cache/dev-java/Manifest.gz
+2206241140 metadata/md5-cache/dev-java/jackson-annotations-2.13.3
+2206241140 metadata/md5-cache/dev-java/jackson-core-2.13.3
+2206241140 metadata/md5-cache/dev-java/jackson-databind-2.13.3
+2206241140 metadata/md5-cache/dev-java/jackson-dataformat-xml-2.13.3
+2206241140 metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.13.3
+2206241140 metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3
 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
@@ -37426,13 +37407,9 @@
 2205170654 metadata/md5-cache/dev-lang/vala-0.50.10
 2205170654 metadata/md5-cache/dev-lang/vala-0.52.10
 2205170654 metadata/md5-cache/dev-lang/yasm-1.3.0-r1
-2205220940 metadata/md5-cache/dev-lang/execline-2.8.3.0
 2205221940 metadata/md5-cache/dev-lang/mercury-extras-22.01.1
 2205202040 metadata/md5-cache/dev-lang/whitespace-0.4
-2205241040 metadata/md5-cache/dev-lang/ammonite-repl-bin-2.5.3
-2205241040 metadata/md5-cache/dev-lang/ammonite-repl-bin-2.5.4
 2205251240 metadata/md5-cache/dev-lang/elixir-1.13.3
-2205242310 metadata/md5-cache/dev-lang/rust-bin-1.61.0
 2205271010 metadata/md5-cache/dev-lang/elixir-1.13.4
 2205311810 metadata/md5-cache/dev-lang/rust-bin-1.59.0
 2205311240 metadata/md5-cache/dev-lang/vala-0.54.7
@@ -37455,7 +37432,6 @@
 2206071015 metadata/md5-cache/dev-lang/python-exec-conf-2.4.6
 2206071015 metadata/md5-cache/dev-lang/qu-prolog-10.6
 2206071015 metadata/md5-cache/dev-lang/rust-1.59.0
-2206071015 metadata/md5-cache/dev-lang/rust-1.61.0-r1
 2206071015 metadata/md5-cache/dev-lang/spidermonkey-68.12.0-r1
 2206071015 metadata/md5-cache/dev-lang/spidermonkey-78.15.0
 2206071015 metadata/md5-cache/dev-lang/spidermonkey-91.10.0
@@ -37467,7 +37443,6 @@
 2206121142 metadata/md5-cache/dev-lang/jsonnet-0.16.0
 2206121142 metadata/md5-cache/dev-lang/jsonnet-0.16.0-r2
 2206121142 metadata/md5-cache/dev-lang/jsonnet-0.17.0-r1
-2206091110 metadata/md5-cache/dev-lang/perl-5.34.1-r3
 2206100840 metadata/md5-cache/dev-lang/python-exec-2.4.9
 2206101010 metadata/md5-cache/dev-lang/rust-1.60.0
 2206101010 metadata/md5-cache/dev-lang/rust-bin-1.60.0
@@ -37475,18 +37450,15 @@
 2206121540 metadata/md5-cache/dev-lang/gnat-gpl-2020
 2206121540 metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
 2206121540 metadata/md5-cache/dev-lang/gnat-gpl-2021-r3
-2206161940 metadata/md5-cache/dev-lang/gforth-0.7.3-r2
 2206161940 metadata/md5-cache/dev-lang/mlton-20180207
 2206161940 metadata/md5-cache/dev-lang/teyjus-2.1
 2206161940 metadata/md5-cache/dev-lang/teyjus-2.1-r1
 2206180040 metadata/md5-cache/dev-lang/python-3.11.0_beta3
-2206180210 metadata/md5-cache/dev-lang/python-3.9.13
 2206191140 metadata/md5-cache/dev-lang/R-4.2.0
 2206181840 metadata/md5-cache/dev-lang/hy-0.20.0
 2206202010 metadata/md5-cache/dev-lang/luajit-2.1.0_beta3_p20220127-r2
 2206202040 metadata/md5-cache/dev-lang/luajit-2.1.0_beta3_p20220613
 2206211710 metadata/md5-cache/dev-lang/moarvm-2022.06
-2206230910 metadata/md5-cache/dev-lang/Manifest.gz
 2206221910 metadata/md5-cache/dev-lang/clipsjni-6.40-r1
 2206221040 metadata/md5-cache/dev-lang/clojure-1.10.3
 2206221040 metadata/md5-cache/dev-lang/closure-compiler-bin-20211107
@@ -37528,7 +37500,6 @@
 2206221910 metadata/md5-cache/dev-lang/pico8-0.2.4c
 2206221910 metadata/md5-cache/dev-lang/polyml-5.8
 2206221910 metadata/md5-cache/dev-lang/polyml-5.8.2
-2206222210 metadata/md5-cache/dev-lang/python-3.10.5
 2206221510 metadata/md5-cache/dev-lang/python-3.8.13_p2
 2206221040 metadata/md5-cache/dev-lang/rakudo-2021.06
 2206221040 metadata/md5-cache/dev-lang/rakudo-2021.08
@@ -37552,6 +37523,16 @@
 2206220743 metadata/md5-cache/dev-lang/yap-7.1.0
 2206220743 metadata/md5-cache/dev-lang/zig-0.9.1
 2206220743 metadata/md5-cache/dev-lang/zig-9999
+2206251010 metadata/md5-cache/dev-lang/Manifest.gz
+2206242340 metadata/md5-cache/dev-lang/ammonite-repl-bin-2.5.4
+2206250910 metadata/md5-cache/dev-lang/execline-2.8.3.0-r1
+2206250910 metadata/md5-cache/dev-lang/execline-2.9.0.0
+2206232310 metadata/md5-cache/dev-lang/gforth-0.7.3-r2
+2206241240 metadata/md5-cache/dev-lang/perl-5.34.1-r3
+2206241010 metadata/md5-cache/dev-lang/python-3.10.5
+2206251010 metadata/md5-cache/dev-lang/python-3.9.13
+2206250910 metadata/md5-cache/dev-lang/rust-1.61.0-r1
+2206250840 metadata/md5-cache/dev-lang/rust-bin-1.61.0
 2108220339 metadata/md5-cache/dev-libs/argtable-2.13-r1
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 2007042139 metadata/md5-cache/dev-libs/bemenu-0.5.0
@@ -37617,7 +37598,6 @@
 2202021039 metadata/md5-cache/dev-libs/libburn-1.5.4
 2202021039 metadata/md5-cache/dev-libs/libisoburn-1.5.4
 2202021039 metadata/md5-cache/dev-libs/libisofs-1.5.4
-2202080810 metadata/md5-cache/dev-libs/qqwing-1.3.4
 2202100210 metadata/md5-cache/dev-libs/libuninum-2.7-r1
 2202100210 metadata/md5-cache/dev-libs/luise-0.1.1-r2
 2202140039 metadata/md5-cache/dev-libs/faxpp-0.4-r2
@@ -37682,14 +37662,12 @@
 2205170654 metadata/md5-cache/dev-libs/eb-4.4.1-r1
 2205170654 metadata/md5-cache/dev-libs/elfutils-0.185
 2205170654 metadata/md5-cache/dev-libs/elfutils-0.186
-2205170654 metadata/md5-cache/dev-libs/elfutils-0.187
 2205170654 metadata/md5-cache/dev-libs/ell-0.49
 2205170654 metadata/md5-cache/dev-libs/ell-9999
 2205170654 metadata/md5-cache/dev-libs/eventlog-0.2.12
 2205170654 metadata/md5-cache/dev-libs/expat-2.4.6
 2205170654 metadata/md5-cache/dev-libs/expat-2.4.7
 2205170654 metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
-2205170654 metadata/md5-cache/dev-libs/ffcall-2.4
 2205170654 metadata/md5-cache/dev-libs/foma-0.9.18-r1
 2205170654 metadata/md5-cache/dev-libs/fstrm-0.6.1
 2205170654 metadata/md5-cache/dev-libs/gdl-3.40.0
@@ -38025,9 +38003,7 @@
 2206071015 metadata/md5-cache/dev-libs/girara-0.3.7
 2206071015 metadata/md5-cache/dev-libs/girara-9999
 2206071015 metadata/md5-cache/dev-libs/gjs-1.64.5
-2206071015 metadata/md5-cache/dev-libs/gjs-1.72.0
 2206071015 metadata/md5-cache/dev-libs/glib-2.72.1
-2206071015 metadata/md5-cache/dev-libs/glib-2.72.2
 2206071015 metadata/md5-cache/dev-libs/granite-5.2.5-r1
 2206071015 metadata/md5-cache/dev-libs/granite-6.0.0
 2206071015 metadata/md5-cache/dev-libs/granite-6.2.0
@@ -38107,7 +38083,6 @@
 2206071015 metadata/md5-cache/dev-libs/wayland-protocols-1.25
 2206071015 metadata/md5-cache/dev-libs/wayland-protocols-9999
 2206071015 metadata/md5-cache/dev-libs/weston-10.0.0
-2206071015 metadata/md5-cache/dev-libs/weston-9999
 2206121142 metadata/md5-cache/dev-libs/Ice-3.6.5-r2
 2206121142 metadata/md5-cache/dev-libs/boost-1.78.0-r2
 2206121142 metadata/md5-cache/dev-libs/botan-2.19.1
@@ -38117,7 +38092,6 @@
 2206090740 metadata/md5-cache/dev-libs/ell-0.51
 2206121142 metadata/md5-cache/dev-libs/gom-0.4
 2206090740 metadata/md5-cache/dev-libs/libaio-0.3.113
-2206121142 metadata/md5-cache/dev-libs/libbytesize-2.5
 2206121142 metadata/md5-cache/dev-libs/libbytesize-2.6
 2206121142 metadata/md5-cache/dev-libs/libbytesize-2.7
 2206121142 metadata/md5-cache/dev-libs/libdnet-1.14-r2
@@ -38140,7 +38114,6 @@
 2206121142 metadata/md5-cache/dev-libs/libxml2-2.9.14-r1
 2206121142 metadata/md5-cache/dev-libs/libxslt-9999
 2206121142 metadata/md5-cache/dev-libs/link-grammar-5.10.4
-2206121142 metadata/md5-cache/dev-libs/marisa-0.2.5
 2206121142 metadata/md5-cache/dev-libs/marisa-9999
 2206121142 metadata/md5-cache/dev-libs/newt-0.52.21-r1
 2206121142 metadata/md5-cache/dev-libs/newt-0.52.21_p20210816
@@ -38168,7 +38141,6 @@
 2206170210 metadata/md5-cache/dev-libs/libltdl-2.4.7
 2206170210 metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r4
 2206170210 metadata/md5-cache/dev-libs/libtraceevent-1.5.2-r1
-2206171110 metadata/md5-cache/dev-libs/nspr-4.34
 2206171110 metadata/md5-cache/dev-libs/nss-3.79-r1
 2206171010 metadata/md5-cache/dev-libs/tre-0.8.0_p20210321-r1
 2206181910 metadata/md5-cache/dev-libs/boost-1.79.0
@@ -38192,7 +38164,6 @@
 2206220743 metadata/md5-cache/dev-libs/FBGEMM-2022.01.13
 2206220743 metadata/md5-cache/dev-libs/FP16-2021.03.20-r2
 2206220743 metadata/md5-cache/dev-libs/FXdiv-2020.12.09
-2206230840 metadata/md5-cache/dev-libs/Manifest.gz
 2206221040 metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r2
 2206221040 metadata/md5-cache/dev-libs/OpenNI-9999
 2206221040 metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2-r1
@@ -38259,15 +38230,9 @@
 2206220743 metadata/md5-cache/dev-libs/imath-3.1.4-r3
 2206220743 metadata/md5-cache/dev-libs/imath-3.1.4-r4
 2206220743 metadata/md5-cache/dev-libs/imath-3.1.5
-2206220743 metadata/md5-cache/dev-libs/intel-compute-runtime-22.17.23034-r1
-2206220743 metadata/md5-cache/dev-libs/intel-compute-runtime-22.18.23063-r1
-2206220743 metadata/md5-cache/dev-libs/intel-compute-runtime-22.19.23136-r1
-2206220743 metadata/md5-cache/dev-libs/intel-compute-runtime-22.20.23198
 2206220743 metadata/md5-cache/dev-libs/intel-compute-runtime-22.21.23269
 2206220743 metadata/md5-cache/dev-libs/intel-compute-runtime-22.22.23355
 2206220743 metadata/md5-cache/dev-libs/intel-compute-runtime-22.23.23405
-2206220743 metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20211123-r1
-2206220743 metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20220512
 2206220743 metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.1.0-r1
 2206220743 metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.2.0-r1
 2206220743 metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.3.0-r1
@@ -38295,7 +38260,6 @@
 2206220743 metadata/md5-cache/dev-libs/leatherman-1.12.7
 2206220743 metadata/md5-cache/dev-libs/level-zero-1.7.15
 2206220743 metadata/md5-cache/dev-libs/level-zero-1.8.0
-2206220743 metadata/md5-cache/dev-libs/level-zero-1.8.1
 2206220743 metadata/md5-cache/dev-libs/leveldb-1.23-r3
 2206220743 metadata/md5-cache/dev-libs/libansilove-1.2.9
 2206220743 metadata/md5-cache/dev-libs/libansilove-1.3.0
@@ -38409,7 +38373,6 @@
 2206220743 metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.7.0
 2206220743 metadata/md5-cache/dev-libs/pocl-1.8-r2
 2206220743 metadata/md5-cache/dev-libs/poco-1.10.1
-2206220743 metadata/md5-cache/dev-libs/poco-1.11.2
 2206220743 metadata/md5-cache/dev-libs/psimd-2020.05.17
 2206221910 metadata/md5-cache/dev-libs/pslib-0.4.5
 2206220743 metadata/md5-cache/dev-libs/pthreadpool-2022.05.09
@@ -38500,7 +38463,6 @@
 2206220743 metadata/md5-cache/dev-libs/teakra-20220224
 2206220743 metadata/md5-cache/dev-libs/thrift-0.16.0-r1
 2206220743 metadata/md5-cache/dev-libs/tinyxml2-9.0.0
-2206220743 metadata/md5-cache/dev-libs/tlsh-4.8.2
 2206230840 metadata/md5-cache/dev-libs/udis86-1.7.2-r1
 2206220743 metadata/md5-cache/dev-libs/unittest++-2.0.0-r2
 2206220743 metadata/md5-cache/dev-libs/urdfdom-1.0.4-r1
@@ -38524,6 +38486,25 @@
 2206220743 metadata/md5-cache/dev-libs/yajl-2.1.0-r3
 2206220743 metadata/md5-cache/dev-libs/zziplib-0.13.72
 2206220743 metadata/md5-cache/dev-libs/zziplib-0.13.72-r1
+2206251840 metadata/md5-cache/dev-libs/Manifest.gz
+2206241040 metadata/md5-cache/dev-libs/elfutils-0.187
+2206232310 metadata/md5-cache/dev-libs/ffcall-2.4
+2206240810 metadata/md5-cache/dev-libs/gjs-1.72.0
+2206251140 metadata/md5-cache/dev-libs/glib-2.72.2
+2206251740 metadata/md5-cache/dev-libs/intel-compute-runtime-22.20.23198
+2206251740 metadata/md5-cache/dev-libs/intel-compute-runtime-22.24.23453
+2206251740 metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20220512
+2206251740 metadata/md5-cache/dev-libs/level-zero-1.8.1
+2206251640 metadata/md5-cache/dev-libs/libclc-14.0.6
+2206251840 metadata/md5-cache/dev-libs/nspr-4.34
+2206251240 metadata/md5-cache/dev-libs/nss-3.80
+2206231240 metadata/md5-cache/dev-libs/poco-1.11.2-r1
+2206232340 metadata/md5-cache/dev-libs/qqwing-1.3.4-r1
+2206231440 metadata/md5-cache/dev-libs/sdformat-9.8.0
+2206250910 metadata/md5-cache/dev-libs/skalibs-2.12.0.1
+2206241240 metadata/md5-cache/dev-libs/tlsh-4.8.2
+2206241240 metadata/md5-cache/dev-libs/weston-10.0.1
+2206241240 metadata/md5-cache/dev-libs/weston-9999
 2203240726 metadata/md5-cache/dev-lisp/ecls-21.2.1-r4
 2205132310 metadata/md5-cache/dev-lisp/alexandria-1.4
 2205150110 metadata/md5-cache/dev-lisp/asdf-3.3.5
@@ -38607,7 +38588,6 @@
 2201110340 metadata/md5-cache/dev-ml/batteries-3.4.0
 2201110340 metadata/md5-cache/dev-ml/calendar-2.04
 2201110340 metadata/md5-cache/dev-ml/camlpdf-2.3.1
-2201110340 metadata/md5-cache/dev-ml/easy-format-1.2.0
 2201110340 metadata/md5-cache/dev-ml/jsonm-1.0.1
 2201110340 metadata/md5-cache/dev-ml/ocaml-augeas-0.5
 2201110340 metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1-r1
@@ -39051,7 +39031,6 @@
 2206210511 metadata/md5-cache/dev-ml/opam-installer-2.1.2-r1
 2206210511 metadata/md5-cache/dev-ml/ppx_disable_unused_warnings-0.15.0-r1
 2206210511 metadata/md5-cache/dev-ml/ppx_ignore_instrumentation-0.15.0-r1
-2206220743 metadata/md5-cache/dev-ml/Manifest.gz
 2206220743 metadata/md5-cache/dev-ml/llvm-ocaml-12.0.1
 2206220743 metadata/md5-cache/dev-ml/llvm-ocaml-13.0.1
 2206220743 metadata/md5-cache/dev-ml/llvm-ocaml-14.0.1
@@ -39059,6 +39038,9 @@
 2206220743 metadata/md5-cache/dev-ml/llvm-ocaml-14.0.4
 2206220743 metadata/md5-cache/dev-ml/llvm-ocaml-14.0.5
 2206220743 metadata/md5-cache/dev-ml/llvm-ocaml-15.0.0.9999
+2206251640 metadata/md5-cache/dev-ml/Manifest.gz
+2206241640 metadata/md5-cache/dev-ml/easy-format-1.2.0
+2206251640 metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
 2205011048 metadata/md5-cache/dev-perl/Acme-Damn-0.80.0-r2
 2205011048 metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r2
 2205011048 metadata/md5-cache/dev-perl/Algorithm-C3-0.110.0
@@ -41479,7 +41461,6 @@
 2206121142 metadata/md5-cache/dev-python/blosc-1.10.6
 2206121142 metadata/md5-cache/dev-python/bluelet-0.2.0-r1
 2206121142 metadata/md5-cache/dev-python/blurb-1.1.0
-2206121142 metadata/md5-cache/dev-python/boolean-py-4.0
 2206121142 metadata/md5-cache/dev-python/booleanOperations-0.9.0-r1
 2206121142 metadata/md5-cache/dev-python/boto-2.49.0-r4
 2206121142 metadata/md5-cache/dev-python/boto3-9999
@@ -41515,12 +41496,8 @@
 2206121142 metadata/md5-cache/dev-python/charset_normalizer-2.0.12
 2206121142 metadata/md5-cache/dev-python/chart-studio-1.1.0
 2206121142 metadata/md5-cache/dev-python/check-manifest-0.48
-2206121142 metadata/md5-cache/dev-python/cheetah3-3.2.6
-2206121142 metadata/md5-cache/dev-python/cherrypy-18.6.1
 2206121142 metadata/md5-cache/dev-python/chump-1.6.0-r2
 2206121142 metadata/md5-cache/dev-python/citeproc-py-0.6.0
-2206121142 metadata/md5-cache/dev-python/cjkwrap-2.2-r1
-2206121142 metadata/md5-cache/dev-python/cjkwrap-2.2-r2
 2206121142 metadata/md5-cache/dev-python/clang-python-12.0.1
 2206121142 metadata/md5-cache/dev-python/clang-python-13.0.1
 2206121142 metadata/md5-cache/dev-python/clang-python-14.0.1
@@ -41567,8 +41544,6 @@
 2206121142 metadata/md5-cache/dev-python/cryptography-3.4.7-r3
 2206121142 metadata/md5-cache/dev-python/cryptography-37.0.2-r1
 2206121142 metadata/md5-cache/dev-python/css-parser-1.0.7-r1
-2206121142 metadata/md5-cache/dev-python/csscompressor-0.9.5
-2206121142 metadata/md5-cache/dev-python/csscompressor-0.9.5-r1
 2206121142 metadata/md5-cache/dev-python/cssutils-2.4.0
 2206121142 metadata/md5-cache/dev-python/cssutils-2.4.1
 2206121142 metadata/md5-cache/dev-python/csvkit-1.0.7
@@ -41588,8 +41563,6 @@
 2206121142 metadata/md5-cache/dev-python/dask-2022.6.0
 2206121142 metadata/md5-cache/dev-python/dbfread-2.0.7
 2206121142 metadata/md5-cache/dev-python/dbus-python-1.2.18
-2206121142 metadata/md5-cache/dev-python/ddt-1.4.4
-2206121142 metadata/md5-cache/dev-python/ddt-1.5.0
 2206121142 metadata/md5-cache/dev-python/debtcollector-2.5.0
 2206121142 metadata/md5-cache/dev-python/debugpy-1.5.1
 2206121142 metadata/md5-cache/dev-python/debugpy-1.6.0
@@ -41601,11 +41574,9 @@
 2206121142 metadata/md5-cache/dev-python/dictpath-0.1.3
 2206121142 metadata/md5-cache/dev-python/diff-match-patch-20181111
 2206121142 metadata/md5-cache/dev-python/diff-match-patch-20200713
-2206121142 metadata/md5-cache/dev-python/dirty-equals-0.4
 2206121142 metadata/md5-cache/dev-python/diskcache-5.4.0-r1
 2206121142 metadata/md5-cache/dev-python/dissononce-0.34.3-r2
 2206121142 metadata/md5-cache/dev-python/distlib-0.3.4-r1
-2206121142 metadata/md5-cache/dev-python/distro-1.7.0
 2206121142 metadata/md5-cache/dev-python/dj-database-url-0.5.0
 2206121142 metadata/md5-cache/dev-python/dj-search-url-0.1
 2206121142 metadata/md5-cache/dev-python/django-2.2.28
@@ -41633,7 +41604,6 @@
 2206121142 metadata/md5-cache/dev-python/dnspython-2.2.1
 2206121142 metadata/md5-cache/dev-python/docker-py-5.0.3
 2206121142 metadata/md5-cache/dev-python/dockerpty-0.4.1-r1
-2206121142 metadata/md5-cache/dev-python/docopt-0.6.2-r4
 2206121142 metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2-r1
 2206121142 metadata/md5-cache/dev-python/docutils-glep-1.2
 2206121142 metadata/md5-cache/dev-python/dogpile-cache-1.1.5
@@ -41671,7 +41641,6 @@
 2206121142 metadata/md5-cache/dev-python/execnet-1.9.0-r1
 2206121142 metadata/md5-cache/dev-python/executing-0.8.3
 2206121142 metadata/md5-cache/dev-python/expects-0.9.0
-2206121142 metadata/md5-cache/dev-python/extras-1.0.0-r1
 2206121142 metadata/md5-cache/dev-python/eyeD3-0.9.6
 2206121142 metadata/md5-cache/dev-python/eyeD3-0.9.6-r1
 2206121142 metadata/md5-cache/dev-python/fakeredis-1.7.1
@@ -41772,8 +41741,6 @@
 2206121142 metadata/md5-cache/dev-python/h2-3.2.0
 2206121142 metadata/md5-cache/dev-python/h2-3.2.0-r1
 2206121142 metadata/md5-cache/dev-python/h2-4.1.0-r1
-2206121142 metadata/md5-cache/dev-python/h5py-3.6.0
-2206121142 metadata/md5-cache/dev-python/h5py-3.7.0
 2206121142 metadata/md5-cache/dev-python/hcloud-python-1.16.0
 2206121142 metadata/md5-cache/dev-python/helpdev-0.7.1
 2206121142 metadata/md5-cache/dev-python/hiredis-2.0.0-r2
@@ -41786,9 +41753,7 @@
 2206121142 metadata/md5-cache/dev-python/http-parser-0.9.0
 2206121142 metadata/md5-cache/dev-python/httpauth-0.3-r1
 2206121142 metadata/md5-cache/dev-python/httpbin-0.7.0-r5
-2206121142 metadata/md5-cache/dev-python/httpcore-0.14.7-r1
 2206121142 metadata/md5-cache/dev-python/httplib2-0.20.4
-2206121142 metadata/md5-cache/dev-python/httpx-0.22.0-r3
 2206121142 metadata/md5-cache/dev-python/humanfriendly-10.0
 2206121142 metadata/md5-cache/dev-python/hvac-0.11.2
 2206121142 metadata/md5-cache/dev-python/hyperframe-5.2.0
@@ -41803,9 +41768,6 @@
 2206121142 metadata/md5-cache/dev-python/ijson-3.1.4
 2206121142 metadata/md5-cache/dev-python/imageio-2.19.3
 2206121142 metadata/md5-cache/dev-python/imapclient-2.2.0
-2206121142 metadata/md5-cache/dev-python/immutables-0.17
-2206121142 metadata/md5-cache/dev-python/importlib_metadata-4.11.3
-2206121142 metadata/md5-cache/dev-python/importlib_metadata-4.11.4
 2206121142 metadata/md5-cache/dev-python/importlib_resources-5.7.1
 2206121142 metadata/md5-cache/dev-python/imread-0.7.3-r1
 2206121142 metadata/md5-cache/dev-python/incremental-21.3.0-r1
@@ -41891,16 +41853,10 @@
 2206121142 metadata/md5-cache/dev-python/jupyterlab_pygments-0.2.2
 2206121142 metadata/md5-cache/dev-python/jupyterlab_server-2.14.0
 2206121142 metadata/md5-cache/dev-python/kafka-python-2.0.2
-2206121142 metadata/md5-cache/dev-python/kaptan-0.5.12-r1
-2206121142 metadata/md5-cache/dev-python/kaptan-0.5.12-r2
 2206121142 metadata/md5-cache/dev-python/kazoo-2.8.0
 2206121142 metadata/md5-cache/dev-python/kconfiglib-14.1.0-r1
-2206121142 metadata/md5-cache/dev-python/keyring-23.5.0
-2206121142 metadata/md5-cache/dev-python/keyring-23.5.1
-2206121142 metadata/md5-cache/dev-python/keyring-23.6.0
 2206121142 metadata/md5-cache/dev-python/keystoneauth-4.5.0
 2206121142 metadata/md5-cache/dev-python/keystoneauth-4.6.0
-2206121142 metadata/md5-cache/dev-python/kgb-7.0-r1
 2206121142 metadata/md5-cache/dev-python/klein-21.8.0
 2206121142 metadata/md5-cache/dev-python/kombu-5.2.4
 2206121142 metadata/md5-cache/dev-python/krb5-0.3.0
@@ -41928,7 +41884,6 @@
 2206121142 metadata/md5-cache/dev-python/libvirt-python-8.3.0
 2206121142 metadata/md5-cache/dev-python/libvirt-python-8.4.0
 2206121142 metadata/md5-cache/dev-python/libvirt-python-9999
-2206121142 metadata/md5-cache/dev-python/license-expression-30.0.0
 2206121142 metadata/md5-cache/dev-python/lit-12.0.1
 2206121142 metadata/md5-cache/dev-python/lit-13.0.1
 2206121142 metadata/md5-cache/dev-python/lit-14.0.1
@@ -41954,14 +41909,10 @@
 2206121142 metadata/md5-cache/dev-python/lunr-0.6.2
 2206121142 metadata/md5-cache/dev-python/lxml-4.8.0-r1
 2206121142 metadata/md5-cache/dev-python/lxml-4.9.0-r1
-2206121142 metadata/md5-cache/dev-python/lz4-4.0.0
 2206121142 metadata/md5-cache/dev-python/m2crypto-0.38.0
-2206121142 metadata/md5-cache/dev-python/m2r-0.2.1
 2206121142 metadata/md5-cache/dev-python/makefun-1.13.1
 2206121142 metadata/md5-cache/dev-python/mako-1.2.0
-2206121142 metadata/md5-cache/dev-python/mamba-0.11.2
 2206121142 metadata/md5-cache/dev-python/mapbox_earcut-1.0.0
-2206121142 metadata/md5-cache/dev-python/markdown-it-py-2.1.0
 2206121142 metadata/md5-cache/dev-python/markups-3.1.3
 2206121142 metadata/md5-cache/dev-python/markupsafe-1.1.1-r1
 2206121142 metadata/md5-cache/dev-python/markupsafe-2.1.1
@@ -41969,10 +41920,6 @@
 2206121142 metadata/md5-cache/dev-python/matplotlib-inline-0.1.3-r1
 2206121142 metadata/md5-cache/dev-python/matterhook-0.2-r2
 2206121142 metadata/md5-cache/dev-python/mccabe-0.6.1-r2
-2206121142 metadata/md5-cache/dev-python/mdit-py-plugins-0.3.0
-2206121142 metadata/md5-cache/dev-python/mdurl-0.1.1
-2206121142 metadata/md5-cache/dev-python/mdx_gh_links-0.2
-2206121142 metadata/md5-cache/dev-python/mdx_gh_links-0.2-r1
 2206121142 metadata/md5-cache/dev-python/mecab-python-0.996-r1
 2206121142 metadata/md5-cache/dev-python/mechanize-0.4.8
 2206121142 metadata/md5-cache/dev-python/memory_profiler-0.60
@@ -41990,25 +41937,12 @@
 2206121142 metadata/md5-cache/dev-python/miniupnpc-2.2.3
 2206121142 metadata/md5-cache/dev-python/misaka-2.1.1-r1
 2206121142 metadata/md5-cache/dev-python/mkautodoc-0.1.0-r1
-2206121142 metadata/md5-cache/dev-python/mkdocs-1.3.0
-2206121142 metadata/md5-cache/dev-python/mkdocs-1.3.0-r1
-2206121142 metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1-r1
-2206121142 metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1-r2
-2206121142 metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1-r1
-2206121142 metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1-r2
-2206121142 metadata/md5-cache/dev-python/mkdocs-git-authors-plugin-0.6.2
 2206121142 metadata/md5-cache/dev-python/mkdocs-git-authors-plugin-0.6.3
 2206121142 metadata/md5-cache/dev-python/mkdocs-git-authors-plugin-0.6.4
 2206121142 metadata/md5-cache/dev-python/mkdocs-i18n-0.4.4
-2206121142 metadata/md5-cache/dev-python/mkdocs-material-8.2.15
-2206121142 metadata/md5-cache/dev-python/mkdocs-material-8.2.16
-2206121142 metadata/md5-cache/dev-python/mkdocs-material-8.2.8
 2206121142 metadata/md5-cache/dev-python/mkdocs-material-8.3.3
 2206121142 metadata/md5-cache/dev-python/mkdocs-material-8.3.4
 2206121142 metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.3-r1
-2206121142 metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0
-2206121142 metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0-r1
-2206121142 metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0-r2
 2206121142 metadata/md5-cache/dev-python/mkdocs-redirects-1.0.4-r1
 2206121142 metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.0.7
 2206121142 metadata/md5-cache/dev-python/mkdocs_pymdownx_material_extras-1.1.3
@@ -42018,10 +41952,6 @@
 2206121142 metadata/md5-cache/dev-python/mock-4.0.3-r1
 2206121142 metadata/md5-cache/dev-python/mongomock-4.0.0
 2206121142 metadata/md5-cache/dev-python/more-itertools-8.13.0
-2206121142 metadata/md5-cache/dev-python/moto-3.1.10
-2206121142 metadata/md5-cache/dev-python/moto-3.1.11
-2206121142 metadata/md5-cache/dev-python/moto-3.1.12
-2206121142 metadata/md5-cache/dev-python/moto-3.1.9
 2206121142 metadata/md5-cache/dev-python/mpdlcd-0.5.2-r1
 2206121142 metadata/md5-cache/dev-python/mpi4py-3.1.3
 2206121142 metadata/md5-cache/dev-python/mpmath-1.2.1
@@ -42030,8 +41960,6 @@
 2206121142 metadata/md5-cache/dev-python/multidict-6.0.2
 2206121142 metadata/md5-cache/dev-python/multipledispatch-0.6.0
 2206121142 metadata/md5-cache/dev-python/multipledispatch-0.6.0-r1
-2206121142 metadata/md5-cache/dev-python/munch-2.5.0-r1
-2206121142 metadata/md5-cache/dev-python/munch-2.5.0-r2
 2206121142 metadata/md5-cache/dev-python/mygpoclient-1.8
 2206121142 metadata/md5-cache/dev-python/mypy-0.942
 2206121142 metadata/md5-cache/dev-python/mypy-0.950
@@ -42077,7 +42005,6 @@
 2206121142 metadata/md5-cache/dev-python/ntplib-0.4.0
 2206121142 metadata/md5-cache/dev-python/nuitka-0.8.4
 2206121142 metadata/md5-cache/dev-python/numexpr-2.8.1
-2206121142 metadata/md5-cache/dev-python/numexpr-2.8.1-r1
 2206121142 metadata/md5-cache/dev-python/numpy-1.21.5
 2206121142 metadata/md5-cache/dev-python/numpy-1.22.0-r1
 2206121142 metadata/md5-cache/dev-python/numpy-1.22.1
@@ -42093,7 +42020,6 @@
 2206121142 metadata/md5-cache/dev-python/odfpy-1.4.2
 2206121142 metadata/md5-cache/dev-python/openapi-core-0.14.2
 2206121142 metadata/md5-cache/dev-python/openapi-schema-validator-0.2.3
-2206121142 metadata/md5-cache/dev-python/openapi-spec-validator-0.4.0
 2206121142 metadata/md5-cache/dev-python/openstackdocstheme-2.4.0
 2206121142 metadata/md5-cache/dev-python/openstacksdk-0.61.0-r1
 2206121142 metadata/md5-cache/dev-python/openstacksdk-0.99.0
@@ -42147,7 +42073,6 @@
 2206121142 metadata/md5-cache/dev-python/pbkdf2-1.3-r1
 2206121142 metadata/md5-cache/dev-python/pbkdf2-1.3-r2
 2206121142 metadata/md5-cache/dev-python/pdfrw-0.4_p1
-2206121142 metadata/md5-cache/dev-python/pdm-pep517-0.12.7
 2206121142 metadata/md5-cache/dev-python/pdoc3-0.10.0
 2206121142 metadata/md5-cache/dev-python/pebble-4.6.3
 2206121142 metadata/md5-cache/dev-python/pecan-1.4.1
@@ -42177,9 +42102,6 @@
 2206121142 metadata/md5-cache/dev-python/pip-run-8.8.0
 2206121142 metadata/md5-cache/dev-python/pipenv-2022.6.7
 2206121142 metadata/md5-cache/dev-python/pkgconfig-1.5.5-r1
-2206121142 metadata/md5-cache/dev-python/pkginfo-1.8.2
-2206121142 metadata/md5-cache/dev-python/pkginfo-1.8.2-r1
-2206121142 metadata/md5-cache/dev-python/pkginfo-1.8.3
 2206121142 metadata/md5-cache/dev-python/plotly-5.2.2
 2206121142 metadata/md5-cache/dev-python/plotly-5.8.2
 2206121142 metadata/md5-cache/dev-python/plotly-geo-1.0.0
@@ -42266,19 +42188,15 @@
 2206121142 metadata/md5-cache/dev-python/pycryptodome-3.14.1
 2206121142 metadata/md5-cache/dev-python/pycson-0.8-r1
 2206121142 metadata/md5-cache/dev-python/pycson-0.8-r2
-2206121142 metadata/md5-cache/dev-python/pycson-0.8-r3
 2206121142 metadata/md5-cache/dev-python/pycuda-2021.1
 2206121142 metadata/md5-cache/dev-python/pycups-2.0.1-r1
 2206121142 metadata/md5-cache/dev-python/pycurl-7.45.1
 2206121142 metadata/md5-cache/dev-python/pycurl-requests-0.2.1
 2206121142 metadata/md5-cache/dev-python/pycxx-7.1.5
-2206121142 metadata/md5-cache/dev-python/pydantic-1.9.0-r2
-2206121142 metadata/md5-cache/dev-python/pydantic-1.9.0-r4
 2206121142 metadata/md5-cache/dev-python/pydata-sphinx-theme-0.7.2
 2206121142 metadata/md5-cache/dev-python/pydbus-0.6.0
 2206121142 metadata/md5-cache/dev-python/pydecomp-0.3-r3
 2206121142 metadata/md5-cache/dev-python/pydecomp-9999
-2206121142 metadata/md5-cache/dev-python/pydiffx-1.0.1-r1
 2206121142 metadata/md5-cache/dev-python/pydispatcher-2.1.2-r1
 2206121142 metadata/md5-cache/dev-python/pydot-1.4.2-r3
 2206121142 metadata/md5-cache/dev-python/pydotplus-2.0.2-r1
@@ -42288,14 +42206,11 @@
 2206121142 metadata/md5-cache/dev-python/pyenchant-3.2.2
 2206121142 metadata/md5-cache/dev-python/pyenchant-3.2.2-r1
 2206121142 metadata/md5-cache/dev-python/pyfakefs-4.5.6
-2206121142 metadata/md5-cache/dev-python/pyfeyn-1.0.0-r2
 2206121142 metadata/md5-cache/dev-python/pyformance-0.4-r1
 2206121142 metadata/md5-cache/dev-python/pyftpdlib-1.5.6-r1
 2206121142 metadata/md5-cache/dev-python/pygal-3.0.0-r2
 2206121142 metadata/md5-cache/dev-python/pygame-2.1.2-r1
 2206121142 metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
-2206121142 metadata/md5-cache/dev-python/pygit2-1.9.1
-2206121142 metadata/md5-cache/dev-python/pygit2-1.9.2
 2206121142 metadata/md5-cache/dev-python/pygments-2.12.0-r1
 2206121142 metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
 2206121142 metadata/md5-cache/dev-python/pygobject-3.42.1
@@ -42394,7 +42309,6 @@
 2206121142 metadata/md5-cache/dev-python/pytest-codeblocks-0.16.1
 2206121142 metadata/md5-cache/dev-python/pytest-console-scripts-1.3.1
 2206121142 metadata/md5-cache/dev-python/pytest-cov-3.0.0-r1
-2206121142 metadata/md5-cache/dev-python/pytest-datadir-1.3.1-r1
 2206121142 metadata/md5-cache/dev-python/pytest-django-4.5.2
 2206121142 metadata/md5-cache/dev-python/pytest-flake8-1.1.1
 2206121142 metadata/md5-cache/dev-python/pytest-flakes-4.0.4
@@ -42404,24 +42318,18 @@
 2206121142 metadata/md5-cache/dev-python/pytest-html-3.1.1
 2206121142 metadata/md5-cache/dev-python/pytest-httpbin-1.0.2
 2206121142 metadata/md5-cache/dev-python/pytest-httpserver-1.0.4-r1
-2206121142 metadata/md5-cache/dev-python/pytest-httpx-0.20.0
 2206121142 metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
 2206121142 metadata/md5-cache/dev-python/pytest-localftpserver-1.1.3
 2206121142 metadata/md5-cache/dev-python/pytest-markdown-1.0.2
 2206121142 metadata/md5-cache/dev-python/pytest-metadata-2.0.1
 2206121142 metadata/md5-cache/dev-python/pytest-mock-3.7.0
 2206121142 metadata/md5-cache/dev-python/pytest-ordering-0.6
-2206121142 metadata/md5-cache/dev-python/pytest-param-files-0.3.4
 2206121142 metadata/md5-cache/dev-python/pytest-plus-0.2-r1
 2206121142 metadata/md5-cache/dev-python/pytest-pylint-0.18.0
 2206121142 metadata/md5-cache/dev-python/pytest-qt-4.0.2-r1
-2206121142 metadata/md5-cache/dev-python/pytest-regressions-2.3.1
 2206121142 metadata/md5-cache/dev-python/pytest-salt-2020.1.27-r3
 2206121142 metadata/md5-cache/dev-python/pytest-salt-factories-0.121.1-r1
 2206121142 metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc13
-2206121142 metadata/md5-cache/dev-python/pytest-skip-markers-1.2.0
-2206121142 metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0
-2206121142 metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r1
 2206121142 metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2-r2
 2206121142 metadata/md5-cache/dev-python/pytest-subtests-0.7.0
 2206121142 metadata/md5-cache/dev-python/pytest-subtests-0.8.0
@@ -42599,8 +42507,6 @@
 2206121142 metadata/md5-cache/dev-python/retrying-1.3.3-r1
 2206121142 metadata/md5-cache/dev-python/rfc3986-validator-0.1.1-r1
 2206121142 metadata/md5-cache/dev-python/rfc3987-1.3.8-r2
-2206121142 metadata/md5-cache/dev-python/rich-12.4.1
-2206121142 metadata/md5-cache/dev-python/rich-12.4.4
 2206121142 metadata/md5-cache/dev-python/roman-3.3
 2206121142 metadata/md5-cache/dev-python/roman-3.3-r1
 2206121142 metadata/md5-cache/dev-python/rope-1.0.0
@@ -42627,7 +42533,6 @@
 2206121142 metadata/md5-cache/dev-python/scandir-1.10.0-r2
 2206121142 metadata/md5-cache/dev-python/scikit-build-0.12.0
 2206121142 metadata/md5-cache/dev-python/scikit-build-0.14.1
-2206121142 metadata/md5-cache/dev-python/scipy-1.8.0
 2206121210 metadata/md5-cache/dev-python/scipy-1.9.9999
 2206121142 metadata/md5-cache/dev-python/scrypt-0.8.20
 2206121142 metadata/md5-cache/dev-python/seaborn-0.11.2
@@ -42642,8 +42547,6 @@
 2206121142 metadata/md5-cache/dev-python/serverfiles-0.3.1
 2206121142 metadata/md5-cache/dev-python/setproctitle-1.2.3
 2206121142 metadata/md5-cache/dev-python/setuptools-62.3.4
-2206121142 metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r1
-2206121142 metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r2
 2206121142 metadata/md5-cache/dev-python/setuptools-rust-1.3.0
 2206121142 metadata/md5-cache/dev-python/setuptools_scm-6.4.2
 2206121142 metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1
@@ -42684,7 +42587,6 @@
 2206121142 metadata/md5-cache/dev-python/soupsieve-2.3.2
 2206121142 metadata/md5-cache/dev-python/soupsieve-2.3.2_p1
 2206121142 metadata/md5-cache/dev-python/speg-0.3-r2
-2206121142 metadata/md5-cache/dev-python/speg-0.3-r3
 2206121142 metadata/md5-cache/dev-python/speg-0.3_p20180819-r1
 2206121142 metadata/md5-cache/dev-python/sphinx-4.5.0-r1
 2206121142 metadata/md5-cache/dev-python/sphinx-5.0.0
@@ -42727,14 +42629,12 @@
 2206121142 metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r2
 2206121142 metadata/md5-cache/dev-python/sphinxcontrib-log_cabinet-1.0.1-r1
 2206121142 metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4-r1
-2206121142 metadata/md5-cache/dev-python/sphinxcontrib-openapi-0.7.0-r1
 2206121142 metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.17-r1
 2206121142 metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.3-r1
 2206121142 metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.5-r1
 2206121142 metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.3.3
 2206121142 metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.5.0
 2206121142 metadata/md5-cache/dev-python/sphinxcontrib-trio-1.1.2
-2206121142 metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4-r1
 2206121142 metadata/md5-cache/dev-python/sphinxemoji-0.2.0
 2206121142 metadata/md5-cache/dev-python/sphobjinv-2.2.2
 2206121142 metadata/md5-cache/dev-python/spotipy-2.19.0
@@ -42778,7 +42678,6 @@
 2206121142 metadata/md5-cache/dev-python/symengine-0.9.2
 2206121142 metadata/md5-cache/dev-python/symengine-0.9.2-r1
 2206121142 metadata/md5-cache/dev-python/sympy-1.10.1
-2206121142 metadata/md5-cache/dev-python/tabulate-0.8.9
 2206121142 metadata/md5-cache/dev-python/tagpy-2018.1-r3
 2206121142 metadata/md5-cache/dev-python/tblib-1.7.0
 2206121142 metadata/md5-cache/dev-python/tcolorpy-0.1.2
@@ -42786,7 +42685,6 @@
 2206121142 metadata/md5-cache/dev-python/tempest-30.1.0
 2206121142 metadata/md5-cache/dev-python/tempest-31.0.0
 2206121142 metadata/md5-cache/dev-python/tempita-0.5.3-r3
-2206121142 metadata/md5-cache/dev-python/tenacity-8.0.1
 2206121142 metadata/md5-cache/dev-python/termcolor-1.1.0-r3
 2206121142 metadata/md5-cache/dev-python/terminaltables-3.1.10-r1
 2206121142 metadata/md5-cache/dev-python/terminaltables-9999
@@ -42813,8 +42711,6 @@
 2206121142 metadata/md5-cache/dev-python/tomli-2.0.1
 2206121142 metadata/md5-cache/dev-python/tomli-2.0.1-r1
 2206121142 metadata/md5-cache/dev-python/tomli-w-1.0.0-r1
-2206121142 metadata/md5-cache/dev-python/tomlkit-0.10.2
-2206121142 metadata/md5-cache/dev-python/tomlkit-0.11.0
 2206121142 metadata/md5-cache/dev-python/toposort-1.7-r1
 2206121142 metadata/md5-cache/dev-python/towncrier-21.9.0
 2206121142 metadata/md5-cache/dev-python/tox-3.25.0
@@ -42839,7 +42735,6 @@
 2206121142 metadata/md5-cache/dev-python/txaio-22.2.1
 2206121142 metadata/md5-cache/dev-python/txrequests-0.9.6
 2206121142 metadata/md5-cache/dev-python/typed-ast-1.4.3
-2206121142 metadata/md5-cache/dev-python/typeguard-2.13.3
 2206121142 metadata/md5-cache/dev-python/typing-extensions-4.2.0
 2206121142 metadata/md5-cache/dev-python/tzlocal-4.2
 2206121142 metadata/md5-cache/dev-python/ubelt-1.1.1
@@ -42850,8 +42745,6 @@
 2206121142 metadata/md5-cache/dev-python/unittest-mixins-1.6-r2
 2206121142 metadata/md5-cache/dev-python/unittest-or-fail-2
 2206121142 metadata/md5-cache/dev-python/urdf_parser_py-0.4.5
-2206121142 metadata/md5-cache/dev-python/uri_template-1.1.0
-2206121142 metadata/md5-cache/dev-python/uri_template-1.2.0
 2206121142 metadata/md5-cache/dev-python/url-normalize-1.4.3-r1
 2206121142 metadata/md5-cache/dev-python/urlgrabber-4.1.0
 2206121142 metadata/md5-cache/dev-python/urwid_readline-0.13
@@ -42880,8 +42773,6 @@
 2206121142 metadata/md5-cache/dev-python/wand-0.6.7
 2206121142 metadata/md5-cache/dev-python/warlock-1.3.3-r3
 2206121142 metadata/md5-cache/dev-python/watchdog-2.1.9
-2206121142 metadata/md5-cache/dev-python/watchfiles-0.14.1
-2206121142 metadata/md5-cache/dev-python/watchgod-0.8.2
 2206121142 metadata/md5-cache/dev-python/wcag-contrast-ratio-0.9-r1
 2206121142 metadata/md5-cache/dev-python/wcmatch-8.3
 2206121142 metadata/md5-cache/dev-python/wcmatch-8.4
@@ -42905,8 +42796,6 @@
 2206121142 metadata/md5-cache/dev-python/www-authenticate-0.9.2
 2206121142 metadata/md5-cache/dev-python/wxpython-4.0.7-r1
 2206121142 metadata/md5-cache/dev-python/xarray-2022.3.0
-2206121142 metadata/md5-cache/dev-python/xcffib-0.11.1
-2206121142 metadata/md5-cache/dev-python/xcffib-0.11.1-r1
 2206121142 metadata/md5-cache/dev-python/xdoctest-1.0.0
 2206121142 metadata/md5-cache/dev-python/xlrd-2.0.1-r1
 2206121142 metadata/md5-cache/dev-python/xlsxwriter-3.0.3
@@ -43028,7 +42917,6 @@
 2206161210 metadata/md5-cache/dev-python/cachelib-0.7.0
 2206140740 metadata/md5-cache/dev-python/cachelib-0.8.0
 2206161210 metadata/md5-cache/dev-python/cachetools-5.2.0
-2206161210 metadata/md5-cache/dev-python/cerberus-1.3.4-r1
 2206141040 metadata/md5-cache/dev-python/cffi-1.15.0-r1
 2206161240 metadata/md5-cache/dev-python/cloudpickle-2.1.0
 2206161240 metadata/md5-cache/dev-python/cookies-2.2.1-r2
@@ -43078,7 +42966,6 @@
 2206140040 metadata/md5-cache/dev-python/platformdirs-2.5.2
 2206151440 metadata/md5-cache/dev-python/proto-plus-1.20.6
 2206160940 metadata/md5-cache/dev-python/psycopg-3.0.15
-2206150040 metadata/md5-cache/dev-python/pydantic-1.9.1
 2206151440 metadata/md5-cache/dev-python/pyghmi-1.5.47
 2206161310 metadata/md5-cache/dev-python/pyglet-1.5.26
 2206151440 metadata/md5-cache/dev-python/pylint-2.14.2
@@ -43095,7 +42982,6 @@
 2206150040 metadata/md5-cache/dev-python/qtawesome-1.1.1-r1
 2206141040 metadata/md5-cache/dev-python/qtconsole-5.3.0
 2206161310 metadata/md5-cache/dev-python/re-assert-1.1.0-r1
-2206161240 metadata/md5-cache/dev-python/requests-2.27.1-r1
 2206161210 metadata/md5-cache/dev-python/rfc3986-2.0.0-r1
 2206161310 metadata/md5-cache/dev-python/rsa-4.8-r1
 2206140740 metadata/md5-cache/dev-python/setuptools-62.4.0
@@ -43111,7 +42997,6 @@
 2206160910 metadata/md5-cache/dev-python/texttable-1.6.4-r1
 2206162010 metadata/md5-cache/dev-python/thriftpy2-0.4.14-r1
 2206161510 metadata/md5-cache/dev-python/tinycss-0.4-r1
-2206140910 metadata/md5-cache/dev-python/tlsh-4.8.2
 2206132110 metadata/md5-cache/dev-python/translate-toolkit-3.7.0
 2206161240 metadata/md5-cache/dev-python/trustme-0.9.0-r1
 2206161340 metadata/md5-cache/dev-python/ukkonen-1.0.1-r1
@@ -43164,7 +43049,6 @@
 2206171610 metadata/md5-cache/dev-python/lazy-object-proxy-1.7.1-r1
 2206171440 metadata/md5-cache/dev-python/matplotlib-3.5.1-r1
 2206171440 metadata/md5-cache/dev-python/matplotlib-3.5.2-r2
-2206171640 metadata/md5-cache/dev-python/myst_parser-0.18.0
 2206171540 metadata/md5-cache/dev-python/pydevd-2.8.0-r1
 2206171740 metadata/md5-cache/dev-python/pymountboot-0.2.3-r1
 2206171740 metadata/md5-cache/dev-python/python-lzo-1.14-r1
@@ -43212,7 +43096,6 @@
 2206192140 metadata/md5-cache/dev-python/python-dbusmock-0.28.0
 2206192140 metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.5.1
 2206192140 metadata/md5-cache/dev-python/uncertainties-3.1.7
-2206200240 metadata/md5-cache/dev-python/watchfiles-0.15.0
 2206201010 metadata/md5-cache/dev-python/PyPDF2-2.3.1
 2206210810 metadata/md5-cache/dev-python/boto3-1.24.13
 2206210810 metadata/md5-cache/dev-python/botocore-1.27.13
@@ -43234,7 +43117,6 @@
 2206202040 metadata/md5-cache/dev-python/websocket-client-1.3.3
 2206210910 metadata/md5-cache/dev-python/zstandard-0.18.0
 2206222010 metadata/md5-cache/dev-python/Faker-13.14.0
-2206231010 metadata/md5-cache/dev-python/Manifest.gz
 2206212210 metadata/md5-cache/dev-python/aniso8601-9.0.1-r1
 2206220840 metadata/md5-cache/dev-python/ansicolor-0.3.2-r1
 2206230910 metadata/md5-cache/dev-python/apsw-3.38.5_p1-r1
@@ -43272,7 +43154,6 @@
 2206221340 metadata/md5-cache/dev-python/dulwich-0.20.43
 2206220743 metadata/md5-cache/dev-python/editorconfig-core-py-0.12.3-r1
 2206212210 metadata/md5-cache/dev-python/elementpath-2.5.3
-2206221010 metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc8
 2206230940 metadata/md5-cache/dev-python/extras-1.0.0-r2
 2206212140 metadata/md5-cache/dev-python/feedparser-6.0.10
 2206212210 metadata/md5-cache/dev-python/fixtures-4.0.0
@@ -43280,7 +43161,6 @@
 2206220840 metadata/md5-cache/dev-python/flask-cors-3.0.10-r1
 2206221010 metadata/md5-cache/dev-python/flask-mail-0.9.1-r2
 2206221010 metadata/md5-cache/dev-python/flatbuffers-2.0.6
-2206221010 metadata/md5-cache/dev-python/flit_scm-1.6.2
 2206221010 metadata/md5-cache/dev-python/google-api-python-client-2.50.0
 2206220940 metadata/md5-cache/dev-python/googleapis-common-protos-1.56.3
 2206221010 metadata/md5-cache/dev-python/guessit-3.4.3
@@ -43288,19 +43168,16 @@
 2206221510 metadata/md5-cache/dev-python/httpx-0.23.0
 2206220743 metadata/md5-cache/dev-python/iminuit-2.11.2
 2206220743 metadata/md5-cache/dev-python/iminuit-2.12.0
-2206231010 metadata/md5-cache/dev-python/immutables-0.18
 2206221010 metadata/md5-cache/dev-python/jinja2-time-0.2.0-r1
 2206221010 metadata/md5-cache/dev-python/jsonrpclib-0.4.3.2
 2206222010 metadata/md5-cache/dev-python/jupyter_console-6.4.4
 2206221010 metadata/md5-cache/dev-python/jwcrypto-1.3.1
 2206221010 metadata/md5-cache/dev-python/libnacl-1.8.0
 2206220743 metadata/md5-cache/dev-python/line_profiler-3.5.1
-2206231010 metadata/md5-cache/dev-python/lz4-4.0.1
 2206220940 metadata/md5-cache/dev-python/makefun-1.14.0
 2206220940 metadata/md5-cache/dev-python/markdown2-2.4.3
 2206221910 metadata/md5-cache/dev-python/matterhook-0.2-r1
 2206221640 metadata/md5-cache/dev-python/mediafile-0.9.0-r1
-2206221510 metadata/md5-cache/dev-python/meson-python-0.6.0
 2206221010 metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-1.0.1
 2206222010 metadata/md5-cache/dev-python/mkdocs-material-8.3.7
 2206221340 metadata/md5-cache/dev-python/msgpack-1.0.4
@@ -43315,11 +43192,8 @@
 2206212140 metadata/md5-cache/dev-python/passlib-1.7.4-r2
 2206222040 metadata/md5-cache/dev-python/paste-3.5.1
 2206212240 metadata/md5-cache/dev-python/pbr-5.9.0
-2206212110 metadata/md5-cache/dev-python/pillow-9.0.1-r1
-2206230940 metadata/md5-cache/dev-python/pillow-9.1.1
 2206212140 metadata/md5-cache/dev-python/prettytable-3.3.0
 2206221340 metadata/md5-cache/dev-python/proto-plus-1.20.5
-2206231010 metadata/md5-cache/dev-python/psutil-5.9.1
 2206221910 metadata/md5-cache/dev-python/py-ubjson-0.16.1-r1
 2206221640 metadata/md5-cache/dev-python/pyacoustid-1.2.2
 2206220743 metadata/md5-cache/dev-python/pybind11-2.9.2-r1
@@ -43345,12 +43219,10 @@
 2206221340 metadata/md5-cache/dev-python/python-swiftclient-4.0.0
 2206220743 metadata/md5-cache/dev-python/python_orocos_kdl-1.5.1
 2206220743 metadata/md5-cache/dev-python/python_orocos_kdl-9999
-2206222040 metadata/md5-cache/dev-python/pytoolconfig-1.1.2
 2206222010 metadata/md5-cache/dev-python/pytools-2022.1.11
 2206221340 metadata/md5-cache/dev-python/pytools-2022.1.9
 2206212140 metadata/md5-cache/dev-python/pytrie-0.4.0-r1
 2206212140 metadata/md5-cache/dev-python/pyxdg-0.28
-2206222210 metadata/md5-cache/dev-python/pyzmq-23.0.0
 2206212210 metadata/md5-cache/dev-python/qrcode-7.3.1-r1
 2206221340 metadata/md5-cache/dev-python/rebulk-3.1.0-r1
 2206221640 metadata/md5-cache/dev-python/reflink-0.2.1-r3
@@ -43358,15 +43230,11 @@
 2206221340 metadata/md5-cache/dev-python/requests-mock-1.9.3-r1
 2206212210 metadata/md5-cache/dev-python/requests-toolbelt-0.9.1-r1
 2206220940 metadata/md5-cache/dev-python/requests-unixsocket-0.3.0-r2
-2206222040 metadata/md5-cache/dev-python/rope-1.2.0
-2206212210 metadata/md5-cache/dev-python/routes-2.5.1-r1
-2206221640 metadata/md5-cache/dev-python/scipy-1.8.1
 2206212110 metadata/md5-cache/dev-python/send2trash-1.8.0-r1
 2206222010 metadata/md5-cache/dev-python/sentry-sdk-1.6.0
 2206221110 metadata/md5-cache/dev-python/setuptools_scm-7.0.1-r1
 2206220940 metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.2
 2206212110 metadata/md5-cache/dev-python/sgmllib3k-1.0.0-r1
-2206220743 metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
 2206221340 metadata/md5-cache/dev-python/speaklater-1.4
 2206220840 metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.8.0-r1
 2206212140 metadata/md5-cache/dev-python/stevedore-3.5.0
@@ -43391,6 +43259,112 @@
 2206221340 metadata/md5-cache/dev-python/zc-lockfile-2.0-r1
 2206221910 metadata/md5-cache/dev-python/zstandard-0.17.0-r1
 2206221340 metadata/md5-cache/dev-python/zxcvbn-4.4.28-r1
+2206251640 metadata/md5-cache/dev-python/Manifest.gz
+2206250010 metadata/md5-cache/dev-python/boolean-py-4.0
+2206231040 metadata/md5-cache/dev-python/boto3-1.24.15
+2206240840 metadata/md5-cache/dev-python/boto3-1.24.16
+2206250840 metadata/md5-cache/dev-python/boto3-1.24.17
+2206231040 metadata/md5-cache/dev-python/botocore-1.27.15
+2206240840 metadata/md5-cache/dev-python/botocore-1.27.16
+2206250840 metadata/md5-cache/dev-python/botocore-1.27.17
+2206251440 metadata/md5-cache/dev-python/calver-2021.7.30
+2206250010 metadata/md5-cache/dev-python/cerberus-1.3.4-r1
+2206251240 metadata/md5-cache/dev-python/cjkwrap-2.2-r2
+2206251640 metadata/md5-cache/dev-python/clang-python-14.0.6
+2206250840 metadata/md5-cache/dev-python/configupdater-3.1
+2206250010 metadata/md5-cache/dev-python/csscompressor-0.9.5-r1
+2206242340 metadata/md5-cache/dev-python/dask-2022.6.1
+2206241440 metadata/md5-cache/dev-python/ddt-1.5.0
+2206241510 metadata/md5-cache/dev-python/dirty-equals-0.4-r1
+2206251210 metadata/md5-cache/dev-python/distro-1.7.0
+2206240140 metadata/md5-cache/dev-python/exceptiongroup-1.0.0_rc8
+2206240140 metadata/md5-cache/dev-python/flit_scm-1.6.2
+2206240540 metadata/md5-cache/dev-python/git-review-2.3.1
+2206231040 metadata/md5-cache/dev-python/gsd-2.5.3
+2206251240 metadata/md5-cache/dev-python/h5py-3.7.0
+2206232240 metadata/md5-cache/dev-python/humanize-4.2.1
+2206242010 metadata/md5-cache/dev-python/hypothesis-6.47.4
+2206241010 metadata/md5-cache/dev-python/immutables-0.18
+2206241440 metadata/md5-cache/dev-python/importlib_metadata-4.11.4
+2206250840 metadata/md5-cache/dev-python/ini2toml-0.11
+2206250840 metadata/md5-cache/dev-python/ini2toml-0.11-r1
+2206231040 metadata/md5-cache/dev-python/ipywidgets-7.7.1
+2206232240 metadata/md5-cache/dev-python/jupyter_server-1.18.0
+2206251210 metadata/md5-cache/dev-python/kaptan-0.5.12-r2
+2206241210 metadata/md5-cache/dev-python/keyring-23.6.0
+2206250010 metadata/md5-cache/dev-python/kgb-7.0-r1
+2206250010 metadata/md5-cache/dev-python/license-expression-30.0.0
+2206251640 metadata/md5-cache/dev-python/lit-14.0.6
+2206231140 metadata/md5-cache/dev-python/lz4-4.0.1
+2206241640 metadata/md5-cache/dev-python/mamba-0.11.2
+2206242340 metadata/md5-cache/dev-python/manuel-1.12.4
+2206241910 metadata/md5-cache/dev-python/markdown-it-py-2.1.0
+2206241910 metadata/md5-cache/dev-python/mdit-py-plugins-0.3.0
+2206241910 metadata/md5-cache/dev-python/mdurl-0.1.1
+2206251210 metadata/md5-cache/dev-python/mdx_gh_links-0.2-r1
+2206250440 metadata/md5-cache/dev-python/meson-python-0.6.0-r1
+2206240840 metadata/md5-cache/dev-python/minimock-1.3.0-r1
+2206251210 metadata/md5-cache/dev-python/mkdocs-1.3.0-r1
+2206251210 metadata/md5-cache/dev-python/mkdocs-bootstrap-1.1-r2
+2206251210 metadata/md5-cache/dev-python/mkdocs-bootswatch-1.1-r2
+2206251210 metadata/md5-cache/dev-python/mkdocs-material-8.2.16
+2206242340 metadata/md5-cache/dev-python/mkdocs-material-8.3.8
+2206251210 metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.5.0-r2
+2206251210 metadata/md5-cache/dev-python/moto-3.1.12
+2206241210 metadata/md5-cache/dev-python/munch-2.5.0-r2
+2206240840 metadata/md5-cache/dev-python/mygpoclient-1.9
+2206231040 metadata/md5-cache/dev-python/mysqlclient-2.1.1
+2206241910 metadata/md5-cache/dev-python/myst_parser-0.18.0
+2206232240 metadata/md5-cache/dev-python/nuitka-0.9
+2206240710 metadata/md5-cache/dev-python/numexpr-2.8.1-r1
+2206231040 metadata/md5-cache/dev-python/numpy-1.23.0
+2206251210 metadata/md5-cache/dev-python/openapi-schema-validator-0.3.0
+2206251210 metadata/md5-cache/dev-python/openapi-spec-validator-0.4.0
+2206232240 metadata/md5-cache/dev-python/oslo-utils-6.0.0
+2206232240 metadata/md5-cache/dev-python/pandas-1.4.3
+2206250010 metadata/md5-cache/dev-python/pdm-pep517-0.12.7
+2206241240 metadata/md5-cache/dev-python/pillow-9.1.1
+2206241210 metadata/md5-cache/dev-python/pkginfo-1.8.3
+2206231140 metadata/md5-cache/dev-python/psutil-5.9.1
+2206231040 metadata/md5-cache/dev-python/pycryptodome-3.15.0
+2206232210 metadata/md5-cache/dev-python/pycson-0.8-r3
+2206241240 metadata/md5-cache/dev-python/pydantic-1.9.1
+2206250010 metadata/md5-cache/dev-python/pydiffx-1.0.1-r1
+2206242340 metadata/md5-cache/dev-python/pyghmi-1.5.49
+2206251210 metadata/md5-cache/dev-python/pygit2-1.9.2
+2206250840 metadata/md5-cache/dev-python/pyproject-fmt-0.3.3
+2206241910 metadata/md5-cache/dev-python/pytest-datadir-1.3.1-r1
+2206250840 metadata/md5-cache/dev-python/pytest-mock-3.8.1
+2206241910 metadata/md5-cache/dev-python/pytest-param-files-0.3.4
+2206240840 metadata/md5-cache/dev-python/pytest-qt-4.1.0
+2206241910 metadata/md5-cache/dev-python/pytest-regressions-2.3.1
+2206251210 metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r1
+2206250010 metadata/md5-cache/dev-python/pytoolconfig-1.1.2
+2206231140 metadata/md5-cache/dev-python/pyzmq-23.0.0
+2206240910 metadata/md5-cache/dev-python/requests-2.27.1-r2
+2206241210 metadata/md5-cache/dev-python/rich-12.4.4
+2206250010 metadata/md5-cache/dev-python/rope-1.2.0
+2206241510 metadata/md5-cache/dev-python/routes-2.5.1-r2
+2206231210 metadata/md5-cache/dev-python/scipy-1.8.1
+2206250440 metadata/md5-cache/dev-python/scipy-1.9.0_rc1
+2206251210 metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r2
+2206231040 metadata/md5-cache/dev-python/setuptools_scm-7.0.2
+2206250210 metadata/md5-cache/dev-python/shiboken2-5.15.2-r1
+2206232210 metadata/md5-cache/dev-python/speg-0.3-r3
+2206240840 metadata/md5-cache/dev-python/sphinx-pytest-0.0.4
+2206241510 metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.2.4-r2
+2206232240 metadata/md5-cache/dev-python/sqlalchemy-1.4.38
+2206242340 metadata/md5-cache/dev-python/sqlalchemy-1.4.39
+2206241240 metadata/md5-cache/dev-python/tlsh-4.8.2
+2206241210 metadata/md5-cache/dev-python/tomlkit-0.11.0
+2206251440 metadata/md5-cache/dev-python/trove-classifiers-2022.6.23
+2206242140 metadata/md5-cache/dev-python/uri_template-1.2.0-r1
+2206240840 metadata/md5-cache/dev-python/uvicorn-0.18.1
+2206242140 metadata/md5-cache/dev-python/watchfiles-0.15.0-r1
+2206242140 metadata/md5-cache/dev-python/watchgod-0.8.2-r1
+2206231040 metadata/md5-cache/dev-python/widgetsnbextension-3.6.1
+2206251210 metadata/md5-cache/dev-python/xcffib-0.11.1-r1
+2206242340 metadata/md5-cache/dev-python/xmlschema-1.11.3
 2205170654 metadata/md5-cache/dev-qt/qt-creator-6.0.0
 2205170654 metadata/md5-cache/dev-qt/qt-creator-9999
 2205170654 metadata/md5-cache/dev-qt/qt-docs-5.15.2_p202011130614
@@ -43439,7 +43413,6 @@
 2206200210 metadata/md5-cache/dev-qt/qtimageformats-5.15.4-r1
 2206191540 metadata/md5-cache/dev-qt/qtimageformats-5.15.5
 2206191540 metadata/md5-cache/dev-qt/qtlocation-5.15.4
-2206191540 metadata/md5-cache/dev-qt/qtlocation-5.15.5
 2206191540 metadata/md5-cache/dev-qt/qtmultimedia-5.15.4-r1
 2206191540 metadata/md5-cache/dev-qt/qtmultimedia-5.15.5
 2206191540 metadata/md5-cache/dev-qt/qtnetwork-5.15.4
@@ -43507,7 +43480,6 @@
 2206191540 metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.4
 2206191540 metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.5
 2206202210 metadata/md5-cache/dev-qt/qtwebengine-5.15.5_p20220618
-2206221910 metadata/md5-cache/dev-qt/Manifest.gz
 2206221910 metadata/md5-cache/dev-qt/assistant-5.15.4
 2206221910 metadata/md5-cache/dev-qt/assistant-5.15.5
 2206221910 metadata/md5-cache/dev-qt/designer-5.15.4
@@ -43517,6 +43489,8 @@
 2206221910 metadata/md5-cache/dev-qt/qdbusviewer-5.15.4
 2206221910 metadata/md5-cache/dev-qt/qdbusviewer-5.15.5
 2206220110 metadata/md5-cache/dev-qt/qtdeclarative-5.15.5
+2206240810 metadata/md5-cache/dev-qt/Manifest.gz
+2206240810 metadata/md5-cache/dev-qt/qtlocation-5.15.5
 2206121142 metadata/md5-cache/dev-ros/ament_copyright-0.11.2
 2206121142 metadata/md5-cache/dev-ros/ament_copyright-0.12.1
 2206121142 metadata/md5-cache/dev-ros/ament_copyright-9999
@@ -43544,7 +43518,6 @@
 2206121142 metadata/md5-cache/dev-ros/ament_xmllint-0.11.2
 2206121142 metadata/md5-cache/dev-ros/ament_xmllint-0.12.1
 2206121142 metadata/md5-cache/dev-ros/ament_xmllint-9999
-2206220743 metadata/md5-cache/dev-ros/Manifest.gz
 2206220743 metadata/md5-cache/dev-ros/actionlib-1.13.2-r1
 2206220743 metadata/md5-cache/dev-ros/actionlib-9999
 2206220743 metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
@@ -43563,7 +43536,6 @@
 2206220743 metadata/md5-cache/dev-ros/ament_cmake_copyright-9999
 2206220743 metadata/md5-cache/dev-ros/ament_cmake_core-1.1.4
 2206220743 metadata/md5-cache/dev-ros/ament_cmake_core-1.3.0
-2206220743 metadata/md5-cache/dev-ros/ament_cmake_core-9999
 2206220743 metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.11.2
 2206220743 metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.12.1
 2206220743 metadata/md5-cache/dev-ros/ament_cmake_cppcheck-9999
@@ -44712,6 +44684,9 @@
 2206220743 metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8-r1
 2206220743 metadata/md5-cache/dev-ros/xmlrpcpp-1.15.9-r1
 2206220743 metadata/md5-cache/dev-ros/xmlrpcpp-9999
+2206231440 metadata/md5-cache/dev-ros/Manifest.gz
+2206231440 metadata/md5-cache/dev-ros/ament_cmake_core-1.3.0-r1
+2206231440 metadata/md5-cache/dev-ros/ament_cmake_core-9999
 2205170654 metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
 2205170654 metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2
 2205192010 metadata/md5-cache/dev-ruby/puppetdb-termini-7.10.1
@@ -44897,7 +44872,6 @@
 2205220911 metadata/md5-cache/dev-ruby/classifier-reborn-2.2.0
 2205220911 metadata/md5-cache/dev-ruby/climate_control-0.2.0
 2205220911 metadata/md5-cache/dev-ruby/climate_control-1.0.1
-2205220911 metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
 2205220911 metadata/md5-cache/dev-ruby/cmdparse-3.0.7-r1
 2205220911 metadata/md5-cache/dev-ruby/coderay-1.1.2
 2205220911 metadata/md5-cache/dev-ruby/coderay-1.1.3-r1
@@ -44997,9 +44971,7 @@
 2205220911 metadata/md5-cache/dev-ruby/em-websocket-0.5.3
 2205220911 metadata/md5-cache/dev-ruby/equalizer-0.0.11-r1
 2205220911 metadata/md5-cache/dev-ruby/equatable-0.7.0
-2205220911 metadata/md5-cache/dev-ruby/erubi-1.10.0
 2205220911 metadata/md5-cache/dev-ruby/erubi-1.10.0-r1
-2205220911 metadata/md5-cache/dev-ruby/erubi-1.9.0
 2205220911 metadata/md5-cache/dev-ruby/erubis-2.7.0-r3
 2205220911 metadata/md5-cache/dev-ruby/erubis-2.7.0-r4
 2205220911 metadata/md5-cache/dev-ruby/ethon-0.14.0
@@ -45053,7 +45025,6 @@
 2205230810 metadata/md5-cache/dev-ruby/forwardable-1.3.2
 2205220911 metadata/md5-cache/dev-ruby/forwardable-extended-2.6.0-r2
 2205220911 metadata/md5-cache/dev-ruby/fuubar-2.5.0-r1
-2205220911 metadata/md5-cache/dev-ruby/fuubar-2.5.1
 2205220911 metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.8.1
 2205220911 metadata/md5-cache/dev-ruby/gherkin-5.1.0
 2205220911 metadata/md5-cache/dev-ruby/gist-6.0.0
@@ -45064,7 +45035,6 @@
 2205220911 metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r3
 2205220911 metadata/md5-cache/dev-ruby/google-protobuf-3.14.0
 2205220911 metadata/md5-cache/dev-ruby/google-protobuf-3.19.3
-2205220911 metadata/md5-cache/dev-ruby/gpgme-2.0.20-r2
 2205220911 metadata/md5-cache/dev-ruby/gpgme-2.0.20-r3
 2205220911 metadata/md5-cache/dev-ruby/gruff-0.14.0
 2205220911 metadata/md5-cache/dev-ruby/gruff-0.15.0
@@ -45081,7 +45051,6 @@
 2205220911 metadata/md5-cache/dev-ruby/hashr-2.0.1-r1
 2205220911 metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0-r1
 2205220911 metadata/md5-cache/dev-ruby/hiera-3.8.0
-2205220911 metadata/md5-cache/dev-ruby/hiera-3.9.0
 2205220911 metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.7.4
 2205220911 metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6-r2
 2205220911 metadata/md5-cache/dev-ruby/highline-2.0.3
@@ -45091,18 +45060,14 @@
 2205220911 metadata/md5-cache/dev-ruby/hitimes-2.0.0
 2205220911 metadata/md5-cache/dev-ruby/hitimes-2.0.0-r1
 2205220911 metadata/md5-cache/dev-ruby/hocon-1.3.1
-2205220911 metadata/md5-cache/dev-ruby/hocon-1.3.1-r1
 2205220911 metadata/md5-cache/dev-ruby/hoe-3.21.0
 2205220911 metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
 2205220911 metadata/md5-cache/dev-ruby/html2haml-2.2.0-r1
 2205220911 metadata/md5-cache/dev-ruby/htmlentities-4.3.4-r1
 2205220911 metadata/md5-cache/dev-ruby/http-4.1.1
 2205220911 metadata/md5-cache/dev-ruby/http-4.4.1
-2205220911 metadata/md5-cache/dev-ruby/http-accept-1.7.0
-2205220911 metadata/md5-cache/dev-ruby/http-accept-2.1.1
 2205220911 metadata/md5-cache/dev-ruby/http-accept-2.1.1-r1
 2205220911 metadata/md5-cache/dev-ruby/http-cookie-1.0.4
-2205220911 metadata/md5-cache/dev-ruby/http-form_data-2.2.0
 2205220911 metadata/md5-cache/dev-ruby/http-form_data-2.3.0
 2205220911 metadata/md5-cache/dev-ruby/http-parser-1.2.3
 2205220911 metadata/md5-cache/dev-ruby/http-parser-1.2.3-r1
@@ -45141,7 +45106,6 @@
 2205220911 metadata/md5-cache/dev-ruby/json-2.5.1-r1
 2205220911 metadata/md5-cache/dev-ruby/json-2.6.1
 2205220911 metadata/md5-cache/dev-ruby/json-2.6.2
-2205220911 metadata/md5-cache/dev-ruby/json_schema-0.20.8
 2205220911 metadata/md5-cache/dev-ruby/json_schema-0.20.9
 2205220911 metadata/md5-cache/dev-ruby/jwt-2.2.3
 2205220911 metadata/md5-cache/dev-ruby/jwt-2.3.0
@@ -45186,7 +45150,6 @@
 2205220911 metadata/md5-cache/dev-ruby/mab-0.0.3-r2
 2205220911 metadata/md5-cache/dev-ruby/magic-0.2.9-r1
 2205220911 metadata/md5-cache/dev-ruby/magic-0.2.9-r2
-2205220911 metadata/md5-cache/dev-ruby/mail-2.7.1
 2205220911 metadata/md5-cache/dev-ruby/maildir-2.2.3
 2205220911 metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
 2205220911 metadata/md5-cache/dev-ruby/maruku-0.7.3-r1
@@ -45220,7 +45183,6 @@
 2205220911 metadata/md5-cache/dev-ruby/mini_portile2-2.6.1
 2205220911 metadata/md5-cache/dev-ruby/mini_portile2-2.7.1
 2205220911 metadata/md5-cache/dev-ruby/mini_portile2-2.8.0
-2205220911 metadata/md5-cache/dev-ruby/minispec-metadata-3.3.1
 2205220911 metadata/md5-cache/dev-ruby/minitar-0.9
 2205220911 metadata/md5-cache/dev-ruby/minitar-0.9-r1
 2205220911 metadata/md5-cache/dev-ruby/minitest-5.13.0
@@ -45280,9 +45242,7 @@
 2205220911 metadata/md5-cache/dev-ruby/net-ssh-6.1.0-r2
 2205220911 metadata/md5-cache/dev-ruby/net-ssh-gateway-2.0.0-r1
 2205220911 metadata/md5-cache/dev-ruby/net-telnet-0.2.0
-2205220911 metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
 2205220911 metadata/md5-cache/dev-ruby/netrc-0.11.0-r1
-2205220911 metadata/md5-cache/dev-ruby/network_interface-0.0.2
 2205220911 metadata/md5-cache/dev-ruby/network_interface-0.0.2-r1
 2205220911 metadata/md5-cache/dev-ruby/nio4r-2.5.4
 2205220911 metadata/md5-cache/dev-ruby/nio4r-2.5.8
@@ -45290,13 +45250,11 @@
 2205220911 metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r3
 2205220911 metadata/md5-cache/dev-ruby/oauth-0.5.10
 2205220911 metadata/md5-cache/dev-ruby/oauth-0.5.8
-2205220911 metadata/md5-cache/dev-ruby/oauth2-1.4.4
 2205220911 metadata/md5-cache/dev-ruby/oauth2-1.4.7
 2205220911 metadata/md5-cache/dev-ruby/octokit-4.22.0
 2205220911 metadata/md5-cache/dev-ruby/omniauth-2.0.4
 2205220911 metadata/md5-cache/dev-ruby/omniauth-2.1.0
 2205220911 metadata/md5-cache/dev-ruby/open4-1.3.4-r1
-2205220911 metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
 2205220911 metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2-r1
 2205220911 metadata/md5-cache/dev-ruby/optimist-3.0.1
 2205220911 metadata/md5-cache/dev-ruby/optionable-0.2.0-r1
@@ -45315,10 +45273,6 @@
 2205220911 metadata/md5-cache/dev-ruby/paramesan-1.0.1
 2205220911 metadata/md5-cache/dev-ruby/paramesan-1.0.1-r1
 2205220911 metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
-2205220911 metadata/md5-cache/dev-ruby/parser-3.0.3.2
-2205220911 metadata/md5-cache/dev-ruby/parser-3.1.0.0
-2205220911 metadata/md5-cache/dev-ruby/parser-3.1.1.0
-2205220911 metadata/md5-cache/dev-ruby/parser-3.1.2.0
 2205220911 metadata/md5-cache/dev-ruby/pastel-0.8.0
 2205220911 metadata/md5-cache/dev-ruby/path_expander-1.1.0
 2205220911 metadata/md5-cache/dev-ruby/pathutil-0.16.2
@@ -45371,16 +45325,12 @@
 2205220911 metadata/md5-cache/dev-ruby/rack-cache-1.13.0
 2205220911 metadata/md5-cache/dev-ruby/rack-openid-1.4.2-r1
 2205220911 metadata/md5-cache/dev-ruby/rack-test-1.1.0
-2205220911 metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1
 2205220911 metadata/md5-cache/dev-ruby/radius-0.7.5-r1
 2205220911 metadata/md5-cache/dev-ruby/rails-5.2.8
 2205220911 metadata/md5-cache/dev-ruby/rails-6.0.5
 2205220911 metadata/md5-cache/dev-ruby/rails-6.1.5.1
 2205220911 metadata/md5-cache/dev-ruby/rails-6.1.6
 2205220911 metadata/md5-cache/dev-ruby/rails-7.0.2.4
-2205220911 metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
-2205220911 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.3.0-r1
-2205220911 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.1
 2205220911 metadata/md5-cache/dev-ruby/railties-6.1.5.1
 2205220911 metadata/md5-cache/dev-ruby/railties-6.1.6
 2205220911 metadata/md5-cache/dev-ruby/railties-7.0.2.4
@@ -45401,7 +45351,6 @@
 2205220911 metadata/md5-cache/dev-ruby/rash_alt-0.4.9
 2205220911 metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2-r1
 2205220911 metadata/md5-cache/dev-ruby/rb-inotify-0.10.1
-2205220911 metadata/md5-cache/dev-ruby/rb-readline-0.5.5
 2205220911 metadata/md5-cache/dev-ruby/rb-readline-0.5.5-r1
 2205220911 metadata/md5-cache/dev-ruby/rbnacl-7.1.1
 2205220911 metadata/md5-cache/dev-ruby/rbpdf-1.20.1-r2
@@ -45429,12 +45378,10 @@
 2205220911 metadata/md5-cache/dev-ruby/redcarpet-3.5.1
 2205220911 metadata/md5-cache/dev-ruby/redcarpet-3.5.1-r1
 2205220911 metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1
-2205220911 metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4
 2205220911 metadata/md5-cache/dev-ruby/redis-4.1.4
 2205220911 metadata/md5-cache/dev-ruby/ref-2.0.0-r1
 2205220911 metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
 2205220911 metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
-2205220911 metadata/md5-cache/dev-ruby/regexp_parser-2.4.0
 2205220911 metadata/md5-cache/dev-ruby/regexp_property_values-1.2.0
 2205220911 metadata/md5-cache/dev-ruby/regexp_property_values-1.3.0
 2205220911 metadata/md5-cache/dev-ruby/request_store-1.5.0
@@ -45456,7 +45403,6 @@
 2205220911 metadata/md5-cache/dev-ruby/roadie-rails-2.3.0
 2205220911 metadata/md5-cache/dev-ruby/roadie-rails-3.0.0
 2205220911 metadata/md5-cache/dev-ruby/roadie-rails-3.0.0-r1
-2205220911 metadata/md5-cache/dev-ruby/robots-0.10.1-r2
 2205220911 metadata/md5-cache/dev-ruby/robots-0.10.1-r3
 2205220911 metadata/md5-cache/dev-ruby/rotp-6.2.0
 2205220911 metadata/md5-cache/dev-ruby/rouge-3.26.0
@@ -45472,27 +45418,22 @@
 2205220911 metadata/md5-cache/dev-ruby/rspec-2.99.0
 2205220911 metadata/md5-cache/dev-ruby/rspec-3.10.0
 2205220911 metadata/md5-cache/dev-ruby/rspec-3.11.0
-2205220911 metadata/md5-cache/dev-ruby/rspec-3.9.0
 2205220911 metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.2.0
 2205220911 metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
 2205220911 metadata/md5-cache/dev-ruby/rspec-core-3.10.1
 2205220911 metadata/md5-cache/dev-ruby/rspec-core-3.10.2
 2205220911 metadata/md5-cache/dev-ruby/rspec-core-3.11.0
-2205220911 metadata/md5-cache/dev-ruby/rspec-core-3.9.3
 2205220911 metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
 2205220911 metadata/md5-cache/dev-ruby/rspec-expectations-3.10.1
 2205220911 metadata/md5-cache/dev-ruby/rspec-expectations-3.10.2
 2205220911 metadata/md5-cache/dev-ruby/rspec-expectations-3.11.0
-2205220911 metadata/md5-cache/dev-ruby/rspec-expectations-3.9.4
 2205220911 metadata/md5-cache/dev-ruby/rspec-its-1.3.0-r1
-2205220911 metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0
 2205220911 metadata/md5-cache/dev-ruby/rspec-json_expectations-2.2.0-r1
 2205220911 metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2-r1
 2205220911 metadata/md5-cache/dev-ruby/rspec-mocks-3.10.2
 2205220911 metadata/md5-cache/dev-ruby/rspec-mocks-3.10.3
 2205220911 metadata/md5-cache/dev-ruby/rspec-mocks-3.11.0
 2205220911 metadata/md5-cache/dev-ruby/rspec-mocks-3.11.1
-2205220911 metadata/md5-cache/dev-ruby/rspec-mocks-3.9.1
 2205220911 metadata/md5-cache/dev-ruby/rspec-rails-3.9.1
 2205220911 metadata/md5-cache/dev-ruby/rspec-rails-4.1.2
 2205220911 metadata/md5-cache/dev-ruby/rspec-rails-5.0.2
@@ -45504,7 +45445,6 @@
 2205220911 metadata/md5-cache/dev-ruby/rspec-support-3.10.2
 2205220911 metadata/md5-cache/dev-ruby/rspec-support-3.10.3
 2205220911 metadata/md5-cache/dev-ruby/rspec-support-3.11.0
-2205220911 metadata/md5-cache/dev-ruby/rspec-support-3.9.4
 2205220911 metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
 2205220911 metadata/md5-cache/dev-ruby/rss-0.2.9
 2205220911 metadata/md5-cache/dev-ruby/rss-0.2.9-r1
@@ -45538,7 +45478,6 @@
 2205220911 metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.4.3
 2205220911 metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.4.3
 2205220911 metadata/md5-cache/dev-ruby/ruby-gtksourceview4-3.4.3
-2205220911 metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r2
 2205220911 metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20-r3
 2205220911 metadata/md5-cache/dev-ruby/ruby-libsecret-3.4.3
 2205220911 metadata/md5-cache/dev-ruby/ruby-macho-2.5.1
@@ -45550,7 +45489,6 @@
 2205220911 metadata/md5-cache/dev-ruby/ruby-oembed-0.16.1
 2205220911 metadata/md5-cache/dev-ruby/ruby-ole-1.2.12.2-r1
 2205220911 metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
-2205220911 metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1
 2205220911 metadata/md5-cache/dev-ruby/ruby-openid-2.9.2
 2205220911 metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
 2205220911 metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
@@ -45575,7 +45513,6 @@
 2205220911 metadata/md5-cache/dev-ruby/ruby2_keywords-0.0.5
 2205220911 metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
 2205220911 metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4-r1
-2205220911 metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
 2205220911 metadata/md5-cache/dev-ruby/ruby_parser-3.18.1
 2205220911 metadata/md5-cache/dev-ruby/ruby_parser-3.19.1
 2205220911 metadata/md5-cache/dev-ruby/ruby_smb-1.1.0
@@ -45690,7 +45627,6 @@
 2205220911 metadata/md5-cache/dev-ruby/timecop-0.9.4
 2205220911 metadata/md5-cache/dev-ruby/timecop-0.9.5
 2205220911 metadata/md5-cache/dev-ruby/timeout-0.2.0
-2205220911 metadata/md5-cache/dev-ruby/timers-4.3.3
 2205220911 metadata/md5-cache/dev-ruby/tins-1.29.1
 2205220911 metadata/md5-cache/dev-ruby/tins-1.31.0
 2205220911 metadata/md5-cache/dev-ruby/tins-1.31.1
@@ -45767,7 +45703,6 @@
 2205220911 metadata/md5-cache/dev-ruby/yard-0.9.27
 2205220911 metadata/md5-cache/dev-ruby/zeitwerk-2.4.2
 2205220911 metadata/md5-cache/dev-ruby/zeitwerk-2.5.4
-2205220911 metadata/md5-cache/dev-ruby/zentest-4.12.0
 2205240840 metadata/md5-cache/dev-ruby/combustion-1.3.6
 2205240840 metadata/md5-cache/dev-ruby/jquery-rails-4.5.0
 2205240910 metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
@@ -45791,7 +45726,6 @@
 2205291210 metadata/md5-cache/dev-ruby/digest-3.1.0-r1
 2205281010 metadata/md5-cache/dev-ruby/mime-types-3.3.1
 2205281010 metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901
-2205280910 metadata/md5-cache/dev-ruby/msgpack-1.5.2
 2205271640 metadata/md5-cache/dev-ruby/nokogiri-1.13.6
 2205280910 metadata/md5-cache/dev-ruby/octokit-4.23.0
 2205290940 metadata/md5-cache/dev-ruby/regexp_parser-2.3.1
@@ -45820,12 +45754,10 @@
 2206121142 metadata/md5-cache/dev-ruby/locale-2.1.3
 2206100810 metadata/md5-cache/dev-ruby/mechanize-2.8.4
 2206100810 metadata/md5-cache/dev-ruby/mechanize-2.8.5
-2206121142 metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
 2206100810 metadata/md5-cache/dev-ruby/multipart-post-2.2.2
 2206121142 metadata/md5-cache/dev-ruby/niceogiri-1.1.2-r1
 2206100810 metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r2
 2206100810 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.2
-2206100810 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.3
 2206121142 metadata/md5-cache/dev-ruby/rouge-3.29.0
 2206121142 metadata/md5-cache/dev-ruby/ruby-gettext-3.4.3
 2206121142 metadata/md5-cache/dev-ruby/sass-3.7.4-r1
@@ -45853,7 +45785,6 @@
 2206131140 metadata/md5-cache/dev-ruby/sourcemap-0.1.1-r1
 2206131140 metadata/md5-cache/dev-ruby/sprockets-4.0.2
 2206131140 metadata/md5-cache/dev-ruby/sprockets-rails-3.4.2-r1
-2206131140 metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1
 2206131140 metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
 2206131140 metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
 2206161940 metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
@@ -45902,7 +45833,6 @@
 2206191140 metadata/md5-cache/dev-ruby/test_construct-2.0.2-r1
 2206200810 metadata/md5-cache/dev-ruby/temple-0.8.2-r1
 2206200940 metadata/md5-cache/dev-ruby/zentest-4.12.1
-2206230910 metadata/md5-cache/dev-ruby/Manifest.gz
 2206220743 metadata/md5-cache/dev-ruby/facter-3.14.23
 2206221910 metadata/md5-cache/dev-ruby/listen-1.3.1-r4
 2206220743 metadata/md5-cache/dev-ruby/minitest-5.16.1
@@ -45912,6 +45842,30 @@
 2206230910 metadata/md5-cache/dev-ruby/ruby-xslt-0.9.10-r1
 2206220743 metadata/md5-cache/dev-ruby/simple-rss-1.3.3-r1
 2206220743 metadata/md5-cache/dev-ruby/stringex-2.8.5-r1
+2206251240 metadata/md5-cache/dev-ruby/Manifest.gz
+2206251210 metadata/md5-cache/dev-ruby/cliver-0.3.2-r1
+2206251210 metadata/md5-cache/dev-ruby/fattr-2.4.0-r1
+2206251210 metadata/md5-cache/dev-ruby/fuubar-2.5.1
+2206240540 metadata/md5-cache/dev-ruby/hiera-3.9.0
+2206240540 metadata/md5-cache/dev-ruby/hocon-1.3.1-r1
+2206251110 metadata/md5-cache/dev-ruby/http-accept-1.7.0
+2206251210 metadata/md5-cache/dev-ruby/msgpack-1.5.2
+2206251040 metadata/md5-cache/dev-ruby/multi_xml-0.6.0-r2
+2206250940 metadata/md5-cache/dev-ruby/net-telnet-0.2.0-r1
+2206251240 metadata/md5-cache/dev-ruby/parser-3.0.3.2
+2206251240 metadata/md5-cache/dev-ruby/parser-3.1.0.0
+2206251240 metadata/md5-cache/dev-ruby/parser-3.1.1.0
+2206251240 metadata/md5-cache/dev-ruby/parser-3.1.2.0
+2206241310 metadata/md5-cache/dev-ruby/pg-1.4.1
+2206241310 metadata/md5-cache/dev-ruby/rack-test-1.1.0-r1
+2206241310 metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.4.3
+2206241310 metadata/md5-cache/dev-ruby/redcloth-4.3.2-r4
+2206241110 metadata/md5-cache/dev-ruby/regexp_parser-2.4.0
+2206241040 metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0-r1
+2206250940 metadata/md5-cache/dev-ruby/sprockets-4.1.0
+2206251210 metadata/md5-cache/dev-ruby/timers-4.3.3
+2206250940 metadata/md5-cache/dev-ruby/uglifier-4.2.0-r1
+2206250940 metadata/md5-cache/dev-ruby/unicode-display_width-2.2.0
 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
@@ -46281,8 +46235,6 @@
 2205170654 metadata/md5-cache/dev-util/btyacc-3.0-r4
 2205170654 metadata/md5-cache/dev-util/build2-0.13.0
 2205170654 metadata/md5-cache/dev-util/build2-0.14.0
-2205170654 metadata/md5-cache/dev-util/cargo-audit-0.15.0
-2205170654 metadata/md5-cache/dev-util/cargo-audit-0.15.2
 2205170654 metadata/md5-cache/dev-util/cargo-c-0.6.2-r1
 2205170654 metadata/md5-cache/dev-util/cargo-c-0.9.5
 2205170654 metadata/md5-cache/dev-util/cargo-c-0.9.6
@@ -46514,7 +46466,6 @@
 2206071015 metadata/md5-cache/dev-util/gef-9999
 2206071015 metadata/md5-cache/dev-util/glade-3.38.2-r1
 2206071015 metadata/md5-cache/dev-util/glib-utils-2.72.1
-2206071015 metadata/md5-cache/dev-util/glib-utils-2.72.2
 2206071015 metadata/md5-cache/dev-util/gn-0.1943
 2206071015 metadata/md5-cache/dev-util/gnome-builder-3.40.2
 2206071015 metadata/md5-cache/dev-util/gnome-builder-42.1
@@ -46535,7 +46486,6 @@
 2206071015 metadata/md5-cache/dev-util/rizin-0.3.4
 2206071015 metadata/md5-cache/dev-util/rizin-0.3.4-r1
 2206071015 metadata/md5-cache/dev-util/rocm-smi-4.0.0
-2206071015 metadata/md5-cache/dev-util/rpmdevtools-9.5
 2206071015 metadata/md5-cache/dev-util/rt-tests-2.3
 2206071015 metadata/md5-cache/dev-util/scanmem-0.17
 2206071015 metadata/md5-cache/dev-util/smem-1.5-r2
@@ -46609,7 +46559,6 @@
 2206121142 metadata/md5-cache/dev-util/flawfinder-2.0.19
 2206121142 metadata/md5-cache/dev-util/gcovr-4.2
 2206121142 metadata/md5-cache/dev-util/gdbus-codegen-2.72.1
-2206121142 metadata/md5-cache/dev-util/gdbus-codegen-2.72.2
 2206121142 metadata/md5-cache/dev-util/gertty-1.6.0-r1
 2206121142 metadata/md5-cache/dev-util/gertty-9999
 2206121142 metadata/md5-cache/dev-util/gi-docgen-2022.1
@@ -46619,7 +46568,6 @@
 2206121142 metadata/md5-cache/dev-util/gprof2dot-2021.02.21-r1
 2206121142 metadata/md5-cache/dev-util/gyp-20200512145953
 2206121142 metadata/md5-cache/dev-util/gyp-99999999999999
-2206121142 metadata/md5-cache/dev-util/howdoi-2.0.19
 2206112210 metadata/md5-cache/dev-util/lttng-modules-2.12.5
 2206112210 metadata/md5-cache/dev-util/lttng-modules-2.12.6
 2206112210 metadata/md5-cache/dev-util/lttng-modules-2.12.8
@@ -46638,7 +46586,6 @@
 2206120340 metadata/md5-cache/dev-util/pkgconf-1.8.0-r1
 2206120340 metadata/md5-cache/dev-util/pkgconf-9999
 2206121142 metadata/md5-cache/dev-util/rbtools-2.0.1
-2206121142 metadata/md5-cache/dev-util/rbtools-3.1
 2206121142 metadata/md5-cache/dev-util/ropper-1.13.7
 2206121142 metadata/md5-cache/dev-util/ropper-9999
 2206121142 metadata/md5-cache/dev-util/rosdep-0.21.0
@@ -46657,7 +46604,6 @@
 2206121142 metadata/md5-cache/dev-util/yamllint-1.26.3-r1
 2206121142 metadata/md5-cache/dev-util/ydiff-1.2
 2206122110 metadata/md5-cache/dev-util/pkgdev-9999
-2206140910 metadata/md5-cache/dev-util/diffoscope-216
 2206152140 metadata/md5-cache/dev-util/difftastic-0.29.1
 2206161940 metadata/md5-cache/dev-util/gcovr-5.1
 2206161210 metadata/md5-cache/dev-util/geany-1.38
@@ -46696,7 +46642,6 @@
 2206201810 metadata/md5-cache/dev-util/regexxer-0.10-r2
 2206211940 metadata/md5-cache/dev-util/stressapptest-1.0.9-r1
 2206211940 metadata/md5-cache/dev-util/xdelta-3.0.11-r1
-2206230910 metadata/md5-cache/dev-util/Manifest.gz
 2206221910 metadata/md5-cache/dev-util/ald-0.1.7-r2
 2206221910 metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1-r1
 2206221910 metadata/md5-cache/dev-util/android-studio-2020.3.1.24
@@ -46776,10 +46721,6 @@
 2206220743 metadata/md5-cache/dev-util/ignition-cmake-2.11.0
 2206220743 metadata/md5-cache/dev-util/include-what-you-use-0.17
 2206220743 metadata/md5-cache/dev-util/include-what-you-use-0.18
-2206220743 metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11104
-2206220743 metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11222_p20220518
-2206220743 metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11279_p20220528
-2206220743 metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11378
 2206220743 metadata/md5-cache/dev-util/intel-graphics-system-controller-0.6.0
 2206230910 metadata/md5-cache/dev-util/jenkins-bin-2.332.4
 2206230910 metadata/md5-cache/dev-util/jenkins-bin-2.356
@@ -46895,6 +46836,22 @@
 2206220743 metadata/md5-cache/dev-util/watchman-2022.03.28.00
 2206220743 metadata/md5-cache/dev-util/watchman-2022.04.11.00
 2206221040 metadata/md5-cache/dev-util/weka-3.8.0-r1
+2206251740 metadata/md5-cache/dev-util/Manifest.gz
+2206242140 metadata/md5-cache/dev-util/cargo-audit-0.15.2-r1
+2206242140 metadata/md5-cache/dev-util/cargo-audit-0.17.0
+2206241240 metadata/md5-cache/dev-util/diffoscope-216
+2206231240 metadata/md5-cache/dev-util/ebuildtester-42
+2206251140 metadata/md5-cache/dev-util/gdbus-codegen-2.72.2
+2206251140 metadata/md5-cache/dev-util/glib-utils-2.72.2
+2206241210 metadata/md5-cache/dev-util/gource-0.53
+2206241140 metadata/md5-cache/dev-util/howdoi-2.0.19
+2206251740 metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11378
+2206250940 metadata/md5-cache/dev-util/jenkins-bin-2.346.1
+2206240040 metadata/md5-cache/dev-util/kube-linter-0.3.0
+2206232040 metadata/md5-cache/dev-util/kubeval-0.16.1
+2206251640 metadata/md5-cache/dev-util/lldb-14.0.6
+2206250010 metadata/md5-cache/dev-util/rbtools-3.1
+2206241210 metadata/md5-cache/dev-util/rpmdevtools-9.5
 2101070210 metadata/md5-cache/dev-vcs/colorsvn-0.3.3
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 2002230040 metadata/md5-cache/dev-vcs/cvsgraph-1.7.0
@@ -47141,7 +47098,6 @@
 2205170654 metadata/md5-cache/games-arcade/xjump-2.7.5-r2
 2206071015 metadata/md5-cache/games-arcade/gnome-nibbles-3.38.2
 2206071015 metadata/md5-cache/games-arcade/gnome-robots-40.0
-2206221910 metadata/md5-cache/games-arcade/Manifest.gz
 2206221910 metadata/md5-cache/games-arcade/abe-1.1-r1
 2206221910 metadata/md5-cache/games-arcade/amphetamine-0.8.10-r1
 2206221910 metadata/md5-cache/games-arcade/apricots-0.2.7
@@ -47214,7 +47170,6 @@
 2206221910 metadata/md5-cache/games-arcade/rockdodger-1.1.4
 2206221910 metadata/md5-cache/games-arcade/rocksndiamonds-4.1.4.1
 2206221910 metadata/md5-cache/games-arcade/sable-1.0-r1
-2206220743 metadata/md5-cache/games-arcade/savagewheels-1.6.1-r2
 2206221910 metadata/md5-cache/games-arcade/sdb-1.0.2-r2
 2206221910 metadata/md5-cache/games-arcade/sdl-sopwith-1.7.5-r2
 2206221910 metadata/md5-cache/games-arcade/sdlroids-1.3.4-r5
@@ -47243,6 +47198,8 @@
 2206221910 metadata/md5-cache/games-arcade/xsfcave-0.5-r1
 2206221910 metadata/md5-cache/games-arcade/xtux-20030306-r1
 2206221910 metadata/md5-cache/games-arcade/yarsrevenge-0.99-r1
+2206241640 metadata/md5-cache/games-arcade/Manifest.gz
+2206241640 metadata/md5-cache/games-arcade/savagewheels-1.6.1-r2
 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
@@ -47408,7 +47365,6 @@
 2205170654 metadata/md5-cache/games-engines/scummvm-tools-2.2.0
 2205170654 metadata/md5-cache/games-engines/xzip-1.8.2-r3
 2206081210 metadata/md5-cache/games-engines/exult-1.6
-2206221910 metadata/md5-cache/games-engines/Manifest.gz
 2206220743 metadata/md5-cache/games-engines/box2d-2.4.1
 2206220743 metadata/md5-cache/games-engines/devilutionx-1.1.0-r2
 2206220743 metadata/md5-cache/games-engines/devilutionx-1.2.0
@@ -47435,6 +47391,8 @@
 2206220743 metadata/md5-cache/games-engines/stratagus-3.1.1
 2206220743 metadata/md5-cache/games-engines/stratagus-3.1.2
 2206220743 metadata/md5-cache/games-engines/stratagus-3.2.0
+2206250040 metadata/md5-cache/games-engines/Manifest.gz
+2206250040 metadata/md5-cache/games-engines/scrap-engine-1.2.0
 2005172009 metadata/md5-cache/games-fps/doom-data-1.9
 2107291439 metadata/md5-cache/games-fps/freedoom-0.12.1
 2104062139 metadata/md5-cache/games-fps/glxquake-bin-0-r3
@@ -47456,7 +47414,6 @@
 2202210209 metadata/md5-cache/games-fps/doom2-data-gog-1.9
 2202210209 metadata/md5-cache/games-fps/final-doom-data-gog-1.9
 2204011845 metadata/md5-cache/games-fps/ezquake-bin-2.2-r3
-2204112210 metadata/md5-cache/games-fps/duke3d-data-1.0-r5
 2204112210 metadata/md5-cache/games-fps/etqw-data-1.0-r1
 2204112210 metadata/md5-cache/games-fps/quake1-data-2.40-r1
 2205122041 metadata/md5-cache/games-fps/urbanterror-data-4.3.4
@@ -47472,15 +47429,11 @@
 2206071015 metadata/md5-cache/games-fps/chocolate-doom-3.0.1-r1
 2206071015 metadata/md5-cache/games-fps/freedm-data-0.12.1-r1
 2206071015 metadata/md5-cache/games-fps/freedoom-data-0.12.1-r1
-2206221910 metadata/md5-cache/games-fps/Manifest.gz
 2206221910 metadata/md5-cache/games-fps/alienarena-7.66
 2206220743 metadata/md5-cache/games-fps/avp-20150214-r1
 2206221910 metadata/md5-cache/games-fps/blackshades-20070723-r1
 2206221910 metadata/md5-cache/games-fps/darkplaces-20140513-r2
 2206220743 metadata/md5-cache/games-fps/doomsday-2.3.1
-2206221910 metadata/md5-cache/games-fps/eduke32-20211202.9831
-2206221910 metadata/md5-cache/games-fps/eduke32-20220204.9957
-2206221910 metadata/md5-cache/games-fps/eduke32-20220422.10033
 2206221910 metadata/md5-cache/games-fps/etqw-bin-1.5-r4
 2206221910 metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r4
 2206221910 metadata/md5-cache/games-fps/gzdoom-4.7.1
@@ -47507,6 +47460,9 @@
 2206221910 metadata/md5-cache/games-fps/worldofpadman-1.6-r2
 2206221910 metadata/md5-cache/games-fps/xonotic-0.8.2
 2206221910 metadata/md5-cache/games-fps/yamagi-quake2-8.01
+2206251810 metadata/md5-cache/games-fps/Manifest.gz
+2206251740 metadata/md5-cache/games-fps/duke3d-data-1.0-r5
+2206251810 metadata/md5-cache/games-fps/eduke32-20220422.10033
 2206071015 metadata/md5-cache/games-kids/gmult-10.0
 2206221910 metadata/md5-cache/games-kids/Manifest.gz
 2206220743 metadata/md5-cache/games-kids/gcompris-1.0
@@ -47731,7 +47687,6 @@
 2206071015 metadata/md5-cache/games-rpg/adonthell-0.3.8
 2206071015 metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc2-r1
 2206071015 metadata/md5-cache/games-rpg/wastesedge-0.3.8
-2206221910 metadata/md5-cache/games-rpg/Manifest.gz
 2206221910 metadata/md5-cache/games-rpg/avadon-1.0.4_p1331768904
 2206221910 metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
 2206221910 metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121
@@ -47774,21 +47729,22 @@
 2206221910 metadata/md5-cache/games-rpg/wasteland2-1.9.0.13-r2
 2206221910 metadata/md5-cache/games-rpg/zsdx-1.9.0-r1
 2206221910 metadata/md5-cache/games-rpg/zsxd-1.9.0-r1
+2206250110 metadata/md5-cache/games-rpg/Manifest.gz
+2206250110 metadata/md5-cache/games-rpg/pokete-0.7.3
 2106302209 metadata/md5-cache/games-server/crossfire-server-1.71.0-r2
 1702282323 metadata/md5-cache/games-server/mednafen-server-0.5.2-r1
 2104180939 metadata/md5-cache/games-server/mtavc-0.5-r2
 2203240726 metadata/md5-cache/games-server/steamcmd-1.0-r4
 2204011845 metadata/md5-cache/games-server/etqw-ded-1.5-r1
-2204091809 metadata/md5-cache/games-server/bedrock-server-1.18.12.01-r2
 2205122041 metadata/md5-cache/games-server/ut2004-ded-3369.3-r2
-2205141440 metadata/md5-cache/games-server/bedrock-server-1.18.33.02
 2205170654 metadata/md5-cache/games-server/pvpgn-1.8.5-r4
-2206072340 metadata/md5-cache/games-server/bedrock-server-1.19.1.01
-2206221910 metadata/md5-cache/games-server/Manifest.gz
 2206221040 metadata/md5-cache/games-server/minecraft-server-1.18.2
 2206221040 metadata/md5-cache/games-server/minecraft-server-1.19
 2206221910 metadata/md5-cache/games-server/monopd-0.10.2-r1
 2206220743 metadata/md5-cache/games-server/pvpgn-1.99.7.2.1-r1
+2206251740 metadata/md5-cache/games-server/Manifest.gz
+2206251740 metadata/md5-cache/games-server/bedrock-server-1.19.1.01
+2206251740 metadata/md5-cache/games-server/bedrock-server-1.19.2.02
 2104161439 metadata/md5-cache/games-simulation/senken-0.3.0-r1
 2202261509 metadata/md5-cache/games-simulation/simutrans-paksets-123.0.1
 2203240726 metadata/md5-cache/games-simulation/flightgear-data-9999
@@ -47822,18 +47778,18 @@
 2206221910 metadata/md5-cache/games-simulation/train-valley-1.3.31403
 2010031709 metadata/md5-cache/games-sports/gracer-0.1.5-r2
 2203240726 metadata/md5-cache/games-sports/trophy-2.0.4
-2206221910 metadata/md5-cache/games-sports/Manifest.gz
 2206221910 metadata/md5-cache/games-sports/billardgl-1.75-r2
 2206221910 metadata/md5-cache/games-sports/bygfoot-2.3.2-r1
 2206220743 metadata/md5-cache/games-sports/dustrac-1.13.0
 2206221910 metadata/md5-cache/games-sports/foobillard-3.0a-r1
-2206221910 metadata/md5-cache/games-sports/skatebird-12
 2206221910 metadata/md5-cache/games-sports/speed-dreams-2.2.3
 2206221910 metadata/md5-cache/games-sports/stormbaancoureur-2.1.6-r2
 2206221910 metadata/md5-cache/games-sports/torcs-1.3.6-r2
 2206221910 metadata/md5-cache/games-sports/trigger-0.6.1-r1
 2206221910 metadata/md5-cache/games-sports/ultimatestunts-0.7.7-r1
 2206220743 metadata/md5-cache/games-sports/xmoto-0.6.1-r100
+2206251140 metadata/md5-cache/games-sports/Manifest.gz
+2206251140 metadata/md5-cache/games-sports/skatebird-14
 2204112210 metadata/md5-cache/games-strategy/settlers-2-gold-data-0
 2204112210 metadata/md5-cache/games-strategy/wargus-data-0-r1
 2205122041 metadata/md5-cache/games-strategy/ja2-stracciatella-data-1-r1
@@ -48000,13 +47956,14 @@
 2206161940 metadata/md5-cache/gnome-base/gnome-desktop-42.1-r300
 2206211940 metadata/md5-cache/gnome-base/gnome-common-3.18.0-r2
 2206211940 metadata/md5-cache/gnome-base/gnome-menus-3.36.0-r1
-2206221910 metadata/md5-cache/gnome-base/Manifest.gz
 2206221910 metadata/md5-cache/gnome-base/gconf-3.2.6-r5
 2206221910 metadata/md5-cache/gnome-base/gdm-42.0
 2206221910 metadata/md5-cache/gnome-base/gnome-session-42.0
 2206221910 metadata/md5-cache/gnome-base/libglade-2.6.4-r3
 2206221910 metadata/md5-cache/gnome-base/librsvg-2.54.3
 2206221910 metadata/md5-cache/gnome-base/librsvg-2.54.4
+2206240710 metadata/md5-cache/gnome-base/Manifest.gz
+2206240710 metadata/md5-cache/gnome-base/gnome-shell-42.1-r3
 2203240726 metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.38.1
 2205050610 metadata/md5-cache/gnome-extra/cinnamon-translations-5.2.2
 2205170654 metadata/md5-cache/gnome-extra/eiciel-0.9.13.1
@@ -48058,7 +48015,6 @@
 2206071015 metadata/md5-cache/gnome-extra/gnome-color-manager-3.36.0
 2206071015 metadata/md5-cache/gnome-extra/gnome-contacts-41.0
 2206071015 metadata/md5-cache/gnome-extra/gnome-contacts-42.0
-2206071015 metadata/md5-cache/gnome-extra/gnome-documents-3.34.0-r1
 2206071015 metadata/md5-cache/gnome-extra/gnome-logs-42.0
 2206071015 metadata/md5-cache/gnome-extra/gnome-power-manager-3.32.0
 2206071015 metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-41
@@ -48090,7 +48046,6 @@
 2206200610 metadata/md5-cache/gnome-extra/gnome-commander-1.14.3
 2206211940 metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6-r1
 2206211040 metadata/md5-cache/gnome-extra/nemo-5.2.4-r1
-2206221910 metadata/md5-cache/gnome-extra/Manifest.gz
 2206220743 metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r5
 2206220743 metadata/md5-cache/gnome-extra/evolution-data-server-3.44.1
 2206220743 metadata/md5-cache/gnome-extra/evolution-data-server-3.44.2
@@ -48103,6 +48058,7 @@
 2206221910 metadata/md5-cache/gnome-extra/libgda-5.2.9
 2206221910 metadata/md5-cache/gnome-extra/mousetweaks-3.32.0
 2206221910 metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92
+2206232210 metadata/md5-cache/gnome-extra/Manifest.gz
 2205170654 metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
 2205170654 metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
 2205170654 metadata/md5-cache/gnustep-apps/batmon-0.8-r1
@@ -48267,13 +48223,14 @@
 2206071015 metadata/md5-cache/gui-libs/wlroots-9999
 2206071015 metadata/md5-cache/gui-libs/wpebackend-fdo-1.12.0
 2206071015 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.4.0
-2206071015 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.5.0
 2206071015 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
 2206101440 metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.5
 2206121910 metadata/md5-cache/gui-libs/egl-wayland-1.1.10
 2206140610 metadata/md5-cache/gui-libs/gtksourceview-5.4.2
-2206220743 metadata/md5-cache/gui-libs/Manifest.gz
 2206220743 metadata/md5-cache/gui-libs/xdg-desktop-portal-lxqt-0.2.0
+2206240540 metadata/md5-cache/gui-libs/Manifest.gz
+2206240540 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.5.0
+2206240540 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.6.0
 2205170654 metadata/md5-cache/gui-wm/hikari-2.3.3
 2206071015 metadata/md5-cache/gui-wm/Manifest.gz
 2206071015 metadata/md5-cache/gui-wm/sway-1.7
@@ -48307,11 +48264,9 @@
 2206091440 metadata/md5-cache/kde-apps/kdegraphics-meta-22.04.2
 2206091440 metadata/md5-cache/kde-apps/kdemultimedia-meta-22.04.2
 2206091440 metadata/md5-cache/kde-apps/kdenetwork-meta-22.04.2
-2206091440 metadata/md5-cache/kde-apps/kdepim-meta-22.04.2
 2206091440 metadata/md5-cache/kde-apps/kdesdk-meta-22.04.2
 2206091440 metadata/md5-cache/kde-apps/kdeutils-meta-22.04.2
 2206091440 metadata/md5-cache/kde-apps/plasma-telepathy-meta-22.04.2
-2206220743 metadata/md5-cache/kde-apps/Manifest.gz
 2206220743 metadata/md5-cache/kde-apps/akonadi-21.12.3
 2206220743 metadata/md5-cache/kde-apps/akonadi-22.04.2
 2206220743 metadata/md5-cache/kde-apps/akonadi-calendar-21.12.3
@@ -48735,6 +48690,8 @@
 2206220743 metadata/md5-cache/kde-apps/yakuake-22.04.2
 2206220743 metadata/md5-cache/kde-apps/zeroconf-ioslave-21.12.3
 2206220743 metadata/md5-cache/kde-apps/zeroconf-ioslave-22.04.2
+2206240810 metadata/md5-cache/kde-apps/Manifest.gz
+2206240810 metadata/md5-cache/kde-apps/kdepim-meta-22.04.2
 2205251440 metadata/md5-cache/kde-frameworks/kf-env-5
 2206121142 metadata/md5-cache/kde-frameworks/kapidox-5.92.0
 2206122310 metadata/md5-cache/kde-frameworks/kapidox-5.95.0
@@ -49119,7 +49076,6 @@
 2205170654 metadata/md5-cache/mail-client/alpine-2.25-r1
 2205170654 metadata/md5-cache/mail-client/balsa-2.6.3-r1
 2205170654 metadata/md5-cache/mail-client/hap-3.7-r1
-2205170654 metadata/md5-cache/mail-client/mailx-8.1.2.20180807
 2205170654 metadata/md5-cache/mail-client/mailx-support-20060102-r2
 2205170654 metadata/md5-cache/mail-client/mutt-2.2.3
 2205170654 metadata/md5-cache/mail-client/s-nail-14.9.22
@@ -49141,7 +49097,6 @@
 2206161940 metadata/md5-cache/mail-client/neomutt-20220429
 2206161940 metadata/md5-cache/mail-client/neomutt-99999999
 2206131710 metadata/md5-cache/mail-client/roundcube-1.6_rc
-2206221910 metadata/md5-cache/mail-client/Manifest.gz
 2206221910 metadata/md5-cache/mail-client/claws-mail-3.18.0-r3
 2206221910 metadata/md5-cache/mail-client/claws-mail-3.19.0-r1
 2206221910 metadata/md5-cache/mail-client/claws-mail-4.1.0
@@ -49154,6 +49109,9 @@
 2206221910 metadata/md5-cache/mail-client/sylpheed-3.7.0-r5
 2206221910 metadata/md5-cache/mail-client/thunderbird-91.10.0
 2206221910 metadata/md5-cache/mail-client/thunderbird-bin-91.10.0
+2206250810 metadata/md5-cache/mail-client/Manifest.gz
+2206250810 metadata/md5-cache/mail-client/alpine-2.26
+2206240710 metadata/md5-cache/mail-client/mailx-8.1.2.20180807
 2111071239 metadata/md5-cache/mail-filter/dkimproxy-1.4.1
 2105021209 metadata/md5-cache/mail-filter/mailfilter-0.8.4
 2107120039 metadata/md5-cache/mail-filter/mimedefang-2.84-r1
@@ -49316,7 +49274,6 @@
 2205051410 metadata/md5-cache/media-fonts/source-han-sans-1.004
 2205100440 metadata/md5-cache/media-fonts/dejavu-2.37
 2205100440 metadata/md5-cache/media-fonts/fira-code-6.2
-2205100440 metadata/md5-cache/media-fonts/fira-mono-4.202
 2205100440 metadata/md5-cache/media-fonts/fira-sans-4.202
 2205141340 metadata/md5-cache/media-fonts/urw-fonts-2.4.9
 2205171610 metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1-r2
@@ -49534,8 +49491,9 @@
 2206180610 metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r2
 2206180610 metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r2
 2206200910 metadata/md5-cache/media-fonts/cascadia-code-2111.01
-2206220743 metadata/md5-cache/media-fonts/Manifest.gz
 2206220743 metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1
+2206241610 metadata/md5-cache/media-fonts/Manifest.gz
+2206241610 metadata/md5-cache/media-fonts/fira-mono-4.202
 2107180709 metadata/md5-cache/media-gfx/album-4.15-r1
 2009111309 metadata/md5-cache/media-gfx/dpic-20200901
 2101181809 metadata/md5-cache/media-gfx/exif-0.6.22
@@ -49735,7 +49693,6 @@
 2206151210 metadata/md5-cache/media-gfx/jpeg2ps-1.9-r3
 2206181210 metadata/md5-cache/media-gfx/graphviz-4.0.0
 2206211940 metadata/md5-cache/media-gfx/scrot-1.7-r2
-2206230740 metadata/md5-cache/media-gfx/Manifest.gz
 2206220743 metadata/md5-cache/media-gfx/alembic-1.8.3-r2
 2206220743 metadata/md5-cache/media-gfx/ansilove-4.1.5
 2206220743 metadata/md5-cache/media-gfx/ansilove-4.1.6
@@ -49868,11 +49825,13 @@
 2206221910 metadata/md5-cache/media-gfx/viewer-0.8.0-r1
 2206220743 metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20220419
 2206221910 metadata/md5-cache/media-gfx/xpaint-3.1.4
-2206221910 metadata/md5-cache/media-gfx/xsane-0.999-r3
 2206221910 metadata/md5-cache/media-gfx/xv-3.10a-r19
 2206220743 metadata/md5-cache/media-gfx/yafaray-3.4.1
 2206220743 metadata/md5-cache/media-gfx/yafaray-3.5.1-r1
 2206221040 metadata/md5-cache/media-gfx/zbar-0.23.90
+2206240140 metadata/md5-cache/media-gfx/Manifest.gz
+2206240140 metadata/md5-cache/media-gfx/prusaslicer-2.6.0_pre20220620
+2206232340 metadata/md5-cache/media-gfx/xsane-0.999-r4
 2109230439 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.4
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 2012270139 metadata/md5-cache/media-libs/cimg-2.9.3
@@ -50203,7 +50162,6 @@
 2206071015 metadata/md5-cache/media-libs/gupnp-dlna-0.12.0
 2206071015 metadata/md5-cache/media-libs/hamlib-4.3.1
 2206071015 metadata/md5-cache/media-libs/hamlib-4.4
-2206071015 metadata/md5-cache/media-libs/harfbuzz-4.3.0
 2206071015 metadata/md5-cache/media-libs/harfbuzz-9999
 2206071015 metadata/md5-cache/media-libs/jbig2dec-0.18
 2206071015 metadata/md5-cache/media-libs/jbig2dec-0.19
@@ -50235,13 +50193,7 @@
 2206071015 metadata/md5-cache/media-libs/lv2-1.18.2
 2206071015 metadata/md5-cache/media-libs/lv2-1.18.4
 2206071015 metadata/md5-cache/media-libs/lvtk-1.2.0-r1
-2206071015 metadata/md5-cache/media-libs/mesa-21.3.8
-2206071015 metadata/md5-cache/media-libs/mesa-22.0.3
-2206071015 metadata/md5-cache/media-libs/mesa-22.0.4
-2206071015 metadata/md5-cache/media-libs/mesa-22.1.0
-2206071015 metadata/md5-cache/media-libs/mesa-22.1.1
 2206071015 metadata/md5-cache/media-libs/mesa-9999
-2206071015 metadata/md5-cache/media-libs/mesa-amber-21.3.8
 2206071015 metadata/md5-cache/media-libs/rlottie-0.2_p20210405
 2206071015 metadata/md5-cache/media-libs/rubberband-2.0.2
 2206071015 metadata/md5-cache/media-libs/sratom-0.6.10
@@ -50271,7 +50223,6 @@
 2206161940 metadata/md5-cache/media-libs/sdl2-mixer-2.0.4
 2206161940 metadata/md5-cache/media-libs/sdl2-mixer-2.0.4-r1
 2206170040 metadata/md5-cache/media-libs/freeimage-3.18.0-r8
-2206171010 metadata/md5-cache/media-libs/mesa-22.0.5
 2206162140 metadata/md5-cache/media-libs/mesa-22.1.2
 2206172240 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.7.1
 2206180340 metadata/md5-cache/media-libs/libpulse-16.0-r1
@@ -50292,7 +50243,6 @@
 2206210240 metadata/md5-cache/media-libs/gavl-1.4.0-r2
 2206220743 metadata/md5-cache/media-libs/Field3D-1.7.2
 2206220743 metadata/md5-cache/media-libs/Field3D-1.7.2-r3
-2206231010 metadata/md5-cache/media-libs/Manifest.gz
 2206220743 metadata/md5-cache/media-libs/SoQt-1.6.0
 2206220743 metadata/md5-cache/media-libs/SoXt-1.4.0
 2206220743 metadata/md5-cache/media-libs/aften-0.0.8-r2
@@ -50300,19 +50250,14 @@
 2206220743 metadata/md5-cache/media-libs/allegro-5.2.7.0
 2206220743 metadata/md5-cache/media-libs/alure-1.2-r2
 2206220743 metadata/md5-cache/media-libs/ampache_browser-1.0.3
-2206220743 metadata/md5-cache/media-libs/assimp-5.0.1
-2206220743 metadata/md5-cache/media-libs/assimp-5.2.2
-2206220743 metadata/md5-cache/media-libs/assimp-5.2.3
 2206221940 metadata/md5-cache/media-libs/assimp-5.2.4
 2206220940 metadata/md5-cache/media-libs/aubio-0.4.9-r2
 2206220743 metadata/md5-cache/media-libs/avidemux-core-2.7.8
 2206220743 metadata/md5-cache/media-libs/avidemux-plugins-2.7.8
 2206220743 metadata/md5-cache/media-libs/bcg729-1.1.1
 2206220743 metadata/md5-cache/media-libs/chromaprint-1.5.1-r2
-2206221910 metadata/md5-cache/media-libs/clutter-1.26.4
 2206221910 metadata/md5-cache/media-libs/clutter-gst-3.0.27-r1
 2206220743 metadata/md5-cache/media-libs/codec2-1.0.3
-2206221910 metadata/md5-cache/media-libs/cogl-1.22.8-r1
 2206220743 metadata/md5-cache/media-libs/coin-4.0.0
 2206220743 metadata/md5-cache/media-libs/ctl-1.5.2-r2
 2206221910 metadata/md5-cache/media-libs/cubeb-0.2_p20211213
@@ -50332,9 +50277,6 @@
 2206220743 metadata/md5-cache/media-libs/glm-0.9.9.8-r1
 2206220743 metadata/md5-cache/media-libs/glpng-1.46-r1
 2206220743 metadata/md5-cache/media-libs/glyr-1.0.10-r1
-2206220743 metadata/md5-cache/media-libs/gmmlib-22.1.2
-2206220743 metadata/md5-cache/media-libs/gmmlib-22.1.3
-2206220743 metadata/md5-cache/media-libs/gmmlib-9999
 2206221910 metadata/md5-cache/media-libs/gnonlin-1.4.0-r1
 2206221910 metadata/md5-cache/media-libs/gst-rtsp-server-1.16.3
 2206221910 metadata/md5-cache/media-libs/id3lib-3.8.3-r8
@@ -50496,6 +50438,18 @@
 2206221910 metadata/md5-cache/media-libs/xine-lib-1.2.10
 2206220743 metadata/md5-cache/media-libs/zmusic-1.1.4
 2206220743 metadata/md5-cache/media-libs/zxing-cpp-1.3.0
+2206251740 metadata/md5-cache/media-libs/Manifest.gz
+2206232340 metadata/md5-cache/media-libs/clutter-1.26.4-r1
+2206232340 metadata/md5-cache/media-libs/cogl-1.22.8-r2
+2206251740 metadata/md5-cache/media-libs/gmmlib-22.1.3
+2206251740 metadata/md5-cache/media-libs/gmmlib-22.1.4
+2206251740 metadata/md5-cache/media-libs/gmmlib-9999
+2206251140 metadata/md5-cache/media-libs/harfbuzz-4.3.0
+2206241410 metadata/md5-cache/media-libs/mesa-22.0.5
+2206251210 metadata/md5-cache/media-libs/openal-1.22.1
+2206251240 metadata/md5-cache/media-libs/sbc-2.0
+2206251240 metadata/md5-cache/media-libs/speex-1.2.1
+2206251240 metadata/md5-cache/media-libs/speexdsp-1.2.1
 2109230909 metadata/md5-cache/media-plugins/audacious-plugins-4.0.5
 2011090239 metadata/md5-cache/media-plugins/gimp-lqr-0.7.2-r1
 2006152009 metadata/md5-cache/media-plugins/gmpc-alarm-11.8.16
@@ -50748,7 +50702,6 @@
 2206172240 metadata/md5-cache/media-plugins/alsa-plugins-1.2.7.1
 2206210940 metadata/md5-cache/media-plugins/vdr-epgsync-1.0.2
 2206210940 metadata/md5-cache/media-plugins/vdr-remoteosd-1.0.1
-2206221910 metadata/md5-cache/media-plugins/Manifest.gz
 2206220743 metadata/md5-cache/media-plugins/frei0r-plugins-1.7.0-r1
 2206220743 metadata/md5-cache/media-plugins/frei0r-plugins-1.7.0-r2
 2206221910 metadata/md5-cache/media-plugins/gst-plugins-jack-1.16.3
@@ -50964,15 +50917,13 @@
 2206221910 metadata/md5-cache/media-plugins/vdr-vcd-0.9-r4
 2206221910 metadata/md5-cache/media-plugins/vdr-vdrmanager-0.14
 2206221910 metadata/md5-cache/media-plugins/vdr-vompserver-0.4.1-r1
+2206242010 metadata/md5-cache/media-plugins/Manifest.gz
+2206242010 metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r2
 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
 2106172209 metadata/md5-cache/media-radio/flmsg-4.0.17-r1
-2110142009 metadata/md5-cache/media-radio/flrig-1.4.2
-2104282139 metadata/md5-cache/media-radio/gpredict-2.3
 2104161439 metadata/md5-cache/media-radio/xdx-2.5.0
-2112231339 metadata/md5-cache/media-radio/flrig-1.4.3
-2202072210 metadata/md5-cache/media-radio/flrig-1.4.4
 2203240726 metadata/md5-cache/media-radio/cqrlog-2.4.0
 2204271640 metadata/md5-cache/media-radio/flamp-2.2.07
 2204280210 metadata/md5-cache/media-radio/flmsg-4.0.19-r1
@@ -50999,7 +50950,6 @@
 2205170654 metadata/md5-cache/media-radio/xwxapt-3.4.3
 2205291740 metadata/md5-cache/media-radio/flrig-1.4.5
 2205311210 metadata/md5-cache/media-radio/gpredict-2.3-r1
-2206221910 metadata/md5-cache/media-radio/Manifest.gz
 2206220743 metadata/md5-cache/media-radio/direwolf-1.6
 2206221910 metadata/md5-cache/media-radio/grig-0.8.1-r1
 2206220743 metadata/md5-cache/media-radio/js8call-2.2.0-r1
@@ -51008,6 +50958,7 @@
 2206220743 metadata/md5-cache/media-radio/tqsl-2.6.3
 2206220743 metadata/md5-cache/media-radio/tqsl-2.6.4
 2206220743 metadata/md5-cache/media-radio/wsjtx-2.5.4
+2206251940 metadata/md5-cache/media-radio/Manifest.gz
 2008082009 metadata/md5-cache/media-sound/cdstatus-0.97.03
 1912100409 metadata/md5-cache/media-sound/cdtool-2.1.8-r1
 2008082009 metadata/md5-cache/media-sound/chordii-4.5.3
@@ -51266,14 +51217,12 @@
 2206071015 metadata/md5-cache/media-sound/guitarix-9999
 2206071015 metadata/md5-cache/media-sound/jack2-1.9.19
 2206071015 metadata/md5-cache/media-sound/jack2-9999
-2206071015 metadata/md5-cache/media-sound/jalv-1.6.6
 2206071015 metadata/md5-cache/media-sound/klick-0.12.2-r2
 2206071015 metadata/md5-cache/media-sound/lash-0.5.4-r4
 2206071015 metadata/md5-cache/media-sound/lilypond-2.22.0-r1
 2206071015 metadata/md5-cache/media-sound/lilypond-2.22.1-r1
 2206071015 metadata/md5-cache/media-sound/lilypond-2.23.0-r1
 2206071015 metadata/md5-cache/media-sound/lilypond-2.23.2-r1
-2206071015 metadata/md5-cache/media-sound/lilypond-9999
 2206071015 metadata/md5-cache/media-sound/lollypop-1.4.29
 2206071015 metadata/md5-cache/media-sound/mpc-0.33
 2206071015 metadata/md5-cache/media-sound/mpc-0.34
@@ -51285,7 +51234,6 @@
 2206071015 metadata/md5-cache/media-sound/mpdscribble-0.23
 2206071015 metadata/md5-cache/media-sound/ncmpc-0.46
 2206071015 metadata/md5-cache/media-sound/paprefs-1.2-r1
-2206071015 metadata/md5-cache/media-sound/patchage-1.0.4
 2206081210 metadata/md5-cache/media-sound/patchage-1.0.6
 2206071015 metadata/md5-cache/media-sound/playerctl-2.3.1
 2206080340 metadata/md5-cache/media-sound/pulseaudio-13.0-r1
@@ -51332,12 +51280,10 @@
 2206210840 metadata/md5-cache/media-sound/apetag-1.12-r3
 2206211010 metadata/md5-cache/media-sound/beets-9999
 2206210740 metadata/md5-cache/media-sound/chuck-1.4.1.1
-2206201510 metadata/md5-cache/media-sound/denonavr-cli-1
 2206210810 metadata/md5-cache/media-sound/denonavr-cli-2
 2206210440 metadata/md5-cache/media-sound/pulseaudio-16.0
 2206210440 metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r5
 2206200810 metadata/md5-cache/media-sound/vorbisgain-0.37-r4
-2206230740 metadata/md5-cache/media-sound/Manifest.gz
 2206220940 metadata/md5-cache/media-sound/abcmidi-2022.05.20
 2206221910 metadata/md5-cache/media-sound/aeolus-0.10.4
 2206221910 metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4
@@ -51352,8 +51298,6 @@
 2206221910 metadata/md5-cache/media-sound/baudline-1.08-r1
 2206221640 metadata/md5-cache/media-sound/beets-1.6.0
 2206220743 metadata/md5-cache/media-sound/bpmdetect-0.7.0_pre20170810
-2206221910 metadata/md5-cache/media-sound/cadence-0.9.1-r2
-2206221910 metadata/md5-cache/media-sound/cadence-0.9.2
 2206221910 metadata/md5-cache/media-sound/cadence-9999
 2206220743 metadata/md5-cache/media-sound/cantata-2.5.0
 2206220743 metadata/md5-cache/media-sound/clementine-1.4.0_rc1
@@ -51393,9 +51337,6 @@
 2206220743 metadata/md5-cache/media-sound/lmms-1.2.2
 2206220743 metadata/md5-cache/media-sound/lmms-9999
 2206221910 metadata/md5-cache/media-sound/milkytracker-1.03.00
-2206220743 metadata/md5-cache/media-sound/mixxx-2.3.2
-2206220743 metadata/md5-cache/media-sound/mixxx-2.3.9999
-2206220743 metadata/md5-cache/media-sound/mixxx-9999
 2206221910 metadata/md5-cache/media-sound/mp3blaster-3.2.6
 2206221910 metadata/md5-cache/media-sound/mp3diags-1.5.01-r1
 2206221640 metadata/md5-cache/media-sound/mp3val-0.1.8
@@ -51470,6 +51411,17 @@
 2206220743 metadata/md5-cache/media-sound/yoshimi-2.2.0
 2206220743 metadata/md5-cache/media-sound/zynaddsubfx-3.0.5
 2206220743 metadata/md5-cache/media-sound/zynaddsubfx-3.0.6
+2206251740 metadata/md5-cache/media-sound/Manifest.gz
+2206251210 metadata/md5-cache/media-sound/cadence-0.9.2
+2206251040 metadata/md5-cache/media-sound/denonavr-cli-3
+2206251240 metadata/md5-cache/media-sound/jalv-1.6.6
+2206251240 metadata/md5-cache/media-sound/lash-0.5.4-r5
+2206251540 metadata/md5-cache/media-sound/lilypond-9999
+2206251610 metadata/md5-cache/media-sound/mixxx-2.3.2
+2206251610 metadata/md5-cache/media-sound/mixxx-2.3.3
+2206251610 metadata/md5-cache/media-sound/mixxx-2.3.9999
+2206251610 metadata/md5-cache/media-sound/mixxx-9999
+2206251740 metadata/md5-cache/media-sound/teamspeak-server-3.13.7
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20190922
 2110160409 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
@@ -51809,13 +51761,11 @@
 2202231639 metadata/md5-cache/net-analyzer/nagios-check_rbl-1.6.3
 2202260609 metadata/md5-cache/net-analyzer/nagios-check_logfiles-4.0.1.3
 2202251339 metadata/md5-cache/net-analyzer/sslscan-2.0.11
-2202251139 metadata/md5-cache/net-analyzer/sslscan-2.0.12
 2202280209 metadata/md5-cache/net-analyzer/nagios-check_ipmi_sensor-3.13
 2203040040 metadata/md5-cache/net-analyzer/ipaudit-1.0_beta2-r1
 2203040040 metadata/md5-cache/net-analyzer/nagios-4.4.6
 2203040040 metadata/md5-cache/net-analyzer/nsca-2.7.2-r103
 2203040040 metadata/md5-cache/net-analyzer/pnp4nagios-0.6.26-r10
-2203161009 metadata/md5-cache/net-analyzer/sslscan-2.0.12-r1
 2203230410 metadata/md5-cache/net-analyzer/nagios-plugins-2.3.1-r3
 2203230410 metadata/md5-cache/net-analyzer/nagios-plugins-2.3.3-r3
 2203240726 metadata/md5-cache/net-analyzer/tcpslice-1.5
@@ -51824,7 +51774,6 @@
 2203282310 metadata/md5-cache/net-analyzer/fping-5.0
 2203282310 metadata/md5-cache/net-analyzer/lilac-1.0.3-r1
 2203282310 metadata/md5-cache/net-analyzer/syweb-0.65-r1
-2204040909 metadata/md5-cache/net-analyzer/sslscan-2.0.13
 2205011048 metadata/md5-cache/net-analyzer/nagios-plugin-check_lm_sensors-4.1.1_p20191028
 2205011048 metadata/md5-cache/net-analyzer/nagios-plugin-check_raid-4.0.10-r2
 2205011048 metadata/md5-cache/net-analyzer/nagios-plugin-check_raid-4.0.8-r2
@@ -51975,7 +51924,6 @@
 2205170654 metadata/md5-cache/net-analyzer/odhcploc-20111021-r1
 2205170654 metadata/md5-cache/net-analyzer/openbsd-netcat-1.190
 2205170654 metadata/md5-cache/net-analyzer/openbsd-netcat-1.195
-2205170654 metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
 2205170654 metadata/md5-cache/net-analyzer/ostinato-1.1-r2
 2205170654 metadata/md5-cache/net-analyzer/p0f-3.09_beta
 2205170654 metadata/md5-cache/net-analyzer/packit-1.7
@@ -52118,12 +52066,10 @@
 2206160110 metadata/md5-cache/net-analyzer/xprobe-0.3-r1
 2206170110 metadata/md5-cache/net-analyzer/nessus-agent-bin-10.1.4
 2206171540 metadata/md5-cache/net-analyzer/ssh-audit-2.5.0
-2206171510 metadata/md5-cache/net-analyzer/sslscan-2.0.13-r1
 2206171540 metadata/md5-cache/net-analyzer/testssl-3.0.7
 2206171940 metadata/md5-cache/net-analyzer/nikto-2.1.6_p20220602
 2206210511 metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r3
 2206211940 metadata/md5-cache/net-analyzer/traceroute-2.1.0-r2
-2206231010 metadata/md5-cache/net-analyzer/Manifest.gz
 2206220743 metadata/md5-cache/net-analyzer/arpon-3.0
 2206221910 metadata/md5-cache/net-analyzer/dhcp_probe-1.3.0-r4
 2206220743 metadata/md5-cache/net-analyzer/ettercap-0.8.3.1
@@ -52168,6 +52114,10 @@
 2206221040 metadata/md5-cache/net-analyzer/zabbix-6.0.5
 2206220743 metadata/md5-cache/net-analyzer/zmap-2.1.1-r4
 2206220743 metadata/md5-cache/net-analyzer/zmap-9999
+2206251640 metadata/md5-cache/net-analyzer/Manifest.gz
+2206250010 metadata/md5-cache/net-analyzer/openbsd-netcat-1.195-r1
+2206251640 metadata/md5-cache/net-analyzer/sslscan-2.0.13-r1
+2206250940 metadata/md5-cache/net-analyzer/sslscan-2.0.14
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2104161439 metadata/md5-cache/net-dialup/sercd-3.0.0-r2
 2111292209 metadata/md5-cache/net-dialup/pppconfig-2.3.21
@@ -52261,7 +52211,6 @@
 2205170654 metadata/md5-cache/net-dns/pdns-4.6.2
 2205170654 metadata/md5-cache/net-dns/pdnsd-1.2.9a-r2
 2205170654 metadata/md5-cache/net-dns/rbldnsd-0.998b-r2
-2205170654 metadata/md5-cache/net-dns/s6-dns-2.3.5.3
 2205170654 metadata/md5-cache/net-dns/smartdns-36.1
 2205222040 metadata/md5-cache/net-dns/knot-3.1.8
 2205310640 metadata/md5-cache/net-dns/bind-tools-9.16.29
@@ -52289,7 +52238,6 @@
 2206162110 metadata/md5-cache/net-dns/bind-tools-9.16.30
 2206170040 metadata/md5-cache/net-dns/pdns-4.6.2-r1
 2206201510 metadata/md5-cache/net-dns/unbound-1.16.0
-2206221910 metadata/md5-cache/net-dns/Manifest.gz
 2206221910 metadata/md5-cache/net-dns/dnssec-check-2.2
 2206221910 metadata/md5-cache/net-dns/dnstop-20140915-r2
 2206220743 metadata/md5-cache/net-dns/getdns-1.7.0-r1
@@ -52298,6 +52246,10 @@
 2206221040 metadata/md5-cache/net-dns/libidn-1.38-r1
 2206220810 metadata/md5-cache/net-dns/libidn-1.40
 2206220743 metadata/md5-cache/net-dns/resolv_wrapper-1.1.7
+2206251210 metadata/md5-cache/net-dns/Manifest.gz
+2206251210 metadata/md5-cache/net-dns/dnsdist-1.7.2
+2206250910 metadata/md5-cache/net-dns/s6-dns-2.3.5.3-r1
+2206250910 metadata/md5-cache/net-dns/s6-dns-2.3.5.4
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2205170654 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1
@@ -52356,12 +52308,9 @@
 2205170654 metadata/md5-cache/net-fs/s3fs-1.91
 2206071015 metadata/md5-cache/net-fs/cifs-utils-6.13-r1
 2206071015 metadata/md5-cache/net-fs/samba-4.14.12-r3
-2206071015 metadata/md5-cache/net-fs/samba-4.14.13
 2206071015 metadata/md5-cache/net-fs/samba-4.15.4-r3
 2206071015 metadata/md5-cache/net-fs/samba-4.15.6-r1
-2206071015 metadata/md5-cache/net-fs/samba-4.15.7
 2206071015 metadata/md5-cache/net-fs/samba-4.16.0-r1
-2206071015 metadata/md5-cache/net-fs/samba-4.16.1
 2206071015 metadata/md5-cache/net-fs/sshfs-3.7.0
 2206071015 metadata/md5-cache/net-fs/sshfs-3.7.1
 2206121142 metadata/md5-cache/net-fs/btfs-2.23
@@ -52370,10 +52319,15 @@
 2206112210 metadata/md5-cache/net-fs/openafs-1.8.8.1-r1
 2206131940 metadata/md5-cache/net-fs/libnfs-5.0.1
 2206180310 metadata/md5-cache/net-fs/nfs4-acl-tools-0.3.7-r1
-2206220743 metadata/md5-cache/net-fs/Manifest.gz
 2206220743 metadata/md5-cache/net-fs/cvmfs-2.8.2
 2206220743 metadata/md5-cache/net-fs/cvmfs-2.9.0
 2206220743 metadata/md5-cache/net-fs/cvmfs-2.9.2
+2206251210 metadata/md5-cache/net-fs/Manifest.gz
+2206240840 metadata/md5-cache/net-fs/cifs-utils-6.15
+2206251210 metadata/md5-cache/net-fs/samba-4.14.13
+2206251210 metadata/md5-cache/net-fs/samba-4.15.7
+2206240840 metadata/md5-cache/net-fs/samba-4.16.1
+2206241110 metadata/md5-cache/net-fs/samba-4.16.2
 2201032209 metadata/md5-cache/net-ftp/uftpd-2.15
 2204111309 metadata/md5-cache/net-ftp/cmdftp-0.9.8
 2204102210 metadata/md5-cache/net-ftp/tnftp-20210827
@@ -52381,7 +52335,6 @@
 2205170654 metadata/md5-cache/net-ftp/filezilla-3.58.0
 2205170654 metadata/md5-cache/net-ftp/filezilla-3.59.0
 2205170654 metadata/md5-cache/net-ftp/frox-0.7.18-r8
-2205170654 metadata/md5-cache/net-ftp/ftp-0.17.34.0.2.5.1
 2205170654 metadata/md5-cache/net-ftp/ftpbase-0.01-r6
 2205170654 metadata/md5-cache/net-ftp/gftp-2.9.1b
 2205170654 metadata/md5-cache/net-ftp/gproftpd-8.3.2-r3
@@ -52401,9 +52354,10 @@
 2206161940 metadata/md5-cache/net-ftp/lftp-4.9.2
 2206161940 metadata/md5-cache/net-ftp/lftp-9999
 2206142310 metadata/md5-cache/net-ftp/pure-ftpd-1.0.51
-2206221910 metadata/md5-cache/net-ftp/Manifest.gz
 2206221910 metadata/md5-cache/net-ftp/gftp-2.0.19-r3
 2206221910 metadata/md5-cache/net-ftp/pureadmin-0.4-r3
+2206250810 metadata/md5-cache/net-ftp/Manifest.gz
+2206250810 metadata/md5-cache/net-ftp/ftp-0.17.34.0.2.5.1
 2102160539 metadata/md5-cache/net-im/centerim-5.0.1-r1
 2104192239 metadata/md5-cache/net-im/cpop-0.0.4-r1
 2011142339 metadata/md5-cache/net-im/librvp-0.9.7
@@ -52431,7 +52385,6 @@
 2205170654 metadata/md5-cache/net-im/libcommuni-3.7.0
 2205170654 metadata/md5-cache/net-im/prosody-0.12.0
 2205170654 metadata/md5-cache/net-im/psi-1.5
-2205170654 metadata/md5-cache/net-im/purple-events-0.99.1
 2205170654 metadata/md5-cache/net-im/ricochet-1.1.4
 2205170654 metadata/md5-cache/net-im/ricochet-9999
 2205170654 metadata/md5-cache/net-im/ysm-2.9.9.1-r2
@@ -52463,7 +52416,6 @@
 2206201110 metadata/md5-cache/net-im/err-6.1.9
 2206211040 metadata/md5-cache/net-im/gajim-1.3.3-r2
 2206211040 metadata/md5-cache/net-im/gajim-1.3.3_p2-r1
-2206230910 metadata/md5-cache/net-im/Manifest.gz
 2206220743 metadata/md5-cache/net-im/biboumi-9.0-r4
 2206221910 metadata/md5-cache/net-im/bitlbee-steam-1.4.2
 2206221910 metadata/md5-cache/net-im/bitlbee-steam-9999
@@ -52509,6 +52461,8 @@
 2206221910 metadata/md5-cache/net-im/whatsapp-desktop-bin-0.5.2
 2206221910 metadata/md5-cache/net-im/zoom-5.10.7.3311
 2206222210 metadata/md5-cache/net-im/zoom-5.11.0.3540
+2206241640 metadata/md5-cache/net-im/Manifest.gz
+2206241640 metadata/md5-cache/net-im/purple-events-0.99.1
 2106302209 metadata/md5-cache/net-irc/bnc-2.9.4-r2
 2002230040 metadata/md5-cache/net-irc/ircmap-0.99-r1
 2106302209 metadata/md5-cache/net-irc/muh-2.2a-r2
@@ -52543,7 +52497,6 @@
 2205170654 metadata/md5-cache/net-irc/ircstats-1.2
 2205170654 metadata/md5-cache/net-irc/iroffer-dinoex-3.32-r2
 2205191040 metadata/md5-cache/net-irc/irssi-1.2.3
-2205170654 metadata/md5-cache/net-irc/irssi-xmpp-0.54
 2205170654 metadata/md5-cache/net-irc/irssistats-0.75-r1
 2205170654 metadata/md5-cache/net-irc/ninja-1.5.9_pre14-r2
 2205170654 metadata/md5-cache/net-irc/psybnc-2.3.2.9-r4
@@ -52565,7 +52518,6 @@
 2206071015 metadata/md5-cache/net-irc/znc-palaver-1.2.1-r1
 2206121410 metadata/md5-cache/net-irc/irssi-1.4.1
 2206120840 metadata/md5-cache/net-irc/irssi-9999
-2206121410 metadata/md5-cache/net-irc/irssi-xmpp-0.54-r1
 2206121142 metadata/md5-cache/net-irc/limnoria-20211118
 2206121142 metadata/md5-cache/net-irc/limnoria-20220203
 2206121142 metadata/md5-cache/net-irc/limnoria-20220427
@@ -52573,7 +52525,6 @@
 2206121142 metadata/md5-cache/net-irc/quasselgrep-0_p20200830
 2206160210 metadata/md5-cache/net-irc/ngircd-26.1-r5
 2206161940 metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48
-2206221910 metadata/md5-cache/net-irc/Manifest.gz
 2206220743 metadata/md5-cache/net-irc/anope-2.0.10-r1
 2206220743 metadata/md5-cache/net-irc/anope-2.0.11
 2206221910 metadata/md5-cache/net-irc/irccloud-desktop-bin-0.16.0-r1
@@ -52592,6 +52543,9 @@
 2206220743 metadata/md5-cache/net-irc/znc-1.8.2-r1
 2206220743 metadata/md5-cache/net-irc/znc-9999
 2206220743 metadata/md5-cache/net-irc/znc-clientbuffer-1.0.48-r1
+2206241640 metadata/md5-cache/net-irc/Manifest.gz
+2206241640 metadata/md5-cache/net-irc/irssi-xmpp-0.54
+2206241640 metadata/md5-cache/net-irc/irssi-xmpp-0.54-r1
 2103061309 metadata/md5-cache/net-libs/courier-unicode-2.1.2
 2010101039 metadata/md5-cache/net-libs/enet-1.2.2-r1
 2109121739 metadata/md5-cache/net-libs/enet-1.3.17
@@ -52726,11 +52680,8 @@
 2205170654 metadata/md5-cache/net-libs/nDPI-4.2
 2205170654 metadata/md5-cache/net-libs/nDPI-9999
 2205170654 metadata/md5-cache/net-libs/neon-0.32.2
-2205170654 metadata/md5-cache/net-libs/net6-1.3.14-r2
 2205170654 metadata/md5-cache/net-libs/netwib-5.39.0
 2205170654 metadata/md5-cache/net-libs/nghttp2-1.45.1-r1
-2205170654 metadata/md5-cache/net-libs/nghttp2-1.46.0
-2205170654 metadata/md5-cache/net-libs/nghttp2-1.47.0
 2205170654 metadata/md5-cache/net-libs/nghttp2-9999
 2205170654 metadata/md5-cache/net-libs/pjproject-2.10-r1
 2205170654 metadata/md5-cache/net-libs/pjproject-2.10-r2
@@ -52751,7 +52702,6 @@
 2205220010 metadata/md5-cache/net-libs/libnpupnp-4.2.2
 2205241440 metadata/md5-cache/net-libs/libndp-1.8
 2205260840 metadata/md5-cache/net-libs/libotr-4.1.1
-2205241440 metadata/md5-cache/net-libs/libqmi-9999
 2205260840 metadata/md5-cache/net-libs/uhttpmock-0.5.3
 2205280910 metadata/md5-cache/net-libs/gnome-online-accounts-3.44.0
 2205292340 metadata/md5-cache/net-libs/libmicrohttpd-0.9.75
@@ -52794,7 +52744,6 @@
 2206071015 metadata/md5-cache/net-libs/telepathy-accounts-signon-2.1
 2206071015 metadata/md5-cache/net-libs/telepathy-glib-0.24.2
 2206121142 metadata/md5-cache/net-libs/libaccounts-glib-1.25-r2
-2206082210 metadata/md5-cache/net-libs/libqrtr-glib-1.2.2
 2206110110 metadata/md5-cache/net-libs/librouteros-1.1.3
 2206121142 metadata/md5-cache/net-libs/libsignon-glib-2.1
 2206121142 metadata/md5-cache/net-libs/nodejs-14.19.3
@@ -52814,7 +52763,6 @@
 2206190210 metadata/md5-cache/net-libs/gnutls-3.7.6
 2206182010 metadata/md5-cache/net-libs/nodejs-18.3.0
 2206200240 metadata/md5-cache/net-libs/miniupnpc-2.2.3-r1
-2206221940 metadata/md5-cache/net-libs/Manifest.gz
 2206221040 metadata/md5-cache/net-libs/NativeThread-0_pre20190914-r1
 2206220743 metadata/md5-cache/net-libs/biblesync-2.1.0
 2206221910 metadata/md5-cache/net-libs/c-client-2007f-r7
@@ -52875,7 +52823,6 @@
 2206220743 metadata/md5-cache/net-libs/libwebsockets-4.3.1
 2206220743 metadata/md5-cache/net-libs/libwebsockets-4.3.2
 2206220743 metadata/md5-cache/net-libs/libyang-2.0.164
-2206220743 metadata/md5-cache/net-libs/libyang-2.0.194
 2206220743 metadata/md5-cache/net-libs/mbedtls-2.16.12
 2206220743 metadata/md5-cache/net-libs/mbedtls-2.28.0-r1
 2206220743 metadata/md5-cache/net-libs/mbedtls-3.1.0
@@ -52906,7 +52853,6 @@
 2206220743 metadata/md5-cache/net-libs/qxmpp-1.4.0
 2206220743 metadata/md5-cache/net-libs/qxmpp-9999
 2206220743 metadata/md5-cache/net-libs/rabbitmq-c-0.11.0
-2206221910 metadata/md5-cache/net-libs/rest-0.8.1
 2206220743 metadata/md5-cache/net-libs/rtrlib-0.7.0
 2206220743 metadata/md5-cache/net-libs/rtrlib-0.8.0
 2206221910 metadata/md5-cache/net-libs/shairplay-0_pre20170118
@@ -52931,6 +52877,16 @@
 2206220743 metadata/md5-cache/net-libs/xrootd-ceph-5.0.3
 2206220743 metadata/md5-cache/net-libs/xrootd-ceph-5.4.3
 2206220743 metadata/md5-cache/net-libs/zmqpp-4.2.0-r1
+2206251840 metadata/md5-cache/net-libs/Manifest.gz
+2206241840 metadata/md5-cache/net-libs/libqmi-1.30.8
+2206241840 metadata/md5-cache/net-libs/libqmi-9999
+2206251840 metadata/md5-cache/net-libs/libqrtr-glib-1.2.2
+2206241140 metadata/md5-cache/net-libs/libyang-2.0.194
+2206241640 metadata/md5-cache/net-libs/net6-1.3.14-r2
+2206251210 metadata/md5-cache/net-libs/nghttp2-1.47.0
+2206241310 metadata/md5-cache/net-libs/nghttp2-1.48.0
+2206251810 metadata/md5-cache/net-libs/ppp-defs-0
+2206232340 metadata/md5-cache/net-libs/rest-0.8.1-r1
 2104060140 metadata/md5-cache/net-mail/autorespond-2.0.4
 2007210509 metadata/md5-cache/net-mail/autorespond-2.0.5
 2009050439 metadata/md5-cache/net-mail/email-3.1.3-r1
@@ -52977,8 +52933,6 @@
 2205170654 metadata/md5-cache/net-mail/cyrus-imapd-3.0.17-r1
 2205170654 metadata/md5-cache/net-mail/cyrus-imapd-3.4.2-r2
 2205170654 metadata/md5-cache/net-mail/cyrus-imapd-3.4.3-r2
-2205170654 metadata/md5-cache/net-mail/dbmail-3.2.3-r5
-2205170654 metadata/md5-cache/net-mail/dbmail-3.2.5-r2
 2205191710 metadata/md5-cache/net-mail/dovecot-2.3.18-r1
 2205170654 metadata/md5-cache/net-mail/eps-1.7-r1
 2205170654 metadata/md5-cache/net-mail/isync-9999
@@ -53041,7 +52995,6 @@
 2206161940 metadata/md5-cache/net-mail/relay-ctrl-3.1.1-r3
 2206161940 metadata/md5-cache/net-mail/relay-ctrl-3.2
 2206211940 metadata/md5-cache/net-mail/qprint-1.1-r1
-2206221910 metadata/md5-cache/net-mail/Manifest.gz
 2206221910 metadata/md5-cache/net-mail/gnubiff-2.2.17-r2
 2206221910 metadata/md5-cache/net-mail/list-remote-forwards-0.0.1-r2
 2206221910 metadata/md5-cache/net-mail/mpack-1.6-r4
@@ -53049,6 +53002,9 @@
 2206221910 metadata/md5-cache/net-mail/notmuch-0.34.2
 2206220743 metadata/md5-cache/net-mail/poppassd_ceti-1.8.9
 2206221910 metadata/md5-cache/net-mail/vchkuser-0.4-r1
+2206250740 metadata/md5-cache/net-mail/Manifest.gz
+2206250740 metadata/md5-cache/net-mail/dbmail-3.2.3-r5
+2206250740 metadata/md5-cache/net-mail/dbmail-3.2.5-r2
 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
 2105261539 metadata/md5-cache/net-misc/asterisk-opus-13.0.1.3.0-r1
@@ -53056,8 +53012,6 @@
 2105261539 metadata/md5-cache/net-misc/asterisk-opus-18.0.1.3.0-r1
 2108291210 metadata/md5-cache/net-misc/autossh-1.4g
 1911110039 metadata/md5-cache/net-misc/autoupnp-0.4.7
-2105021539 metadata/md5-cache/net-misc/axel-2.17.8
-2105021539 metadata/md5-cache/net-misc/axel-2.17.9
 2002230040 metadata/md5-cache/net-misc/babeld-1.8.2
 2002230040 metadata/md5-cache/net-misc/babeld-1.9.1
 2110110309 metadata/md5-cache/net-misc/bird-2.0.7
@@ -53317,7 +53271,6 @@
 2205170654 metadata/md5-cache/net-misc/rdesktop-1.9.0-r1
 2205170654 metadata/md5-cache/net-misc/rinetd-0.62-r2
 2205170654 metadata/md5-cache/net-misc/rwhoisd-1.5.9.6-r2
-2205170654 metadata/md5-cache/net-misc/s6-networking-2.5.1.0
 2205170654 metadata/md5-cache/net-misc/scponly-4.8-r7
 2205170654 metadata/md5-cache/net-misc/shigofumi-9999
 2205170654 metadata/md5-cache/net-misc/sipp-3.6.0
@@ -53432,7 +53385,6 @@
 2206071015 metadata/md5-cache/net-misc/seafile-8.0.6
 2206071015 metadata/md5-cache/net-misc/seafile-8.0.7
 2206071015 metadata/md5-cache/net-misc/wget-1.21.2
-2206071015 metadata/md5-cache/net-misc/wget-1.21.3
 2206112210 metadata/md5-cache/net-misc/AQtion-2.2.7-r1
 2206112210 metadata/md5-cache/net-misc/AQtion-2.3.1-r1
 2206112210 metadata/md5-cache/net-misc/AQtion-2.3.4-r1
@@ -53507,12 +53459,8 @@
 2206171010 metadata/md5-cache/net-misc/ntpsec-1.2.1-r6
 2206181110 metadata/md5-cache/net-misc/whois-5.5.13-r1
 2206181840 metadata/md5-cache/net-misc/websocat-1.10.0
-2206200310 metadata/md5-cache/net-misc/networkmanager-1.36.4
-2206200310 metadata/md5-cache/net-misc/networkmanager-1.38.0
-2206200310 metadata/md5-cache/net-misc/networkmanager-1.38.2
 2206211710 metadata/md5-cache/net-misc/gnome-online-miners-3.34.0-r2
 2206200810 metadata/md5-cache/net-misc/rsync-3.2.4-r3
-2206230910 metadata/md5-cache/net-misc/Manifest.gz
 2206221910 metadata/md5-cache/net-misc/anydesk-5.5.6-r1
 2206221910 metadata/md5-cache/net-misc/anydesk-6.0.0-r1
 2206221910 metadata/md5-cache/net-misc/anydesk-6.0.1
@@ -53589,7 +53537,6 @@
 2206221910 metadata/md5-cache/net-misc/sslh-1.20-r2
 2206221910 metadata/md5-cache/net-misc/streamtuner-0.99.99-r5
 2206220743 metadata/md5-cache/net-misc/sysrepo-2.1.42
-2206220743 metadata/md5-cache/net-misc/sysrepo-2.1.64
 2206221910 metadata/md5-cache/net-misc/teamviewer-15.28.6
 2206221910 metadata/md5-cache/net-misc/teamviewer-15.30.3
 2206221040 metadata/md5-cache/net-misc/tigervnc-1.12.0-r6
@@ -53605,10 +53552,22 @@
 2206221910 metadata/md5-cache/net-misc/x2goclient-4.1.2.2-r1
 2206220743 metadata/md5-cache/net-misc/xmrig-6.16.4
 2206220743 metadata/md5-cache/net-misc/xmrig-6.17.0
-2206220743 metadata/md5-cache/net-misc/xmrig-9999
 2206221910 metadata/md5-cache/net-misc/youtube-viewer-3.9.7
 2206221910 metadata/md5-cache/net-misc/youtube-viewer-9999
 2206220440 metadata/md5-cache/net-misc/yt-dlp-2022.6.22.1
+2206251810 metadata/md5-cache/net-misc/Manifest.gz
+2206240010 metadata/md5-cache/net-misc/axel-2.17.11
+2206231640 metadata/md5-cache/net-misc/dropbox-151.4.4304
+2206251810 metadata/md5-cache/net-misc/networkmanager-1.36.4
+2206251810 metadata/md5-cache/net-misc/networkmanager-1.38.0
+2206251810 metadata/md5-cache/net-misc/networkmanager-1.38.2
+2206240140 metadata/md5-cache/net-misc/openssh-9.0_p1-r2
+2206250910 metadata/md5-cache/net-misc/s6-networking-2.5.1.0-r1
+2206250910 metadata/md5-cache/net-misc/s6-networking-2.5.1.1
+2206241140 metadata/md5-cache/net-misc/sysrepo-2.1.64
+2206241440 metadata/md5-cache/net-misc/wget-1.21.3
+2206231810 metadata/md5-cache/net-misc/xmrig-6.18.0
+2206231810 metadata/md5-cache/net-misc/xmrig-9999
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2203040040 metadata/md5-cache/net-nds/gssproxy-0.8.4-r2
 2203282310 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
@@ -53894,7 +53853,6 @@
 2205170654 metadata/md5-cache/net-vpn/networkmanager-libreswan-1.2.14-r1
 2205170654 metadata/md5-cache/net-vpn/networkmanager-libreswan-1.2.16
 2205170654 metadata/md5-cache/net-vpn/networkmanager-sstp-1.3.0
-2205170654 metadata/md5-cache/net-vpn/networkmanager-strongswan-1.5.2-r1
 2205170654 metadata/md5-cache/net-vpn/nstx-1.1_beta6-r3
 2205170654 metadata/md5-cache/net-vpn/ocserv-1.0.1-r1
 2205170654 metadata/md5-cache/net-vpn/ocserv-1.1.3
@@ -53903,7 +53861,6 @@
 2205170654 metadata/md5-cache/net-vpn/openfortivpn-1.17.1
 2205170654 metadata/md5-cache/net-vpn/openvpn-2.5.2-r2
 2205170654 metadata/md5-cache/net-vpn/openvpn-9999
-2205170654 metadata/md5-cache/net-vpn/pptpd-1.4.0-r3
 2205170654 metadata/md5-cache/net-vpn/strongswan-5.9.2-r3
 2205170654 metadata/md5-cache/net-vpn/strongswan-5.9.4-r2
 2205170654 metadata/md5-cache/net-vpn/strongswan-5.9.5-r1
@@ -53919,7 +53876,6 @@
 2205170654 metadata/md5-cache/net-vpn/vtun-3.0.3-r2
 2205170654 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210424
 2205170654 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210914
-2205230240 metadata/md5-cache/net-vpn/networkmanager-strongswan-1.6.0
 2205260910 metadata/md5-cache/net-vpn/libreswan-4.7
 2205282140 metadata/md5-cache/net-vpn/frp-0.43.0
 2205280440 metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.18
@@ -53937,7 +53893,6 @@
 2206121142 metadata/md5-cache/net-vpn/protonvpn-cli-2.2.11-r1
 2206112210 metadata/md5-cache/net-vpn/wireguard-modules-1.0.20211208
 2206182010 metadata/md5-cache/net-vpn/tor-0.4.7.8
-2206221910 metadata/md5-cache/net-vpn/Manifest.gz
 2206221040 metadata/md5-cache/net-vpn/i2p-1.6.1
 2206221040 metadata/md5-cache/net-vpn/i2p-1.7.0
 2206220743 metadata/md5-cache/net-vpn/i2pd-2.41.0
@@ -53945,6 +53900,9 @@
 2206221910 metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.2.10
 2206221910 metadata/md5-cache/net-vpn/networkmanager-fortisslvpn-1.2.8-r2
 2206221910 metadata/md5-cache/net-vpn/riseup-vpn-0.21.11
+2206251810 metadata/md5-cache/net-vpn/Manifest.gz
+2206251740 metadata/md5-cache/net-vpn/networkmanager-strongswan-1.6.0
+2206251810 metadata/md5-cache/net-vpn/pptpd-1.4.0-r3
 2004041439 metadata/md5-cache/net-wireless/bluez-hcidump-2.5
 2009240309 metadata/md5-cache/net-wireless/hidclient-20120728
 2008032109 metadata/md5-cache/net-wireless/kismetmobiledashboard-1.5_beta1-r2
@@ -54028,7 +53986,6 @@
 2206141610 metadata/md5-cache/net-wireless/dump1090-6.1
 2206141640 metadata/md5-cache/net-wireless/iwgtk-0.6
 2206172110 metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.5
-2206221910 metadata/md5-cache/net-wireless/Manifest.gz
 2206220743 metadata/md5-cache/net-wireless/airspy-1.0.10
 2206220743 metadata/md5-cache/net-wireless/airspy-9999
 2206220743 metadata/md5-cache/net-wireless/bladerf-2021.03
@@ -54110,6 +54067,8 @@
 2206221040 metadata/md5-cache/net-wireless/unifi-7.1.66
 2206221910 metadata/md5-cache/net-wireless/wpa_supplicant-2.10-r1
 2206221910 metadata/md5-cache/net-wireless/wpa_supplicant-9999
+2206251240 metadata/md5-cache/net-wireless/Manifest.gz
+2206251240 metadata/md5-cache/net-wireless/gnuradio-3.8.5.0-r1
 2205011048 metadata/md5-cache/perl-core/CPAN-2.290.0-r1
 2205011048 metadata/md5-cache/perl-core/Encode-3.120.0
 2205011048 metadata/md5-cache/perl-core/File-Temp-0.231.100
@@ -54476,8 +54435,6 @@
 2206221910 metadata/md5-cache/sci-biology/ucsc-genome-browser-260-r1
 2206221910 metadata/md5-cache/sci-biology/vcftools-0.1.14
 2206221910 metadata/md5-cache/sci-biology/yass-1.14-r2
-2110190609 metadata/md5-cache/sci-calculators/bc-gh-5.1.1
-2111101409 metadata/md5-cache/sci-calculators/bc-gh-5.2.0
 2106222139 metadata/md5-cache/sci-calculators/datamash-1.7-r1
 2101022239 metadata/md5-cache/sci-calculators/transcalc-0.14-r2
 2111280340 metadata/md5-cache/sci-calculators/bc-gh-5.2.1
@@ -54491,7 +54448,6 @@
 2205170654 metadata/md5-cache/sci-calculators/xsv-0.13.0
 2205280940 metadata/md5-cache/sci-calculators/qalculate-gtk-4.2.0
 2206121142 metadata/md5-cache/sci-calculators/units-2.21
-2206221910 metadata/md5-cache/sci-calculators/Manifest.gz
 2206221910 metadata/md5-cache/sci-calculators/calcoo-1.3.18-r1
 2206221910 metadata/md5-cache/sci-calculators/grpn-1.4.0
 2206220743 metadata/md5-cache/sci-calculators/hcalc-1.2-r1
@@ -54500,6 +54456,8 @@
 2206221910 metadata/md5-cache/sci-calculators/tiemu-3.03-r1
 2206221910 metadata/md5-cache/sci-calculators/tilp2-1.18
 2206221910 metadata/md5-cache/sci-calculators/wcalc-2.5
+2206241610 metadata/md5-cache/sci-calculators/Manifest.gz
+2206241610 metadata/md5-cache/sci-calculators/bc-gh-5.3.3
 2108141339 metadata/md5-cache/sci-chemistry/bodr-10
 2011300009 metadata/md5-cache/sci-chemistry/cara-bin-1.8.4-r2
 2009162339 metadata/md5-cache/sci-chemistry/clashlist-3.17-r1
@@ -54641,14 +54599,11 @@
 2206071015 metadata/md5-cache/sci-electronics/magic-8.3.309
 2206162010 metadata/md5-cache/sci-electronics/systemc-2.3.4-r2
 2206211310 metadata/md5-cache/sci-electronics/magic-8.3.309-r1
-2206221910 metadata/md5-cache/sci-electronics/Manifest.gz
 2206220743 metadata/md5-cache/sci-electronics/Stage-4.3.0-r1
 2206221910 metadata/md5-cache/sci-electronics/eagle-7.7.0-r1
 2206221910 metadata/md5-cache/sci-electronics/eagle-9.6.2-r3
 2206221910 metadata/md5-cache/sci-electronics/electric-9.03
-2206220743 metadata/md5-cache/sci-electronics/gazebo-11.10.1
 2206220743 metadata/md5-cache/sci-electronics/gazebo-11.10.2
-2206220743 metadata/md5-cache/sci-electronics/gazebo-11.9.1-r1
 2206221910 metadata/md5-cache/sci-electronics/gspiceui-1.1.0
 2206221910 metadata/md5-cache/sci-electronics/gspiceui-1.2.87
 2206221910 metadata/md5-cache/sci-electronics/gwave-20190116
@@ -54677,6 +54632,8 @@
 2206220743 metadata/md5-cache/sci-electronics/pulseview-9999
 2206221910 metadata/md5-cache/sci-electronics/spice-3.5.5-r3
 2206221910 metadata/md5-cache/sci-electronics/xcircuit-3.9.73
+2206231440 metadata/md5-cache/sci-electronics/Manifest.gz
+2206231440 metadata/md5-cache/sci-electronics/gazebo-11.11.0
 2105311239 metadata/md5-cache/sci-geosciences/congen-1.6.2-r1
 2006040939 metadata/md5-cache/sci-geosciences/dcw-gmt-1.1.4
 2002171539 metadata/md5-cache/sci-geosciences/gshhg-gmt-2.3.7
@@ -54995,7 +54952,6 @@
 2206172110 metadata/md5-cache/sci-libs/tensorflow-2.7.0
 2206172110 metadata/md5-cache/sci-libs/tensorflow-2.8.0
 2206210240 metadata/md5-cache/sci-libs/cqrlib-1.1.4
-2206222210 metadata/md5-cache/sci-libs/Manifest.gz
 2206220743 metadata/md5-cache/sci-libs/NNPACK-2020.12.22
 2206220743 metadata/md5-cache/sci-libs/QNNPACK-2019.08.28
 2206220743 metadata/md5-cache/sci-libs/ViSP-3.3.0-r1
@@ -55055,7 +55011,6 @@
 2206220743 metadata/md5-cache/sci-libs/hdf5-1.12.1-r1
 2206220743 metadata/md5-cache/sci-libs/hdf5-1.12.2-r1
 2206220743 metadata/md5-cache/sci-libs/hdf5-1.12.2-r2
-2206212240 metadata/md5-cache/sci-libs/hdf5-1.12.2-r3
 2206220743 metadata/md5-cache/sci-libs/hipBLAS-4.3.0
 2206220743 metadata/md5-cache/sci-libs/hipBLAS-5.0.2
 2206220743 metadata/md5-cache/sci-libs/hipCUB-4.0.0-r1
@@ -55206,6 +55161,8 @@
 2206221040 metadata/md5-cache/sci-libs/vtk-9.1.0-r2
 2206220743 metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r4
 2206221910 metadata/md5-cache/sci-libs/xdrfile-1.1.4
+2206251040 metadata/md5-cache/sci-libs/Manifest.gz
+2206251040 metadata/md5-cache/sci-libs/hdf5-1.12.2-r4
 2111031339 metadata/md5-cache/sci-mathematics/eclib-20210625
 2101061839 metadata/md5-cache/sci-mathematics/flintqs-1.0
 2101061839 metadata/md5-cache/sci-mathematics/lrcalc-1.2
@@ -55298,7 +55255,6 @@
 2206071015 metadata/md5-cache/sci-mathematics/petsc-3.17.1-r1
 2206071015 metadata/md5-cache/sci-mathematics/pspp-1.2.0-r1
 2206071015 metadata/md5-cache/sci-mathematics/pspp-1.4.1
-2206071015 metadata/md5-cache/sci-mathematics/pspp-1.6.0
 2206071015 metadata/md5-cache/sci-mathematics/relational-2.5-r2
 2206071015 metadata/md5-cache/sci-mathematics/slepc-3.16.0
 2206071015 metadata/md5-cache/sci-mathematics/slepc-3.17.1
@@ -55313,7 +55269,6 @@
 2206210511 metadata/md5-cache/sci-mathematics/alt-ergo-2.3.0-r1
 2206211340 metadata/md5-cache/sci-mathematics/gimps-30.8.15
 2206211940 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0-r1
-2206221910 metadata/md5-cache/sci-mathematics/Manifest.gz
 2206220743 metadata/md5-cache/sci-mathematics/arb-2.19.0
 2206220743 metadata/md5-cache/sci-mathematics/arb-2.21.0
 2206220743 metadata/md5-cache/sci-mathematics/arb-2.22.1
@@ -55374,6 +55329,8 @@
 2206221910 metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1
 2206220743 metadata/md5-cache/sci-mathematics/yacas-1.9.1
 2206221040 metadata/md5-cache/sci-mathematics/z3-4.8.17
+2206241140 metadata/md5-cache/sci-mathematics/Manifest.gz
+2206241140 metadata/md5-cache/sci-mathematics/pspp-1.6.0
 2104180939 metadata/md5-cache/sci-misc/ViSP-images-3.3.0
 2203231439 metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
 2205170654 metadata/md5-cache/sci-misc/apertium-3.2.0
@@ -55486,7 +55443,6 @@
 2206221910 metadata/md5-cache/sci-visualization/xgraph-12.1-r4
 2206221910 metadata/md5-cache/sci-visualization/xyscan-4.3.0
 2206221910 metadata/md5-cache/sci-visualization/zhu3d-4.2.6-r1
-2012081009 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.1
 2203240726 metadata/md5-cache/sec-policy/apparmor-profiles-9999
 2203240726 metadata/md5-cache/sec-policy/selinux-abrt-9999
 2203240726 metadata/md5-cache/sec-policy/selinux-accountsd-9999
@@ -56483,9 +56439,9 @@
 2206071015 metadata/md5-cache/sec-policy/selinux-base-2.20220106-r2
 2206071015 metadata/md5-cache/sec-policy/selinux-base-2.20220106-r3
 2206071015 metadata/md5-cache/sec-policy/selinux-base-9999
-2206171010 metadata/md5-cache/sec-policy/Manifest.gz
 2206171010 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.3
 2206170440 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.4
+2206241210 metadata/md5-cache/sec-policy/Manifest.gz
 2008051909 metadata/md5-cache/sys-apps/apply-default-acl-0.4.4
 2104161439 metadata/md5-cache/sys-apps/biosdisk-1.01
 2106230809 metadata/md5-cache/sys-apps/byld-1.0.3-r1
@@ -56565,7 +56521,6 @@
 2205170654 metadata/md5-cache/sys-apps/agedu-20200617
 2205170654 metadata/md5-cache/sys-apps/agedu-20200705
 2205170654 metadata/md5-cache/sys-apps/apmd-3.2.2_p14-r2
-2205170654 metadata/md5-cache/sys-apps/apparmor-3.0.1
 2205170654 metadata/md5-cache/sys-apps/attr-2.5.1
 2205170654 metadata/md5-cache/sys-apps/audio-entropyd-2.0.3-r1
 2205170654 metadata/md5-cache/sys-apps/baselayout-2.7-r3
@@ -56698,7 +56653,6 @@
 2205170654 metadata/md5-cache/sys-apps/paxctld-1.2.5
 2205170654 metadata/md5-cache/sys-apps/pcsc-slb-rf72-drv-1.1.0-r2
 2205170654 metadata/md5-cache/sys-apps/pick-4.0.0
-2205170654 metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r6
 2205170654 metadata/md5-cache/sys-apps/pmount-gui-0_pre20130806
 2205170654 metadata/md5-cache/sys-apps/pnputils-0.1-r1
 2205170654 metadata/md5-cache/sys-apps/powerpc-utils-1.1.3.18-r4
@@ -56722,8 +56676,6 @@
 2205170654 metadata/md5-cache/sys-apps/ripgrep-all-0.9.6-r1
 2205170654 metadata/md5-cache/sys-apps/rkflashtool-6.1
 2205191710 metadata/md5-cache/sys-apps/rng-tools-6.15
-2205170654 metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.7
-2205170654 metadata/md5-cache/sys-apps/s6-rc-0.5.3.0
 2205170654 metadata/md5-cache/sys-apps/salinfo-1.2
 2205170654 metadata/md5-cache/sys-apps/sandbox-2.24
 2205170654 metadata/md5-cache/sys-apps/sandbox-2.25
@@ -56751,7 +56703,6 @@
 2205170654 metadata/md5-cache/sys-apps/sysvinit-3.01
 2205170654 metadata/md5-cache/sys-apps/sysvinit-3.03
 2205170654 metadata/md5-cache/sys-apps/sysvinit-3.04
-2205170654 metadata/md5-cache/sys-apps/tas-1.6.0.200601-r1
 2205170654 metadata/md5-cache/sys-apps/tcp-wrappers-7.6.31
 2205170654 metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0
 2205170654 metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0_p20201217-r1
@@ -56777,9 +56728,6 @@
 2205220640 metadata/md5-cache/sys-apps/hwdata-0.358
 2205220640 metadata/md5-cache/sys-apps/hwdata-0.359
 2205220640 metadata/md5-cache/sys-apps/man-pages-5.13
-2205220940 metadata/md5-cache/sys-apps/s6-2.11.1.0
-2205220940 metadata/md5-cache/sys-apps/s6-linux-init-1.0.7.3
-2205220940 metadata/md5-cache/sys-apps/s6-portable-utils-2.2.4.0
 2205212010 metadata/md5-cache/sys-apps/ucspi-ssl-0.99e-r2
 2205212010 metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
 2205250210 metadata/md5-cache/sys-apps/acl-2.3.1-r1
@@ -56789,7 +56737,6 @@
 2205252010 metadata/md5-cache/sys-apps/inxi-3.3.13.1
 2205260840 metadata/md5-cache/sys-apps/netplug-1.2.9.2-r3
 2205250040 metadata/md5-cache/sys-apps/pciutils-3.8.0
-2205241010 metadata/md5-cache/sys-apps/s6-rc-0.5.3.1
 2205252010 metadata/md5-cache/sys-apps/sdparm-1.12
 2205252010 metadata/md5-cache/sys-apps/setserial-2.17-r5
 2205260710 metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.14.0
@@ -56877,7 +56824,6 @@
 2206071015 metadata/md5-cache/sys-apps/usbutils-014-r1
 2206071015 metadata/md5-cache/sys-apps/x86info-1.30_p20190617
 2206071015 metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.4
-2206121142 metadata/md5-cache/sys-apps/apparmor-utils-3.0.1
 2206110910 metadata/md5-cache/sys-apps/dchroot-0.12.1
 2206121142 metadata/md5-cache/sys-apps/dstat-0.7.4-r2
 2206110910 metadata/md5-cache/sys-apps/ethq-0.6.1
@@ -56931,11 +56877,9 @@
 2206141910 metadata/md5-cache/sys-apps/kmscon-8_p20220214-r1
 2206141910 metadata/md5-cache/sys-apps/memtest86+-6.00_beta2
 2206141840 metadata/md5-cache/sys-apps/systemd-250.6
-2206141840 metadata/md5-cache/sys-apps/systemd-250.7
 2206141840 metadata/md5-cache/sys-apps/systemd-251.2
 2206141840 metadata/md5-cache/sys-apps/systemd-9999
 2206141840 metadata/md5-cache/sys-apps/systemd-utils-250.6
-2206141840 metadata/md5-cache/sys-apps/systemd-utils-250.7
 2206171010 metadata/md5-cache/sys-apps/apparmor-3.0.3
 2206170440 metadata/md5-cache/sys-apps/apparmor-3.0.4
 2206171010 metadata/md5-cache/sys-apps/apparmor-utils-3.0.3
@@ -56949,12 +56893,10 @@
 2206200440 metadata/md5-cache/sys-apps/dbus-1.12.22-r2
 2206200440 metadata/md5-cache/sys-apps/dbus-1.14.0-r2
 2206200610 metadata/md5-cache/sys-apps/dbus-1.14.0-r4
-2206200240 metadata/md5-cache/sys-apps/pciutils-3.8.0-r1
 2206191940 metadata/md5-cache/sys-apps/usbguard-1.1.1-r3
 2206201840 metadata/md5-cache/sys-apps/attr-2.5.1-r1
 2206201840 metadata/md5-cache/sys-apps/attr-9999
 2206211740 metadata/md5-cache/sys-apps/hwinfo-21.81
-2206221910 metadata/md5-cache/sys-apps/Manifest.gz
 2206220743 metadata/md5-cache/sys-apps/agedu-20211129
 2206221910 metadata/md5-cache/sys-apps/arrayprobe-2.0-r2
 2206221910 metadata/md5-cache/sys-apps/bar-1.11.1
@@ -56992,6 +56934,25 @@
 2206212110 metadata/md5-cache/sys-apps/x86info-1.31
 2206221910 metadata/md5-cache/sys-apps/xinetd-2.3.15.4
 2206221910 metadata/md5-cache/sys-apps/zorroutils-0.04
+2206251740 metadata/md5-cache/sys-apps/Manifest.gz
+2206240840 metadata/md5-cache/sys-apps/pciutils-3.8.0-r1
+2206250740 metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r6
+2206250740 metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r7
+2206250910 metadata/md5-cache/sys-apps/s6-2.11.1.0-r1
+2206250910 metadata/md5-cache/sys-apps/s6-2.11.1.1
+2206250910 metadata/md5-cache/sys-apps/s6-linux-init-1.0.7.3-r1
+2206250910 metadata/md5-cache/sys-apps/s6-linux-init-1.0.8.0
+2206250910 metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.7-r1
+2206250910 metadata/md5-cache/sys-apps/s6-linux-utils-2.6.0.0
+2206250910 metadata/md5-cache/sys-apps/s6-portable-utils-2.2.4.0-r1
+2206250910 metadata/md5-cache/sys-apps/s6-portable-utils-2.2.5.0
+2206250910 metadata/md5-cache/sys-apps/s6-rc-0.5.3.0-r1
+2206250910 metadata/md5-cache/sys-apps/s6-rc-0.5.3.1-r1
+2206250910 metadata/md5-cache/sys-apps/s6-rc-0.5.3.2
+2206251740 metadata/md5-cache/sys-apps/smc-sum-2.8.1.20220506
+2206251310 metadata/md5-cache/sys-apps/systemd-250.7
+2206251310 metadata/md5-cache/sys-apps/systemd-utils-250.7
+2206251740 metadata/md5-cache/sys-apps/tas-1.7.0.220503
 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
@@ -57058,13 +57019,9 @@
 2206121142 metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.12-r1
 2206121142 metadata/md5-cache/sys-auth/solo1-0.1.1
 2206121142 metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.4.0
-2206150040 metadata/md5-cache/sys-auth/ssh-import-id-5.11
 2206151310 metadata/md5-cache/sys-auth/ykpers-1.20.0-r1
 2206182010 metadata/md5-cache/sys-auth/polkit-0.120_p20220509
-2206220743 metadata/md5-cache/sys-auth/AusweisApp2-1.22.5
-2206220743 metadata/md5-cache/sys-auth/AusweisApp2-1.22.7
 2206220743 metadata/md5-cache/sys-auth/AusweisApp2-9999
-2206230810 metadata/md5-cache/sys-auth/Manifest.gz
 2206220743 metadata/md5-cache/sys-auth/google-authenticator-wrappers-1
 2206220743 metadata/md5-cache/sys-auth/google-authenticator-wrappers-2
 2206220743 metadata/md5-cache/sys-auth/google-authenticator-wrappers-3-r1
@@ -57077,6 +57034,9 @@
 2206220743 metadata/md5-cache/sys-auth/yubico-piv-tool-2.2.1
 2206220743 metadata/md5-cache/sys-auth/yubico-piv-tool-2.3.0
 2206221910 metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.25
+2206251740 metadata/md5-cache/sys-auth/AusweisApp2-1.22.7
+2206251740 metadata/md5-cache/sys-auth/Manifest.gz
+2206251210 metadata/md5-cache/sys-auth/ssh-import-id-5.11
 1910191339 metadata/md5-cache/sys-block/devio-1.2
 1911072009 metadata/md5-cache/sys-block/endpoint-0.1.0-r1
 1702282333 metadata/md5-cache/sys-block/hdrecover-0.5
@@ -57223,7 +57183,6 @@
 2205170654 metadata/md5-cache/sys-boot/palo-9999
 2205170654 metadata/md5-cache/sys-boot/plymouth-0.9.5-r2
 2205170654 metadata/md5-cache/sys-boot/plymouth-0.9.6_pre20211225-r1
-2205170654 metadata/md5-cache/sys-boot/plymouth-22.02.122-r1
 2205170654 metadata/md5-cache/sys-boot/plymouth-9999
 2205170654 metadata/md5-cache/sys-boot/refind-0.13.2
 2205181840 metadata/md5-cache/sys-boot/refind-0.13.3.1
@@ -57242,11 +57201,12 @@
 2205311540 metadata/md5-cache/sys-boot/syslinux-6.04_pre3
 2206071015 metadata/md5-cache/sys-boot/systemd-boot-249.9
 2206202110 metadata/md5-cache/sys-boot/grub-9999
-2206230840 metadata/md5-cache/sys-boot/Manifest.gz
-2206230840 metadata/md5-cache/sys-boot/grub-2.06-r2
 2206221910 metadata/md5-cache/sys-boot/shim-15.5-r1
 2206221910 metadata/md5-cache/sys-boot/unetbootin-700
 2206221910 metadata/md5-cache/sys-boot/unetbootin-702
+2206251340 metadata/md5-cache/sys-boot/Manifest.gz
+2206251340 metadata/md5-cache/sys-boot/grub-2.06-r2
+2206240540 metadata/md5-cache/sys-boot/plymouth-22.02.122-r1
 2005081846 metadata/md5-cache/sys-cluster/c3-4.0.1
 2002230040 metadata/md5-cache/sys-cluster/fake-1.1.10
 2103132309 metadata/md5-cache/sys-cluster/libcircle-0.3.0
@@ -57255,7 +57215,6 @@
 2005081846 metadata/md5-cache/sys-cluster/ucx-1.3.0
 2005081846 metadata/md5-cache/sys-cluster/ucx-1.5.2
 2102281509 metadata/md5-cache/sys-cluster/ucx-1.9.0
-2203240726 metadata/md5-cache/sys-cluster/zetcd-0.0.4-r2
 2203240726 metadata/md5-cache/sys-cluster/zookeepercli-1.0.12
 2203282310 metadata/md5-cache/sys-cluster/ganglia-web-3.7.3-r2
 2204150511 metadata/md5-cache/sys-cluster/k9scli-0.25.18
@@ -57385,7 +57344,6 @@
 2206192110 metadata/md5-cache/sys-cluster/ploop-1.14.1-r1
 2206191910 metadata/md5-cache/sys-cluster/ploop-1.15
 2206202110 metadata/md5-cache/sys-cluster/sanlock-3.8.4
-2206221910 metadata/md5-cache/sys-cluster/Manifest.gz
 2206220743 metadata/md5-cache/sys-cluster/ceph-15.2.16
 2206220743 metadata/md5-cache/sys-cluster/ceph-16.2.7
 2206220743 metadata/md5-cache/sys-cluster/ceph-16.2.7-r1
@@ -57412,6 +57370,9 @@
 2206221910 metadata/md5-cache/sys-cluster/ucx-1.2.2-r1
 2206221040 metadata/md5-cache/sys-cluster/zookeeper-bin-3.7.1
 2206221040 metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.0
+2206251910 metadata/md5-cache/sys-cluster/Manifest.gz
+2206251910 metadata/md5-cache/sys-cluster/minikube-1.26.0
+2206241640 metadata/md5-cache/sys-cluster/zetcd-0.0.4-r2
 2104060140 metadata/md5-cache/sys-devel/autoconf-2.69-r5
 2105131939 metadata/md5-cache/sys-devel/autoconf-archive-2021.02.19
 2109100910 metadata/md5-cache/sys-devel/autoconf-archive-2021.02.19-r1
@@ -57422,7 +57383,6 @@
 2002112051 metadata/md5-cache/sys-devel/ct-ng-1.24.0
 2111180839 metadata/md5-cache/sys-devel/gcc-config-2.4
 2109110910 metadata/md5-cache/sys-devel/llvmgold-12
-2104231009 metadata/md5-cache/sys-devel/parity-2.0.1
 2107030940 metadata/md5-cache/sys-devel/remake-4.3.1.1.5
 2106011409 metadata/md5-cache/sys-devel/ucpp-1.3.5
 2202010909 metadata/md5-cache/sys-devel/crossdev-20211121
@@ -57475,7 +57435,6 @@
 2205170654 metadata/md5-cache/sys-devel/mold-1.2.1-r1
 2205170654 metadata/md5-cache/sys-devel/mold-9999
 2205170654 metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0-r2
-2205170654 metadata/md5-cache/sys-devel/parity-9999
 2205170654 metadata/md5-cache/sys-devel/patch-2.7.6-r4
 2205170654 metadata/md5-cache/sys-devel/pmake-1.111.3.3
 2205170654 metadata/md5-cache/sys-devel/qconf-2.5
@@ -57551,7 +57510,6 @@
 2206190440 metadata/md5-cache/sys-devel/gcc-12.1.1_p20220618
 2206192210 metadata/md5-cache/sys-devel/automake-wrapper-11-r1
 2206192210 metadata/md5-cache/sys-devel/bc-1.07.1-r4
-2206231010 metadata/md5-cache/sys-devel/Manifest.gz
 2206221910 metadata/md5-cache/sys-devel/binutils-apple-3.2.6
 2206221910 metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
 2206220743 metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r101
@@ -57598,6 +57556,16 @@
 2206221910 metadata/md5-cache/sys-devel/native-cctools-5
 2206230940 metadata/md5-cache/sys-devel/smatch-1.72
 2206230940 metadata/md5-cache/sys-devel/smatch-9999
+2206251640 metadata/md5-cache/sys-devel/Manifest.gz
+2206251640 metadata/md5-cache/sys-devel/clang-14.0.6
+2206251640 metadata/md5-cache/sys-devel/clang-common-14.0.6
+2206251640 metadata/md5-cache/sys-devel/clang-runtime-14.0.6
+2206250310 metadata/md5-cache/sys-devel/gcc-10.3.1_p20220623
+2206250440 metadata/md5-cache/sys-devel/gcc-11.3.1_p20220624
+2206251640 metadata/md5-cache/sys-devel/lld-14.0.6
+2206251640 metadata/md5-cache/sys-devel/llvm-14.0.6
+2206251640 metadata/md5-cache/sys-devel/llvm-common-14.0.6
+2206241640 metadata/md5-cache/sys-devel/parity-2.0.1
 2205170654 metadata/md5-cache/sys-fabric/mstflint-4.18.0_p1-r1
 2205170654 metadata/md5-cache/sys-fabric/opensm-3.3.23-r1
 2205170654 metadata/md5-cache/sys-fabric/opensm-3.3.24
@@ -57756,7 +57724,6 @@
 2205170654 metadata/md5-cache/sys-fs/mergerfs-2.32.3
 2205170654 metadata/md5-cache/sys-fs/mergerfs-2.33.1
 2205170654 metadata/md5-cache/sys-fs/mergerfs-2.33.3
-2205170654 metadata/md5-cache/sys-fs/mergerfs-2.33.4
 2205170654 metadata/md5-cache/sys-fs/mhddfs-0.1.39-r2
 2205170654 metadata/md5-cache/sys-fs/nilfs-utils-2.2.2-r1
 2205170654 metadata/md5-cache/sys-fs/nilfs-utils-2.2.8
@@ -57802,7 +57769,6 @@
 2206080340 metadata/md5-cache/sys-fs/fuse-3.11.0
 2206080340 metadata/md5-cache/sys-fs/fuse-common-3.10.4
 2206081040 metadata/md5-cache/sys-fs/inotify-tools-3.22.6.0
-2206080340 metadata/md5-cache/sys-fs/lvm2-2.02.188-r2
 2206080340 metadata/md5-cache/sys-fs/mdadm-4.1
 2206080340 metadata/md5-cache/sys-fs/mdadm-4.2-r1
 2206071015 metadata/md5-cache/sys-fs/mergerfs-tools-0_p20210502-r3
@@ -57842,10 +57808,8 @@
 2206151910 metadata/md5-cache/sys-fs/btrfs-progs-9999
 2206160410 metadata/md5-cache/sys-fs/eudev-3.2.12_pre3
 2206160410 metadata/md5-cache/sys-fs/eudev-9999
-2206170140 metadata/md5-cache/sys-fs/lvm2-2.03.14-r1
 2206162210 metadata/md5-cache/sys-fs/zfs-2.0.7
 2206162210 metadata/md5-cache/sys-fs/zfs-2.1.4
-2206230210 metadata/md5-cache/sys-fs/Manifest.gz
 2206221040 metadata/md5-cache/sys-fs/android-file-transfer-linux-4.2
 2206221040 metadata/md5-cache/sys-fs/android-file-transfer-linux-9999
 2206221910 metadata/md5-cache/sys-fs/cachefilesd-0.10.10-r1
@@ -57871,6 +57835,11 @@
 2206230210 metadata/md5-cache/sys-fs/zfs-9999
 2206230210 metadata/md5-cache/sys-fs/zfs-kmod-2.1.5
 2206230210 metadata/md5-cache/sys-fs/zfs-kmod-9999
+2206241940 metadata/md5-cache/sys-fs/Manifest.gz
+2206241940 metadata/md5-cache/sys-fs/lvm2-2.02.188-r3
+2206241940 metadata/md5-cache/sys-fs/lvm2-2.03.14-r2
+2206241040 metadata/md5-cache/sys-fs/mergerfs-2.33.4
+2206240010 metadata/md5-cache/sys-fs/mergerfs-2.33.5
 2106270109 metadata/md5-cache/sys-kernel/installkernel-systemd-boot-1
 2112140909 metadata/md5-cache/sys-kernel/raspberrypi-image-4.14.98_p20190215
 2112140909 metadata/md5-cache/sys-kernel/raspberrypi-image-4.19.75_p20190925
@@ -57968,9 +57937,6 @@
 2206151940 metadata/md5-cache/sys-kernel/rt-sources-5.15.44_p46
 2206151940 metadata/md5-cache/sys-kernel/rt-sources-5.18_p11
 2206151940 metadata/md5-cache/sys-kernel/rt-sources-5.4.193_p74
-2206161510 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.284
-2206161510 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.248
-2206161510 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.319
 2206142040 metadata/md5-cache/sys-kernel/vanilla-sources-5.17.15
 2206162240 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.5
 2206171110 metadata/md5-cache/sys-kernel/pf-sources-5.18_p2
@@ -57989,7 +57955,6 @@
 2206191040 metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.5-r1
 2206191040 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.18.5-r1
 2206200040 metadata/md5-cache/sys-kernel/git-sources-5.19_rc3
-2206222310 metadata/md5-cache/sys-kernel/Manifest.gz
 2206222310 metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.124
 2206222310 metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.49
 2206222310 metadata/md5-cache/sys-kernel/gentoo-kernel-5.18.6
@@ -58010,6 +57975,14 @@
 2206221610 metadata/md5-cache/sys-kernel/vanilla-sources-5.15.49
 2206221610 metadata/md5-cache/sys-kernel/vanilla-sources-5.18.6
 2206221610 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.200
+2206251410 metadata/md5-cache/sys-kernel/Manifest.gz
+2206251410 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.285
+2206251410 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.249
+2206251410 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.320
+2206251210 metadata/md5-cache/sys-kernel/linux-headers-5.19_rc3
+2206251340 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.285
+2206251340 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.249
+2206251340 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.320
 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
@@ -58112,9 +58085,7 @@
 2206071015 metadata/md5-cache/sys-libs/glibc-2.35-r6
 2206081410 metadata/md5-cache/sys-libs/glibc-2.35-r7
 2206071015 metadata/md5-cache/sys-libs/ldb-2.3.2-r1
-2206071015 metadata/md5-cache/sys-libs/ldb-2.3.3
 2206071015 metadata/md5-cache/sys-libs/ldb-2.4.1-r1
-2206071015 metadata/md5-cache/sys-libs/ldb-2.4.2-r1
 2206071015 metadata/md5-cache/sys-libs/ldb-2.5.0-r1
 2206071015 metadata/md5-cache/sys-libs/libblockdev-2.26
 2206071015 metadata/md5-cache/sys-libs/libblockdev-2.27
@@ -58139,8 +58110,6 @@
 2206071015 metadata/md5-cache/sys-libs/tevent-0.12.0
 2206121142 metadata/md5-cache/sys-libs/cracklib-2.9.7
 2206090140 metadata/md5-cache/sys-libs/glibc-9999
-2206121142 metadata/md5-cache/sys-libs/libapparmor-3.0.1
-2206121142 metadata/md5-cache/sys-libs/libapparmor-3.0.3
 2206121142 metadata/md5-cache/sys-libs/libcap-ng-0.8.3
 2206121142 metadata/md5-cache/sys-libs/libseccomp-2.5.4
 2206121142 metadata/md5-cache/sys-libs/libseccomp-9999
@@ -58150,14 +58119,12 @@
 2206121142 metadata/md5-cache/sys-libs/libsemanage-3.3
 2206121142 metadata/md5-cache/sys-libs/libsemanage-3.4
 2206121142 metadata/md5-cache/sys-libs/libsemanage-9999
-2206091110 metadata/md5-cache/sys-libs/zlib-1.2.12-r2
 2206170440 metadata/md5-cache/sys-libs/libapparmor-3.0.3-r1
 2206170440 metadata/md5-cache/sys-libs/libapparmor-3.0.4
 2206172240 metadata/md5-cache/sys-libs/readline-8.2_rc1
 2206181840 metadata/md5-cache/sys-libs/libxcrypt-4.4.28-r1
 2206200810 metadata/md5-cache/sys-libs/db-4.8.30-r7
 2206210840 metadata/md5-cache/sys-libs/gpm-1.20.7-r5
-2206230410 metadata/md5-cache/sys-libs/Manifest.gz
 2206221910 metadata/md5-cache/sys-libs/argp-standalone-1.3-r2
 2206220743 metadata/md5-cache/sys-libs/compiler-rt-12.0.1
 2206220743 metadata/md5-cache/sys-libs/compiler-rt-13.0.1
@@ -58222,6 +58189,22 @@
 2206220743 metadata/md5-cache/sys-libs/uid_wrapper-1.2.8
 2206220743 metadata/md5-cache/sys-libs/zlib-ng-2.0.5
 2206220743 metadata/md5-cache/sys-libs/zlib-ng-2.0.6
+2206251640 metadata/md5-cache/sys-libs/Manifest.gz
+2206251640 metadata/md5-cache/sys-libs/compiler-rt-14.0.6
+2206251640 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
+2206251210 metadata/md5-cache/sys-libs/ldb-2.3.3
+2206251210 metadata/md5-cache/sys-libs/ldb-2.4.2-r1
+2206241110 metadata/md5-cache/sys-libs/ldb-2.4.3
+2206241110 metadata/md5-cache/sys-libs/ldb-2.5.1
+2206251640 metadata/md5-cache/sys-libs/libcxx-14.0.6
+2206251640 metadata/md5-cache/sys-libs/libcxxabi-14.0.6
+2206251640 metadata/md5-cache/sys-libs/libomp-14.0.6
+2206240840 metadata/md5-cache/sys-libs/libseccomp-2.5.4-r1
+2206251640 metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6
+2206241110 metadata/md5-cache/sys-libs/talloc-2.3.4
+2206241110 metadata/md5-cache/sys-libs/tdb-1.4.7
+2206241110 metadata/md5-cache/sys-libs/tevent-0.12.1
+2206241240 metadata/md5-cache/sys-libs/zlib-1.2.12-r2
 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
@@ -58390,7 +58373,6 @@
 1912222309 metadata/md5-cache/virtual/wine-0-r7
 2111220609 metadata/md5-cache/virtual/dotnet-sdk-6.0
 2201100140 metadata/md5-cache/virtual/linux-sources-3-r6
-2201242240 metadata/md5-cache/virtual/cron-0-r2
 2201301339 metadata/md5-cache/virtual/qmail-1.03-r1
 2202122309 metadata/md5-cache/virtual/dotnet-sdk-3.1
 2202262309 metadata/md5-cache/virtual/podofo-build-0.9.7
@@ -58454,7 +58436,6 @@
 2204291110 metadata/md5-cache/virtual/service-manager-1
 2204291110 metadata/md5-cache/virtual/yacc-0
 2205010512 metadata/md5-cache/virtual/cblas-3.8
-2205010512 metadata/md5-cache/virtual/fortran-0
 2205010512 metadata/md5-cache/virtual/lapack-3.10
 2205010512 metadata/md5-cache/virtual/perl-Test-Simple-1.302.183
 2205010512 metadata/md5-cache/virtual/secret-service-0
@@ -58582,17 +58563,12 @@
 2205260040 metadata/md5-cache/virtual/perl-threads-2.270.0
 2205260040 metadata/md5-cache/virtual/perl-threads-shared-1.640.0
 2205260040 metadata/md5-cache/virtual/perl-version-0.992.900
-2205242310 metadata/md5-cache/virtual/rust-1.61.0
 2205280440 metadata/md5-cache/virtual/perl-Module-CoreList-5.202.205.200-r1
 2205311810 metadata/md5-cache/virtual/rust-1.59.0
 2206040540 metadata/md5-cache/virtual/libudev-232-r7
 2206040540 metadata/md5-cache/virtual/tmpfiles-0-r3
 2206040540 metadata/md5-cache/virtual/udev-217-r5
 2206072240 metadata/md5-cache/virtual/pandoc-0
-2206091110 metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.103.0-r2
-2206091110 metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.103.0-r1
-2206091110 metadata/md5-cache/virtual/perl-IO-Compress-2.103.0-r1
-2206120040 metadata/md5-cache/virtual/perl-Module-CoreList-5.202.203.130
 2206121142 metadata/md5-cache/virtual/python-cffi-1
 2206121142 metadata/md5-cache/virtual/python-greenlet-1.0-r2
 2206101010 metadata/md5-cache/virtual/rust-1.60.0
@@ -58605,7 +58581,6 @@
 2206211940 metadata/md5-cache/virtual/imagemagick-tools-0-r1
 2206211940 metadata/md5-cache/virtual/pager-0-r1
 2206211940 metadata/md5-cache/virtual/ssh-0-r1
-2206222310 metadata/md5-cache/virtual/Manifest.gz
 2206222310 metadata/md5-cache/virtual/dist-kernel-5.10.124
 2206222310 metadata/md5-cache/virtual/dist-kernel-5.15.49
 2206222310 metadata/md5-cache/virtual/dist-kernel-5.18.6
@@ -58613,6 +58588,14 @@
 2206221940 metadata/md5-cache/virtual/gsasl-3
 2206221010 metadata/md5-cache/virtual/httpd-php-8.1
 2206220743 metadata/md5-cache/virtual/mpi-2.0-r7
+2206250840 metadata/md5-cache/virtual/Manifest.gz
+2206232340 metadata/md5-cache/virtual/cron-0-r3
+2206232340 metadata/md5-cache/virtual/fortran-0-r1
+2206241240 metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.103.0-r2
+2206241240 metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.103.0-r1
+2206241240 metadata/md5-cache/virtual/perl-IO-Compress-2.103.0-r1
+2206241240 metadata/md5-cache/virtual/perl-Module-CoreList-5.202.203.130
+2206250840 metadata/md5-cache/virtual/rust-1.61.0
 2112220410 metadata/md5-cache/www-apache/modsecurity-crs-3.3.2
 2203240726 metadata/md5-cache/www-apache/mod_auth_radius-1.6.0
 2203240726 metadata/md5-cache/www-apache/mod_auth_tkt-2.1.0-r2
@@ -58716,7 +58699,6 @@
 2205170654 metadata/md5-cache/www-apps/cgit-9999
 2205192140 metadata/md5-cache/www-apps/grafana-bin-7.5.16
 2205192140 metadata/md5-cache/www-apps/grafana-bin-8.5.3
-2205170654 metadata/md5-cache/www-apps/hugo-0.98.0
 2205170654 metadata/md5-cache/www-apps/icingaweb2-2.10.1
 2205170654 metadata/md5-cache/www-apps/icingaweb2-9999
 2205170654 metadata/md5-cache/www-apps/icingaweb2-module-director-1.8.1
@@ -58768,7 +58750,6 @@
 2205290910 metadata/md5-cache/www-apps/nanoc-spec-0.0.2
 2206042310 metadata/md5-cache/www-apps/nextcloud-23.0.5
 2206071015 metadata/md5-cache/www-apps/cgit-1.2.3-r200
-2206062340 metadata/md5-cache/www-apps/hugo-0.99.1
 2206061840 metadata/md5-cache/www-apps/mediawiki-1.38.1
 2206060940 metadata/md5-cache/www-apps/wordpress-6.0
 2206071015 metadata/md5-cache/www-apps/xpra-html5-5.0
@@ -58790,10 +58771,12 @@
 2206182010 metadata/md5-cache/www-apps/element-1.10.15
 2206181210 metadata/md5-cache/www-apps/jekyll-sitemap-1.4.0
 2206221910 metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
-2206230110 metadata/md5-cache/www-apps/Manifest.gz
-2206221640 metadata/md5-cache/www-apps/nikola-8.2.2
 2206230110 metadata/md5-cache/www-apps/tt-rss-99999999
 2206221040 metadata/md5-cache/www-apps/zeppelin-bin-0.8.2-r1
+2206250610 metadata/md5-cache/www-apps/Manifest.gz
+2206250610 metadata/md5-cache/www-apps/hugo-0.101.0
+2206250610 metadata/md5-cache/www-apps/hugo-0.99.1
+2206231310 metadata/md5-cache/www-apps/nikola-8.2.2-r1
 1703072138 metadata/md5-cache/www-client/fetch-1.0-r3
 2104121139 metadata/md5-cache/www-client/fetch-1.0-r4
 2107180040 metadata/md5-cache/www-client/lynx-2.9.0_pre6-r2
@@ -58823,7 +58806,6 @@
 2206151940 metadata/md5-cache/www-client/opera-beta-89.0.4447.12
 2206141210 metadata/md5-cache/www-client/opera-developer-90.0.4450.0
 2206161640 metadata/md5-cache/www-client/qutebrowser-2.5.1
-2206222141 metadata/md5-cache/www-client/Manifest.gz
 2206221910 metadata/md5-cache/www-client/chromium-102.0.5005.115
 2206221910 metadata/md5-cache/www-client/chromium-102.0.5005.61
 2206221910 metadata/md5-cache/www-client/chromium-103.0.5060.53
@@ -58834,8 +58816,6 @@
 2206221910 metadata/md5-cache/www-client/dillo-9999
 2206220743 metadata/md5-cache/www-client/falkon-22.04.2
 2206220743 metadata/md5-cache/www-client/falkon-3.2.0-r1
-2206221910 metadata/md5-cache/www-client/firefox-101.0.1
-2206221910 metadata/md5-cache/www-client/firefox-101.0.1-r10
 2206221910 metadata/md5-cache/www-client/firefox-101.0.1-r11
 2206221910 metadata/md5-cache/www-client/firefox-91.10.0
 2206221910 metadata/md5-cache/www-client/firefox-bin-101.0.1
@@ -58844,7 +58824,6 @@
 2206221910 metadata/md5-cache/www-client/google-chrome-beta-103.0.5060.53
 2206221910 metadata/md5-cache/www-client/google-chrome-unstable-104.0.5112.12
 2206221910 metadata/md5-cache/www-client/jd-2.8.9_p150226-r2
-2206221910 metadata/md5-cache/www-client/links-2.26-r1
 2206221910 metadata/md5-cache/www-client/links-2.27
 2206221910 metadata/md5-cache/www-client/microsoft-edge-102.0.1245.44
 2206221910 metadata/md5-cache/www-client/microsoft-edge-beta-103.0.1264.17
@@ -58867,10 +58846,12 @@
 2206221910 metadata/md5-cache/www-client/seamonkey-2.53.12
 2206221910 metadata/md5-cache/www-client/surf-2.1-r1
 2206221910 metadata/md5-cache/www-client/surf-9999
-2206221910 metadata/md5-cache/www-client/vivaldi-5.3.2679.55
-2206221910 metadata/md5-cache/www-client/vivaldi-5.3.2679.58
-2206221910 metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2704.3
 2206221910 metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2707.2
+2206251610 metadata/md5-cache/www-client/Manifest.gz
+2206250840 metadata/md5-cache/www-client/links-2.26-r1
+2206240040 metadata/md5-cache/www-client/vivaldi-5.3.2679.58
+2206240040 metadata/md5-cache/www-client/vivaldi-5.3.2679.61
+2206240040 metadata/md5-cache/www-client/vivaldi-snapshot-5.4.2712.3
 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
@@ -58940,7 +58921,6 @@
 2205220911 metadata/md5-cache/www-servers/thin-1.8.1
 2206030540 metadata/md5-cache/www-servers/caddy-2.5.1
 2206040910 metadata/md5-cache/www-servers/puma-5.6.4
-2206081640 metadata/md5-cache/www-servers/apache-2.4.54
 2206081210 metadata/md5-cache/www-servers/nginx-1.21.6-r1
 2206071015 metadata/md5-cache/www-servers/nginx-unit-1.26.1
 2206071015 metadata/md5-cache/www-servers/pshs-0.4.1
@@ -58956,7 +58936,6 @@
 2206121142 metadata/md5-cache/www-servers/varnish-6.6.1
 2206121142 metadata/md5-cache/www-servers/varnish-7.0.1
 2206121142 metadata/md5-cache/www-servers/varnish-7.1.0
-2206221040 metadata/md5-cache/www-servers/Manifest.gz
 2206220743 metadata/md5-cache/www-servers/civetweb-1.12
 2206220743 metadata/md5-cache/www-servers/h2o-2.2.6-r1
 2206220743 metadata/md5-cache/www-servers/h2o-9999
@@ -58969,6 +58948,8 @@
 2206221040 metadata/md5-cache/www-servers/tomcat-8.5.81
 2206221040 metadata/md5-cache/www-servers/tomcat-9.0.63
 2206221040 metadata/md5-cache/www-servers/tomcat-9.0.64
+2206241740 metadata/md5-cache/www-servers/Manifest.gz
+2206241740 metadata/md5-cache/www-servers/apache-2.4.54
 2112190440 metadata/md5-cache/x11-apps/mesa-progs-8.4.0-r1
 2205100440 metadata/md5-cache/x11-apps/luit-20220111
 2205170654 metadata/md5-cache/x11-apps/radeon-profile-20200824
@@ -59070,24 +59051,20 @@
 2205081040 metadata/md5-cache/x11-base/xorg-drivers-9999
 2206071015 metadata/md5-cache/x11-base/xorg-proto-2022.1
 2206071015 metadata/md5-cache/x11-base/xorg-proto-9999
-2206071015 metadata/md5-cache/x11-base/xwayland-22.1.1
 2206071015 metadata/md5-cache/x11-base/xwayland-9999
 2206171010 metadata/md5-cache/x11-base/xwayland-22.1.2
-2206180610 metadata/md5-cache/x11-base/Manifest.gz
-2206180610 metadata/md5-cache/x11-base/xcb-proto-1.14.1
-2206180610 metadata/md5-cache/x11-base/xcb-proto-1.15
-2206180610 metadata/md5-cache/x11-base/xcb-proto-1.15.1
 2206180610 metadata/md5-cache/x11-base/xcb-proto-1.15.2
 2206180610 metadata/md5-cache/x11-base/xorg-server-1.20.14-r1
 2206180610 metadata/md5-cache/x11-base/xorg-server-21.1.3-r2
 2206180610 metadata/md5-cache/x11-base/xorg-server-21.1.3-r3
 2206180610 metadata/md5-cache/x11-base/xorg-server-9999
 2206180610 metadata/md5-cache/x11-base/xorg-sgml-doctools-1.12
+2206241940 metadata/md5-cache/x11-base/Manifest.gz
+2206241410 metadata/md5-cache/x11-base/xcb-proto-1.15
 2202012143 metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.5.0
 2206180610 metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.2
 2206180610 metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
 2206180610 metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3
-2206180610 metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.0
 2206180610 metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.1
 2206180610 metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
 2206180610 metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
@@ -59117,12 +59094,12 @@
 2206180610 metadata/md5-cache/x11-drivers/xf86-video-vboxvideo-1.0.0
 2206180610 metadata/md5-cache/x11-drivers/xf86-video-vesa-2.5.0
 2206180610 metadata/md5-cache/x11-drivers/xf86-video-vmware-13.3.0-r1
-2206221910 metadata/md5-cache/x11-drivers/Manifest.gz
 2206221910 metadata/md5-cache/x11-drivers/nvidia-drivers-390.151
 2206221910 metadata/md5-cache/x11-drivers/nvidia-drivers-470.129.06
 2206221910 metadata/md5-cache/x11-drivers/nvidia-drivers-510.73.05-r1
 2206221910 metadata/md5-cache/x11-drivers/nvidia-drivers-515.48.07
 2206221910 metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.05
+2206241940 metadata/md5-cache/x11-drivers/Manifest.gz
 2102271539 metadata/md5-cache/x11-libs/fox-wrapper-3
 2104031909 metadata/md5-cache/x11-libs/gtkdatabox-0.9.3.0
 2002101739 metadata/md5-cache/x11-libs/libGLw-8.0.0-r1
@@ -59197,7 +59174,6 @@
 2206071015 metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.8
 2206071015 metadata/md5-cache/x11-libs/gdk-pixbuf-xlib-2.40.2
 2206071015 metadata/md5-cache/x11-libs/gtksourceview-4.8.2
-2206071015 metadata/md5-cache/x11-libs/libdrm-2.4.110
 2206071015 metadata/md5-cache/x11-libs/libdrm-9999
 2206071015 metadata/md5-cache/x11-libs/libnotify-0.7.12
 2206071015 metadata/md5-cache/x11-libs/libnotify-0.7.9-r1
@@ -59205,13 +59181,10 @@
 2206071015 metadata/md5-cache/x11-libs/libva-9999
 2206071015 metadata/md5-cache/x11-libs/libvdpau-1.5
 2206071015 metadata/md5-cache/x11-libs/libwnck-40.1
-2206071015 metadata/md5-cache/x11-libs/libxkbcommon-1.4.0
 2206071015 metadata/md5-cache/x11-libs/pixman-0.40.0
 2206071015 metadata/md5-cache/x11-libs/pixman-9999
-2206070940 metadata/md5-cache/x11-libs/spread-sheet-widget-0.7
 2206071015 metadata/md5-cache/x11-libs/vte-0.68.0
 2206121142 metadata/md5-cache/x11-libs/xapp-2.2.8
-2206171010 metadata/md5-cache/x11-libs/libdrm-2.4.111
 2206171010 metadata/md5-cache/x11-libs/libxkbcommon-1.4.1
 2206170210 metadata/md5-cache/x11-libs/motif-2.3.8-r3
 2206170240 metadata/md5-cache/x11-libs/pango-1.50.7
@@ -59219,7 +59192,6 @@
 2206180610 metadata/md5-cache/x11-libs/libICE-1.0.10-r1
 2206180610 metadata/md5-cache/x11-libs/libSM-1.2.3-r1
 2206180610 metadata/md5-cache/x11-libs/libX11-1.7.5
-2206180610 metadata/md5-cache/x11-libs/libX11-1.8
 2206180610 metadata/md5-cache/x11-libs/libX11-1.8.1
 2206180610 metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3
 2206180610 metadata/md5-cache/x11-libs/libXau-1.0.9-r1
@@ -59252,8 +59224,6 @@
 2206180610 metadata/md5-cache/x11-libs/libdmx-1.1.4
 2206180610 metadata/md5-cache/x11-libs/libfontenc-1.1.4
 2206180610 metadata/md5-cache/x11-libs/libpciaccess-0.16-r1
-2206180610 metadata/md5-cache/x11-libs/libxcb-1.14
-2206180610 metadata/md5-cache/x11-libs/libxcb-1.15
 2206180610 metadata/md5-cache/x11-libs/libxcb-1.15-r1
 2206180610 metadata/md5-cache/x11-libs/libxcvt-0.1.1
 2206180610 metadata/md5-cache/x11-libs/libxcvt-9999
@@ -59269,12 +59239,10 @@
 2206180610 metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r3
 2206180610 metadata/md5-cache/x11-libs/xcb-util-xrm-1.3-r1
 2206180610 metadata/md5-cache/x11-libs/xtrans-1.4.0
-2206221910 metadata/md5-cache/x11-libs/Manifest.gz
 2206220743 metadata/md5-cache/x11-libs/gl2ps-1.4.2
 2206221910 metadata/md5-cache/x11-libs/gtk+extra-3.3.4
 2206221910 metadata/md5-cache/x11-libs/gtkglext-1.2.0-r5
 2206221910 metadata/md5-cache/x11-libs/gtkmathview-0.8.0-r4
-2206221910 metadata/md5-cache/x11-libs/gtksourceview-3.24.11
 2206221910 metadata/md5-cache/x11-libs/libcryptui-3.12.2-r1
 2206220743 metadata/md5-cache/x11-libs/libfm-qt-0.17.1
 2206220743 metadata/md5-cache/x11-libs/libfm-qt-1.0.0
@@ -59299,6 +59267,11 @@
 2206220743 metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
 2206220743 metadata/md5-cache/x11-libs/tslib-1.22
 2206221910 metadata/md5-cache/x11-libs/vte-0.28.2-r209
+2206241940 metadata/md5-cache/x11-libs/Manifest.gz
+2206232340 metadata/md5-cache/x11-libs/gtksourceview-3.24.11-r1
+2206241410 metadata/md5-cache/x11-libs/libdrm-2.4.111
+2206241410 metadata/md5-cache/x11-libs/libxcb-1.15
+2206241140 metadata/md5-cache/x11-libs/spread-sheet-widget-0.7
 1703221038 metadata/md5-cache/x11-misc/3dfm-1.0-r1
 1805220439 metadata/md5-cache/x11-misc/autocutsel-0.10.0
 1910111911 metadata/md5-cache/x11-misc/bblaunch-0.0.3
@@ -59383,7 +59356,6 @@
 2205170654 metadata/md5-cache/x11-misc/bbkeys-0.9.2
 2205170654 metadata/md5-cache/x11-misc/bbmail-0.9.3-r2
 2205170654 metadata/md5-cache/x11-misc/bbpager-0.4.7-r2
-2205170654 metadata/md5-cache/x11-misc/bbppp-0.2.5-r1
 2205170654 metadata/md5-cache/x11-misc/bbrun-1.6-r1
 2205170654 metadata/md5-cache/x11-misc/bbtime-0.1.5-r2
 2205170654 metadata/md5-cache/x11-misc/bbweather-0.6.3-r2
@@ -59584,7 +59556,6 @@
 2206071015 metadata/md5-cache/x11-misc/revelation-0.5.5
 2206071015 metadata/md5-cache/x11-misc/shared-mime-info-2.1
 2206071015 metadata/md5-cache/x11-misc/shared-mime-info-2.2
-2206071015 metadata/md5-cache/x11-misc/xkeyboard-config-2.35.1
 2206071015 metadata/md5-cache/x11-misc/xkeyboard-config-9999
 2206121142 metadata/md5-cache/x11-misc/arandr-0.1.10-r2
 2206121142 metadata/md5-cache/x11-misc/dex-0.8.0
@@ -59612,10 +59583,8 @@
 2206121142 metadata/md5-cache/x11-misc/zim-0.74.2
 2206121142 metadata/md5-cache/x11-misc/zim-0.74.3
 2206161710 metadata/md5-cache/x11-misc/py3status-3.45
-2206171010 metadata/md5-cache/x11-misc/xkeyboard-config-2.36
 2206172110 metadata/md5-cache/x11-misc/colord-1.4.6
 2206180610 metadata/md5-cache/x11-misc/compose-tables-1.7.5
-2206180610 metadata/md5-cache/x11-misc/compose-tables-1.8
 2206180610 metadata/md5-cache/x11-misc/compose-tables-1.8.1
 2206180610 metadata/md5-cache/x11-misc/imake-1.0.8-r1
 2206180610 metadata/md5-cache/x11-misc/makedepend-1.0.6
@@ -59623,7 +59592,6 @@
 2206200140 metadata/md5-cache/x11-misc/alacarte-3.44.2
 2206211410 metadata/md5-cache/x11-misc/autorandr-1.12.1
 2206211410 metadata/md5-cache/x11-misc/autorandr-9999
-2206230840 metadata/md5-cache/x11-misc/Manifest.gz
 2206220743 metadata/md5-cache/x11-misc/albert-0.17.2-r1
 2206220743 metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r2
 2206221910 metadata/md5-cache/x11-misc/barrier-2.4.0
@@ -59700,6 +59668,9 @@
 2206221910 metadata/md5-cache/x11-misc/xprintidle-2.0
 2206220743 metadata/md5-cache/x11-misc/xsettingsd-1.0.2
 2206220743 metadata/md5-cache/x11-misc/xss-lock-0.3.0_p20140302-r2
+2206251810 metadata/md5-cache/x11-misc/Manifest.gz
+2206251810 metadata/md5-cache/x11-misc/bbppp-0.2.5-r1
+2206241410 metadata/md5-cache/x11-misc/xkeyboard-config-2.36
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 2104120442 metadata/md5-cache/x11-plugins/guifications-2.16
@@ -59823,7 +59794,6 @@
 2205170654 metadata/md5-cache/x11-plugins/pidgin-xmpp-receipts-0.8
 2205170654 metadata/md5-cache/x11-plugins/pidgintex-1.1.2_p20170107
 2205170654 metadata/md5-cache/x11-plugins/purple-hangouts-0_p20200710
-2205170654 metadata/md5-cache/x11-plugins/purple-libnotify-plus-2.99.1
 2205171110 metadata/md5-cache/x11-plugins/vicious-2.5.1
 2205170654 metadata/md5-cache/x11-plugins/wmCalClock-1.25-r3
 2205170654 metadata/md5-cache/x11-plugins/wmDownload-0.1.2a-r3
@@ -59865,7 +59835,6 @@
 2205170654 metadata/md5-cache/x11-plugins/wmmenu-1.3-r2
 2205170654 metadata/md5-cache/x11-plugins/wmmisc-1.2
 2205170654 metadata/md5-cache/x11-plugins/wmmon+smp-1.0-r3
-2205170654 metadata/md5-cache/x11-plugins/wmnet-1.06-r2
 2205170654 metadata/md5-cache/x11-plugins/wmnetload-1.3-r6
 2205170654 metadata/md5-cache/x11-plugins/wmpasman-2.2
 2205170654 metadata/md5-cache/x11-plugins/wmpop3-0.5.6a-r1
@@ -59890,7 +59859,6 @@
 2206152340 metadata/md5-cache/x11-plugins/asclock-2.0.12-r4
 2206152340 metadata/md5-cache/x11-plugins/cputnik-0.2.0-r1
 2206191210 metadata/md5-cache/x11-plugins/pidgin-otr-4.0.2-r1
-2206221910 metadata/md5-cache/x11-plugins/Manifest.gz
 2206221910 metadata/md5-cache/x11-plugins/gkrellstock-0.5.1-r1
 2206221910 metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r1
 2206221910 metadata/md5-cache/x11-plugins/pidgin-privacy-please-0.7.1
@@ -59906,6 +59874,9 @@
 2206221910 metadata/md5-cache/x11-plugins/wmrecord-1.0.5.3-r2
 2206221910 metadata/md5-cache/x11-plugins/wmsystray-0.1.1-r1
 2206221910 metadata/md5-cache/x11-plugins/wmtop-0.85
+2206251810 metadata/md5-cache/x11-plugins/Manifest.gz
+2206241640 metadata/md5-cache/x11-plugins/purple-libnotify-plus-2.99.1
+2206251810 metadata/md5-cache/x11-plugins/wmnet-1.06-r2
 2201091240 metadata/md5-cache/x11-terms/st-terminfo-0.8.5
 2203240726 metadata/md5-cache/x11-terms/kitty-terminfo-9999
 2203240726 metadata/md5-cache/x11-terms/st-terminfo-9999
@@ -60186,12 +60157,10 @@
 2206152340 metadata/md5-cache/x11-wm/windowlab-1.40-r2
 2206141610 metadata/md5-cache/x11-wm/wmii-3.9.2-r7
 2206180610 metadata/md5-cache/x11-wm/twm-1.0.12
-2206230110 metadata/md5-cache/x11-wm/Manifest.gz
 2206221910 metadata/md5-cache/x11-wm/awesome-4.3-r101
 2206221910 metadata/md5-cache/x11-wm/awesome-9999
 2206220743 metadata/md5-cache/x11-wm/ctwm-4.0.3
 2206221910 metadata/md5-cache/x11-wm/cwm-6.7
-2206221910 metadata/md5-cache/x11-wm/cwm-9999
 2206221910 metadata/md5-cache/x11-wm/evilwm-1.0.1-r1
 2206221910 metadata/md5-cache/x11-wm/evilwm-1.1.1
 2206221910 metadata/md5-cache/x11-wm/evilwm-1.3.1
@@ -60218,6 +60187,9 @@
 2206221910 metadata/md5-cache/x11-wm/xmonad-0.15
 2206230110 metadata/md5-cache/x11-wm/xpra-4.3.4
 2206230110 metadata/md5-cache/x11-wm/xpra-9999
+2206231240 metadata/md5-cache/x11-wm/Manifest.gz
+2206231240 metadata/md5-cache/x11-wm/cwm-7.1
+2206231240 metadata/md5-cache/x11-wm/cwm-9999
 2107251109 metadata/md5-cache/xfce-base/xfce4-meta-4.16-r2
 2203240726 metadata/md5-cache/xfce-base/exo-4.17.1
 2203240726 metadata/md5-cache/xfce-base/garcon-0.8.0
@@ -60476,4 +60448,4 @@
 2206111440 metadata/md5-cache/sec-keys/openpgp-keys-llvm-14
 2206220110 metadata/md5-cache/sec-keys/Manifest.gz
 2206220110 metadata/md5-cache/sec-keys/openpgp-keys-libidn-20220621
-2206231010 metadata/md5-cache/Manifest.gz
+2206251940 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2d41327e20ad..e62c29c427fc 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 23 Jun 2022 07:30:01 +0000
+Sat, 25 Jun 2022 17:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 44245b6701e1..d7d80148a388 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9a48bcb527b13ffc7eacffed4444b241c8c49133 1655966746 2022-06-23T06:45:46+00:00
+ff1b85799b455dc74eaa7eabdb84a659fe0ca9d1 1656174817 2022-06-25T16:33:37+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 410fabefe785..4bb623b24a66 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1655968201 Thu 23 Jun 2022 07:10:01 AM UTC
+1656175201 Sat 25 Jun 2022 04:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 4e18c9f2c1dd..23669e13a1d3 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 23 Jun 2022 07:09:34 +0000
+Sat, 25 Jun 2022 16:39:36 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 0510c9ae439e..dfd379ed3df0 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index 1d9c8528257b..d735235b6fbd 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -7,6 +7,6 @@ DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe
 DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552
 DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51
 EBUILD openbsd-netcat-1.190.ebuild 1518 BLAKE2B 901b4c5b0f4c58c6b542667e0740d3058a7e22003805a3520555f7f1b843d5e1338a47db60900db527acc47cb91c3b99d292e34a768fa75dcb44a7f3fc229f2b SHA512 1c26caaa2c5978ddb0348e1c6c2e2855736f8df3517020930ee3dfeb6e24edd08b88e665258a80aeb38d845b6aac5bf20c085edea6450e600c1027a1e836ccd7
-EBUILD openbsd-netcat-1.195-r1.ebuild 1725 BLAKE2B c25a805d0738395b19b17c85a8b9575ef9745146b16860f6e36a4eff8c3ec0d4038517d4c7d1763d569267e6e5b6628afc69bd6aabf593d288b0f2f088bfae01 SHA512 950eda80b93656d9c49f3f35c6bce007a47fed81fce8338732932a5abd28a9c1e00fbb02d1f5dbc0bad96bf5b7ceb8090fe470b49619224ed1c5357140f13b9a
+EBUILD openbsd-netcat-1.195-r1.ebuild 1730 BLAKE2B 4b9df7b86c4231f3f7b6fe0a87ae7ed2ea0220a60ff64496bd392ed2a78f88ca84ff5d7e4d51a578fbc205619d332c5443885582deaa5c6f32604ebcad007334 SHA512 93d77dc56c65ad792cc963d6c0edf0ca8c2684356a8624231178fde8c5d08e1cdb814c537bccbf8a8b156952c4c2b2bac7ac0ef1f6aca830cd8a394f7fd07158
 EBUILD openbsd-netcat-1.195.ebuild 1524 BLAKE2B e0d11d336a9a2d3ab6bd67c5eb30106a0a58b80f4f0c656853f6f1826167dfc94c62f291b5029a4cf5707ea61547c458916bbfc40f5fbb767ac0f8028bad237e SHA512 2b76e272f75e54a52a30b1debda6aaab7df03be3f054cf3d17234c04bdd881a720c9c74f1c2dde61c1da9c445c2826124d735b909f8d5f2ccb159c6f30b60f3f
 MISC metadata.xml 245 BLAKE2B ac72ef778f5d556deab2ebcf80116f69791bc0590fea00ad21d361df28a3d1b96fb42db2de7f7545ad6f38137b9c26510efa2a2a251ca5646f77476dfb27d339 SHA512 ad4d8a54ad37031eaf3e1f1a06d53b85f504bdeeda433eee0a6101c2ccbc5b8da2d33725c9b0dfd013c3c5ad218171f6010722f443f81124086bc8c54a216b06
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
index c04edf0bb0da..10daf4381959 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 1a05a4e63cee..12f6c589bb31 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,12 +1,11 @@
 AUX gentoo.config-1.0.2 5253 BLAKE2B 2a167c760399401cd595e6b85ee8c29f8e4d3e4a44e7b6b7e42320ec9f88b1a61bcd4387815bd6f73dea71c9b39603c1809e4f1537d5de553ec77996429c0516 SHA512 59479e5af84e1f991ba8abeac42276a08a5c9f61fa0c79af96cd7c94fddb72de82ba56f31babf9b3bef5de26431ebb2b98bc1c58715b20baea350e16360108a3
 DIST sslscan-2.0.11.tar.gz 110704 BLAKE2B 4d4db6fa7b8f6f611e752d0f97ff1219fcbd064280bc4133dd38d1268cb268847801d25403eeb6bc475579a931e944c9a21d90e40fed6bed2a6a6bc535540f7d SHA512 99681cd8b7240cf85dedfaf210cae11ba3dbf2d56c3fa8ef3f3cdcabb6b29916b640e5955a7876ebb9be36dbe326da303e5bda7537b48743ff0a8c1bd35dbf0c
-DIST sslscan-2.0.12.tar.gz 110785 BLAKE2B 4c7ec58b7e454bb661f05da58eff55dad940ae1a8fb28daf8056114402949e6712e59e13e7128dec0eb45e3e21c2b349e0ac5b2fc7a3a334807b6fc4e2aeb595 SHA512 3758b5e697a1b53e4c574deabfe366d0796d6cb2481a644ec6139cd11e9b4cc2878b094ab9bf4e700ecc73cce6a374a1cf9f487967de3a038dacb985aebee948
 DIST sslscan-2.0.13.tar.gz 111142 BLAKE2B 049791183ebf1e00d11868c0dd7b79eddcd27cbb1f915812938f46837c4b300844c26e0a0bee0a4bee4886f24f7b10e5bc77ddedc86893ae228658ab71d11bea SHA512 50455a4f4a999e63107e705a4bc703b94b30d4fa71b5126cdc08788eedeb02f4c7a204a385fa485f0c9d0fa368c7a48f96c492b91631fe8833b68f20d45b0fca
+DIST sslscan-2.0.14.tar.gz 111539 BLAKE2B 392a5f043172aa5800c40e1a86c198421de7fb4ddf92f8504e0b6270c70f4c58f0527cfaaff4892469d763d970b044168ab2a37fa4d836cddda88e5e9fd04586 SHA512 bb496fffbd4e130bae8b9272d1303bfa0a681ff88aa3471e4b3f56bece2072ad8f8f41c19c4325de3d5772e785c1ab7491d3520ac3a44a7a170636ae4e13ed0d
 DIST sslscan-OpenSSL_1_1_1m.tar.gz 10023608 BLAKE2B a6951bfcddea224a4920f18b7352feb427b979965f8f563b9adf3dc3152133fd44d7a3c490c522986066db6b23c2e878f135a7a9160f564d435e66c2cce0c51f SHA512 af85d15c9db06eb9cdfa9e16ef9f859df752d823aa7c7f0c1b334cd71ba924878c686a65e756fd09c7630b650aad1a2bbe02acdfd6c389b52c2560d32d4150fb
 DIST sslscan-OpenSSL_1_1_1n.tar.gz 10031245 BLAKE2B 8af659fc9eead7b91a7553c17570dabb17d15fb37a77e7eecfa2a9dffc9eb0a331dd3f11a193907d16e535594eb8c31707ae91d91db91e99c75d75bdd43a7774 SHA512 bfe45e4cbe082e45d165212caa8e660c8af68559675c42461aba5685a7baa7e16c9c0096557106706114176dc31142c760fe835022f796e4341eb08d1b20408d
+DIST sslscan-OpenSSL_1_1_1o.tar.gz 10030908 BLAKE2B 97b2e9a385ef8d2c9b23cacb6c5f5998572299cc4189b1110691c87b3d56fa9eebcedf6cc4cdaf305e3c419f2ab6bbac7b3260ff0e1070b0c2f620b7bb18db9c SHA512 ee9e9a8dd2ccc5dc63ede1774c4bf931570be3bad4555b208bca718cb2b814eea7a067dfe29f0eee8dcf5588d0d2df272b578526fea6fc3bf5ed2d6bbf21d2fb
 EBUILD sslscan-2.0.11.ebuild 983 BLAKE2B 58a4c15afea3ec7b7ca0a5a9abbcf34b091387c27713021fd63e52b5dac3f252bb942659b4445b773adff21f29f9c8c289b051ad73d9ae0de0395067f5367162 SHA512 92d02a25e68b9c36fac4d4fdb1b720ce595066c2beb4818c7c127c9f03759a1cbf6fd42e5a8a469bc99ace37305a8904374204178d8272e43cda3c40c229988b
-EBUILD sslscan-2.0.12-r1.ebuild 985 BLAKE2B c60444c030824333de7bde2996904795b5ad690209bb4d05cbf55d737b45f814f8745eb2e11f7222b63b600ece7f5fe5bc294115a699bacda85abe61086ffe97 SHA512 91a2b53f77f1b1f09f2c6546e7a8ac56c07c9b7681c45fbf04a095057c46b00e308a0a49dfabd3353c5e6cf583d3b5e3575563587ff8f668dee88a5081018f16
-EBUILD sslscan-2.0.12.ebuild 985 BLAKE2B 90e92ffd6339ca75f63c6c67408379402af68460c56d067df6682e2cb2abbcfce81afd4d1816e81751bbe4023e83f91df2f39771e0c4815e947ed46b1cfb226c SHA512 6e9aadd016eb0f8dfa9133b12cef5c529e431143fc1d4fa7e4246bf20c1d32d262fd8e983e2898f9045513bdfbed9070ff387cdc5a9f28ac0429fd049210e8c5
-EBUILD sslscan-2.0.13-r1.ebuild 2056 BLAKE2B 0d2638ecd8c029a882bc097769ffb5d9be769b966ff2ed296545c11e7663c990ade708f20e8ddae1e0b8cc655e2846fef1b5cec253df87c2387d7689fb05fa8c SHA512 64cfb3d8d0f091613e18542602f713de43c7a7a1f3c40c78531c2c2caabf667be78d72b18af60cae8737491e03cd75981f1f4faedf4192865e83100769d4a7bb
-EBUILD sslscan-2.0.13.ebuild 985 BLAKE2B c60444c030824333de7bde2996904795b5ad690209bb4d05cbf55d737b45f814f8745eb2e11f7222b63b600ece7f5fe5bc294115a699bacda85abe61086ffe97 SHA512 91a2b53f77f1b1f09f2c6546e7a8ac56c07c9b7681c45fbf04a095057c46b00e308a0a49dfabd3353c5e6cf583d3b5e3575563587ff8f668dee88a5081018f16
+EBUILD sslscan-2.0.13-r1.ebuild 2054 BLAKE2B 3a0e0c3686b70511e285c42f8396b0b697d6cc3a222f4764ab0d648e6c52d86c51986f5018799dc153cca729586b0a374ada8520f3deb05b266cd18e995f01ed SHA512 d96b30fd216312f0172dae40403d7dc609490f9dc0c7224a07f54fffc51f14dda74c3dd538f932e86bc670f0126a64c467191198d51b2dccd62afd582c11ce6d
+EBUILD sslscan-2.0.14.ebuild 2056 BLAKE2B fb3e0132b6d675d2344b391b7b54e7a6efaa634480242cdcfc5acd7dcd096ffeb63a1c2c507508fd15db10ffbfffdec28ccce110ed143c4ccb0811c22cb984f5 SHA512 4359b5ae36c5430523fe8109ce6394c4403c53b7bd1f57b380563f937408fe368a7454d9f6beb3fde45469de8262bdf41b7213b9630b905e4e74b8b3704bb98c
 MISC metadata.xml 296 BLAKE2B b16b4e5a187d36ca8495bd63c691f67ae420fcc4cc742cdd8e477534edbe36414cef5eaa60eca31bdb62b9fbd7a6922754ea0d3d2adeb6d0d4181fefcbe3cb81 SHA512 650f60a88d140869a64a7287d094832e0e553f5d0093d248c3b94f9f3565bed26784ba2e6629128b602c3fcb56496fc4a92d1cd5148acf3b00b72aae22f16780
diff --git a/net-analyzer/sslscan/sslscan-2.0.12-r1.ebuild b/net-analyzer/sslscan/sslscan-2.0.12-r1.ebuild
deleted file mode 100644
index 69df855c7e64..000000000000
--- a/net-analyzer/sslscan/sslscan-2.0.12-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# sslscan builds against a static openssl library to allow weak ciphers
-# to be enabled so that they can be tested.
-OPENSSL_RELEASE_TAG="OpenSSL_1_1_1n"
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
-		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Requires a docker environment
-RESTRICT="test"
-
-# S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
-	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
-	touch .openssl_is_fresh || die
-	sed -i -e '/openssl\/.git/,/fi/d' \
-		-e '/openssl test/d' Makefile || die
-
-	default
-}
-
-src_compile() {
-	emake static
-}
-
-src_install() {
-	DESTDIR="${D}" emake install
-
-	dodoc Changelog README.md
-}
diff --git a/net-analyzer/sslscan/sslscan-2.0.12.ebuild b/net-analyzer/sslscan/sslscan-2.0.12.ebuild
deleted file mode 100644
index d9d16ed46086..000000000000
--- a/net-analyzer/sslscan/sslscan-2.0.12.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# sslscan builds against a static openssl library to allow weak ciphers
-# to be enabled so that they can be tested.
-OPENSSL_RELEASE_TAG="OpenSSL_1_1_1m"
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
-		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Requires a docker environment
-RESTRICT="test"
-
-# S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
-	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
-	touch .openssl_is_fresh || die
-	sed -i -e '/openssl\/.git/,/fi/d' \
-		-e '/openssl test/d' Makefile || die
-
-	default
-}
-
-src_compile() {
-	emake static
-}
-
-src_install() {
-	DESTDIR="${D}" emake install
-
-	dodoc Changelog README.md
-}
diff --git a/net-analyzer/sslscan/sslscan-2.0.13-r1.ebuild b/net-analyzer/sslscan/sslscan-2.0.13-r1.ebuild
index 17101310e3d6..534847f179f8 100644
--- a/net-analyzer/sslscan/sslscan-2.0.13-r1.ebuild
+++ b/net-analyzer/sslscan/sslscan-2.0.13-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # Requires a docker environment
 RESTRICT="test"
diff --git a/net-analyzer/sslscan/sslscan-2.0.13.ebuild b/net-analyzer/sslscan/sslscan-2.0.13.ebuild
deleted file mode 100644
index 69df855c7e64..000000000000
--- a/net-analyzer/sslscan/sslscan-2.0.13.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# sslscan builds against a static openssl library to allow weak ciphers
-# to be enabled so that they can be tested.
-OPENSSL_RELEASE_TAG="OpenSSL_1_1_1n"
-
-DESCRIPTION="Fast SSL configuration scanner"
-HOMEPAGE="https://github.com/rbsec/sslscan"
-SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
-		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Requires a docker environment
-RESTRICT="test"
-
-# S="${WORKDIR}/${P}-${MY_FORK}"
-
-src_prepare() {
-	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
-	touch .openssl_is_fresh || die
-	sed -i -e '/openssl\/.git/,/fi/d' \
-		-e '/openssl test/d' Makefile || die
-
-	default
-}
-
-src_compile() {
-	emake static
-}
-
-src_install() {
-	DESTDIR="${D}" emake install
-
-	dodoc Changelog README.md
-}
diff --git a/net-analyzer/sslscan/sslscan-2.0.14.ebuild b/net-analyzer/sslscan/sslscan-2.0.14.ebuild
new file mode 100644
index 000000000000..048fd50ff5a1
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-2.0.14.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+# sslscan builds against a static openssl library to allow weak ciphers
+# to be enabled so that they can be tested.
+OPENSSL_RELEASE_TAG="OpenSSL_1_1_1o"
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
+		 https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# Requires a docker environment
+RESTRICT="test"
+
+# S="${WORKDIR}/${P}-${MY_FORK}"
+
+src_prepare() {
+	ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die
+	touch .openssl_is_fresh || die
+	sed -i -e '/openssl\/.git/,/fi/d' \
+		-e '/openssl test/d' Makefile || die
+
+	# Copied from dev-libs/openssl
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	default
+}
+
+src_configure() {
+	# Copied from dev-libs/openssl
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# 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
+}
+
+src_compile() {
+	emake static
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+
+	dodoc Changelog README.md
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 767d52e316f5..3d2cff702298 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 c78d23b58e85..b6aa0d07fa04 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -7,9 +7,11 @@ DIST dnsdist-1.6.0.tar.bz2 1328707 BLAKE2B d093142875882cacaa456d76d42e703e45577
 DIST dnsdist-1.6.1.tar.bz2 1328069 BLAKE2B a9e9c0cb35ebc2ecd93d7fa0d6d3961b02d711da2df56240335786a5d2e529d4a7e8716f578b6e935edd3bc79dfed767d358b9feaff32dd9cd65993ef0b97b71 SHA512 68e114eeb1a7ae8a4ce52a7de31095c46d0ba8f572676a8ef1e858b97da199c04ec88656c7642160ba07b7db325cc2a49cd91794da8dd2e81a5301d089c34f90
 DIST dnsdist-1.7.0.tar.bz2 1392585 BLAKE2B 3766da5f63df6390f555307d665efcbb2ad1462abae3af44503479d4c6ae6453e43527d2bcac718fabeb8b60ec989f264860532b480c465afc440405f9efac74 SHA512 abaed7aaa18f4acaf220dc938da6896e521373b1da3b6b9c4114467dd5d8b0e6cd9809534edbc6ba5b789ed8387fb47317c47bd4e00e66a6ccb035f6dd6068af
 DIST dnsdist-1.7.1.tar.bz2 1392179 BLAKE2B 48189da6bceb1723b19bab7c42ec8cd834f3ef6d822b5da23fe2f4e02ec825d1566bce472f522fa9ac0b027d36f3089ce7c0c7eb1c7e1161c050dc50305dfdb6 SHA512 eee44a9994c6cab84977cad58539ca59882149d6898dfeed9e4190f06ddbc280b836bf426d22e6980d8acae1437290bddcc5166af165b6eb48c77c669281a310
+DIST dnsdist-1.7.2.tar.bz2 1391588 BLAKE2B cf2a9853be4c896b3909f871fad771d4298eb2586702a8a85eff2c612d275214cdad82e93961f4cfd58300f5629f06569c51a2c4f15de58188a69116bd5275de SHA512 2048ac0f861547fb103da1a128fd39a35ed689ccbf3c080232a3bd0550c9e7c7e01c95864d61e065e341a9f4111c974d2db2aba73eb8f7cba9bf8273da39b8a6
 EBUILD dnsdist-1.5.1-r100.ebuild 2294 BLAKE2B f8e88f0caba126be55c3ad6524be37321da60dba6f50e0cc07be0a70eb5897f35f361090fb1319ed2c08dd7fc38684d12c517ba782deeb3b54c8585d11f77dd9 SHA512 d65e938918fbd2b35a807d48cbe8466a2c6c705b3b18147bd4a79e77f7fd4775835c1ce8b05feaa7f7d4c24e92338a44197e2902db5b39b8451a518689749268
 EBUILD dnsdist-1.6.0.ebuild 2269 BLAKE2B 1a23ebd28849897dd3d62a312be60222da8b9048cb32ad21214b726b24fffa4bd43c4bc104fa4f367b4e07af51933b3c0c885f03e163f90a459ca91524aaf35d SHA512 8466bc936352defae74c6a9d4f19c970399b251b0eeb3f0fd59f3e2e922f88576be257006ff9e69c54a19d1aaa64ac2498ad2ad7c8329eedbfd4e382345929de
 EBUILD dnsdist-1.6.1.ebuild 2201 BLAKE2B 6cc3f47e8790d6a3f657b6bacb0bcd61a850f5f4fdb6fe87222a83e3a7081c1d6ccf514e4bca62cfe4ec5f240f53ba32494d88ab40038c00f26be861908b63ae SHA512 78b30965e4e89cfd241a83f40c9379d3093df0caabf75d6d0d78b8f72ef0e8882b76744f7c6ff9bc6bba4194a8ac501ba2ae38893ce898ae2771707e03e86fd1
 EBUILD dnsdist-1.7.0.ebuild 2219 BLAKE2B 3d5465d75769c886068ee6b75cb313d6fa0fe8170724548ce4a7f52fba3d667320e4fb5d963f6874bade766da5c83644b63a8bd7f82b60ea15d98bc56aa54814 SHA512 da8c63a23c564393a661dbe20740304b1c48eb5f26139d03c03ef52953ef9f3f2c345686a27db1f2e14a411de9e8a606103770cbd9b1dd3f492c6d9a9e447eb9
 EBUILD dnsdist-1.7.1.ebuild 2258 BLAKE2B 38141bac9d2ae4fbef947dd25639e3a1b4814415373069e514f5e15a7b9160a5db557999f042d153fe64b47cf5a3765d8ccecb7141fdc1c7ea91ed3f3dde37f7 SHA512 09ab9296ba9ae72bfedf0b2d2271e527f17a9fb68495afed0a7db00719b676627a6b251f9d0f1912a7419dff922421e7fd972f04f93f1aa49a1d57296134b079
+EBUILD dnsdist-1.7.2.ebuild 2258 BLAKE2B 38141bac9d2ae4fbef947dd25639e3a1b4814415373069e514f5e15a7b9160a5db557999f042d153fe64b47cf5a3765d8ccecb7141fdc1c7ea91ed3f3dde37f7 SHA512 09ab9296ba9ae72bfedf0b2d2271e527f17a9fb68495afed0a7db00719b676627a6b251f9d0f1912a7419dff922421e7fd972f04f93f1aa49a1d57296134b079
 MISC metadata.xml 1131 BLAKE2B 6e5955ebbb27298cc8e1be2afdec0a04cd29c99196586937c0fb518f0bfaf87d0a0cd369bd4fcb3c6815cd4fb7fad306b1c9982fb85df7f36d2f6220355a74e7 SHA512 3cca5ac1fa28c0efa56372a58271c6f8cb491e47dc16926e786b4174edfc14116ee0ea83e338f82fd01e58222e998e1d105e37763f4d7c1c4a8313503d7da085
diff --git a/net-dns/dnsdist/dnsdist-1.7.2.ebuild b/net-dns/dnsdist/dnsdist-1.7.2.ebuild
new file mode 100644
index 000000000000..99404bcecece
--- /dev/null
+++ b/net-dns/dnsdist/dnsdist-1.7.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
+HOMEPAGE="https://dnsdist.org"
+
+SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+		dnscrypt? ( ssl )
+		gnutls? ( ssl )
+		doh? ( ssl !gnutls )"
+
+RDEPEND="acct-group/dnsdist
+	acct-user/dnsdist
+	>=dev-libs/boost-1.35:=
+	dev-libs/libedit:=
+	>=dev-libs/protobuf-3:=
+	dnscrypt? ( dev-libs/libsodium:= )
+	dnstap? ( dev-libs/fstrm:= )
+	doh? ( www-servers/h2o:=[libh2o] )
+	lmdb? ( dev-db/lmdb:= )
+	regex? ( dev-libs/re2:= )
+	snmp? ( net-analyzer/net-snmp:= )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+	systemd? ( sys-apps/systemd:0= )
+	${LUA_DEPS}
+	net-libs/nghttp2
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	# bug #822855
+	append-lfs-flags
+
+	econf \
+		--sysconfdir=/etc/dnsdist \
+		--with-lua="${ELUA}" \
+		$(use_enable doh dns-over-https) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_with lmdb ) \
+		$(use_with regex re2) \
+		$(use_with snmp net-snmp) \
+		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
+		$(use_enable systemd) \
+		$(use_enable test unit-tests)
+		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
+			-i "${S}/configure"
+}
+
+src_install() {
+	default
+
+	insinto /etc/dnsdist
+	doins "${FILESDIR}"/dnsdist.conf.example
+
+	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
+	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
+}
+
+pkg_postinst() {
+	elog "dnsdist provides multiple instances support. You can create more instances"
+	elog "by symlinking the dnsdist init script to another name."
+	elog
+	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
+	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
+}
diff --git a/net-dns/s6-dns/Manifest b/net-dns/s6-dns/Manifest
index 7e425ea6ccb6..d6e883c38e3c 100644
--- a/net-dns/s6-dns/Manifest
+++ b/net-dns/s6-dns/Manifest
@@ -1,3 +1,5 @@
 DIST s6-dns-2.3.5.3.tar.gz 84916 BLAKE2B b315e2319c4b15401a6e41847faefc1798c3a945fc78f1601b06ce13ef0a55ddde270549e0585cac0356f9b1558a1433675dc4c636d1cc58aee434b86bd81627 SHA512 f3984913df65823c4edbeddc2f8c534926e74c5b06c357c394b05b25943ac8c6b4154859c93e182c60228f018522eb6173ece0bd2dbeffe8e1cc6fcbe33f6a76
-EBUILD s6-dns-2.3.5.3.ebuild 1151 BLAKE2B dc59b11074660d9f94810d6cf55c9e9c585efa32ff67e896ca61c5e508651a2d1b3be0fb395d9940a6a7fd3f655818b35bac59782d953a2c3622c1d4085d8679 SHA512 9c41b5133bd3ba89493767434341fb6e4f69553a84402762129d5de2ecc72a77192d0c38975d225811778b50e4cf63a6d89325f475bcc5ed8f32a0ff320444f6
+DIST s6-dns-2.3.5.4.tar.gz 84892 BLAKE2B 3bba411b297b85fdf5da7caf251b3c093d0e7108fdf16321e510a485e750ef37c6ec1a923e627a81a9719f211e2e284c9b8d3bcf60a4e18738d0886f931e380d SHA512 04c8fd40c71c9517f4e8d847a0ddf7d60a7759b4d7075035c2e00b4eb34e81edf4608df562929042c294ed671ab953e613374b577210ff49841ceb27dd563ae5
+EBUILD s6-dns-2.3.5.3-r1.ebuild 1147 BLAKE2B 2e5a2ae10d27e1a9c8bd634b093bb54c6dc37563d5b2630ee8b7c71e901e0ff7ee85d3171cc8fd7569a55e9161e555ee4448b105829e8163985af0f31dc780e5 SHA512 ce7d2efb6c447560eb472e9742c716a30f71a63944517eacd4863a8954557f0dbef01856a9f24b356f5c9b6884b72ff6949ef9aec6e324bc9d46e6aacf4e8620
+EBUILD s6-dns-2.3.5.4.ebuild 1014 BLAKE2B 40840e755b2bf53fb55a8d70d00b520e64e19bb0bdd85514ada7460e8c5011e2b6c50a505c1c563f76a7091296d7952e97435d9865bd26ed14e877d3c8422774 SHA512 e7be913613bec07d380608008b3db82e9a62866b60ecb9e2e833e4c3a094dcbe243873c69a0dd0b51aa08b2cdbcd65d970231a5d699853059a0335515f2e6be2
 MISC metadata.xml 686 BLAKE2B d6722be73cbf714c108651660f94f7b7a5d376bc3d670ae45b791521f89b1cbb6036d7753051de6a223fb5137bb905f1ad2f6704d092f0f40545fc80df14b85f SHA512 98586190f430b166bc03334b8a5a6f6bf04b2efd7f5df19b206fbe71411300f6c52ea60e120a41c8ea3a6bf08718d9a87edc7519656e85ef51e05cd42a582ddd
diff --git a/net-dns/s6-dns/s6-dns-2.3.5.3.ebuild b/net-dns/s6-dns/s6-dns-2.3.5.3-r1.ebuild
similarity index 95%
rename from net-dns/s6-dns/s6-dns-2.3.5.3.ebuild
rename to net-dns/s6-dns/s6-dns-2.3.5.3-r1.ebuild
index 14abc3c2c212..f5cabf08e349 100644
--- a/net-dns/s6-dns/s6-dns-2.3.5.3.ebuild
+++ b/net-dns/s6-dns/s6-dns-2.3.5.3-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND=">=dev-libs/skalibs-2.11.1.0:=[static-libs?]"
+RDEPEND="=dev-libs/skalibs-2.11*:=[static-libs?]"
 DEPEND="${RDEPEND}"
 
 HTML_DOCS=( doc/. )
diff --git a/net-dns/s6-dns/s6-dns-2.3.5.4.ebuild b/net-dns/s6-dns/s6-dns-2.3.5.4.ebuild
new file mode 100644
index 000000000000..3540fb714148
--- /dev/null
+++ b/net-dns/s6-dns/s6-dns-2.3.5.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Suite of DNS client programs and libraries for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-dns/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		--disable-allstatic
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 6f18dd652691..ebe4f2cf05c9 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 86eecb69be52..188fc4c1a26a 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,6 +1,9 @@
 AUX cifs-utils-6.12-ln_in_destdir.patch 629 BLAKE2B aa901b00c41a58ae21d948b3eece79914dc78782fcd49afc27ba8d7fa061f8aec43d187ce1302d67b5e5fc2cce113906545b9ae9920704f29ad3758a71079994 SHA512 354e33c91b0678e08ba9dabd989a5afdb2e558fa71dc427b283f9b987f94908d9b696c95a7e608e13f26497a52e7e8bf973290a84b2024ac9bc817ba512adf26
+AUX cifs-utils-6.15-musl.patch 2215 BLAKE2B 251be73f341d4573aa509915e364680fc6d85ed720ad5682812cd6ba418a64bd7c397bd742cd999cea52fda0e07d668e796383f034c5ccb1639764f93d050e9e SHA512 902deb413bbc7f34d9933fcae9c48c73bb2fb2aaca22b5ef3efd394bb2d550456548c08087db41a96a60f3e1ed945127ba242dc980b286dbf3abad1b0694c605
 AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672b37a0e8ac0b999aa7aaf180ac051f6745ee68373948b266ad359e1ba3b58552eda6314b5a4339673bd04656ab6090 SHA512 e3364e05fba6aff57ea2f09b530692f4f5ec95213e91794388fff9382d210db9bacb28dae1440d3b35a570c0b3bc21084a067e0ce8333febd5246c52aa9260ae
 DIST cifs-utils-6.13-kerberos_mount_regression_fix.patch.xz 4336 BLAKE2B de268f815ee4fbb750bf8b7d7110a69a808682c239a7c9196468ecc4d55a26eed3b63f8d8539569e16131060f57de389ef92e1063283eb2f41e65be00ed21bb1 SHA512 13d1fb8ff7c31100bfa481e647e9d3b90d61633173b3a71683246d7bb4b68c7e147d21697a17b7ad60e1ac8da2d48d6f4b51762370536a32d14da6c9a6db7e5e
 DIST cifs-utils-6.13.tar.bz2 414584 BLAKE2B 5133ea39fc65acaf2a9791f8ac97dee681dd12f509e0abd095542ce663e7c62002b033dcf35f0a8eec214cb9940597fb568fd50d4cfe5271ca4e433afbe1a7bc SHA512 1337ac4b69f0c3e8d0241eb608207ba81dfa35f84c661649d25da78637882c4d73467b0f632be0bd120362e0b786e40eb340bffcf21c8a09629c441100fd10de
+DIST cifs-utils-6.15.tar.bz2 416592 BLAKE2B 8af926bf255c5b3a66bf52ccca99632aacb9ed1c83ad7db5543b32df2f3bcd4be9a9cd17b744ec115d1568d07084e2bd2d03849aa9ab97cff2862f39bcf137b8 SHA512 eedb8066563db584595a8ba7cb7a603e6b763ac2c1261430d605c327fcc5a831acd48b58ea55dd243af778dfdc827ab8c6daf4015764ff550dcffc2182773510
 EBUILD cifs-utils-6.13-r1.ebuild 3606 BLAKE2B 398bc6c882a00d7cecb5315a2f2ea6f16b5a580f37f7d5759c25b35f52e314fd35502f4bbaadd0871905c87e4918e97cee728f4d36795d02981f88752686daac SHA512 be39a907aa792ae30603d8db37a08629a4719e8b2eef78603c47b94b464a0780e25b5bb6c40f6d128ddc0a7bca188267e3ba7a6fc180a0b6188c228ae9091c03
+EBUILD cifs-utils-6.15.ebuild 3462 BLAKE2B 26534380a4e18106dee5f08f7479dca69337c200a8302867900f4d0c8b9e397202fb628ec0ca8e39eec90e8b7959a38045ed1ee066d520eea58b201424457a03 SHA512 66832ae0562c98c77a8c011ade50bb33135e0b2cd8d2106e50923761444db6bc5fe6eab139bf3fd0694e274491c007d895c244051d5e6f446e7a2c512bbb06c0
 MISC metadata.xml 967 BLAKE2B dc6654b412c77f2e95cad9cfa2d4e4465d3292b546d55ddc04ad1b3d5b8220bbe4ef0b0d1409fb2f5da99851d45567667935057f5d5c15dad4e2cf26e3ce0e00 SHA512 c6b0fbdd9d776695032cd4a3e109717dfa7cd07b1456da8264dc0688fcfa158d1f4a73758ee24ba318f14e7a321811bd24f688ca3c39156b304028566315b650
diff --git a/net-fs/cifs-utils/cifs-utils-6.15.ebuild b/net-fs/cifs-utils/cifs-utils-6.15.ebuild
new file mode 100644
index 000000000000..47128fb754a5
--- /dev/null
+++ b/net-fs/cifs-utils/cifs-utils-6.15.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit autotools bash-completion-r1 linux-info pam python-single-r1
+
+DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
+HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
+SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+acl +ads +caps creds pam +python systemd"
+
+RDEPEND="
+	sys-apps/keyutils:=
+	ads? (
+		sys-libs/talloc
+		virtual/krb5
+	)
+	caps? ( sys-libs/libcap-ng )
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/docutils"
+PDEPEND="
+	acl? ( >=net-fs/samba-4.0.0_alpha1 )
+"
+
+REQUIRED_USE="
+	acl? ( ads )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+DOCS="doc/linux-cifs-client-guide.odt"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.12-ln_in_destdir.patch" #766594
+	"${FILESDIR}/${PN}-6.15-musl.patch"
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
+		ewarn "You must enable CIFS support in your kernel config, "
+		ewarn "to be able to mount samba shares. You can find it at"
+		ewarn
+		ewarn "  File systems"
+		ewarn "	Network File Systems"
+		ewarn "			CIFS support"
+		ewarn
+		ewarn "and recompile your kernel ..."
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if has_version app-crypt/heimdal ; then
+		# https://bugs.gentoo.org/612584
+		eapply "${FILESDIR}/${PN}-6.7-heimdal.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-man
+		--enable-smbinfo
+		$(use_enable acl cifsacl cifsidmap)
+		$(use_enable ads cifsupcall)
+		$(use_with caps libcap)
+		$(use_enable creds cifscreds)
+		$(use_enable pam)
+		$(use_with pam pamdir $(getpam_mod_dir))
+		$(use_enable python pythontools)
+		# mount.cifs can get passwords from systemd
+		$(use_enable systemd)
+	)
+	ROOTSBINDIR="${EPREFIX}"/sbin \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# remove empty directories
+	find "${ED}" -type d -empty -delete || die
+
+	if use acl ; then
+		dodir /etc/cifs-utils
+		dosym ../../usr/$(get_libdir)/cifs-utils/idmapwb.so \
+			/etc/cifs-utils/idmap-plugin
+		dodir /etc/request-key.d
+		echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \
+			> "${ED}/etc/request-key.d/cifs.idmap.conf"
+	fi
+
+	if use ads ; then
+		dodir /etc/request-key.d
+		echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \
+			> "${ED}/etc/request-key.d/cifs.upcall.conf"
+		echo 'create cifs.spnego * * /usr/sbin/cifs.upcall %k' \
+			> "${ED}/etc/request-key.d/cifs.spnego.conf"
+	fi
+
+	dobashcomp bash-completion/smbinfo
+	python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+	# Inform about set-user-ID bit of mount.cifs
+	ewarn "setuid use flag was dropped due to multiple security implications"
+	ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
+	ewarn "You are free to set setuid flags by yourself"
+
+	# Inform about upcall usage
+	if use acl ; then
+		einfo "The cifs.idmap utility has been enabled by creating the"
+		einfo "configuration file /etc/request-key.d/cifs.idmap.conf"
+		einfo "This enables you to get and set CIFS acls."
+	fi
+
+	if use ads ; then
+		einfo "The cifs.upcall utility has been enabled by creating the"
+		einfo "configuration file /etc/request-key.d/cifs.upcall.conf"
+		einfo "This enables you to mount DFS shares."
+	fi
+}
diff --git a/net-fs/cifs-utils/files/cifs-utils-6.15-musl.patch b/net-fs/cifs-utils/files/cifs-utils-6.15-musl.patch
new file mode 100644
index 000000000000..f17cc68bdaca
--- /dev/null
+++ b/net-fs/cifs-utils/files/cifs-utils-6.15-musl.patch
@@ -0,0 +1,80 @@
+https://marc.info/?l=linux-cifs&m=165604639613381&w=2
+
+From c267ecf6a1c2152e640897d30cc0e8f637a8ef76 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 24 Jun 2022 05:25:23 +0100
+Subject: [PATCH 1/2] getcifsacl, setcifsacl: add missing <linux/limits.h>
+ include for XATTR_SIZE_MAX
+
+Needed to build on musl. It only works on glibc because of transitive includes
+(which could break in future).
+
+Example failure:
+```
+getcifsacl.c: In function 'getcifsacl':
+getcifsacl.c:429:24: error: 'XATTR_SIZE_MAX' undeclared (first use in this function)
+  429 |         if (bufsize >= XATTR_SIZE_MAX) {
+      |                        ^~~~~~~~~~~~~~
+```
+
+Bug: https://bugs.gentoo.org/842195
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/getcifsacl.c
++++ b/getcifsacl.c
+@@ -34,6 +34,7 @@
+ #include <errno.h>
+ #include <limits.h>
+ #include <ctype.h>
++#include <linux/limits.h>
+ #include <sys/xattr.h>
+ #include "cifsacl.h"
+ #include "idmap_plugin.h"
+--- a/setcifsacl.c
++++ b/setcifsacl.c
+@@ -48,6 +48,7 @@
+ #include <errno.h>
+ #include <limits.h>
+ #include <ctype.h>
++#include <linux/limits.h>
+ #include <sys/xattr.h>
+ 
+ #include "cifsacl.h"
+From d1a36cc4caa541d1f0f9a3426a5202b680cf7ff8 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 24 Jun 2022 05:26:54 +0100
+Subject: [PATCH 2/2] getcifsacl, setcifsacl: add missing <endian.h> include
+ for le32toh
+
+Needed to fix build on musl libc. It only works by chance on glibc
+because of transitive includes (which could break at any time).
+
+Example failure:
+```
+getcifsacl.c: In function 'print_ace':
+getcifsacl.c:284:16: warning: implicit declaration of function 'le16toh' [-Wimplicit-function-declaration]
+  284 |         size = le16toh(pace->size);
+      |                ^~~~~~~
+```
+
+Bug: https://bugs.gentoo.org/842195
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/getcifsacl.c
++++ b/getcifsacl.c
+@@ -23,6 +23,7 @@
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+ 
++#include <endian.h>
+ #include <string.h>
+ #include <getopt.h>
+ #include <stdint.h>
+--- a/setcifsacl.c
++++ b/setcifsacl.c
+@@ -38,6 +38,7 @@
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+ 
++#include <endian.h>
+ #include <string.h>
+ #include <getopt.h>
+ #include <stdint.h>
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 88f43f3632f3..f7be7d94d7f2 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,7 @@
 AUX 4.4/samba4.confd 2035 BLAKE2B a9fa538a0b259c8a184012e0370819729e24fa971de52e3d3891107bd78e6d4e074a2df80b1c424c23229ce5e84ea1da908887c8fef88dd45104eb5c6eb0e4a5 SHA512 d6a7ae560621407b7a5f94db6489d6a85c5056f4212a2a9a24210eaeb585caf4f15801282d1b8682962c0cf5642766fe09cc70c48fffafd1560de615154503af
 AUX 4.4/samba4.initd-r1 1112 BLAKE2B 91d28710ccd512e19307bfd5ba97710ca071b478696d8e933d90b385f0c958a493ab684436915630de2884383e24eb1c9955ebd2b526b0b8f30438d9204dcb57 SHA512 3bfa4c8e0d77994fbca25eb0e12617166909c4d6742d1800c73f5640a7c39ee760988a315d39ddf8a575097df3d3c6fe3f308e8ca1cd698018544a9060176f4e
 AUX 4.4/system-auth-winbind.pam 590 BLAKE2B d8c0190dff88c5b65f7f01b3a84fd776194d3b4ce5c973bd1145e6a12750f01882b2873be03b537e9a68899c0a19fee7a4834385961090e4cb69dda7ae1763c0 SHA512 0886cfd99b3c3dc117b2a83b04bf59d080ebf77d6ea91f24cfc4d8be7af9db377e0efc2216e7c1f8a180b09fb425476ef6874180d9f0fa47e4889faf1d429679
+AUX samba-4.16.1-netdb-defines.patch 546 BLAKE2B eb42eb3429a221d700cc53381cda2a2dbff72cf43a0c3d5d8564d5e264a1ffaff15e3fd13f9647dd0a76e99323d656c07f26cf9c941f7407769c1a986c8c9025 SHA512 3802cf51d1dbcdf631ab4ffdc115ea58ad8d7bf1a23600e91eff2a70fcffb80161a3e87c360f7c961dae99c8f0267bf8f9feed739b388d012ece32bcf97c1dcf
 AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c
 AUX samba.conf 88 BLAKE2B 5bf3391fdf31b284bfa68b904370776d2e5b14fe0ce5677b4982b54da379e504cf9a3c9563438ce262b9634140a1192ecf00f57a66da2e42d52c351ae9972d4e SHA512 b26251050e29571e6a567d8516aa0ea82fe7fdaa25726677b6cad20d0e25b9fec350d755d26c778855a1444d20852930a47c06340c213dac441375a2c424fdb2
 DIST samba-4.14.12.tar.gz 19145135 BLAKE2B 94ffc6dee4448e302591bf30bc34f75c5cdeab8acaa04b2d1105a0f0155ba13d366e61f2d0b38060fccb841febcc212d8ab7b6dfd860d784ae9299a375cb98c3 SHA512 6a021d61dc2a8894c646a9b6d85e38c9020b3c227f10d1820cbdf2ad6793c0beeacedd5fff5f75718d4083ec9169cb1fb58f65636e1a50e638fcefce355690d9
@@ -10,11 +11,13 @@ DIST samba-4.15.6.tar.gz 19290189 BLAKE2B 14a8d3cf03de303cce54e5b336f5866f5d3ded
 DIST samba-4.15.7.tar.gz 19290930 BLAKE2B 4a295f79d38212d4c6917ed61a22e4204b5ea3d5e26f30b65d1e7e81842e92405870dd40fd4d05ec1126a532bdb1ddea300848387a4c64370ba5c2c1354ee8e5 SHA512 beffb09b5bcd62991398d39c7a8aec5fed0c51d550e2f0fb42b2e0a09094f4c6a8f29adf708c4969db12329f5c7343d2debd04315107b79bef59e99a4a7e4ce4
 DIST samba-4.16.0.tar.gz 30583390 BLAKE2B 6ea27634690d00779ec7f671e48b17246285c9576221d9b9b3f9238cd72310e8aaaeb646031212e65c239d2e959deef7bd9739932db0c716b7ea79cc11f2f7b8 SHA512 cea6bab64021779d217669e58612d192b907c2c481ef30e40e449bc6b8f8993a9b7b7b5bfcfebe54d8f70b8f720893cfa77a9d674ef8e07dd45a55a0fbc673e2
 DIST samba-4.16.1.tar.gz 30590897 BLAKE2B 4e22b1a8bbef28116cad71c87da1aaaa39459d5eeb30e975aec6444369576ce716917d3ee89c0b328e457e2dcda17abe705d1f33d12b4205efcebdc54ba7f2fd SHA512 d82ab250e87cb64b083345b61da8c4edbb2185a13f8cef33232f823fd510822570ed27c7b260a1fefd3af3b2fc4b271257c2c3e6ab3241c8c147bebae6ab39fc
+DIST samba-4.16.2.tar.gz 30597031 BLAKE2B d1268cb34ef951a47bd6cd8b76fa8576f3db2a4faca1fdae90f096f25d5e90e9eaca49c73f7952a6c8cf48a200247fb9957b230efb9ec725c29a1af16d8aa37e SHA512 ed85acca0f23f9166530b600ae569f3259c2122d15e361fd3fe48a82921cd53bbb459d6c102bb60cc40b2dd811cde1262a3fb17ed6015a260432bffe5af83366
 EBUILD samba-4.14.12-r3.ebuild 10031 BLAKE2B ef98c98e96c6bc442ae917f5ea98eac20ad8b47e5cf95d629c3c057885a5e0d2b15c57d435c792b2a4edc5d8e75a76a4b0903d08efab1b9832e8a324c23d1357 SHA512 e73d8c96e32582e5c7fb80dfa89f4c1506106e8dc9bdb07e17ab676c1d8c2a9b319e1f4e5d2cf76046dfc5b78868484fca5c32b1835ca06701e6719be754b635
-EBUILD samba-4.14.13.ebuild 10039 BLAKE2B 820da611d7a5237c9028b4650c745ec6d296c31c3d7ff44fc738e1c5a22ef3f479f9ea6656c8441fdb572bd324bec3c1fa5a7be05d75d1ec589bef5a521d7f81 SHA512 269d428fe48b252c8ecf3fee905087617d607904dd880e4e7c81c275f2296826ec527cd4699051985a6fd70210fc3ff9c16841bc5d07693ae1c580d25041bb6d
+EBUILD samba-4.14.13.ebuild 10033 BLAKE2B 55deafc994a7646b1d11bc3e7281be3c1feb620f7ea3657a9e6054ea3a27c0fa598cc29a38dd5063816a410122b73e15cce413e8c82c38b7fd9b875c48fc2810 SHA512 b04663ab851610b7cc3b2354ef9cdd5e7cd88699fe940da9706000e9a7376328c6e192b4fab15df826cd581587e778d1ed7ed359e5358ffccdb59bf7fc59390b
 EBUILD samba-4.15.4-r3.ebuild 9964 BLAKE2B 33e95d71e3a5d3172fc8dae76807e198b2ef4100d32d5e8bee2964dd41b2a9f3396c3b9b9d2a93e75ec47b94365871c6005ceca35a153f42f5e143b8fe2c24aa SHA512 bacfa5b5a1c29f8eefaea6b5b31134ce8a0059b2365987453cf14994ae0122cca4e241445e600689072eab27ca1809347c0321515728da792a166aad37801fe1
 EBUILD samba-4.15.6-r1.ebuild 10022 BLAKE2B 0588e5c12f2c4d31bc8e34c50de2cc8894d7eb62df1d55f243f067e0938408fea6fa0cba01d47606ad132e560214a76f2771f2197318b2757c988255a18d0a3a SHA512 45f04624f8a88acbc4b3939d7192c38bc3e86495a4ce2e16095aeb66b7eda7ae68ff4f920fa50577cf27a16791edfa621497094f287c13bb758f5e0117bd9788
-EBUILD samba-4.15.7.ebuild 10022 BLAKE2B 0588e5c12f2c4d31bc8e34c50de2cc8894d7eb62df1d55f243f067e0938408fea6fa0cba01d47606ad132e560214a76f2771f2197318b2757c988255a18d0a3a SHA512 45f04624f8a88acbc4b3939d7192c38bc3e86495a4ce2e16095aeb66b7eda7ae68ff4f920fa50577cf27a16791edfa621497094f287c13bb758f5e0117bd9788
+EBUILD samba-4.15.7.ebuild 10016 BLAKE2B 1ef15a1dcc9b0e5b9b87778aba40664378167abf152b222f353e330e61d0720e23ea13c1c939bcf1d6af074b850dddf292343b2feafd8279e1228249ad2a66e5 SHA512 7a9990c63d6e4d2fc8f33f0a62c50700026353d5cc1ff99c65fa9abd8e768a541209c3ac6e3761db7caff70bccafd25e152262bf35d9efc5ceb3cba77eba11eb
 EBUILD samba-4.16.0-r1.ebuild 10037 BLAKE2B 8679d1dbc9fe6a550eecfb86fb32ab26297c9b02eccc8a36621bcc13be96c70450e25759d9ffb810f87a43b6768e2bdbc459a990bbf4fbc261ff5bee5bac2ddf SHA512 75ff78eae02920315c40d74d7348a5ff98d5d20abc463a615e572602d2daf6e61f6fa66fbd910933c883ca9e7731360441d1fe575b2643926dace994fb59a549
-EBUILD samba-4.16.1.ebuild 10037 BLAKE2B 8679d1dbc9fe6a550eecfb86fb32ab26297c9b02eccc8a36621bcc13be96c70450e25759d9ffb810f87a43b6768e2bdbc459a990bbf4fbc261ff5bee5bac2ddf SHA512 75ff78eae02920315c40d74d7348a5ff98d5d20abc463a615e572602d2daf6e61f6fa66fbd910933c883ca9e7731360441d1fe575b2643926dace994fb59a549
+EBUILD samba-4.16.1.ebuild 10085 BLAKE2B e652f81751b0e4971ba0f1850cdf6a629732b998f0a97a91f4a623a28a6ef1e67cb0d949144bd8e62f46cf1b970d62b4d5db73deec39420b68e0b913c71dbe4d SHA512 82f77c0504b778265c346347b1f9ca1955fbb436c23cb285985f0271013a221c121aba707eb055ec4215137d7a998356d8199fef100a811fe5a4156d2f1224ee
+EBUILD samba-4.16.2.ebuild 10058 BLAKE2B d371853ff17ad1cb56eceefb5bc1971ebedb92d35ac42232e7cd9c041ce43d5c1d6f2c5431a2420c3c52d779dc5a4edd1c8079d32cb6076a8ad3c343de14828f SHA512 6a9aea02a5500d8e2099a2eed9b170716b722fd2f9f22883521627e56aec818f9cc59dfba7ba3c069b913e61b2d2f2201daba3131ee00ba4c21e5fec5e5e222c
 MISC metadata.xml 2061 BLAKE2B b6232fb0408426e595b8569a26aba4938e2e0edd61cf4d73650ee4eed48725ca3181c212003515ef573a95bd73659fe482d964e26fef3ff61a66e06f0566b600 SHA512 301d931501a67d7189881fb269c31f75790b99c3c6c74caea963507ca5a60e5ae39bfd97f8d7e2f3096ae71645c8d7abea36d70ae621017c72cb20c9ec51d2d8
diff --git a/net-fs/samba/files/samba-4.16.1-netdb-defines.patch b/net-fs/samba/files/samba-4.16.1-netdb-defines.patch
new file mode 100644
index 000000000000..b0f01e42acbb
--- /dev/null
+++ b/net-fs/samba/files/samba-4.16.1-netdb-defines.patch
@@ -0,0 +1,23 @@
+https://gitlab.com/samba-team/samba/-/merge_requests/1025
+
+# Define NETDB_INTERNAL and NETDB_SUCCESS if they are not defined
+#
+# Gentoo bug 832629 and 835017
+
+--- a/nsswitch/wins.c
++++ b/nsswitch/wins.c
+@@ -40,6 +40,14 @@ static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER;
+ #define INADDRSZ 4
+ #endif
+
++#ifndef NETDB_INTERNAL
++#define NETDB_INTERNAL -1
++#endif
++
++#ifndef NETDB_SUCCESS
++#define NETDB_SUCCESS 0
++#endif
++
+ _PUBLIC_ON_LINUX_
+ NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname,
+ 				     struct hostent *he,
diff --git a/net-fs/samba/samba-4.14.13.ebuild b/net-fs/samba/samba-4.14.13.ebuild
index 165914c640d6..8e8b7156f29f 100644
--- a/net-fs/samba/samba-4.14.13.ebuild
+++ b/net-fs/samba/samba-4.14.13.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = *_rc* ]]; then
 	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-fs/samba/samba-4.15.7.ebuild b/net-fs/samba/samba-4.15.7.ebuild
index aa3c460800e1..c23859866f3c 100644
--- a/net-fs/samba/samba-4.15.7.ebuild
+++ b/net-fs/samba/samba-4.15.7.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = *_rc* ]]; then
 	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-fs/samba/samba-4.16.1.ebuild b/net-fs/samba/samba-4.16.1.ebuild
index a7d3fa8bb5d3..8b16a80d66cb 100644
--- a/net-fs/samba/samba-4.16.1.ebuild
+++ b/net-fs/samba/samba-4.16.1.ebuild
@@ -141,6 +141,7 @@ BDEPEND="${PYTHON_DEPS}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.16.1-netdb-defines.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.16.2.ebuild b/net-fs/samba/samba-4.16.2.ebuild
new file mode 100644
index 000000000000..090a59c32be1
--- /dev/null
+++ b/net-fs/samba/samba-4.16.2.ebuild
@@ -0,0 +1,343 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam
+glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	ads? ( acl ldap python winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.5.1[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.6.0[ldap(+)?,${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing:=[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.6[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	$(python_gen_cond_dep "
+		addc? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			dev-python/markdown[\${PYTHON_USEDEP}]
+		)
+		ads? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			net-dns/bind-tools[gssapi]
+		)
+	")
+	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
+	acl? ( virtual/acl )
+	ceph? ( sys-cluster/ceph )
+	cluster? ( net-libs/rpcsvc-proto )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme:= )
+	json? ( dev-libs/jansson:= )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	dev-perl/JSON
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
+		!system-mitkrb5? (
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/nss_wrapper-1.1.3
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-samba )
+"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.16.1-netdb-defines.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+	export PYTHONHASHSEED=1
+
+	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	if use cluster ; then
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS+=",idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		--accel-aes=$(usex cpu_flags_x86_aes intelaesni none)
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		--without-dmapi
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
+
+	CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \
+	waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool \
+				/usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		if ! use addc ; then
+			rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
+				|| die
+		fi
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process samba.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
+	if [[ "${PV}" != *_rc* ]] ; then
+		elog "For further information and migration steps make sure to read "
+		elog "https://samba.org/samba/history/${P}.html "
+		elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+	fi
+}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 3ea619d99960..c9ac45a9f59e 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest
index a9727eb1a897..91245836b3d9 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -1,5 +1,6 @@
+AUX ftp-0.17.34.0.2.5.1-musl-glob-brace.patch 350 BLAKE2B c061328876a4e47b10fbfd01da1703abf8bf710a3ceaebbbb86b44ed4b9c7d796809e63ede40f0d8218c57ff07b48164452450d8365a707f0d03317c42e04545 SHA512 e56bff74eff1f18519fd06e730ab15b4f155ce258ce0638e4275a03a2fc51234b198eec0fbe37ff56b2211a732040a93dbc4999a672d5a6c4f73912d8d82968a
 DIST netkit-ftp-0.17-patches-3.tar.bz2 4082 BLAKE2B d70c0340641647ab993a7b2aa1c49be2a1ff16e7b6b3038ebe9eff329bf4796cfa21d8c8d88f123c2f633cc1ba3b5ecdd4b1be78a7fda63b77ece077d643fca5 SHA512 083796f89c6d02f2b094616a6b7c9ef8ef7d0edbe337521cf311deb03f1af2000f12b85e3978a5eb1c56c64f2a2a105c0b7735fd6ea31d626d171a047cd858c3
 DIST netkit-ftp-0.17.tar.gz 53934 BLAKE2B 451f90f26cd5cc1a6693fea7c31d47127d8b89b4b00a2f863af61d46d87f6e416141db1c6f6bb320021665a99f0d9e00dc4a5c3b0bb209df0ae74aad97a45f20 SHA512 ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554
 DIST netkit-ftp-ssl_0.17.34+0.2-5.1.debian.tar.xz 48976 BLAKE2B 30c867a3a8fabc55ba05603c54b5e4153d198e8e92d55353bf02cbf0494a41de1362c945aef013edfa3a6f0b1c78e5041ec7127db5eb99bac5351f57bb526c2d SHA512 6061b9b22fe8463a7d4542988685e108b282b6d2908d67cc70951fc23b1d842a70aee44af989d1e683e80c050ffe284fbfa776581e0120439bec98d479672718
-EBUILD ftp-0.17.34.0.2.5.1.ebuild 1507 BLAKE2B 11473a162ef03ae30414308b40edcc55e9a9e6aa5ed78c07caca0630f9e89f545a571c36b27a3f8f43962e720b7d7b7404e0283d7278c9e9bb2e0389eae4b77b SHA512 6656ced60a327119cdaf7c82558b9a892a0217e03ef4d50d609089cb46f69dfe8b5e8c0c1462b036d4807464fa6fd2557cce9e1fa269211812c9e14a59a2308f
+EBUILD ftp-0.17.34.0.2.5.1.ebuild 1739 BLAKE2B 08051dc05b9b200c67149e85dc66803ab9973a265924dda8439be353f905068363f9af4060accc1bae6ec5bdf93809aff5fb689efb7c18be9047dde2c8d148b4 SHA512 3ba91f7394875c05a2b9a2ec6e4fd9054ea6e3b7a5430406dbac6ef3dd1d215d1b99530f1081bc33282642274a91cd44bec2d36590013c4b5048e8f8a0189a43
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/net-ftp/ftp/files/ftp-0.17.34.0.2.5.1-musl-glob-brace.patch b/net-ftp/ftp/files/ftp-0.17.34.0.2.5.1-musl-glob-brace.patch
new file mode 100644
index 000000000000..386af410e913
--- /dev/null
+++ b/net-ftp/ftp/files/ftp-0.17.34.0.2.5.1-musl-glob-brace.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/832430
+
+See e.g. https://patchwork.kernel.org/project/selinux/patch/20180517051117.48454-5-jason@perfinion.com/ too.
+--- a/ftp/cmds.h
++++ b/ftp/cmds.h
+@@ -61,3 +61,7 @@
+ void do_umask(int argc, char *argv[]);
+ void idle_cmd(int argc, char *argv[]);
+ void setpassive(void);
++
++#ifndef GLOB_BRACE
++#define GLOB_BRACE 0
++#endif
+
diff --git a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
index a25ce7b145e0..bbdb45b4f87b 100644
--- a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit edo flag-o-matic toolchain-funcs
 
 PATCH_VER="3"
 MY_PN="netkit-ftp"
@@ -11,11 +11,13 @@ MY_PV="$(ver_cut 1-2)"
 MY_P="netkit-${PN}-${MY_PV}"
 DEB_PN="${MY_PN}-ssl"
 DEB_PV="$(ver_cut 1-3)+$(ver_cut 4-5)-$(ver_cut 6-7)"
+
 DESCRIPTION="Standard Linux FTP client"
 HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
 SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 	mirror://debian/pool/main/n/${DEB_PN}/${DEB_PN}_${DEB_PV}.debian.tar.xz
 	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}-patches-${PATCH_VER}.tar.bz2"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,22 +26,23 @@ IUSE="ipv6 readline ssl"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.2:=
-	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
+	elibc_musl? ( sys-libs/obstack-standalone )
+	readline? ( sys-libs/readline:= )
+	ssl? ( dev-libs/openssl:= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="sys-apps/grep"
 
-S=${WORKDIR}/${MY_P}
-
 src_prepare() {
 	local p
 	for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series || die); do
-		eapply "${WORKDIR}/debian/patches/${p}"
+		eapply "${WORKDIR}"/debian/patches/${p}
 	done
 
 	eapply "${WORKDIR}"/patch
+	eapply "${FILESDIR}"/${PN}-0.17.34.0.2.5.1-musl-glob-brace.patch
 
+	# Drop bashism from configure
 	sed -i \
 		-e 's:echo -n:printf %s :' \
 		configure || die
@@ -48,15 +51,20 @@ src_prepare() {
 }
 
 src_configure() {
-	append-lfs-flags #101038
+	# bug #101038
+	append-lfs-flags
 	tc-export CC
-	# not an autoconf script
-	./configure \
+
+	# Not an autoconf script
+	edo ./configure \
 		--prefix=/usr \
 		$(use_enable ipv6) \
 		$(use_enable readline) \
-		$(use_enable ssl) \
-		|| die
+		$(use_enable ssl)
+
+	if use elibc_musl ; then
+		sed -i -e '/^LIBS=/ s/$/ -lobstack/' MCONFIG || die
+	fi
 }
 
 src_install() {
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 067192b89678..2ff0b7b0af9e 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/purple-events/Manifest b/net-im/purple-events/Manifest
index 6ca6237a6d05..d20b1f3cbac6 100644
--- a/net-im/purple-events/Manifest
+++ b/net-im/purple-events/Manifest
@@ -1,3 +1,3 @@
 DIST purple-events-0.99.1.tar.gz 24437 BLAKE2B c4952de806deb6357cfcd59b0392319522c26ac267e991de40adcf1ab622b1df4156854951543a6ad8e0f05b160b31bbf38352a1b5f4a980e24fb37fd8f61dca SHA512 105126fd0dbcc74d6a5878308e43ff27df4c9f1ec20601f382419cb8ebbe1a39e44da6327be86d779dbc66f6251699126776fc8389cdf48dc1569ae6bd8fa6fb
-EBUILD purple-events-0.99.1.ebuild 609 BLAKE2B 05ebb83bd2b84b683b67684704038dc3c7ce04c2c74516d655af1d98ecdda705354d028dcd1f3fc4463a898684cac8cdf35c6e2e7797152220267a2eb91b3303 SHA512 a1cb0d1e6efc7f46685a664e3204c4e52726826ec6406010ad2e746baa7bcef3588ce77cb2f4af75ecf9e4acdba9800cbfc44281aafae2d389b8f5e7fa89aa8b
+EBUILD purple-events-0.99.1.ebuild 616 BLAKE2B 25d3c6ae845cc218d19b015458491eabed87995706a6ebeb5d5558a22837d078eceefbde82ca8b6653b7266b4704de6118b928f829d681bcdd771862c89ffa82 SHA512 160038771d65c188b0e37de11e02e8784b1bf499187599403f3035953f00882a3fbcd1470985e58be30ce084b76bc525387f5f793d39d82abc61aeb0987d2b54
 MISC metadata.xml 398 BLAKE2B 0c45ced9972e38cd15a467c622ed2b5d6b476dc20065bd00fe9aa9266a172ed8e6051e50b5a98d6fdb846f8c7cf3838506718bfaeda47a44487df864214677de SHA512 4520868469d584d3952d3d88463700da250e5466329ffd5bd34d68b18da56b1b52c0a413a7f80e5918c3280fd6d5f382b031c55143b815a5e17f3be97a6366c3
diff --git a/net-im/purple-events/purple-events-0.99.1.ebuild b/net-im/purple-events/purple-events-0.99.1.ebuild
index e4d139ae3b6f..b415329f383f 100644
--- a/net-im/purple-events/purple-events-0.99.1.ebuild
+++ b/net-im/purple-events/purple-events-0.99.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="Allows a fine-grained control over libpurple events"
-HOMEPAGE="http://purple-events.sardemff7.net/"
+HOMEPAGE="https://github.com/sardemff7/purple-events"
 SRC_URI="https://github.com/sardemff7/purple-events/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 0bea3bad14ba..1e2014486f34 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/irssi-xmpp/Manifest b/net-irc/irssi-xmpp/Manifest
index c0c85187db3c..edb6561923ce 100644
--- a/net-irc/irssi-xmpp/Manifest
+++ b/net-irc/irssi-xmpp/Manifest
@@ -1,6 +1,6 @@
 DIST irssi-xmpp-0.54-irssi.patch.xz 4060 BLAKE2B 305120bed1e05fc144ca4bbade4894f3f7b20d3f0fe8946182db9525c0b8ed6ce37228233a36b5a24f080cac7d0496097609fd8319294e0e140d9046bfc216ce SHA512 8865084b167138cc02feec39a014c6ea3c047f32430d531b0fb84f9172cf43024c44ffafb274a5c049e4b1060bf30a7f219ba22ce2ea4e2858fe000cd2538f5a
 DIST irssi-xmpp-0.54-musl-build.patch 24443 BLAKE2B b0ed65a688d0db84f89bc65c429b4754cd4dcfb9de2c1cd5aa64f4e02badc82d26ab42b2a29a3658910dcdbf61b2d49eca4c1b4355b5566c5a3bd120e06340bb SHA512 1417c328867b59de41f71fa720cb00581352604acec9787db183820f1ffb77209623bc236aa5b6e4f661c3780ee5c3d407aecbc286176a4d850f6e40bebecd45
 DIST irssi-xmpp-0.54.tar.gz 65618 BLAKE2B 5dd1f3a858cdb397351b93800fdd2050aa8e5764ac2e03008d629dee7d825b02bce4bfc627ab2d3249392efe43ceb1530a7ccefc3241c8ca101cc2963d28f872 SHA512 31ddd9e0147eec23d08b8bcbe242e831d612cb2d00f3b56776e9d0b87db9bd76d4bb147422cdf18c0567f0e0463ab828ab7a0ef80a2b35cfdc0a8be962b39f14
-EBUILD irssi-xmpp-0.54-r1.ebuild 1009 BLAKE2B b93bdcbb4bc06364a53f1c7a0618d7b2419b3455523262d6df9dd6d4a5d4ee40a7fafa7d24a0c3704798c00a6168bf9fe1c01d14551d9b302c5e05ea16e8bff7 SHA512 3c2a7f0b6ecbbf35a8c4c50988a9453ad66084079998a76d4cb71729caba5bb303357d7741ce60a875749e19c150221498fb76abc75c1eb75c0209f1395a55b9
-EBUILD irssi-xmpp-0.54.ebuild 891 BLAKE2B b3d49990bce3c6f74547e25465faf5e962dca086b787fbc3909d2498794c1aca4e6434306290a98e3dfaac615718c390ee70616b55a8f6460931e44aaf389425 SHA512 250dfaacb0f0ca219d8b3862e7008acbde97732af27f536f22e00ef3e577e4c31a4a4369857cbd71a9d37eb4a8c362c1bb2ed110e8cb036d04e1dde8bd9136d5
+EBUILD irssi-xmpp-0.54-r1.ebuild 1011 BLAKE2B 3ddae921941660d9557dd36530bfda272224f1d8be0c6ddbe3e77237f6b6655b6832a4b7d59be0f7948c9f6a67326ff8dd1b4505bd1d5d3f78d2676f7e20df63 SHA512 98a4461ae0544c21ec247a328f8d4f3b004f9bc0307996ec71b02901c4b6cfd23b06f703fa5f51e61fdc1ce366fa2c1e9698d963297afb33da7ed8f3673bbf01
+EBUILD irssi-xmpp-0.54.ebuild 893 BLAKE2B 9e32091f16e129cb8be6790bbec6561d279feacb2987ecae3daf151614a5423ed72c2f3e9a4dcee96da011e992bca6f11a5a650b0d2efc1574f2a5f5c970d72d SHA512 311154784ec6a7b5d47d57b6a354721d304c27385e16f628796aa26ed1c4e1eeadbaafa16b4bb8fdcacb573a3a9906cb510a138f7b5c3b83d8d3a0325b73d95c
 MISC metadata.xml 251 BLAKE2B 2747d36e680d3c177857330b264b7b16b27bf86f1929fdd93cf853c7662a243aeadb2a1f15b6de252095db9a082c3f9c53976cd9e12230dc0c1778adcc337aa6 SHA512 8ce0ede4ca516beb3ef33975a869dbe02a6ef330f759d38357ffbc5a0d22d87e2d489be7aaa1145cefd6a4ab34253c1b1c0b7676da2e21a4ab58c13ac354d640
diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.54-r1.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.54-r1.ebuild
index d025f597df6d..f8c6c3ba96c9 100644
--- a/net-irc/irssi-xmpp/irssi-xmpp-0.54-r1.ebuild
+++ b/net-irc/irssi-xmpp/irssi-xmpp-0.54-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=8
 
 inherit toolchain-funcs
 
-DESCRIPTION="An irssi plugin providing Jabber/XMPP support"
-HOMEPAGE="https://cybione.org/~irssi-xmpp/"
+DESCRIPTION="Irssi plugin providing Jabber/XMPP support"
+HOMEPAGE="https://github.com/cdidier/irssi-xmpp"
 SRC_URI="https://github.com/cdidier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-musl-build.patch"
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-irssi.patch.xz"
diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
index fab3d7c47f16..785cfd482a3e 100644
--- a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
+++ b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION="An irssi plugin providing Jabber/XMPP support"
-HOMEPAGE="https://cybione.org/~irssi-xmpp/"
+DESCRIPTION="Irssi plugin providing Jabber/XMPP support"
+HOMEPAGE="https://github.com/cdidier/irssi-xmpp"
 SRC_URI="https://github.com/cdidier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-musl-build.patch"
 
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 628e8b6f5e6d..b8efe2b522b1 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index e6f2cd57da92..d8670b0bfcfd 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,4 +1,6 @@
 DIST libqmi-1.30.6.tar.xz 1242612 BLAKE2B 318af914b595f0442f7929be53c128dcd111e12913814bb52e683fff814b7aa00a32d40f8eae367db469a7adef6c146fb692d5908951cec4337f21e9a266a400 SHA512 6dc9819bb45063ea827b989e99e8e889db0ce6ebec62586003ea385bd54bd76f3e79d63e3f2b57e19da5f42ed87d7aa11aa024a805ec86a6b203981eb7922a76
+DIST libqmi-1.30.8.tar.xz 1244844 BLAKE2B c8d98106783eb22571ee82c0012e1ce7ed79e94818350134b80853e16fa287c77bafb34d2913690ae593d02112dc5d2b0ff77606a24c4ce63733fd64245961a1 SHA512 60567e82eb35ed7ab3d65f1073e19ca8faa68e909f96e498b8f9d8ce2a987156e0a580f9c212416c4e0740d2ad05cb93f4dfeae9b2d048f0eb53ab6a83f6d024
 EBUILD libqmi-1.30.6.ebuild 1242 BLAKE2B d4caeb7134774ebaf08147c555c1781a198f4923ddc28acfb0e0ba790050644ec86172b51a21c707800882135ce42fb9dd939bfae9a190f901e0b54d22883381 SHA512 e947b68dcb01bcedec37ede4d6dff4b0d79db06c192b5c0ba2b3f35d567a66ed6eca6cef84b0ea6ad0f79bba8c64dbdeaf80056b92cea4f4f661f6ad86927a5b
-EBUILD libqmi-9999.ebuild 1241 BLAKE2B 06535ef221353d469c941cf5b72631c6c710d736a0e36ab1f0de059efe5a3c0699dfe6eacf412d6cc706df3aa542935498b499bc7ec050b7c8b65db2b44b930d SHA512 cec2f74bf33bfdb711cbd9ea016aaf6deee725b9e76ad3deebd62f950ee3620d232ea80dbbf1608c806ca222eb6ced511e3e39d117b8484a3b4b171bcf99ed96
-MISC metadata.xml 425 BLAKE2B 95b85fd54d9a2f9836025d60e76d9d51d39f7ff9c08c571b134326bdd69fccdae3f7483b3f3e178bc03939f90a3fafcbf2bc98876b64726172d2bf3b25ce3c01 SHA512 626784480b99bfc5c55ada209c4ee6a8e8891583a34c9f45c1f3ffe3a01b465444e352c3a508b24611a05ea7c4e49c5dbb6157a18d3ac8f478c05871b6ef0040
+EBUILD libqmi-1.30.8.ebuild 1274 BLAKE2B 59b385ed839554f7c1af5ddbf10039c9a7792eff43b035ab8618e34a77913ca148b01b120c51d2442a36c9d80c0263f4be19978bf07cdd67547b9edb3055f128 SHA512 9dda22b5dfb286317875902d46524edcde2df7c453f2aa2f743570e3521b96e56ffe8a8f254567fb6e611c0be4f7d06dfab00152a381ab304ccd24d76c91975b
+EBUILD libqmi-9999.ebuild 1274 BLAKE2B 59b385ed839554f7c1af5ddbf10039c9a7792eff43b035ab8618e34a77913ca148b01b120c51d2442a36c9d80c0263f4be19978bf07cdd67547b9edb3055f128 SHA512 9dda22b5dfb286317875902d46524edcde2df7c453f2aa2f743570e3521b96e56ffe8a8f254567fb6e611c0be4f7d06dfab00152a381ab304ccd24d76c91975b
+MISC metadata.xml 491 BLAKE2B cbc6db0da5ce117f66475c8a20f1449f6bbb99f1717ac85d29285f6acb2ff7ecadeab7bc7dfa6aa1b5fa9c1a1f79ac5f4074a880cb5f90888f350c2979bb311d SHA512 cf7f4a7084246db2d968cd81a0b79d0f9e389977989912067c1b142e6dc25a9b1c1e6b0caf6038682a38a8d0273c0cfb087286ca5d92b117317d6e99c2858d1a
diff --git a/net-libs/libqmi/libqmi-1.30.8.ebuild b/net-libs/libqmi/libqmi-1.30.8.ebuild
new file mode 100644
index 000000000000..56d9060d775c
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.30.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
+fi
+
+DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi"
+
+LICENSE="LGPL-2"
+SLOT="0/5.8"	# soname of libqmi-glib.so
+IUSE="gtk-doc +mbim +qrtr"
+
+RDEPEND=">=dev-libs/glib-2.56
+	>=dev-libs/libgudev-232
+	mbim? ( >=net-libs/libmbim-1.18.0 )
+	qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )"
+[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-Werror
+		--disable-static
+		$(use_enable qrtr)
+		$(use_enable mbim mbim-qmux)
+		$(use_enable gtk-doc)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild
index 96f87a762e23..56d9060d775c 100644
--- a/net-libs/libqmi/libqmi-9999.ebuild
+++ b/net-libs/libqmi/libqmi-9999.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
@@ -16,11 +16,13 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freed
 
 LICENSE="LGPL-2"
 SLOT="0/5.8"	# soname of libqmi-glib.so
-IUSE="gtk-doc +mbim"
+IUSE="gtk-doc +mbim +qrtr"
 
 RDEPEND=">=dev-libs/glib-2.56
 	>=dev-libs/libgudev-232
-	mbim? ( >=net-libs/libmbim-1.18.0 )"
+	mbim? ( >=net-libs/libmbim-1.18.0 )
+	qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
@@ -36,7 +38,7 @@ src_configure() {
 	local myconf=(
 		--disable-Werror
 		--disable-static
-		--disable-qrtr # libqrtr-glib not packaged
+		$(use_enable qrtr)
 		$(use_enable mbim mbim-qmux)
 		$(use_enable gtk-doc)
 	)
diff --git a/net-libs/libqmi/metadata.xml b/net-libs/libqmi/metadata.xml
index ada015f36a2b..2ac8814ecd1a 100644
--- a/net-libs/libqmi/metadata.xml
+++ b/net-libs/libqmi/metadata.xml
@@ -10,5 +10,6 @@
 	</slots>
 	<use>
 		<flag name="mbim">Support QMI over Mobile Broadband Interface Model (MBIM)</flag>
+		<flag name="qrtr">Support QMI over IPC Router bus (QRTR)</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-libs/libqrtr-glib/Manifest b/net-libs/libqrtr-glib/Manifest
index a1a5b7ebc407..58a7aa08311c 100644
--- a/net-libs/libqrtr-glib/Manifest
+++ b/net-libs/libqrtr-glib/Manifest
@@ -1,3 +1,3 @@
 DIST libqrtr-glib-1.2.2.tar.bz2 26398 BLAKE2B e52cab3e4ac85c53a51782d7d6b3658060282f2e75e1ce2ff2e0c52dfb3343f5ba43c03f58c25eed73c2bc16254672a828318daae00bd2900ffda9ff23b38d27 SHA512 b21df1685c2474c1124e6f6bf12c552a06a28986284fde876210a3a6db8c19872a5458cae622bb22020ffd278167f52eba38d763ba633e783fa708863832bade
-EBUILD libqrtr-glib-1.2.2.ebuild 852 BLAKE2B bef5ae606a09626fd0ab887b3bfc4543b7ef642fb028f6ff8a93bf68f8325211b167d3e5aa7eac918ef39d80fc1577e2de7356ad08020c26ec8d3606b86a3e9e SHA512 be31d51fe48ae5836059ec1318b3421c837a7b68e3f17eafa0718c377f5c6bf242b3bdcc6529b72537038750040600af4f1564554f1a49e87dae7ad4ac06928c
+EBUILD libqrtr-glib-1.2.2.ebuild 883 BLAKE2B 9f48432884324fb4f74540cada67503ed34ef89f46bad9f38de9dc94ceffd04fb32993e0cca66d484bb91511d859eaa04e55c69188704b1c2c3c80dd88d709ca SHA512 9587b397ba472f36d7753f93dcfc26ad6fad08b32f7a18d66e7dbd435307dbc55423c6a9bc2feb5e7c9825356035fb7e9370275bb4cb234694b623c0fda26e22
 MISC metadata.xml 327 BLAKE2B 1bc75a5f4160e28aa0824fb73a8a7ca267c66a371ad768101a5ab4654d4b02a82607be5ba20a2039bc0842932a43e2c77b9e350d509705457cc2921e9a30d49e SHA512 f11b8ad6e0ce009aeae86dafd556578f6dd2ebec9bbd71367c6c534880461de0bba4cc9f7cc69a77f521b9102f5629201ebccc87511a00aa1a2ab80057448c47
diff --git a/net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild b/net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild
index e3723a626231..ce5502bd438c 100644
--- a/net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild
+++ b/net-libs/libqrtr-glib/libqrtr-glib-1.2.2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git"
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 	SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/${PN}/-/archive/${PV}/${P}.tar.bz2"
 fi
 
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index 8f4d4f489805..4a4250142482 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,5 +1,5 @@
 DIST libyang-2.0.164.tar.gz 1120619 BLAKE2B 7b9fc93ae4c7d42c3d818a26448bf1f7fc8df21634668f46e14256d094997ef22f74ae5e8f46807692e1bab176dd14d9d3036712013bf83716f6069664a74436 SHA512 016e450110e968665195bec692ef1eca6889636de79bd873f74cddde6a58859ac1df4d1fb2bc3024ff05d82ff4c2b0f4eb8df06ddfd4b04d3a0c5f5fed44af65
 DIST libyang-2.0.194.tar.gz 1150705 BLAKE2B aa323b39752ac426f35e1ef17ca4a61d726c48916b740511ed03b06b8132747207dd4620842f9730ff1d05f216086310bc1634f393163067c119f5eec0aa91b1 SHA512 33d043ff696fc59c1cf5265a463b85a17459086162a03c56b1894cc524b7325ded2e14a71fce55ee70d02ea1119eef523190708c5f7b22438ab8ffd014fccefb
 EBUILD libyang-2.0.164.ebuild 888 BLAKE2B 3b47ae02ebd607797c367101b983cb6eba4d74a0366e19c03fa829edba6a2ad60e4094e37da7fb5ea7986fc2d0de3b2c21f275e7bd449ba3b823c7474b48c59c SHA512 f584ba0ec8087956e970db2da7d93720323ba8efc7bb7935b7bdb36a057349a7ddd1269a630825e5af3bef1d0d8b18b1103e4b96604a213158a4974c8b6764e8
-EBUILD libyang-2.0.194.ebuild 890 BLAKE2B f265e91ad35d249e917dc5e307556ab12cd9c3eb87ad04671f354fed8923ca4a6fbd768644eafcc56c12eaa2e10921da7e9c0c4eb61664682c57e60005e01a0c SHA512 9e586ebc7e1bc84f4d64c5b9e6e01def7782536675223a951265d81767dcc490c0ef6541edae87accd7adf735900123f704715aa109bebde6ce20164ffa8c8c9
+EBUILD libyang-2.0.194.ebuild 888 BLAKE2B 3b47ae02ebd607797c367101b983cb6eba4d74a0366e19c03fa829edba6a2ad60e4094e37da7fb5ea7986fc2d0de3b2c21f275e7bd449ba3b823c7474b48c59c SHA512 f584ba0ec8087956e970db2da7d93720323ba8efc7bb7935b7bdb36a057349a7ddd1269a630825e5af3bef1d0d8b18b1103e4b96604a213158a4974c8b6764e8
 MISC metadata.xml 435 BLAKE2B 23ee5c217c07799c169828436f3abe2100418ce870a9a2a523b6571d4f789ba5c56b4b74c48d3ce3e9db035efbc7692d5a3eae2dcb6732f6677c81e11122334e SHA512 63ff1dedf5aed1463b90733271f0d623233bd371d19126944b92cea27795f3753a93c2ad328a817bb6f7b9360f20cb838b2518cd156b95151a1a73d6b3478042
diff --git a/net-libs/libyang/libyang-2.0.194.ebuild b/net-libs/libyang/libyang-2.0.194.ebuild
index 4f71c69760dd..9ce1420009ab 100644
--- a/net-libs/libyang/libyang-2.0.194.ebuild
+++ b/net-libs/libyang/libyang-2.0.194.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/net6/Manifest b/net-libs/net6/Manifest
index 3b93eef43583..128bd311a9d1 100644
--- a/net-libs/net6/Manifest
+++ b/net-libs/net6/Manifest
@@ -1,4 +1,4 @@
 AUX net6-1.3.14-gnutls-3.4.patch 943 BLAKE2B 47b21caeb130001c44a44d84bc9a6fc459f3e5fbd5c6e19762e41dfe0b8ce04cde049d0f596f4c05d767f0ff0fa76ce56c4881753542bae4ec215cb4b4769a62 SHA512 8fe45b816d21d5542aedcd88cde8013815a9035c51174c6f6f5ecd90eb75380a68c4d376d2c5f45280fab38f662bc0f7a97815e8bdcb335030cd0534c30c542f
 DIST net6-1.3.14.tar.gz 483549 BLAKE2B 171251fbd24eb76cf06999d64ad818817e92abb190b9df71a75c7f68e04a5012e555767b49d99cba8dcbb060e70830bbf47d8fd046381ffbd23c036258e56a7c SHA512 6a604d51da32b13d61a45d3927e937c2fc5dc83061ea4312df363a57ba1a9830215e0a1b794914790d4606411cc71211675ceca86609614718aaeb998598c5c0
-EBUILD net6-1.3.14-r2.ebuild 768 BLAKE2B 7123a310d87b430b01f935c44ceab6885a97a5b329af009d737bfec690bced5333677e1d06c98283a0d624e6e628b0b615b8001a0d132a98b113baaa65a0a69e SHA512 254b3c646c907fa43c7bee97a231ed33cbdb81d6a97cd0d50e54a6ac3a951e09589e178b2cdbbf4f17387e977bad6a3632a6e5b21e870b64bbcbc23fabb8aaa8
+EBUILD net6-1.3.14-r2.ebuild 795 BLAKE2B 251b2e41ecb4efc4b1a215522d090b8a7c298d5773b7e2bfa7feec89e3d754d167b3b4ba7790a58c55d3d81a7a9811a3b7cc9b95674f9f8933018612a03d8a77 SHA512 6b71c2212d7e22c34878ca51d00aa4aba51986a2b0a7a0c31e5083a1eecfa0b5299d30acdac0fe53e6dfeb4d8b47fff61fc96ce32d8e990a50715ee7c8b5f435
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/net-libs/net6/net6-1.3.14-r2.ebuild b/net-libs/net6/net6-1.3.14-r2.ebuild
index cb41c438fc5d..222b9f1cf536 100644
--- a/net-libs/net6/net6-1.3.14-r2.ebuild
+++ b/net-libs/net6/net6-1.3.14-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit flag-o-matic
 
 DESCRIPTION="Network access framework for IPv4/IPv6 written in C++"
-HOMEPAGE="http://gobby.0x539.de/"
-SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
+HOMEPAGE="https://gobby.github.io/"
+SRC_URI="https://github.com/gobby/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 19ac11584bb1..ae1a6eee7c58 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,8 +1,8 @@
 DIST nghttp2-1.45.1.tar.xz 4017852 BLAKE2B 17bc5e0a6270494a0296da7f1394d0b89666ca42ad04bcce097740da2b30cdc575f17e681a8320dc2a2161eeebb753f22f228a340fc7cd690fa883d29149bcd8 SHA512 320a8c9f29b58c55df98be4312d415bc406edbdfb0765aa37570cdb472a84f40c4f95a51c44c5488363c16ad6815c75b5503b32e43d94724c54117ff583c7150
-DIST nghttp2-1.46.0.tar.xz 4024972 BLAKE2B 85fe1259b791ff7cda163265f553e0aac8a10ef6674cf6152d5bc7747c7f4f3bc6e9d9c0472534dd7185f093936efed1b4632da64d426b6a7ac432657e8579a1 SHA512 fcf3573bcc421705190c7cf0e3230f6f3028b669cb2976d29cfeb73e706deaae91ce60d0a615472e3f296454049ea5798f1e8defdd260a98895e94fea6a7a16b
 DIST nghttp2-1.47.0.tar.xz 4028580 BLAKE2B 4f5302701c8d8a89c3ae72cbb8acb4cbcbe32cd0e2995643e0b669cf802ae28e8f6e52b2d59f69f87e0d12fc64a73c251edbe01c2b0eca2676626a9e456df93f SHA512 ad6266a15789fec966db6be8ac0b9ee6cca257a3bb91fdd34a58acf0e472643a571941b5974d16c98f6ac5bfa6a03c4b70a6dff222fb0cd50909178b7e94ce48
+DIST nghttp2-1.48.0.tar.xz 4112072 BLAKE2B a52dc1ef4c9658298acef5ad703bec1708e538ebe19584dd5fcfe39089777e105594a998c7db696ee54bc8f17d3086828c09e921d8714b7ad3efbf33d04aaca0 SHA512 77c22371290f77e8a538b9efea225d23567cc27cb60b71703cbcb057839b5f117cf50796aa82bf4518f22b38a5773e90a1c273eafff4b17c435ac5858bdf7c6f
 EBUILD nghttp2-1.45.1-r1.ebuild 2010 BLAKE2B d3614234303f1f085350894e881637d18d9802d38b004e2283c6ada601603ae57858a6c00cff18c15fcede1a5debf30671c37531b01fd94ca73f7709238c29ab SHA512 1f278beb4fa0e3dc2b2a709ff05704360d1b21117f41b2e7491f3f31c0268ca0ea4f9ec4f56270443f6f043a7d1fa4dfaeb9e18848a42218b5e1d35bf05a623d
-EBUILD nghttp2-1.46.0.ebuild 2026 BLAKE2B 286f6dac885f0b8903c8b3a325cc18481e362ae45a950bb5d274b45e5c55030ec05e98b77810de212a16f979c76233e99c2c8c0438b5c5ee506f17d5cbeb62a4 SHA512 05d32a9cdf1b761d086cdcd545cf6038f819ab0ef8a18743e83ebb8b4b3333f57e68718ed63f1b52fed5a7c02fa94e93fa2db603fb10fa40de1087db16e5d6a8
-EBUILD nghttp2-1.47.0.ebuild 2033 BLAKE2B 0297639e79cc12bbed801326c356d9df5624e2a1f87790d664b11b33dc653fe91bfde16dfd764bfc7aaf99128f5761d2cf0628092a467344f1e161595a4761b9 SHA512 25de51ea35fc2031a92e4fcb80304a70525924faf94f380160bd8440b0f74ec267730c9cf50b529fe222165d78895a5022528cd9769e3e03e1521b816a0102a3
+EBUILD nghttp2-1.47.0.ebuild 2025 BLAKE2B 7c4dbcfe5083f983192851ff027a016ad9b4d03c645c8ae1ff752864dc818210d8defea0186a3f59141d9da5012cb97c0f729c9512592e6fb8c5fd56035a66be SHA512 ca9538daaa140b909ab39228b9f43033f787e0c8e5fe4533f00b0fe6da80327feabc05e8ce2f09770e8d6d5150c02e5790b6db5332c20e11ffe8abd5dc515df5
+EBUILD nghttp2-1.48.0.ebuild 2033 BLAKE2B 0297639e79cc12bbed801326c356d9df5624e2a1f87790d664b11b33dc653fe91bfde16dfd764bfc7aaf99128f5761d2cf0628092a467344f1e161595a4761b9 SHA512 25de51ea35fc2031a92e4fcb80304a70525924faf94f380160bd8440b0f74ec267730c9cf50b529fe222165d78895a5022528cd9769e3e03e1521b816a0102a3
 EBUILD nghttp2-9999.ebuild 2026 BLAKE2B 286f6dac885f0b8903c8b3a325cc18481e362ae45a950bb5d274b45e5c55030ec05e98b77810de212a16f979c76233e99c2c8c0438b5c5ee506f17d5cbeb62a4 SHA512 05d32a9cdf1b761d086cdcd545cf6038f819ab0ef8a18743e83ebb8b4b3333f57e68718ed63f1b52fed5a7c02fa94e93fa2db603fb10fa40de1087db16e5d6a8
 MISC metadata.xml 493 BLAKE2B daffa7d9a21815507215b560815358be5bdfb984eab2fdc28ae872ce2e7fb4f43339bed4b8426ecd7e09ac8c79a19b33427b8a4de68123bf127e88a3a178a6a2 SHA512 85224aae10478e7a6bb2442d595b0bb750503272f281ef4526d976a620316ef0fb5cc7d1d3ae88fd2da05faab1d67b7d93d1bdbc97195ae5bfdf182bd180cc15
diff --git a/net-libs/nghttp2/nghttp2-1.47.0.ebuild b/net-libs/nghttp2/nghttp2-1.47.0.ebuild
index 97b642d84a6d..cbcd334f43a6 100644
--- a/net-libs/nghttp2/nghttp2-1.47.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.47.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-1.46.0.ebuild b/net-libs/nghttp2/nghttp2-1.48.0.ebuild
similarity index 88%
rename from net-libs/nghttp2/nghttp2-1.46.0.ebuild
rename to net-libs/nghttp2/nghttp2-1.48.0.ebuild
index 6d92e5272f14..97b642d84a6d 100644
--- a/net-libs/nghttp2/nghttp2-1.46.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.48.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: Add python support.
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/ppp-defs/Manifest b/net-libs/ppp-defs/Manifest
new file mode 100644
index 000000000000..50fd16cfc869
--- /dev/null
+++ b/net-libs/ppp-defs/Manifest
@@ -0,0 +1,3 @@
+AUX ppp_defs.h 108 BLAKE2B 4261434d8985de8ee4c23b9ff2f551daad763d37107a59b37c69d35ecb56b4016c0232eda11e92a1b33f1e08785c3b21f72d1328712c4366c4a4aaec4badcc09 SHA512 cc3f6e2deabdfbf954b8652f28278a24781ac79b3542fde04cbb3924e25aad2e4c1a424b18b70f77b88bc3549ea7c98683ee63f07900386a54208274dd66bf8c
+EBUILD ppp-defs-0.ebuild 420 BLAKE2B b3938a036383a3b31c80003ad66e6983e0907ce8ae76787a7c95970b9f0c24772b72eeffc96a6af9338bb6f7adf0dfead2fa081d3689f49d93c2dc7956de4915 SHA512 082d93cd543b8365df0b7a33377a67864c744b07e48a2bd52f8a3c4f7a0e4e94bea2747ff033e6228e02b22f4179467756a891da0e0e5124f92c9abebb7af8f6
+MISC metadata.xml 217 BLAKE2B b827888fdd4e1572aade77387c9e6e702b7637e5fb50e47c163308d2e1609967e473611061373febf39543bd178c2b753ed43043b5d3e875e1dc30ddaa5db943 SHA512 a425ec31e1d9f15041755a5b4102c69b4500955ffe8872a6bc90b8ccb731693ee1c6a194928c0e042ffbaa8e09818d170baac66e1b2b5fc6940cf80a4356369e
diff --git a/net-libs/ppp-defs/files/ppp_defs.h b/net-libs/ppp-defs/files/ppp_defs.h
new file mode 100644
index 000000000000..c8be812168c1
--- /dev/null
+++ b/net-libs/ppp-defs/files/ppp_defs.h
@@ -0,0 +1,6 @@
+#ifndef _NET_PPP_DEFS_H
+#define _NET_PPP_DEFS_H 1
+
+#include <linux/ppp_defs.h>
+
+#endif /* net/ppp_defs.h */
diff --git a/net-libs/ppp-defs/metadata.xml b/net-libs/ppp-defs/metadata.xml
new file mode 100644
index 000000000000..6b00211d29ea
--- /dev/null
+++ b/net-libs/ppp-defs/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>musl@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-libs/ppp-defs/ppp-defs-0.ebuild b/net-libs/ppp-defs/ppp-defs-0.ebuild
new file mode 100644
index 000000000000..f3f93b109e31
--- /dev/null
+++ b/net-libs/ppp-defs/ppp-defs-0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Shim header for net/ppp_defs.h on musl"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Musl"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
+
+RDEPEND="!sys-libs/glibc"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/include/net
+	doins "${FILESDIR}/ppp_defs.h"
+}
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index dc04c2d813a2..dd6978961eed 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -1,3 +1,3 @@
 DIST rest-0.8.1.tar.xz 333376 BLAKE2B 595576f29ebe35121b7a896086abd3411ac3b2d324d2e50d646274c4060cfaffbd3b701eaae80afdc60d52c77bb5076135064648536378f2562f27c79c5738b7 SHA512 824a341db3827e4360abe03e33735918c68913c70d797699ef74271080a1985872006ec70fd994dc8fa3fbfef417e6fe979883c11286512d0ce623b8368e40c3
-EBUILD rest-0.8.1.ebuild 1516 BLAKE2B c35afb9790f3339f2140800a23ba5718056291052d05b661f31130194768d13fe00ac48559e0b182ff747fb1c18f9df74c48c85269739b85ab1421f5dbe6e04f SHA512 95e9637d13305285e6d85c2262e2863a65b6324a39e40d569a90b626589150b39162ddffe4b9680dda41b9a3faa5119eb9c71aa7b571773337c3b859569dff6f
+EBUILD rest-0.8.1-r1.ebuild 1483 BLAKE2B fd647f2cc7b7e945644118a38d98035373188fc2839bda61e4ef72d484731be4179e48c7b043240b7e529597165ab29c38e06c18f1153cf2a2bc3b3a32998504 SHA512 d6035981ef8410bb5b593606d567b2ea4c837941e8b3ad32cb8cf7b283d4be055cdb4d0ad40a7e7b26aa464cbdff8c868cbf1aeadae4f17ba6a0ef4b9df20c6e
 MISC metadata.xml 260 BLAKE2B 74a7980ab34785ba7920342b0a2708af439bed09b7ffdc1ae3ca6cbbaba8b7dbd7a6894375c6d5adf00819685f44f58b1e069dcd1062a70e99f0dbcfe39dc3d3 SHA512 f4c15c784194c80663c49692140afcfef3450b722254b99b2bd7fd0d7a08c57b463afcfa3b5609e799d0b2d6ff6451172eace91e93b886856d2591d491585c0c
diff --git a/net-libs/rest/rest-0.8.1.ebuild b/net-libs/rest/rest-0.8.1-r1.ebuild
similarity index 92%
rename from net-libs/rest/rest-0.8.1.ebuild
rename to net-libs/rest/rest-0.8.1-r1.ebuild
index 1a871b83d473..9e3edc280976 100644
--- a/net-libs/rest/rest-0.8.1.ebuild
+++ b/net-libs/rest/rest-0.8.1-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-GNOME2_LA_PUNT="yes"
+EAPI=8
 
 inherit gnome2 multilib-minimal virtualx
 
@@ -11,9 +10,9 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Librest"
 
 LICENSE="LGPL-2.1"
 SLOT="0.7"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="+introspection test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 # Coverage testing should not be enabled
 RDEPEND="
@@ -23,7 +22,8 @@ RDEPEND="
 	net-libs/libsoup:2.4[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.13
 	>=dev-util/intltool-0.40
@@ -36,7 +36,6 @@ multilib_src_configure() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=758166
 	ECONF_SOURCE="${S}" \
 	gnome2_src_configure \
-		--disable-static \
 		--disable-gcov \
 		--without-gnome \
 		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index f3e63fd44df3..6650cade779f 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index bbf249b72cf0..0293572b7211 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -6,6 +6,6 @@ AUX dbmail-pop3d.initd 867 BLAKE2B 2d24bbe482c28fab0884377bbd47fe7a859313d8c8b20
 AUX dbmail-timsieved.initd 930 BLAKE2B 4eb24e608540d994d75c8aea44aa8128e603fd9c64c4a8205c9581cc521e4a0ca75391796d4a9b369cdcbe74636cdaf55c00408c14b7cc9ec4ad4db307445909 SHA512 7f66fa4b77a638e803f1763809da66bd26f54b435f8e4cff3304d4b4e62d1510485c1af943046489a8c37b3b93a8b6cf4901feefa9f1f38dcdaa313211f19fa0
 DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fcb01cb8100cfbd0464f1342f934c099ca52fd857e05fc82b97227155e9dcfc987d6c9b5c37e7daf21b167c9841 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85
 DIST dbmail-3.2.5.tar.gz 2463966 BLAKE2B f4099c6f869dbb041d7eccdf20f3a34d36918237cc0386c71a1d339da8651b9301e676b25201856038045bb9590f880353c6ccafd57330f9cf48382c1b4c603c SHA512 6b0d7e1f6f7449869db1e094ffce9e1ef315c60784ea5ae5f814f2cf9a18c358b4c5d107a420c7317961ffa343fc59c9083789177514aee96523927688f276a0
-EBUILD dbmail-3.2.3-r5.ebuild 3962 BLAKE2B fadb891d448426025b7f49248f3cd110c48aeba946181f2d113a92e344f3cf0dfac3b1026db42037bfb296e62a552fb3004f63ea4beca7e04f09d2d68e5caa62 SHA512 4dba4024c5407ea654ae25eef87dabdaa571e149b2dc3b9fc77804cf85ce058fbcd655334bcaad5507e6f01200a61b1239bfd61735cca1cd8c5d23f2b68db924
-EBUILD dbmail-3.2.5-r2.ebuild 2396 BLAKE2B 59abc9fed5451bdbdd8565f37b7601347140a183229084cc4c96a7f0f149fb7740fecf4fb1645dce3452d0ac948ef151413036bf41f3e02b241b6377bca8a542 SHA512 043b8ed0108326c07a169a4f10715d4a6b9b7e904bfc73be784d7bf46dbc80eaf242838dff26ba0daa3247bdbbb8e6d8f93d70b10ba03f66fb9cca6e359789a4
+EBUILD dbmail-3.2.3-r5.ebuild 4005 BLAKE2B f39773fa94f3af0d031a8fa7c7666aa91ac9de95a55314b8e82356168f2896264cd4fe15aaeca2311a0e981cc1aafb3d792d07a1d8bb9feb536000ab608488cb SHA512 92379e527e1215bf40c3c16db02a25977d680c638dc7fba5ec074c0a0b24a7d8ec3a39acaae1cf5566f646bb6272b4e88ab9780e36d8e510a457bc04c2c8fab0
+EBUILD dbmail-3.2.5-r2.ebuild 2492 BLAKE2B de0e331eed68d1a5c5b75f393e5a9571b49b73a8eccd095d7af67b7edf2503da0e528e38ad586ab9ce285f70646d464cd05521d72388c994d587ea7ec73414cd SHA512 50522c2f81760878f374c7a91a98c50ecb0f77f58fdee9249f45d4c6a90ccf0f1d94a1a7eae31c680a938341dcbcc2225adb099853f88f23620c21f7fc77d026
 MISC metadata.xml 571 BLAKE2B 68a2a0a6d1b2cb2837c7589125f4895269d60588760a43d7b275619b5e7a01cd4625f754da41a7a377673d09ae097f53144d62c451a316a5cf1f786ee18ac74e SHA512 b3e72b2de1aa541129542f907b0a3b332402bd7f3d5d1029c36769834eae1e9e5f67fdedc40d024630d93fe766c5f346eb7e6e366b443a82a8a5bc12f1ace7e6
diff --git a/net-mail/dbmail/dbmail-3.2.3-r5.ebuild b/net-mail/dbmail/dbmail-3.2.3-r5.ebuild
index edabceb37645..50a1edf5ed0b 100644
--- a/net-mail/dbmail/dbmail-3.2.3-r5.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.3-r5.ebuild
@@ -31,7 +31,8 @@ RDEPEND="
 	ssl? (
 		dev-libs/openssl:=
 	)"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
diff --git a/net-mail/dbmail/dbmail-3.2.5-r2.ebuild b/net-mail/dbmail/dbmail-3.2.5-r2.ebuild
index 17e33e79a6f2..0c48f3c6305c 100644
--- a/net-mail/dbmail/dbmail-3.2.5-r2.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.5-r2.ebuild
@@ -18,6 +18,7 @@ DEPEND="dev-db/libzdb
 	sieve? ( >=mail-filter/libsieve-2.2.1 )
 	ldap? ( >=net-nds/openldap-2.3.33:= )
 	jemalloc? ( dev-libs/jemalloc:= )
+	elibc_musl? ( sys-libs/queue-standalone )
 	app-text/asciidoc
 	app-text/xmlto
 	app-crypt/mhash
@@ -32,6 +33,7 @@ DEPEND="dev-db/libzdb
 RDEPEND="${DEPEND}
 	acct-group/dbmail
 	acct-user/dbmail"
+DEPEND+=" elibc_musl? ( sys-libs/queue-standalone )"
 DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING )
 
 README_GENTOO_SUFFIX=""
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index f8e3a5a6fd89..2f5f924566be 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index e30fe1ffc210..e1b1e988024c 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,7 +1,5 @@
 DIST axel-2.17.10.tar.xz 274648 BLAKE2B ee89614412dda04092bd89821ce78d1fff9224d0e026b136d50f2c52a42bbb6a3a110dcf8c0e8110dfdb6a67d0b6aecf0322101f75016b38888f35f44849340c SHA512 f102ae742940d123364de49f01fe97cc146afc32adfb3776437a53ffef14fcca0c5926c39d6ac338fe2bd368529d18b0c885b694de48f7cb0e6d0195d2339437
-DIST axel-2.17.8.tar.xz 201224 BLAKE2B 0a10187013aa888ae8fa7f165b88955f5a7d63241157f552778c042eaecc7873e10e27537a8c7a26a09df5e655097845037f23a6c39f4d46328d633f944a316a SHA512 9158cc0f1c7b54d84e5c15331ddcf6056b5eb654c0ad068e058eedbea99bb87c1b2e759b57872a86d76d83d6807500989ad6bbf87f1c0210db2d4dab100933ea
-DIST axel-2.17.9.tar.xz 204212 BLAKE2B 8ec63a5ccf73bf8e17c559b7fbce08ee926b0001b1d6f8ea09cbe1a7c600ceba69b6b6ecd19f989da333b57ed11e9a93913b2fa520d7e56b7d796cf18dcb9f1a SHA512 a0cabf43f451d61f4b1f4892a381fd5cf4088f7148502bf4e27d1c98177c3777bab9b732780cb9ba60c45aeead6cf9b79f870ac16db7148180f26350e69d8b01
+DIST axel-2.17.11.tar.xz 279964 BLAKE2B d2a740b6a9471cc384ddb8556c3dce946edffc3ef7b2740306040cb22d4cbabea92064ed3b0f351235f004b1017cefb5b0fc8a427691a74f29880eec7e3f5b85 SHA512 111e8b3bbb70e717bee8b3c318c18d0121776301c609c0894376a371238dd839f5dae7edda6738d2b89296fd4b6ac1083399acf62308eaa479b6d70b080e65a1
 EBUILD axel-2.17.10.ebuild 987 BLAKE2B 501a8487c3c9ee7dc1259684e4b786cd2d85c7b54f770410278b431ae59b14f2ba3d337e49f152e9e8805b54f2d07baf3b88ea71fe6393d4b30cf9eebeaf66c9 SHA512 06300c333d23f5060f559694990429223884a79a77f6f13d51f2ba84842a5f2de01ea5de13fa6bf47751098beddaff9ab4edc31615e41a770034b3e2c4b256eb
-EBUILD axel-2.17.8.ebuild 974 BLAKE2B 20f71b59b2fba73a6eae3cdcbe9863177be7c32edf7b24186673c514a71034789ea98c03d3589ec931723a45281e2d1b47053284b336db12929f660fd90929cd SHA512 bc806cd0ed64d74cb654a4c5d9a01a040d65dc35dcbaa31367d4e81871b9995a332aaf413ad1e8cda1ddf1e30b48f65edcf575077de0e6437a9666cf15358654
-EBUILD axel-2.17.9.ebuild 979 BLAKE2B 2674e0f45621ac1dda8b5139aa49f7cbad1cbffa159510b7800c7951208e687a139a86ff1f837ee53bcbbe2a67756d8251a12cf98d44e3ece019983b88865982 SHA512 0d00c387b1f13db45a6bcf37d040395e58b98aa1c2a19d203da06de2fbc85e19d02d444bf3064bb85add4cdc4952fc54d415a3abd094e0148e050305bb203381
+EBUILD axel-2.17.11.ebuild 992 BLAKE2B 3b66e241379fb0b083194d798a08a6473662c7a3319edc962fc3d44fd091010dd89f79d81f935408e8faf68cf4dddf35f58e1c998af04747d6ad504389f2b675 SHA512 0285dd384a68585cdda2b2ee446fd01e1a03856bacdfb12c027c6352cc6b5079af42e74b535a64c4f09935c4bd8dbb1c11649b0d12d01fc09af0794cdc8901f8
 MISC metadata.xml 335 BLAKE2B 8de02303ead90809cd34dcc7fed0a845e137b3ae3338ca44c10a9339da0ee5391ac183f17f0b59fbc9515eefa8daa0030bc009feef7f1400b0a76d4f2f6d5900 SHA512 41e63e21afcb123fbe05f43fe1958e4883d37eb2a1df38b013f95d6eb6cce6cba9819d4843b5a267f123bc145325bc09bb4f2f8ceac1000b750812fb367398ac
diff --git a/net-misc/axel/axel-2.17.8.ebuild b/net-misc/axel/axel-2.17.11.ebuild
similarity index 93%
rename from net-misc/axel/axel-2.17.8.ebuild
rename to net-misc/axel/axel-2.17.11.ebuild
index c2b94b904b2b..f9fabe3a83d0 100644
--- a/net-misc/axel/axel-2.17.8.ebuild
+++ b/net-misc/axel/axel-2.17.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="debug nls ssl"
 
 CDEPEND="
diff --git a/net-misc/axel/axel-2.17.9.ebuild b/net-misc/axel/axel-2.17.9.ebuild
deleted file mode 100644
index 1a4eb679c275..000000000000
--- a/net-misc/axel/axel-2.17.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Light Unix download accelerator"
-HOMEPAGE="https://github.com/axel-download-accelerator/axel"
-SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug nls ssl"
-
-CDEPEND="
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libintl virtual/libiconv )"
-
-DOCS=( doc/. )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl)
-}
-
-pkg_postinst() {
-	einfo 'To use axel with Portage, one can configure make.conf with:'
-	einfo
-	einfo 'FETCHCOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
-	einfo 'RESUMECOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
-}
diff --git a/net-misc/bsdwhois/Manifest b/net-misc/bsdwhois/Manifest
index 1d9a0bf543db..14d5de111d6c 100644
--- a/net-misc/bsdwhois/Manifest
+++ b/net-misc/bsdwhois/Manifest
@@ -1,4 +1,4 @@
-AUX bsdwhois-1.43.2.1-musl-cdefs.patch 357 BLAKE2B f7e32907c3df769eb37c65625fc8a9e452d920fe73948bffbfab37c25b782175844b81c39b0004b8267f1fd8b77a92dced6d84625d488448f230c8d29ae7cdde SHA512 49857453c288f4d8ed23309345d934d5e81da1ff314ff33e53bd2baa6625299e52a514c90fb03ef43e225bf84439fe9835a8ce552f1401f1a28ec733f72e1061
+AUX bsdwhois-1.43.2.1-musl-cdefs.patch 508 BLAKE2B 3db720af35df824f2107ab84147ddfccf63bbbc9c85d88a6e33785e3b0b89b008aa2e161effc49dd224cec3f1b1013be51c789318074c224523756ac8cb2414c SHA512 adccd80534475b42f6d1b910e251b1fd7fc1290497a0e66efcc4f83d4c3dd39168690330b9d1a15563a39f65e081ee1d42b050224c8d195d3398736809ecf050
 DIST bsdwhois-1.43.2.1.tar.gz 85895 BLAKE2B 584bec2f58deee1208b35df1dae0b638049eab990cade979f56022b701d24b2cd653feb381f79e89610246743c8b20df2c7b83cffec68e3a00a9169c79edd7e5 SHA512 c1b3f93b8d7f838478d59cb70a7326fba84f87e1fcb4af9e7cc64ac1928adf96b0e6facbd6dfabaa7d146f0d1ea1abe1330771be4c7a6f3590d3c9e86a3b53dc
 EBUILD bsdwhois-1.43.2.1.ebuild 507 BLAKE2B 931770ea6e38b6d2285ebf3b12e3ac7b2d455d83900fe31bd45ce17e32f0a83d7c7c975a6e3213b00a17c28b8c3a86035dc1848a5fe5a00f099375fa127d3a42 SHA512 1d6d282564a81d4098dcf217f9a1923f8a876710b295f185e3467f1ed4365723805281a55185cc3c9fb14b7225f23365ef6844fe53cc136529777d2f487b9f93
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch b/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch
index 2eec53c2645c..a27f2d5a1665 100644
--- a/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch
+++ b/net-misc/bsdwhois/files/bsdwhois-1.43.2.1-musl-cdefs.patch
@@ -1,8 +1,17 @@
-diff --git a/whois.c b/whois.c
-index 329559a..d2f6561 100644
+https://bugs.gentoo.org/828901
+--- a/strnstr.c
++++ b/strnstr.c
+@@ -38,7 +38,6 @@
+ #if defined(LIBC_SCCS) && !defined(lint)
+ static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
+ #endif /* LIBC_SCCS and not lint */
+-#include <sys/cdefs.h>
+ 
+ #include <string.h>
+ 
 --- a/whois.c
 +++ b/whois.c
-@@ -43,7 +43,6 @@ static char sccsid[] = "@(#)whois.c	8.1 (Berkeley) 6/6/93";
+@@ -43,7 +43,6 @@
  #endif /* not lint */
  #endif
  
@@ -10,3 +19,4 @@ index 329559a..d2f6561 100644
  #ifdef __FBSDID
  __FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/whois/whois.c,v 1.43.2.1 2006/01/31 18:11:21 jhay Exp $");
  #endif
+
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index b6e66bd7bf7f..9a07298e58d3 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -3,6 +3,9 @@ AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af00
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712
 DIST dropbox-lnx.x86-150.4.5000.tar.gz 103645837 BLAKE2B e6f304c99cfe419aed2afe58a6e4f86dbcb4c81ddc9aed82635b715f735c70b196827bcba169ac04f77520b74aa1ad87507072ab5e383398fd2e03a56f339af1 SHA512 90f5568ac372120497b090b60204b3a671b25c38aa93ec0b70d0071bf91c9d656001df3ff1fec2a66fdcf1acdee0b8cc70c110c4d7091d2fac63c389baa70607
+DIST dropbox-lnx.x86-151.4.4304.tar.gz 104019555 BLAKE2B d5aa1b0ce651c9b41a959bfa299349432252f9689f3b647090cc584b7b9812d606cc0cbb863178e926d91486343672b6d1df3912173d3fbefdc56e0e4c68d45c SHA512 55e673da79db0b2b8c94592c440c81c677aa34ea213de84c3539c52040a15a63bea6f593a48415f502690171bc5e8439de4e3ab29f5be01677e1fe211e73815b
 DIST dropbox-lnx.x86_64-150.4.5000.tar.gz 105506526 BLAKE2B 44b13413b2480afd2849264c59e4d2fb17af014a56e9fbc7b75049b80e12d0ef86edfb1dfdfa3532f261280df7a19444307d862e9695dce3cf147ff39454742b SHA512 9f78e12047fad0c94331c4a12ef72d6afe0b8f044880a08cdc68ac7c9d2596325c5f732805870e656c36ab3825bcefed5542343f76c363811c68507cc8463cf7
+DIST dropbox-lnx.x86_64-151.4.4304.tar.gz 105875742 BLAKE2B ef3d84bf6483207b685ee5989788b4630a879a8b92a0cf6382e95f586c27358d856d74797876a08f85ce3f66d618a384d3afa1360a1a099984b6a965423f325e SHA512 ab3ec143365b9870b01969232b0faf102a51e0e385c3da33abc98381019a23162921242aca1a27b91885312776016f6e955ae42a44e98bb5f29c73be7949ff7f
 EBUILD dropbox-150.4.5000.ebuild 2865 BLAKE2B 05f3927207125b61497a4ce3c6e76d4e0380bf5f06ef104942036b4663ba6862b64c3ac140753d0199df66aa2556cbb10eb149720bf219f220c7609df970bd11 SHA512 4da3e90183b7f79ce35e50e1b231cd1a3cfb9aeb4fbeafe4cbb922ba45e805e39c2fe91176d52dda7073ff0b8cf300069222fac35fa928fc88ecc936937204d5
+EBUILD dropbox-151.4.4304.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-151.4.4304.ebuild b/net-misc/dropbox/dropbox-151.4.4304.ebuild
new file mode 100644
index 000000000000..0c3e0f739306
--- /dev/null
+++ b/net-misc/dropbox/dropbox-151.4.4304.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
+	https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
+"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		x11-themes/hicolor-icon-theme
+	)
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libffi-compat:6
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/wget
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcb
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+	# we supply all of these in RDEPEND
+	rm -vf libGL.so.1 libX11* libffi.so.6 || die
+	# some of these do not appear to be used
+	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
+		wmctrl libdrm.so.2 libpopt.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	if use X; then
+		doicon -s 16 -c status "${T}"/status
+		newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
+	fi
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+	einfo " your user's home directory.  To prevent this, run the following as"
+	einfo " each user who will run dropbox:"
+	einfo ""
+	einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 764ca0f1775e..fd642003d947 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,7 +5,7 @@ AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31e
 DIST NetworkManager-1.36.4.tar.xz 5433152 BLAKE2B 2bb625381bc5a816a9fdc51498721f9bc1e85fe2e83d114c8897f99f90af6924a0a07fddf0099f8e52c0df2f3353834129b99b4bb487b413cee503da7c680035 SHA512 17b2d39ed2584fb8b805e7b9950f9c4e6d657380881e9e78a1aa85dc58615e0a3896413a6902086f516dee2f373155f69042b4a229f3b9e15fb3c0f958cd8149
 DIST NetworkManager-1.38.0.tar.xz 5431664 BLAKE2B adc298681e339d6cfac9c7310a94a1b11bc7f5044a0b2a129d5ab764bd5f29ccc604bbc27c49d52ceab9e2e6dbd923a686fbaf96cf20c73438d680fa5659e5ff SHA512 0f1532b4ea1aeb9d5dd922ee005eef325d39ba3526884793aaaed2eae61737f6a6e95644077f2b45ace569df79246d3d6404272cce02ca7e02b3632aee882940
 DIST NetworkManager-1.38.2.tar.xz 5526780 BLAKE2B 54e9746d3bf41146bb2bbc1ec273c4e2ca0a458e1a488eba7e5f17572e6e8db02ccfcd5b884e00162e505512b24a38de77447944d979fbe40d20d4af4c688a71 SHA512 0da3294bec659e6742c2b941eb6cb2464df1018e801148ac37cce0a0612c4468701add13659c18b1c08b51556c7e3e2782ad2353804fdf2a094e97d531da964b
-EBUILD networkmanager-1.36.4.ebuild 12455 BLAKE2B 6f8a83efdf63c65abaea8c43f3702c7e47fdf6b37f15d27b08397ae7d272011efd9b05284774852b2be07e759fd10cd6afe4e0ac420ab2edd65ed0168b19fc68 SHA512 8794ad71eed3a4200f0ad1f46197268e4a5e0a75c7a99491db92fcb7231dbfe29fa58cc07150d141514db54888c93fd4c9780de46703487e0c821094501de21b
-EBUILD networkmanager-1.38.0.ebuild 12482 BLAKE2B e3524750cf86e7faed3dd3d8ffa23581aa0a80cd67fd3097190f04c3c87657702698c129f711f6c21bbbb3c21d9c60d4ab1944ab0e702641d2426a93ce306c5d SHA512 1ac70f469274b07faa31f440740a6ccc1bb87a864f7ae055d25f390c9e6c51fa6470c019da8b8e72d14c0e4f9eb81b99146f4d6096c211f08cb1e43bf0dab4b3
-EBUILD networkmanager-1.38.2.ebuild 12499 BLAKE2B 5eacc3078f10aa9322c2ef355918b485cfaf77a936fdd934a2aa408e5575db917ed16777443a603a9ac2a037f3f68d20f87ba742417b42f7965eb2d4b4cadb87 SHA512 5258255a431a0a1a0f30bf7a6aaa34ccd1e5b49bba56537b4ecb442ec3f70ac5ecbfb39e838f939d006b97b6142aeae0017d470d5909feff51ddb1576c45d872
+EBUILD networkmanager-1.36.4.ebuild 12499 BLAKE2B 265082e6355c141f4519b00ec136b1aed69461e91f299c7de5f03108abfdef69f2743c1cefcee800eb4659945263324aa0aa7df2ea507d88ac0c569966d1c8d7 SHA512 a6c7ee2a653ab3d7d873156ed45c6ea51eb9fc65574a84a240457564c54681f6830984d7c3177e7de342f04ce5622e0d89f8f1a7a59c163a076592a3340bcbe2
+EBUILD networkmanager-1.38.0.ebuild 12526 BLAKE2B 3617f3cb3de8b4c00fb1c1be6505a0289f798d0ad93068a50b68e4b31ad0cbfa81b474f4a64e1de7a7c2b7980fe70f7f6aeb404f7c0b1cbfaf63269657bcd432 SHA512 2d27c3bad9613e467bef49ffab35b26b3a779419439fa1dae2a17b52d7988ee46cdecb1cb067a04534ba1e47d3a4dafdf7db8f7441642aae4e9ed076f8ff3a69
+EBUILD networkmanager-1.38.2.ebuild 12543 BLAKE2B 1235910f66ea116902f8041e95f6e8d38a8ceb9f651eef76eca82f7439c42a2d863352fdca33aa02f7ad710920a683ccad4b724332ea99fdc817db83c830cc59 SHA512 3a0dd2337e4af2af2fc5a6631c769e8b34223b29274c3f97cd3fc933be486a02f75dcf32711bf4aa6175e8b17bf022543ae8094262e9a00f96e8bc60955412dc
 MISC metadata.xml 2377 BLAKE2B e665210ad074426373296d0164654cd793c0fad1eb71ba68ede73ecbcbb17c1636722a7676bc5ccde93d0a8b7c75c170a3cc0bfe1f06305984dc630e8c0e0b2b SHA512 e43a86d9af9ff0dbc2d701b59f29ffca279f9a3adaf3fd3473f170827c15e77a454e6f5df554028c300e13dd536fdee0528acab62eb706f7061a3600b2e9dad3
diff --git a/net-misc/networkmanager/networkmanager-1.36.4.ebuild b/net-misc/networkmanager/networkmanager-1.36.4.ebuild
index aea085429b8b..6fbf9dea8762 100644
--- a/net-misc/networkmanager/networkmanager-1.36.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.36.4.ebuild
@@ -93,6 +93,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-3.18
 	net-libs/libndp[${MULTILIB_USEDEP}]
+	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
 "
 BDEPEND="
 	dev-util/gdbus-codegen
diff --git a/net-misc/networkmanager/networkmanager-1.38.0.ebuild b/net-misc/networkmanager/networkmanager-1.38.0.ebuild
index f090e4648993..47515b23c184 100644
--- a/net-misc/networkmanager/networkmanager-1.38.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.38.0.ebuild
@@ -93,6 +93,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-3.18
 	net-libs/libndp[${MULTILIB_USEDEP}]
+	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
 "
 BDEPEND="
 	dev-util/gdbus-codegen
diff --git a/net-misc/networkmanager/networkmanager-1.38.2.ebuild b/net-misc/networkmanager/networkmanager-1.38.2.ebuild
index 320c496e4384..15e85166b3f8 100644
--- a/net-misc/networkmanager/networkmanager-1.38.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.38.2.ebuild
@@ -92,6 +92,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-3.18
 	net-libs/libndp[${MULTILIB_USEDEP}]
+	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
 "
 BDEPEND="
 	dev-util/gdbus-codegen
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index bb3bf4535d88..97263897a7cb 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -13,6 +13,7 @@ AUX openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch 419 BLAKE2B c5ef82ed92da96213c84d
 AUX openssh-8.9_p1-hpn-15.2-X509-glue.patch 15810 BLAKE2B 5ef56bee2ce09033d86c5f99a0956d5e3f268dcf18cc4bb32c75de9e81c3873efe643c39d155188cca4812e677223d66621b061897308ed66bbbc1793343519e SHA512 a1903c6ab7842a14d1324e6ea3b1a25cc161e564092ed4679b333a081f1659712a519335fb2cfbdd344bded47a00d538bb5b5a9bfd2e82a321a8347cfeb5bb16
 AUX openssh-8.9_p1-hpn-15.2-glue.patch 8473 BLAKE2B a4616e498db7400702b3c0ba8c6eb6d58b198b1104215b91c0938bb68bf15850f63e3f32e4b99af04ae78ef60818127e17cab68dc3e3bbfe696545057ef3ec63 SHA512 ceff7521accb464c916b5aa695c80de5760272da319f537dc93bb6b6e39de1d408ba4a5335b4071091afb360c5cf44d91429109f84f1e669a175beb3cfcecd26
 AUX openssh-9.0_p1-X509-glue-13.3.2.patch 2118 BLAKE2B 8d7211b713025dc2749b58907dce8fd9bc415f92a90041b9daae0b80401b91095b7160b5105634fb7c578af12d425863ea85bab4a59dec5d6a9746fbba603a65 SHA512 681d457457fd2a2709c34d7df0eee93a6602532b79b4ceb17f937e0639ded0efd786fdf2002c48a9a52594eae305bd818ae6ee9cc9bf192e619e19bf553be2ae
+AUX openssh-9.0_p1-X509-glue-13.4.1.patch 2118 BLAKE2B 171c776e8a1dc64dd63d0e471dd7064fb0360a4abdec7f03915246f07082341e6b505e7a5467aad25bd5282ab4a63a48405984317b12c1692d04f5427503a86b SHA512 7dc1c43e6f70a4c990dc3cf493f8a5b4fbdf1753f2d4bf474ba40adb656d843fcf72a4e076e6450e0488ada68758f9e2e0814a71388d552ce50d34c3692e573d
 AUX openssh-9.0_p1-X509-uninitialized-delay.patch 321 BLAKE2B 19bff0fc7ecdc6350f8e6bd30f36f30b455c65b7455fe8b1d481d8fa7cdfa7cc76719931857fe2c9730b05ae8fe3e7e05c538e743e055d6594dd2fc7c3f250ee SHA512 57798621a51a60abf6985391ec73dcafdb46de75c93579e23b786aa095d8eea29ebd9ab5987b951a136b15e60896332c9717c82b42e1c22b345444aedf17a9f5
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
@@ -28,9 +29,11 @@ DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a
 DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
 DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
 DIST openssh-9.0p1+x509-13.3.2.diff.gz 1128591 BLAKE2B fb560e2f1803ceb946a1ba8bd53a1f9fd262896b820c23d4b0015218433d2200f1fd9df5b1889a670261f13936d8153da1ab4beb2a5d52ede78168189c522bf3 SHA512 e643168d7098c44f85a9bac9894a936a3480ec843162197ce56e016dd4f634ef182dcfae1f7e18408f6a18832e0a95d2d249a23fdbc3dc46df76989ca0a0c7fc
+DIST openssh-9.0p1+x509-13.4.1.diff.gz 1146757 BLAKE2B 070d6bc23179a581e4fe79412274f11399009ba69ad643cc354ec9cd6392ffb0a651fd2d7f310c52c60a9c626140b9c823e2f19c600f15ac9cdf992707274bcb SHA512 4aaa86c1a785741b28c5e2738cf6de6fa7965ac8692165a8b18fe7677aeb0996979f23b45306781e6be75d34fb39294659be5ae016ab4a82ef2a73bedcc6e8e7
 DIST openssh-9.0p1-sctp-1.2.patch.xz 6768 BLAKE2B 8a18aea57b0b3f8f0a641870f0cd1570c6cc48d1e28ef7261344918905e94a548d3a3acb6feb1c6ef13f0c6cacf2b845163cad2b96ab20cb9fc58a49aeb699c1 SHA512 d6aa5f32464d5f3e2e63e9ba82108f33bdaa890e2adf2ccc47ce0d672979fc67510d9dd7561b17eaba0c2f11a8eb565029b0ebff3b2d050e9e04e6143aedb8a3
 DIST openssh-9.0p1.tar.gz 1822183 BLAKE2B 49724a400951964d659d136908657940f79e150056728cc4dadf8ff8652a832f7fd46eebb47b15085e57fca4b00c77d1ec4dd1b056ea2bbcee89f54a121ed5e2 SHA512 613ae95317e734868c6a60d9cc5af47a889baa3124bbdd2b31bb51dd6b57b136f4cfcb5604cca78a03bd500baab9b9b45eaf77e038b1ed776c86dce0437449a9
 DIST openssh-9.0p1.tar.gz.asc 833 BLAKE2B e29ff08f10feee7347c02a7ce4b33b8d9c71a26656f0430a2511c25bc6b5006f1683d845826a68ff4eed068b30c911e273cb34e5b4880854d55a776415474019 SHA512 7b1445764058435d2fa8a9c7553643983650d4232036c088e46e44beeb538d32cba88f775b1be9da5f21a01d6caea59b3dc4714507781e9cb946546fa54f169f
 EBUILD openssh-8.9_p1-r2.ebuild 17076 BLAKE2B 6f236af760da98ff31643f2bf22560c65d7fc0b00a00502b84657739039663e230b78db2a0cc3cc02eea6fc3f030157bc22053955501ecaa055698eea5a70bca SHA512 4d2d05fc3a15318687d769c99b779bdc41998a5456650b7d174828e4d557711036d2def92f7f8465c9c4e38180e614f12462e58ca7e0653d7be7e242e4408bb5
 EBUILD openssh-9.0_p1-r1.ebuild 16937 BLAKE2B 34b2fa4021a8f55c017af579bac3e07f20debc330450c56b0fe562bcf8822397fd527902fc5bed3f9f2a7c687ab96d67a33ce29a894eea641db154301d15e505 SHA512 de3849679d4440d2e2d69b68c2c2d5d01bf240aff3868dcae1d53b120468098f3dedebcefc826b0898ea8fcea61107a177e6c1df6f5ba54e600e2f41ae67d772
+EBUILD openssh-9.0_p1-r2.ebuild 16937 BLAKE2B a87e2567925aa66ab898ec130951822b21087fcfcd28cd9cf5ca61a4281f89e55ca585811cc6241fd2f8a5b26bfcb1b8f07c4d08f4f545039119915b901264a2 SHA512 5e55cefd3da1d9f348f298687dd549d59a96527a91eaa8d007eecefe5c4cf85c91b74fba5e0f0fd91f41e372b0f6722b626695bad568bf6e294f07300276680f
 MISC metadata.xml 2013 BLAKE2B 5d452c9b16516ff3a7e01ae7a6f95102bec19b3f0df1aa4607558b012718e14e72e24fa09c1bd3ea6bc48506a7fc55180a9e4735809381bf4535569de59b1409 SHA512 5b56870f1e203f339b57792fca7ddcdf488be2f010c0a23e0b811825e0d8f2f5823c2f4ae8a2ec05b27ffd663fac4f8029a3b2bede9fa1beac067f5b5a57d6bd
diff --git a/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch b/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch
new file mode 100644
index 000000000000..dc93182e1d4c
--- /dev/null
+++ b/net-misc/openssh/files/openssh-9.0_p1-X509-glue-13.4.1.patch
@@ -0,0 +1,54 @@
+diff -ur '--exclude=.*.un~' a/openssh-9.0p1+x509-13.4.1.diff b/openssh-9.0p1+x509-13.4.1.diff
+--- a/openssh-9.0p1+x509-13.4.1.diff	2022-06-23 10:43:33.957093896 -0700
++++ b/openssh-9.0p1+x509-13.4.1.diff	2022-06-23 10:44:17.232396805 -0700
+@@ -48941,8 +48941,8 @@
+  		gss_create_empty_oid_set(&status, &oidset);
+  		gss_add_oid_set_member(&status, ctx->oid, &oidset);
+  
+--		if (gethostname(lname, MAXHOSTNAMELEN)) {
+-+		if (gethostname(lname, MAXHOSTNAMELEN) == -1) {
++-		if (gethostname(lname, HOST_NAME_MAX)) {
+++		if (gethostname(lname, HOST_NAME_MAX) == -1) {
+  			gss_release_oid_set(&status, &oidset);
+  			return (-1);
+  		}
+@@ -57102,12 +57102,11 @@
+  
+  install-files:
+  	$(MKDIR_P) $(DESTDIR)$(bindir)
+-@@ -395,6 +372,8 @@
++@@ -395,6 +372,7 @@
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
+ +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
+-+	$(MKDIR_P) $(DESTDIR)$(piddir)
+  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
+@@ -78638,7 +78637,7 @@
+ +if test "$sshd_type" = "pkix" ; then
+ +  unset_arg=''
+ +else
+-+  unset_arg=none
+++  unset_arg=''
+ +fi
+ +
+  cat > $OBJ/sshd_config.i << _EOF
+@@ -143777,16 +143776,6 @@
+ +int	 asnmprintf(char **, size_t, int *, const char *, ...)
+  	    __attribute__((format(printf, 4, 5)));
+  void	 msetlocale(void);
+-diff -ruN openssh-9.0p1/version.h openssh-9.0p1+x509-13.4.1/version.h
+---- openssh-9.0p1/version.h	2022-04-06 03:47:48.000000000 +0300
+-+++ openssh-9.0p1+x509-13.4.1/version.h	2022-06-23 09:07:00.000000000 +0300
+-@@ -2,5 +2,4 @@
+- 
+- #define SSH_VERSION	"OpenSSH_9.0"
+- 
+--#define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+ diff -ruN openssh-9.0p1/version.m4 openssh-9.0p1+x509-13.4.1/version.m4
+ --- openssh-9.0p1/version.m4	1970-01-01 02:00:00.000000000 +0200
+ +++ openssh-9.0p1+x509-13.4.1/version.m4	2022-06-23 09:07:00.000000000 +0300
diff --git a/net-misc/openssh/openssh-9.0_p1-r2.ebuild b/net-misc/openssh/openssh-9.0_p1-r2.ebuild
new file mode 100644
index 000000000000..9402ad203dc3
--- /dev/null
+++ b/net-misc/openssh/openssh-9.0_p1-r2.ebuild
@@ -0,0 +1,485 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+# PV to USE for HPN patches
+#HPN_PV="${PV^^}"
+HPN_PV="8.5_P1"
+
+HPN_VER="15.2"
+HPN_PATCHES=(
+	${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
+)
+
+SCTP_VER="1.2"
+SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+X509_VER="13.4.1"
+X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
+	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
+	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssh.org.asc
+S="${WORKDIR}/${PARCH}"
+
+LICENSE="BSD GPL-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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	hpn? ( ssl )
+	ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !sctp ssl !xmss )
+	xmss? ( ssl  )
+	test? ( ssl )
+"
+
+# tests currently fail with XMSS
+REQUIRED_USE+="test? ( !xmss )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		net-libs/ldns[ecdsa(+),ssl(+)]
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] )
+	virtual/libcrypt:=[static-libs(+)]
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
+"
+RDEPEND="
+	acct-group/sshd
+	acct-user/sshd
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
+	static? ( ${LIB_DEPEND} )
+"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	!prefix? ( sys-apps/shadow )
+	X? ( x11-apps/xauth )
+"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf
+	verify-sig? ( sec-keys/openpgp-keys-openssh )
+"
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	local missing=()
+	check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); }
+	check_feature hpn HPN_VER
+	check_feature sctp SCTP_PATCH
+	check_feature X509 X509_PATCH
+	if [[ ${#missing[@]} -ne 0 ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested: ${missing[*]}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "Missing requested third party patch."
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
+	fi
+}
+
+src_unpack() {
+	default
+
+	# We don't have signatures for HPN, X509, so we have to write this ourselves
+	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc}
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
+	eapply "${FILESDIR}"/${PN}-8.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
+	eapply "${FILESDIR}"/${PN}-8.9_p1-allow-ppoll_time64.patch #834019
+	eapply "${FILESDIR}"/${PN}-8.9_p1-gss-use-HOST_NAME_MAX.patch #834044
+
+	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
+
+	local PATCHSET_VERSION_MACROS=()
+
+	if use X509 ; then
+		pushd "${WORKDIR}" &>/dev/null || die
+		eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch"
+		popd &>/dev/null || die
+
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+		eapply "${FILESDIR}/${PN}-9.0_p1-X509-uninitialized-delay.patch"
+
+		# We need to patch package version or any X.509 sshd will reject our ssh client
+		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
+		# error
+		einfo "Patching package version for X.509 patch set ..."
+		sed -i \
+			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+		einfo "Patching version.h to expose X.509 patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+	fi
+
+	if use sctp ; then
+		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+
+		einfo "Patching version.h to expose SCTP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
+
+		einfo "Disabling known failing test (cfgparse) caused by SCTP patch ..."
+		sed -i \
+			-e "/\t\tcfgparse \\\/d" \
+			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
+	fi
+
+	if use hpn ; then
+		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
+		mkdir "${hpn_patchdir}" || die
+		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
+		pushd "${hpn_patchdir}" &>/dev/null || die
+		eapply "${FILESDIR}"/${PN}-8.9_p1-hpn-${HPN_VER}-glue.patch
+		use X509 && eapply "${FILESDIR}"/${PN}-8.9_p1-hpn-${HPN_VER}-X509-glue.patch
+		use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch
+		popd &>/dev/null || die
+
+		eapply "${hpn_patchdir}"
+
+		use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch"
+
+		einfo "Patching Makefile.in for HPN patch set ..."
+		sed -i \
+			-e "/^LIBS=/ s/\$/ -lpthread/" \
+			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+		einfo "Patching version.h to expose HPN patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
+			"${S}"/version.h || die "Failed to sed-in HPN patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+			einfo "Disabling known non-working MT AES cipher per default ..."
+
+			cat > "${T}"/disable_mtaes.conf <<- EOF
+
+			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+			# and therefore disabled per default.
+			DisableMTAES yes
+			EOF
+			sed -i \
+				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+			sed -i \
+				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+		fi
+	fi
+
+	if use X509 || use sctp || use hpn ; then
+		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+		sed -i \
+			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+	fi
+
+	sed -i \
+		-e "/#UseLogin no/d" \
+		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
+
+	eapply_user #473004
+
+	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
+	sed -e '/\t\tpercent \\/ d' \
+		-i regress/Makefile || die
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+	use xmss && append-cflags -DWITH_XMSS
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
+		# doesn't check for this, so force the replacement to be put in
+		# place
+		append-cppflags -DBROKEN_GLOB
+	fi
+
+	# use replacement, RPF_ECHO_ON doesn't exist here
+	[[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the sctp patch conditionally, so can't pass --without-sctp
+		# unconditionally else we get unknown flag warnings.
+		$(use sctp && use_with sctp)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(usex X509 '' "$(use_with security-key security-key-builtin)")
+		$(use_with ssl openssl)
+		$(use_with ssl ssl-engine)
+		$(use_with !elibc_Cygwin hardening) #659210
+	)
+
+	if use elibc_musl; then
+		# musl defines bogus values for UTMP_FILE and WTMP_FILE
+		# https://bugs.gentoo.org/753230
+		myconf+=( --disable-utmp --disable-wtmp )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local tests=( compat-tests )
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		ewarn "user, so we will run a subset only."
+		tests+=( interop-tests )
+	else
+		tests+=( tests )
+	fi
+
+	local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1
+	mkdir -p "${HOME}"/.ssh || die
+	emake -j1 "${tests[@]}" </dev/null
+}
+
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+	local locale_vars=(
+		# These are language variables that POSIX defines.
+		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
+		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+		# These are the GNU extensions.
+		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
+		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+	)
+
+	# First the server config.
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables. #367017
+	AcceptEnv ${locale_vars[*]}
+
+	# Allow client to pass COLORTERM to match TERM. #658540
+	AcceptEnv COLORTERM
+	EOF
+
+	# Then the client config.
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables. #367017
+	SendEnv ${locale_vars[*]}
+
+	# Send COLORTERM to match TERM. #658540
+	SendEnv COLORTERM
+	EOF
+
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd-r1.initd sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	if use pam; then
+		newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	fi
+
+	tweak_ssh_configs
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use hpn && dodoc HPN-README
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+	rmdir "${ED}"/var/empty || die
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+pkg_preinst() {
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
+		show_ssl_warning=1
+	fi
+}
+
+pkg_postinst() {
+	local old_ver
+	for old_ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${old_ver}" -lt "5.8_p1"; then
+			elog "Starting with openssh-5.8p1, the server will default to a newer key"
+			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+		fi
+		if ver_test "${old_ver}" -lt "7.0_p1"; then
+			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+			elog "Make sure to update any configs that you might have.  Note that xinetd might"
+			elog "be an alternative for you as it supports USE=tcpd."
+		fi
+		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
+			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+			elog "adding to your sshd_config or ~/.ssh/config files:"
+			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+			elog "You should however generate new keys using rsa or ed25519."
+
+			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+			elog "out of the box.  If you need this, please update your sshd_config explicitly."
+		fi
+		if ver_test "${old_ver}" -lt "7.6_p1"; then
+			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+		fi
+		if ver_test "${old_ver}" -lt "7.7_p1"; then
+			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
+			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
+			elog "if you need to authenticate against LDAP."
+			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
+		fi
+		if ver_test "${old_ver}" -lt "8.2_p1"; then
+			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
+			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
+			ewarn "connection is generally safe."
+		fi
+	done
+
+	if [[ -n ${show_ssl_warning} ]]; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+		elog ""
+		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+		elog "and therefore disabled at runtime per default."
+		elog "Make sure your sshd_config is up to date and contains"
+		elog ""
+		elog "  DisableMTAES yes"
+		elog ""
+		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+		elog ""
+	fi
+}
diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index 2c100cc77cb9..a255d03e9419 100644
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -1,3 +1,5 @@
 DIST s6-networking-2.5.1.0.tar.gz 110443 BLAKE2B 489676bcb050d57482b0901742b53ce6cff00e25c1d8effc5c3d96d8e8ad0d32d42a62c15c73155d3b21fcfe6f310fc0f0c020bf945ac1a4b1c7fb9e9785adf4 SHA512 5d64420811d8d8a0034431dccda82b7ddd546f3b7c40ed02e05565c29c3ec14b75477306fea1a1e4aacc898e66e03718d7ac229b85be82d62bfe26c3ffc5fdf8
-EBUILD s6-networking-2.5.1.0.ebuild 1499 BLAKE2B 37e5180ff6def720c91084889bfa9611269ff101f1c35dc56e3be6a7b9c3021238918cd7f3c010787582a16d70a8c31717be662928a0ce6bce90b2a2f2d64800 SHA512 73cb9a9746d3e2e93a0a4d3cd8bb87c36aea727331878c64abb269df38a2b5562e1ece1ffe6a7a97e0a7bc6ef618ee842f2862f8fdf49264c0d783c24f183483
+DIST s6-networking-2.5.1.1.tar.gz 110431 BLAKE2B 67776a8aa6b02d20ed73c8b8d45e255677c3688973f9ee5f8dcc0de5cfd26146b7ccdc680b22a57e2523d8ab3c08d6e090252e376d09c1edd971a391632d83a0 SHA512 a9c1970cad5b3aeee447cce7c858e8bd88ee378fe456cc68d032f195373dabf658eacf55d9fa39ec635e893116296c1c614b89d97c5045b90dbe745a52e24021
+EBUILD s6-networking-2.5.1.0-r1.ebuild 1504 BLAKE2B 33adf1e83378e0328edc28361b2e883e3bfd83fdaec2e38f0cac0d85b498091fea3439904ccfbf4f551686ac3a49aaa86b9b3a8810bc71138b32c741c7a987de SHA512 b4f765272eaa5496c9fed6f709bee064d2ed73aa43492c818db6d04eafc8390c14c300e66ad528fc6db29b5cf1a5bf2b9a8126145655ed6e8b2cd939e241c6d3
+EBUILD s6-networking-2.5.1.1.ebuild 1223 BLAKE2B 8e7b85ba0fca7e3cfd07a7fcb6c22037d9bd51d51ba8499ea9b35c0877e784e99cfbbdb4443bba569cd29c5c26972b4407e3c043a61f394466ba1153d81e58fc SHA512 81518d26f3ed84744d48c07ec48306e8f050962c38fa89d9efd2fb11af594704ff627bb09e608e321da06431570466db3bc1741f73610bbdf2855abf706e88b8
 MISC metadata.xml 807 BLAKE2B 3b0c32efb3bde7b1694f42e3210878e74b3b79d553cfde13815e4a3dee276540c8444191fdab060f3639ef8414ecc06c1efb3621a67b24a41c1fb3be01343a07 SHA512 a38d2ba464e4e6fa7da69fc2006e6110fcd5ab6e65d41676c4d8fc5ee06c5c9b4dc333ef83d1b607cd13927eb2a88d868aee92cd184bbc64d572a30900250833
diff --git a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild b/net-misc/s6-networking/s6-networking-2.5.1.0-r1.ebuild
similarity index 87%
rename from net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
rename to net-misc/s6-networking/s6-networking-2.5.1.0-r1.ebuild
index 47a1748d6605..47977f15efc7 100644
--- a/net-misc/s6-networking/s6-networking-2.5.1.0.ebuild
+++ b/net-misc/s6-networking/s6-networking-2.5.1.0-r1.ebuild
@@ -17,16 +17,16 @@ IUSE="ssl static static-libs"
 REQUIRED_USE="static? ( static-libs )
 	ssl? ( !static !static-libs )"
 
-RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs?]
-	>=dev-libs/skalibs-2.11.0.0:=[static-libs?]
-	>=sys-apps/s6-2.11.0.0:=[execline,static-libs?]
+RDEPEND=">=dev-lang/execline-2.8.1.0:=[static-libs(-)?]
+	=dev-libs/skalibs-2.11*:=[static-libs?]
+	>=sys-apps/s6-2.11.0.0:=[execline,static-libs(-)?]
 	ssl? ( dev-libs/libretls )
 	!static? (
 		>=net-dns/s6-dns-2.3.5.2:=
 	)
 "
 DEPEND="${RDEPEND}
-	>=net-dns/s6-dns-2.3.5.2[static-libs?]
+	>=net-dns/s6-dns-2.3.5.2[static-libs(-)?]
 "
 
 HTML_DOCS=( doc/. )
diff --git a/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild b/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild
new file mode 100644
index 000000000000..9adaf81f7a5d
--- /dev/null
+++ b/net-misc/s6-networking/s6-networking-2.5.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Suite of small networking utilities for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+RDEPEND="dev-lang/execline:=
+	>=dev-libs/skalibs-2.12.0.0:=
+	net-dns/s6-dns:=
+	sys-apps/s6:=[execline]
+	ssl? ( dev-libs/libretls )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/s6
+		--with-lib=/usr/$(get_libdir)/s6-dns
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		--disable-allstatic
+		--disable-static-libc
+		$(use_enable ssl ssl libtls)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
index 03093760ce4e..0ff7d7ccafa8 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -1,5 +1,5 @@
 DIST sysrepo-2.1.42.tar.gz 712516 BLAKE2B 6ae56ada0156f49483ca9c3b2494a4bc8093ffa910a2f043e12f4cc5af2285580dfd0f950d5fccb2c00b5a299c9345045194b480ef857448479de5e838b49bbc SHA512 186eee0f1ddef28a1aa2d9a9038e9fcbfc829579f1a47eeefb4f2aa31d18f97ec2723bd04fe0684f80dacfba3d1a8da8748b564e310ffbdde5f18251c81d7405
 DIST sysrepo-2.1.64.tar.gz 722294 BLAKE2B 55f71bd2bfa987775d324763d989f57ef79c74d45c261e2f880740201ca5585107459f849d915e3bf4084c9f5ff538a7867787ce53145ad1a64e418384e3558c SHA512 363d6a0dd057326125aa11c51bb1e80a2a521708a95b95eecf2b416a2ebd938b5ac6b8ae49311376bfbae5599679e23f62503da946920bffb48379c665183b40
 EBUILD sysrepo-2.1.42.ebuild 776 BLAKE2B b471c3dbcb63922783798bb9e56ba8e23492cb8c4656adfebabf42cc4167389b96d681f0ddfd72a296e83d081c7e66448b1520c74970c5ffbbdd1219791733e3 SHA512 fa25527f2efff4a73bf2d71bc04d2c70bce3b94e87f84570b6f4cffd477b38f54e019c4dfcce92fe7b0f4589f74b3ebd599f5bd6b1bd70e068e48b1d7bd14cda
-EBUILD sysrepo-2.1.64.ebuild 777 BLAKE2B 341b1c086ecec7ca5be9699dedeee3496406b1cf1986eed4f41b25c491070403ce10f8049913e72ac2471933da0acb69c320279dfcbfbfe2e0440015795b61c7 SHA512 900dddcfc4a0a0cd4f8b3b3dff2f13e2f0f9c1183f51bc448e5ef677aadc50aa7a92b6725d1b16ed2fbc98703fe0700a5f106e5c35eaab139d1fec10685a6bec
+EBUILD sysrepo-2.1.64.ebuild 776 BLAKE2B 3e6dd00c074d731486e9018b8f18330fecbf0e9ad53bd1c188b8e244addbdd048269b0599c5b7e4b6be05a3aaef55c134e7b531036b0cce1314228bbab19fe71 SHA512 ecc9a8ebde90c90e3548c71bb75450862917c2266cbe8ce536e436604f0d155ed01ff5e7ac2ce8568503bcaff4d6e182624e484c02e7f8c1d92cd80d07201cc1
 MISC metadata.xml 328 BLAKE2B e91ac8ab81f342a9cdbf7b924f37c12f2adade3b0dee1972a3b2f2035997d6e8f5de414a052f2e154f6cecba1ab310103db2fd60e16d085875200bf08fcea522 SHA512 acdb3728e90337d98aea6f5174aba7a81d84259226ec6dda4607524184137b75431e621ebe29b99d371f6b3ff54aed15732a1d89229bf8cb100b52b4e0ae1a99
diff --git a/net-misc/sysrepo/sysrepo-2.1.64.ebuild b/net-misc/sysrepo/sysrepo-2.1.64.ebuild
index 99365b6f25b4..86607e642736 100644
--- a/net-misc/sysrepo/sysrepo-2.1.64.ebuild
+++ b/net-misc/sysrepo/sysrepo-2.1.64.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 52b5c0f49b23..2fcde3ecf7e0 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -4,5 +4,5 @@ DIST wget-1.21.3.tar.gz 5079864 BLAKE2B 4ff40a30cb3be82ea492d0eae324a9d43de30a01
 DIST wget-1.21.3.tar.gz.sig 854 BLAKE2B 71f69492397ae9e36284be9acdd1c94da34a7397c14a6de1a867c0d1e807bf961f8a2e098ab5629425691ce595227fb08f046416245fda2a6025929079f2d7c2 SHA512 b9f41496e0083545bc703c97b0758500f337527647cdc422152d7855d05351e3a62685269238c78300eafdbfaed8afecaeb988901a3d8a6b002e9fb3d70efe4f
 EBUILD wget-1.21.2.ebuild 2873 BLAKE2B b0ca4fa3105c73c9623e788863cd6c46b6da3d4d2f7f158538a7b5468560648d89bfef1900818ddf64343cc8e5d3675b1324835c30964767b51fab2c94e44e90 SHA512 4c2c0e9751fd37ce85be5c9abfa028f0813d17b7d0c902792406e4a94c30590781d00d243e936fd4a107090921d5ec4023c358e712c84aed44bb99d6982936b9
 EBUILD wget-1.21.3-r1.ebuild 3260 BLAKE2B fc3207fe851535b13d306193500a9610461d6d655d14544fec8bc5bfa41689604b5656dbcb4ae2a0120a6c5fbd28ab34a5419fb08bc2a65c11b2c06174fdd555 SHA512 6aa9368503381bdb747844994706f010a772cca1c34126c4ca0bd25e22492afd1427d1036892f3eed870b9a7f7993ef2983317848c47be21a988b149ee88f69a
-EBUILD wget-1.21.3.ebuild 3204 BLAKE2B 2c7e8a07d5a6a19c59a8d6bc4d1f68399c1e707643163c285bc53aa656b536761865ef0b5167e2450b47fd1c0f3df44588598b672d9a0c5bbb38b5a487b7ba89 SHA512 983749e3c57391284a13da6bc15686ecdd5dea22829eb6cb1a77d6d10ce71873b3fd8535d951b9b9e1f19ba5902d81c217b77c6e1ac7fe101c3dccd5ff6decd3
+EBUILD wget-1.21.3.ebuild 3203 BLAKE2B fb43f5fdfe06d756846ed4eb98869777643b7c0cfd373d1ebd6b81bf5067ea74bbb967aaf3549c3544bfd462db81fc20df837b0388624aeacce261a8522d44c7 SHA512 a1008cb3d17be6f4cbf0e6aae87b8891b5d555a6d6967e227383881664e828865f8c8c2e87f8df8308d6d7e500cd1660085dfb16ad241b436bff8f13830b9c73
 MISC metadata.xml 803 BLAKE2B 9bdb761fa36afd7a03f4631ed314230776de4af2c3e153a3631ee8f9e801233e44abe68ba5ec874bcfaef53d2cb1100a671768169d58d6e2c96387be5210abc9 SHA512 4ddbdc883a155f4eddeb5cd6e031b4824f1f50586ceaedd1b72a8d2ce9d3dffe440a0554e4a9a07f1295f79a5958bcb533ae324919c64daf77caff577318dfc1
diff --git a/net-misc/wget/wget-1.21.3.ebuild b/net-misc/wget/wget-1.21.3.ebuild
index f391da93c363..3b93ad5504e4 100644
--- a/net-misc/wget/wget-1.21.3.ebuild
+++ b/net-misc/wget/wget-1.21.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.gz.sig )"
 
 LICENSE="GPL-3"
 SLOT="0"
-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"
+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="cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index 83a4fcbf9321..b24f4fd8af77 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -2,7 +2,9 @@ AUX xmrig-6.12.2-nonotls.patch 578 BLAKE2B 4d71c8d35be47fd12a019d7b8cb6e1b8787e1
 AUX xmrig.service 946 BLAKE2B 1f3b28f8229183da528ac2b4279dd64b5c6f752720c6bdfe90fa9e127108623e4a577a274527249ee7a13969be97e9b1a4348f7c3e0798839d0ed3ee67b16188 SHA512 77da620627272113e7c77a090536b04cb5a89f4010060ffb21ea1c9edc50e0743f913a70e4fb612c23aeea2b8f1a3f9ce024a434076cf9498cce0b5f801faafa
 DIST xmrig-6.16.4.tar.gz 2422895 BLAKE2B bdf4c2ee41b11a5a0d72518aadb71677536dee4ec80af191a337bddb9623e9ec8d0d3f5328732be6246eb08b28f845927ae611e2c8dc66d1b42f1c8f56a3451f SHA512 a66f5d8ef217a4ea31d65c03cc863be694947ce536ca66b0b66f523557fba1651accdc196b6ca1dbc34bd5688041248a3c30e9ee122394207f7e47d82d9e987d
 DIST xmrig-6.17.0.tar.gz 2443393 BLAKE2B 01fa7682dae6dd4aaa0f3b677bedfb3b2e9de35799f9bae0aa1a733b35152d1d6c56dfed06b9aa54fe64df4f40029d2657b9fc95e541746bd8e28bff15eef96b SHA512 a8361a5ccc8237afb59c496d88d920b7222158d9f874ff891f0cb78278e6e00881b75f4e129858c44ffc7d90227c995121f6611f1a20f84139930a883271f0d6
+DIST xmrig-6.18.0.tar.gz 2389032 BLAKE2B c7561e2d9303c80f97615471a28f57bc48c93749459e48451de52d1130b436298354a0419c3ed3c96f2bfe3592b7d28f85b91c7698174917d6eb08b685a12145 SHA512 ed20b760ae7603de752c933513c3f7abb2e254a44d79252264952f3e70c7b5320389ed4f6534a6dc8eb7cac8b1086239c46baf18c71f7ba7f0018914b2fd5917
 EBUILD xmrig-6.16.4.ebuild 1339 BLAKE2B ad28a6034a46772341dee70ca2d80fa2a22aab881684d1eaa329bbcddd8198e654ca2ee989faa7e99126aab73b118c5d1f795c96ef18e500b95b9b7316109af5 SHA512 c4bf53ffce5855eaec0ec9f0e093e713ee5ab7f2efba9e8b9762d49e54bbfd619d05118655b0229e38d7d98c0f49864ab4db61b945e874e1da1181e1241611f4
 EBUILD xmrig-6.17.0.ebuild 1339 BLAKE2B ad28a6034a46772341dee70ca2d80fa2a22aab881684d1eaa329bbcddd8198e654ca2ee989faa7e99126aab73b118c5d1f795c96ef18e500b95b9b7316109af5 SHA512 c4bf53ffce5855eaec0ec9f0e093e713ee5ab7f2efba9e8b9762d49e54bbfd619d05118655b0229e38d7d98c0f49864ab4db61b945e874e1da1181e1241611f4
-EBUILD xmrig-9999.ebuild 1341 BLAKE2B 5bef2d6de415e33f42a4d70914b9d70833b9ea68cd4d816fc590ce442b9e03163d631779008b0e0f27db4df08642e121966bed553a3f7253606906745a6e3de6 SHA512 dc6d46794247ba287ffdfab91643d93096f89ef39a49650ec65310c4c71295da994491a263992c1f6cddfbd350a42c8223327fb51bd47c873ac4ce7c302b91af
+EBUILD xmrig-6.18.0.ebuild 1341 BLAKE2B 57e511706fc10b3ae13aa788cf98fc7bbae846e1993c16e30c6bee5b5ac4d65e43481542a11bdee219d5aa46be79e1d3281259bf61719f9095bd902660617748 SHA512 c2addf892f4692610fc4ff757f13b0528ebaad9aef07bd5d4c8923d97d13a493a169869fe611ea612c0e5607f8a4c67c4adf2f2845405de1f131d9e5800ddee6
+EBUILD xmrig-9999.ebuild 1341 BLAKE2B 57e511706fc10b3ae13aa788cf98fc7bbae846e1993c16e30c6bee5b5ac4d65e43481542a11bdee219d5aa46be79e1d3281259bf61719f9095bd902660617748 SHA512 c2addf892f4692610fc4ff757f13b0528ebaad9aef07bd5d4c8923d97d13a493a169869fe611ea612c0e5607f8a4c67c4adf2f2845405de1f131d9e5800ddee6
 MISC metadata.xml 1023 BLAKE2B 207d4db4091e38a612d7bf060ca7f58c97454a03d39b0f49e0968f387a1d97d7624834ea0d010b650fc384ab51550693d90710808516082f14a5d51ecd42b9f4 SHA512 93dd1dc29085b6277a5787515449b67c45753cdd00de5a854522907cec0a59078327074c0f3a8577c1d505b0eb30e63267375b3ccc2cf0dcae697b56d163aa39
diff --git a/net-misc/xmrig/xmrig-6.18.0.ebuild b/net-misc/xmrig/xmrig-6.18.0.ebuild
new file mode 100644
index 000000000000..5e038e700270
--- /dev/null
+++ b/net-misc/xmrig/xmrig-6.18.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
+HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="Apache-2.0 GPL-3+ MIT"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
+
+DEPEND="
+	dev-libs/libuv:=
+	hwloc? ( >=sys-apps/hwloc-2.5.0:= )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="
+	${DEPEND}
+	!arm64? ( sys-apps/msr-tools )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+)
+
+src_prepare() {
+	if ! use donate ; then
+		sed -i 's/1;/0;/g' src/donate.h || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DWITH_HWLOC=$(usex hwloc)
+		-DWITH_TLS=$(usex ssl)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_CUDA=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	default
+	keepdir /etc/xmrig
+	systemd_dounit "${FILESDIR}"/xmrig.service
+	dobin "${BUILD_DIR}/xmrig"
+	dobin "${S}/scripts/enable_1gb_pages.sh"
+	dobin "${S}/scripts/randomx_boost.sh"
+}
diff --git a/net-misc/xmrig/xmrig-9999.ebuild b/net-misc/xmrig/xmrig-9999.ebuild
index 516d44208bba..5e038e700270 100644
--- a/net-misc/xmrig/xmrig-9999.ebuild
+++ b/net-misc/xmrig/xmrig-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake systemd
 
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index b605f7ecbfde..bf6a23d2d968 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/networkmanager-strongswan/Manifest b/net-vpn/networkmanager-strongswan/Manifest
index e329056065e2..87727ec027e0 100644
--- a/net-vpn/networkmanager-strongswan/Manifest
+++ b/net-vpn/networkmanager-strongswan/Manifest
@@ -1,5 +1,3 @@
-DIST NetworkManager-strongswan-1.5.2.tar.bz2 300735 BLAKE2B f8ac0002d14bc79b33b897785eb60ac46d43d29c2e897a9d2249c905a524bd7e8942d8bb535a551956b81be0af16b6fa8876a8c636aadc06d2c068a4b21b403e SHA512 c79f011470778ae05f80b71330acfd7df75363fd089624007e9bdd82b75513a23eaaa3ef10141f780df075eb501ee675e4c293710e0a4c5fd9d4f4b0565bae59
 DIST NetworkManager-strongswan-1.6.0.tar.bz2 302787 BLAKE2B 2c54f9f13ab61d4a265dd6639cba93089a211f0b75cb976f638a4f5a6565b1386b273a9e80fca90c6581706592e3c396790143e910d2ecac574380eed278b325 SHA512 ecfae6c100f9344d07a9d67f01894edbd509178698ad3bce6f8c1ccdd53e08baca4e95c10f7f72991b163042f9cc19d876bcf71ab8b2efb10a25c5e00fe03572
-EBUILD networkmanager-strongswan-1.5.2-r1.ebuild 977 BLAKE2B 9e980eb6b5603e977542275e236df0ea5142afc746198a4b6e3bf15a1e52c6a0612068fc9f05f72c6e5691dd31c8fc5e914114eac9bebfecec2e70c3632134b4 SHA512 0bd9c3ba52b4b78cd984fac15614cf80ba2416028c102bfd462e433e4442bd5fc67e5d5bd52d3848fe421c7a50de3adeb6fe7e977509e2b426287f8f32602694
-EBUILD networkmanager-strongswan-1.6.0.ebuild 1026 BLAKE2B 7fe645d341d464a0d1ad4c8844922bffb10ace9e423609e10dec685c3a26edf32f237f9323777acabdb0212a037e9b158b61cae3c872bba50e89b0f619447e4b SHA512 1d5cc521f2d8fb6d08665a7c1d9ad1bc6add0a602ec3dd9ee55252ccbb8fa7e9550e259a79c7ea4199acb2dc5be36b17905b5105401388602175f6b8de12e2fd
+EBUILD networkmanager-strongswan-1.6.0.ebuild 1024 BLAKE2B 8b6e5f15eda4c4e6b2cb863d476e3756df0cb7c22621fc5d5e78828610cb34e62dede83e446191f774caf14677387ee6115e083902fdf8ec1907a5e6fded8f48 SHA512 10dc8090e47e52007d796a1e5403a4de0970f66a02fe8dac89440491491bbdc82bb450188fb8817d5b41cd8297ec476eee712092abda9901791c5f335420f2f0
 MISC metadata.xml 319 BLAKE2B 059375d01a100a58269896ad39d73294d0b4444ad72c33df15bdf0b6758071137a8575111f1f0af3b23e031487d44bf1aa40feb3c9f2a42fb91e50dd0b4bc1eb SHA512 c4b162f808c01eb0182d63fb473eabd461eca665036b47f65d14cf2f05b0e37c8c32a6a4934d3e28e4cf6a2766eb134786152c1cf21814102bb0bbba63ad9320
diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.5.2-r1.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.5.2-r1.ebuild
deleted file mode 100644
index 7451dab00b1d..000000000000
--- a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_PN="NetworkManager"
-MY_P="${P/networkmanager/${MY_PN}}"
-
-DESCRIPTION="NetworkManager StrongSwan plugin"
-HOMEPAGE="https://www.strongswan.org/"
-SRC_URI="https://download.strongswan.org/${MY_PN}/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-crypt/libsecret
-	>=net-libs/libnma-1.1.0
-	net-misc/networkmanager
-	>=net-vpn/strongswan-5.8.3[networkmanager]
-	x11-libs/gtk+:3
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		# Don't enable all warnings, as some are treated as errors and the compilation will fail
-		--disable-more-warnings
-		--disable-static
-		--without-libnm-glib
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.6.0.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.6.0.ebuild
index 4a389a2a6bcb..86e540e050db 100644
--- a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.6.0.ebuild
+++ b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.6.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk4"
 
 RDEPEND="
diff --git a/net-vpn/pptpd/Manifest b/net-vpn/pptpd/Manifest
index e4257ed2a37a..65da98afeef1 100644
--- a/net-vpn/pptpd/Manifest
+++ b/net-vpn/pptpd/Manifest
@@ -6,5 +6,5 @@ AUX pptpd-1.4.0-sandbox-fix.patch 528 BLAKE2B 1b784cbf9eb1699a5c8e31a6ebb64035e9
 AUX pptpd-confd 131 BLAKE2B b1cf43035bb96859e3f69ad2ba8d161fd5e7c98370f407767a74ec9e87fd3187ec127155171bebf3e0655d076d2edb640993ec4445672abb40a9d87fb5a6b008 SHA512 59f118715cf6c36442687a58f46a54519fb5125383e85c4fa352a4c97f8a4e19f46c9715330550755eb9691e8174b70cdfab48fbd14c2707364e8083d6baa488
 AUX pptpd-init-r2 325 BLAKE2B 492d4a17910fd45475337376570e23b2193f0b5471e82a575465eb139a9cf0f9296388962e3dc2584784a4be6aac17edf4da67410ca422498a2f3c39c9baba43 SHA512 5eb0839310b6897aeb5ef067f3bbccc3f302f9d5375fea9c2cf405a6e823560a776a96fa0189b4c9adf1744651a35a41d4fcafc3f9e1ebf5ddeb5d88bece9678
 DIST pptpd-1.4.0.tar.gz 252167 BLAKE2B c7fa9397c0a1b7c1ae5f22f9d7f85ba1bb60966984506f7b7c7b4f5dce69efa717f41e8d9a717e4c6f482d2d3e4052611709e0b825a2fcc63fabf19a53a550f0 SHA512 cfb4caef3025c0721e7fabf8b7bf595739f2d3048555b30616cdadc37e70ba9e1c50561c25091dd617b5448da2816aeaf83aea0fc2ef6b0dd5e3fe35d9591484
-EBUILD pptpd-1.4.0-r3.ebuild 1996 BLAKE2B 0066992c4d1bb8510806f62ce6031ed2625a80c9bb99474c2df2d7a764b1ca36e2fcf6c425617e7bbb138893a154ed794bd50de6c9365e3c7cc2c934d68a8bd3 SHA512 3eb884e8eb2d524967efc1b98c9718dd880c5aed69b49ebf7a0ddb0a569509a800111129c4efadc26c756a0a35697aeaa855f1fe9f26d6a64cc42ef20e426a90
+EBUILD pptpd-1.4.0-r3.ebuild 2032 BLAKE2B ba896ff5b3dd21661362bf311772ce714f8152f97fec2f661602df4744c67cbc7fd321959969b182b1bc5e5449dc7dd473647431bb4bc8ad85c67299fd75f932 SHA512 4b324f1ae1c73fd4ef0ef55b668c1f258882248d450c8826d89c6ef13fb96f2a1d5b147ba70807813f77ff3d95f0be2dbcb736d56c3b06d5844438446c4862d1
 MISC metadata.xml 469 BLAKE2B e1c0396ab4a78ed9b1b20dab4a3c81fc4058adacdb87d9f287e0ba9dfdb050ee64727ef95433e249fc1054ad1849ef543fbd0ff35cfd4a2c3f08f3d5ec51965c SHA512 d1d9a5a96795964d88f79aaf93b67948f7298d1410e5ec5bf4a0b98eb11f5157eeb71633209ee6491d1ba02e77454ec641c36ad217c7eb084dc3015a9f8b854b
diff --git a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild b/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
index d22507a50d47..f07ade6610c2 100644
--- a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
+++ b/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,9 +14,10 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gre-extreme-debug tcpd"
 
-DEPEND="net-dialup/ppp:=
+RDEPEND="net-dialup/ppp:=
 	tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	elibc_musl? ( net-libs/ppp-defs )"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 69d888747f9e..b70d5a7cd3f1 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index a5c50305c92a..71d84e92de5a 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,6 +1,7 @@
 DIST gnuradio-3.8.4.0.tar.gz 3395297 BLAKE2B 454724e61306bee4991f8a44c80963080b632f767cbb70e00ee518aa096f150a9bb5c29304b9c30a84ab537b8b19ccd2955806fadb88a6cc4d24a8531e8c0127 SHA512 80d34c6351947f45decf8ba09288d4fc4c411c8d286d2765fad59da421b99c15a4c7b7c25a17c89dacfafd872f13ba8d9a8d84d89a35568e5b088f77fcaaae67
 DIST gnuradio-3.8.5.0.tar.gz 3399660 BLAKE2B 19e3eecb40d7cdafe6fe551d3d36c0fcd34bb92ceb316537f4ebdc1c90d3c649daa1383f3642e2f64bba23026ed6638168fa77da0f21db03330b066e3108c880 SHA512 9b367c8afeb278b90e8ddd835e0ba301f07a53da26791e74913c812bde251daaa8f9611f21969938b215c9a110c9e69dfb6ec8b6d0db9c64013707c57596819a
 EBUILD gnuradio-3.8.4.0.ebuild 6115 BLAKE2B 95a4129cea2b525222a8cd998765337798aceb7cdf513ddea9d79a69287bb5b9d022121d9e19cc644515616de7f64828a93654ed4e42a39a6ac623a2f416e70a SHA512 00f69d0d140312ae462b26d7deddabd262c9958f76308f3c32b2cd27d418fcb1527cc969af5cf3c0ff6124fd5ce5021c8175b687c1f1881deff4265a872b7135
+EBUILD gnuradio-3.8.5.0-r1.ebuild 6179 BLAKE2B 0a80d18deaf566e360a3ac27f9f9be82b1ca77f863e55f63d33e2db2963be501fbb48ff40d803f517ab9d1d6942f70e1308403283ba02994869c583ce8a798cf SHA512 2cb684eb7e6ed1720789adb1a856b0b789d78973f288c02288ecfce734118f7d5d27feda40816981e9633ee925d23d4252317587941983ef1e6829654ffe4b7e
 EBUILD gnuradio-3.8.5.0.ebuild 6125 BLAKE2B 80ff9f450051087bf7d4801115097ca83423c9bb30149c416141bd09fd6b054d6c19a477a09dac84cbfecda14b731d48265e6be0ad50173bf8f47868b4025eab SHA512 5ec39ebc2b28a720a1c19573ad20ff2e7c4a992e3467c7ac999d47044ad212d6ef88f840dcc5cdf7526153656eba58c159c47a2e13c3c61459170788b9e7c74d
 EBUILD gnuradio-9999.ebuild 5985 BLAKE2B 93ab02962149379a688c3db4db570cddb1da16d87fc4955327a22550f1a17eca6b034a69e28d92bafb1915427d659e4292883b231315ce8ed4f002bc35409465 SHA512 3de04e75f3d94d03d21f353ffcf4d8100520772d1864e4f814a6056cd6a5b10abcf3ee6077d28c6dc3126e6989b7993686a279780c2d3a75ceb66c84c9f07dad
 MISC metadata.xml 1676 BLAKE2B 9dc4c025e09d54b083b7681f5a06e491375d9621fbb60d0a0b8c218da0e9a3d7cc557aaac86002984bf0b7dbc82848261d3ec0cceeb0cb35ebaed92675cea2a9 SHA512 e52efa5ac1bb1dc576b2802d581741c43622aabfac2133b1e3aefdcec671e2c67631f91c1322d22a4b315e1e12c006cc696dd97aa0f18ebace534cc249251b12
diff --git a/net-wireless/gnuradio/gnuradio-3.8.5.0-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.8.5.0-r1.ebuild
new file mode 100644
index 000000000000..a8da90f2bd12
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.8.5.0-r1.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake python-single-r1 virtualx xdg-utils
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="https://www.gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
+	EGIT_BRANCH="maint-3.8"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq"
+
+#RESTRICT="!test? ( test )"
+#Tests are known broken right now
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	audio? ( || ( alsa oss jack portaudio ) )
+	alsa? ( audio )
+	jack? ( audio )
+	oss? ( audio )
+	portaudio? ( audio )
+	analog? ( filter )
+	channels? ( filter analog qt5 )
+	digital? ( filter analog )
+	dtv? ( filter analog fec )
+	modtool? ( utils )
+	qt5? ( filter )
+	trellis? ( analog digital )
+	uhd? ( filter analog )
+	vocoder? ( filter analog )
+	wavelet? ( analog )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
+	dev-libs/log4cpp:=
+	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	sci-libs/fftw:3.0=
+	sci-libs/mpir:=
+	sci-libs/volk:=
+	alsa? ( media-libs/alsa-lib:= )
+	ctrlport? ( $(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]') )
+	fec? (
+		sci-libs/gsl:=
+		dev-python/scipy
+	)
+	filter? (
+		dev-python/scipy
+		$(python_gen_cond_dep 'dev-python/pyqtgraph[${PYTHON_USEDEP}]')
+	)
+	grc? (
+		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]')
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+	jack? ( virtual/jack )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	qt5? (
+		$(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-libs/qwt:6[qt5(+)]
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	trellis? ( dev-python/scipy )
+	uhd? (
+		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
+	)
+	utils? (
+		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
+		dev-python/click-plugins[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]')
+	)
+	vocoder? (
+		media-sound/gsm
+		>=media-libs/codec2-0.8.1:=
+	)
+	wavelet? (
+		sci-libs/gsl:=
+		dev-libs/gmp:=
+		sci-libs/lapack
+	)
+	zeromq? ( >=net-libs/zeromq-2.1.11:= )
+"
+
+#That's right, it can't build if gnuradio 3.7 is installed
+#Both due to build failure, and then file collision due to bundled volk
+DEPEND="${RDEPEND}
+	!!<net-wireless/gnuradio-3.8
+	app-text/docbook-xml-dtd:4.2
+	>=dev-lang/swig-3.0.5
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.7.1
+	)
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	test? ( >=dev-util/cppunit-1.9.14 )
+	zeromq? ( net-libs/cppzmq )
+"
+
+src_prepare() {
+	xdg_environment_reset #534582
+
+	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
+	use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_VOLK=OFF
+		-DENABLE_INTERNAL_VOLK=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_CTRLPORT="$(usex ctrlport)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_MODTOOL="$(usex modtool)"
+		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_QTGUI="$(usex qt5)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PYTHON_DIR="$(python_get_sitedir)"
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	if use doc || use examples; then
+		#this doesn't appear useful
+		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
+	fi
+
+	# Remove duplicated icons, MIME and desktop files and installation script
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	#if use grc ; then
+	#	local fd_path="${S}/grc/scripts/freedesktop"
+	#	insinto /usr/share/mime/packages
+	#	doins "${fd_path}/${PN}-grc.xml"
+
+	#	domenu "${fd_path}/"*.desktop
+	#	doicon "${fd_path}/"*.png
+	#fi
+
+	python_fix_shebang "${ED}"
+	# Remove incorrectly byte-compiled Python files and replace
+	find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
+	python_optimize
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+pkg_postinst() {
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 4a4d1a2eeadf..37cb9f7e51d8 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index bea0fbe50af9..3b29e898af4e 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (2022-06-24)
+# net-libs/libqrtr-glib not keyworded
+net-libs/libqmi qrtr
+
 # Sam James <sam@gentoo.org> (2022-06-23)
 # ceph, zfs not keyworded here
 app-emulation/libvirt rbd zfs
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 655a09426c73..eacbc7f1fe78 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (2022-06-24)
+# net-libs/libqrtr-glib not keyworded
+net-libs/libqmi qrtr
+
 # Anna Vyalkova <cyber+gentoo@sysrq.in> (2022-06-25)
 # Unkeyworded test dep
 app-vim/jedi test
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 0e4be5aa20a6..79e2a563ec95 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (2022-06-24)
+# net-libs/libqrtr-glib not keyworded
+net-libs/libqmi qrtr
+
 # Matt Turner <mattst88@gentoo.org> (2022-05-16)
 # media-libs/libheif not keyworded here
 media-gfx/gthumb heif
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 7a09c8b58c7c..0c68c7d0aa38 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (2022-06-24)
+# net-libs/libqrtr-glib not keyworded
+net-libs/libqmi qrtr
+
 # Jimi Huotari <chiitoo@gentoo.org> (2022-05-08)
 # Not keyworded here yet.
 lxqt-base/lxqt-meta desktop-portal
diff --git a/profiles/arch/sparc/package.use.force b/profiles/arch/sparc/package.use.force
index 3c53f2a73cfa..1d86050b6044 100644
--- a/profiles/arch/sparc/package.use.force
+++ b/profiles/arch/sparc/package.use.force
@@ -1,6 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-06-25)
+# dev-lang/rust lacks wiring up to use our custom rust-bin bootstrap
+# tarball, so force system-bootstrap instead (i.e. force using rust-bin
+# or existing installed rust). bug #842246.
+dev-lang/rust system-bootstrap
+
 # Sam James <sam@gentoo.org> (2022-02-19)
 # New enough SpiderMonkey not (yet?) keyworded here, bug #753221
 sys-auth/polkit duktape
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 6bf3b89c736b..7fe4569b7611 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-06-25)
+# sys-devel/lld lacks sparc support right now
+dev-lang/rust wasm
+
+# Sam James <sam@gentoo.org> (2022-06-25)
+# We're not (yet?) providing our own tarballs for these and
+# upstream don't offer them for this arch (see bug #769467).
+dev-lang/rust-bin clippy doc rls rustfmt
+
 # Nickolas Raymond Kaczynski <nrk@disroot.org> (2022-04-24)
 # Dependencies are missing keywords
 media-libs/imlib2 svg heif
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index cc2431ca8f0a..4e15738780e3 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (2022-06-24)
+# net-libs/libqrtr-glib not keyworded
+net-libs/libqmi qrtr
+
 # Anna Vyalkova <cyber+gentoo@sysrq.in> (2022-06-25)
 # Unkeyworded test dep
 app-vim/jedi test
diff --git a/profiles/package.mask b/profiles/package.mask
index 6ff0c06aeba6..46129697e2e1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,31 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2022-06-25)
+# Obsolete slot. Use a newer slot instead.
+# Removal in 30 days.
+dev-ruby/hashie:3
+
+# Hans de Graaff <graaff@gentoo.org> (2022-06-25)
+# Obsolete slot. Use a newer slot instead.
+# Removal in 30 days.
+dev-ruby/marcel:0
+
+# Hans de Graaff <graaff@gentoo.org> (2022-06-25)
+# Obsolete slot. Use a newer slot instead.
+# Removal in 30 days.
+dev-ruby/paramesan:0
+
+# Hans de Graaff <graaff@gentoo.org> (2022-06-25)
+# Obsolete slot. Use a newer slot instead.
+# Removal in 30 days.
+dev-ruby/paramesan:0
+
+# Hans de Graaff <graaff@gentoo.org> (2022-06-24)
+# Obsolete slot. Use a newer slot instead.
+# Removal in 30 days.
+dev-ruby/rspec-rails:3
+
 # Marc Schiffbauer <mschiff@gentoo.org> (2022-06-22)
 # Deprecated package. Removal in 30 days.
 # see bug #843746
@@ -257,26 +282,6 @@ dev-ruby/regexp_parser:1
 # on 2022-06-28. Bugs #833297, #802927.
 dev-python/pypam
 
-# Andrey Grozin <grozin@gentoo.org> (2022-05-25)
-# Does not work with the current dev-python/pyx
-# Removal on 2022-06-24
-dev-python/pyfeyn
-
-# Michał Górny <mgorny@gentoo.org> (2022-05-25)
-# dev-python/m2r has not seen any activity since Jun 2019 and requires
-# old version of dev-python/mistune.  dev-python/sphinxcontrib-openapi
-# has not seen any activity since Oct 2020.  Their only revdep
-# is dev-python/jupyter_server[doc], so let's mask the flag and remove
-# them.
-# Removal on 2022-06-24.  Bug #843881.
-dev-python/m2r
-dev-python/sphinxcontrib-openapi
-
-# Matt Turner <mattst88@gentoo.org> (2022-05-23)
-# Dead package upstream. Depends on dead app-misc/tracker:0.
-# Removal on 2022-06-23. Bug #846605
-gnome-extra/gnome-documents
-
 # Hans de Graaff <graaff@gentoo.org> (2022-05-20)
 # Unused slots of cucumber components that are no longer or were never
 # used by current cucumber versions. Masked for removal in 30 days.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 53cf1ff5f93e..0000e8780fc2 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4266,11 +4266,7 @@ media-libs/lsp-plugins:lv2 - build lv2 plugins
 media-libs/lv2:plugins - Enables examples plugins.
 media-libs/lvtk:gtk2 - Enable x11-libs/gtk+:2 based GUI support
 media-libs/lvtk:tools - Compile and install ttl2c tool
-media-libs/mesa:classic - Build drivers based on the classic architecture.
 media-libs/mesa:d3d9 - Enable Direct 3D9 API through Nine state tracker. Can be used together with patched wine.
-media-libs/mesa:egl - Enable EGL support.
-media-libs/mesa:gallium - Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.
-media-libs/mesa:gbm - Enable the Graphics Buffer Manager for EGL on KMS.
 media-libs/mesa:gles1 - Enable GLESv1 support.
 media-libs/mesa:gles2 - Enable GLESv2 support.
 media-libs/mesa:llvm - Enable LLVM backend for Gallium3D.
@@ -6063,6 +6059,7 @@ net-libs/libproxy:kde - Enable support for reading proxy settings from KDE
 net-libs/libproxy:spidermonkey - Use libmozjs from dev-lang/spidermonkey for PAC parsing
 net-libs/libproxy:webkit - Use libjavascriptcoregtk from net-libs/webkit-gtk for PAC parsing
 net-libs/libqmi:mbim - Support QMI over Mobile Broadband Interface Model (MBIM)
+net-libs/libqmi:qrtr - Support QMI over IPC Router bus (QRTR)
 net-libs/libsoup:brotli - Enable brotli decompression support
 net-libs/libsoup:gssapi - Enable GSSAPI support
 net-libs/libsoup:samba - Use net-fs/samba for NTLM Single Sign-On
@@ -8562,19 +8559,11 @@ www-apps/drupal:uploadprogress - Install dev-php/pecl-uploadprogress package
 www-apps/gitea:acct - User and group management via acct-*/git packages
 www-apps/gitit:plugins - enables optional plugin runtime loader
 www-apps/hugo:sass - Enable SASS/SCSS support
-www-apps/hugo:test-full - Pull optional heavier test-dependency packages
 www-apps/icingaweb2:apache2-server - Adds support for the apache2-server
 www-apps/icingaweb2:fpm - Adds FPM support to php
 www-apps/icingaweb2:nginx - Adds support for nginx
 www-apps/ikiwiki:extras - Installs additional modules used by ikiwiki plugins
 www-apps/klaus:ctags - Enable support for Exuberant ctags; makes all source code symbols hyperlinks to their definitions
-www-apps/nikola:charts - Support chart generation through dev-python/pygal
-www-apps/nikola:hyphenation - Add hyphenation support through dev-python/pyphen
-www-apps/nikola:ipython - Add IPython notebook compilation and LESS support
-www-apps/nikola:jinja - Add support for dev-python/jinja as alternative templating engine to Mako
-www-apps/nikola:server - Enable support for built-in web server using dev-python/aiohttp
-www-apps/nikola:watchdog - Use dev-python/watchdog to monitor file system events
-www-apps/nikola:webmedia - Use dev-python/micawber to extract metadata from web media links
 www-apps/postfixadmin:vacation - Install vacation.pl script and dependencies
 www-apps/redmine:markdown - Enable support for Markdown
 www-apps/redmine:minimagick - Enable image processing support via dev-ruby/mini_magick
@@ -8813,7 +8802,6 @@ x11-libs/libXaw:deprecated - Install deprecated Xaw6 library.
 x11-libs/libXfont2:bzip2 - Support bzip2 compressed PCF fonts.
 x11-libs/libXfont2:truetype - Use media-libs/freetype for font rasterization.
 x11-libs/libdlo:test-program - Build the program for testing Displaylink devices.
-x11-libs/libdrm:libkms - Enable building of libkms, a library for applications to interface with KMS
 x11-libs/libdrm:valgrind - Compile in valgrind memory hints
 x11-libs/libfm:automount - Use gnome-base/gvfs for automounting
 x11-libs/libfm:udisks - Use libfm's udisks-based volume monitor implementation instead of using the one from gvfs
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 0609626778cc..5aede15d19c1 100644
Binary files a/sci-calculators/Manifest.gz and b/sci-calculators/Manifest.gz differ
diff --git a/sci-calculators/bc-gh/Manifest b/sci-calculators/bc-gh/Manifest
index f0976f03d635..f9cc3b8a22f7 100644
--- a/sci-calculators/bc-gh/Manifest
+++ b/sci-calculators/bc-gh/Manifest
@@ -1,7 +1,5 @@
-DIST bc-5.1.1.tar.xz 433944 BLAKE2B d46ae9de6358b3acd1afe9f7013286d8678e26a985664d65e78b51077b494d2b1c1271044170d3488ececeaed5e97df15da2734070a2fbf39b33ab9c01543558 SHA512 d8774fb1e654520abdf7d790783d4a3c04fa8f4982fc1cd0d92331e7e4b5889efa022cafb5e1286b6c82a74c9388f47657c7b9d78888b5d8056fa40d3d5e5c69
-DIST bc-5.2.0.tar.xz 435820 BLAKE2B babcd26a69b845fa1f50b0f65dc536bdcd7603102224379387e6dc60aaf94faebc30088d429206100e053cfa34945117b090cd75c7d0dcf377467204572b9358 SHA512 f5fcaef5a963baa344972432e20c9747cba7b08b2dd7beac5c783da250abcde37cf85c23bfb3273432c31b292c9c470c836daf990c69f83bd6c7e565a46859e2
 DIST bc-5.2.1.tar.xz 437096 BLAKE2B 9ec13897b3489c00761c1478de8ad9428e966ecba4f4582e37ede17cb6d97d492c928f7f931c8e412deb6cdb86e2092b17c5c1b0a31527964a522fd2929e8472 SHA512 8f5cfdfc0b2e1866d8fc1477d7bfc2882cf4d2e4844fcf41ded5f8b52b4d8124c073e845d86b355977f815a5a8a2f22fd98495ec4b5dd41737b808a3a4f4bb56
-EBUILD bc-gh-5.1.1.ebuild 497 BLAKE2B e4a9ebdd7889572a28c6d7ff606de35d162f858478b42451552fc55bf1eb57ed717ed06e997f0283e0b7fb8d5294b6440632b7f0581fc27418fe6e3430e94da5 SHA512 fff00599da592750c235a6441bbf9ca5f921c4829268e6e6e40b74e549250fb123a31eabebe39cbee8503a47fc8e9a76fe747b8884c067697e37002e3f5f8777
-EBUILD bc-gh-5.2.0.ebuild 497 BLAKE2B e4a9ebdd7889572a28c6d7ff606de35d162f858478b42451552fc55bf1eb57ed717ed06e997f0283e0b7fb8d5294b6440632b7f0581fc27418fe6e3430e94da5 SHA512 fff00599da592750c235a6441bbf9ca5f921c4829268e6e6e40b74e549250fb123a31eabebe39cbee8503a47fc8e9a76fe747b8884c067697e37002e3f5f8777
+DIST bc-5.3.3.tar.xz 444552 BLAKE2B b5fd2b1d7fc36505209a6aac89f44b784ce52e0d955b48bbb818462aef022f7e85332d5526ab9ca405a44fcf6089a9edbd3dcdb70a5624a25ebe052bfd007f95 SHA512 94f7c35761211b4909f4bc5a2c19e7cd6589f7b6c2fa6eaf0a889d682ffd3f3ba79b3580d9e2aa4bef32b4c7874d047d0fba4e7dace05d63c87f884afbe8020f
 EBUILD bc-gh-5.2.1.ebuild 497 BLAKE2B e4a9ebdd7889572a28c6d7ff606de35d162f858478b42451552fc55bf1eb57ed717ed06e997f0283e0b7fb8d5294b6440632b7f0581fc27418fe6e3430e94da5 SHA512 fff00599da592750c235a6441bbf9ca5f921c4829268e6e6e40b74e549250fb123a31eabebe39cbee8503a47fc8e9a76fe747b8884c067697e37002e3f5f8777
+EBUILD bc-gh-5.3.3.ebuild 497 BLAKE2B c1647a217b72b8de743428a4fd22ae84b24c17ec2335eb8a54e87daa736a89063b3f8732f8f25ee6333563f21f9a9c249f94a6624f640a80e636baa74c21a7c1 SHA512 2f59b10d1358879b75149cf1661c68629d9523c45e54195d87dab1fea16584842c78763975487da9f54b8b71f2f69205d835795ed81cdbcabf8942abe438c887
 MISC metadata.xml 972 BLAKE2B 3246d762ce2c9c182efd7aaf1595cde2fddf6d81c59f88f9105443585b4b15fc9fcc583b5b767c3022b96fe8639ca679fa0ea76beb36e0bacd4fc0103e3a103c SHA512 a5400b2c288574c75c9598be449ddfdc878e047261388512cdc95b9077ec9e605471438c253551fde37c8b78918716e3523893aeba091db6d389b92184215f13
diff --git a/sci-calculators/bc-gh/bc-gh-5.2.0.ebuild b/sci-calculators/bc-gh/bc-gh-5.2.0.ebuild
deleted file mode 100644
index 47aaece3ed37..000000000000
--- a/sci-calculators/bc-gh/bc-gh-5.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Implementation of POSIX bc with GNU extensions"
-HOMEPAGE="https://git.yzena.com/gavin/bc"
-SRC_URI="https://github.com/gavinhoward/bc/releases/download/${PV}/bc-${PV}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-S="${WORKDIR}/bc-${PV}"
-
-src_configure() {
-	EXECSUFFIX="-gh" PREFIX="${EPREFIX}/usr" ./configure.sh -GTl -sbc.banner -sdc.tty_mode || die
-}
diff --git a/sci-calculators/bc-gh/bc-gh-5.1.1.ebuild b/sci-calculators/bc-gh/bc-gh-5.3.3.ebuild
similarity index 91%
rename from sci-calculators/bc-gh/bc-gh-5.1.1.ebuild
rename to sci-calculators/bc-gh/bc-gh-5.3.3.ebuild
index 47aaece3ed37..24dbaeb6c44c 100644
--- a/sci-calculators/bc-gh/bc-gh-5.1.1.ebuild
+++ b/sci-calculators/bc-gh/bc-gh-5.3.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Implementation of POSIX bc with GNU extensions"
 HOMEPAGE="https://git.yzena.com/gavin/bc"
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 3f945bfe9c8e..940b6c47a807 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index d60e5fbcab11..f54717ce7ba0 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,12 +1,10 @@
 AUX cmake.patch 699 BLAKE2B 64edc9a3e51952ca5e15488a4fa148028d77bbb3a294937d9df263e8f0d78c59e6d2a40574534aa12911d79b8871901ff5fd16af236f32f0e580b7e86a3f8198 SHA512 95693482c14ddbc759af20c7ef30d1660e8630b21cf52d15ca14e8ef08d3631483c736e67423e2cabf1a8c8b834e8e25ece8a7bd15f71b38853b71d2fdcbce8f
 AUX ffmpeg4.patch 619 BLAKE2B 365911baabf0c5a0788e1a964aea75d04749bc6874a696104ed47f7d9c017cb31d0c11294481768ceb3f0c8c139256b0876d5266594cf780954533395ead7034 SHA512 3055895af8a651dc7cac24c4a7258adbd29586a1411178ca7eb7420b8a0897cb6fc9d89dd42a41221b12a79e34757d82071c2841d77ecfeeeb42d60b9a4e8210
 AUX ffmpeg5.patch 5512 BLAKE2B 8bdd4e447fb825cd0a5cd1b2d56503803fc6cda2c8cab568caa604d6f9acaaae3b998b61cacfb275ff8ddb9c484b4ac3d40409b0f56f878437a1332477b6be75 SHA512 bf927c2eec9a6cbc373355c5535bce63618fa29def46c1357172fd45e8229eb122e680e3f7ca01012cc4b9eb49d9c254e302ea42350d3c79a4d44b4ac802235c
-AUX qwt.patch 555 BLAKE2B f959e84dc5e144fd3dd35e6e6c7714507e1a4815495d41611198381165e386d135d334c4f3cb2293592abca72bbb16307b2e5a17d5903d4899c7fa2cd1790d5a SHA512 9a1138acd9bd5ce75a709d50dd585a17ca7d913d4cf37283d8db68e79fd08bf98ddd27ea5d2e459efac0a71df1369c83a67f6727419c0d26c0dd02f5a6ce22b8
+AUX gv.patch 511 BLAKE2B 85011a38aa5f749a152ab725469d96a4cf3560fa655f69af55de0ac9b4a2125efaa3cdaacf7ec5c99351e345c90686dee0ee7dcfa8ea8d4ba8c39c8a764bb33d SHA512 7b3a8fea65ec47ba0d159435c73eb69b12835394c614bf37f95e183a450b446cf93a834dd3cecb28b6571d974ebfb8ac2dcff29b33ce5c454325ecacca030a26
 AUX qwt2.patch 592 BLAKE2B 77c1f9ffa4e1754d8f6bcbd7eff2dfa470abb2c265fb44a4d8a652d0be85b0f337fea7c8786b1f52ecf285a1b78d61238ce61a0d28ca2895d21b700ed3890585 SHA512 16e0c25c13985badc1f4870e02d35d9d72c3006abcc8ae736327b88b15323c2c52892a3d76c5a745b46f512b5f2b2bebd70e390bec2515d954a47e4a08c94792
-DIST gazebo-11.10.1.tar.bz2 56483769 BLAKE2B 9d0aa1d8c21065fddc28d706632cc7bd1b8a3429c606ff51dcbe4657ec41fdfe60e2906dfd5efdcd8d6f1847694d8419957b386bc40aafac739e3277b7c577ab SHA512 ed78aebf0d53a7848dd0900f96082ae508f64bc8fe53277859b32880147643a1b1ff9c273cddfd9e34e8ec4ec53f93d13ba74f3edca16fdcf5e2a040509c5dc3
 DIST gazebo-11.10.2.tar.bz2 56496495 BLAKE2B 09bf370531214e9567d961445797cb50c9e5a81a405720c580d13e6b33029a63dd2cd9930dcbd239c1bf9091a9d5b092bfdef77b0b3524d281a10549e22e7c9a SHA512 8900c483f63cedb8543cfe718b336e3ec372fc0dc3d47ac9cd5378987fae634f16911d3c91fdf70add93b4a090e92f3558beec6c1277e1ba109652dcaf049ac2
-DIST gazebo-11.9.1.tar.bz2 56472954 BLAKE2B c7a1c3c4a03112a90e8a0cb35dde32f5bb478dafb0d8c582d8cbad15ff1f43699782df3d69a75c47efec44d8a15ad96730f1ae9c1b5b0b1ff2099fbc6b8f2e4e SHA512 51af82305ef0758950e2752624cd98bd31abe55469a1cad6432b1edde1a8f896798a554c672f8694c080f7076d13fe1aa91b182227e26f04cb99e9e0f3907694
-EBUILD gazebo-11.10.1.ebuild 1970 BLAKE2B 36e71e0bf16f643a997d56d8a83235e33d336b70cd1951fe4b14c3a8ec80109f2ea61b25ddb3c1f2c368e1cda088c161d7bd5d968fc962523e935dd2f33ac57c SHA512 d889a779064d00ba0ad9e8070ee7946a4086be50689e95218ed2ed6037084218d011f3d49ea0e2ed6d7815c10fa48204b9e46b8afb8014107c70cafdf4337625
+DIST gazebo-11.11.0.tar.bz2 56505651 BLAKE2B c3f63a1ee128fd86be914ba9ad7567d0adf337d82772184bbc362373083ad2b79f1172998182a70faf4127fe6f5996d6946e79927c40a384ac5e0eef3b7799c9 SHA512 f9062a54ee4e252219a246124ad0a22570e12f34f7bced8910a14b96541b16337efbba0f824b0ba70adf91d41acfc407eb0cdb19bbd7272151ef9723acc48882
 EBUILD gazebo-11.10.2.ebuild 1958 BLAKE2B 98a891f8f0b9e1cbee1591f4077fa363b09bd85551eafac5d10ea7f6d191efb823bcb7dfbde5ae8a64752ffb4da9eb3b134296f7b96861bc69fb7fa3883128e3 SHA512 d3996a65b59ce87b1aa970219a76b7c70602ceb76ff9caf45b4d276de812bd6b2e1056354036e51cce2bcd8927b0906bd68516f0951baee25a06967b359a31ec
-EBUILD gazebo-11.9.1-r1.ebuild 1912 BLAKE2B ab1806c0767335f5d3d51f9bf1832cb7e75c44c9ad47560153867167451019d1b296fce5a7c66cb4d1db7379b59970f3612f2b180ecb2a3a963b64e2389b152f SHA512 77e581310235fcba1f4e140d44b0525ba2fd5a29aa0810c9013937defe94cf75cb9a1560544f86a8c35db8de1bb01c29ed75931d6e2a46a387a7b756fdd58b56
+EBUILD gazebo-11.11.0.ebuild 1928 BLAKE2B 48f11a9bea7cf6cfcbbab65ab77119c1654a8b344e6519046b471bbd0c98428a85ecd205f6b72fa77800c4ba12ec4b6f7ceb492eb89975076f1068a9b19b7ab8 SHA512 3898a68d523092af1d174ae2c889b669a7d028940df35c0dfd767537c439a261b503c5436657225e623ff48da67688a361d65be2073984b3c8b80f3868ef90f9
 MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af
diff --git a/sci-electronics/gazebo/files/gv.patch b/sci-electronics/gazebo/files/gv.patch
new file mode 100644
index 000000000000..7afa786f4774
--- /dev/null
+++ b/sci-electronics/gazebo/files/gv.patch
@@ -0,0 +1,13 @@
+Index: gazebo-11.11.0/gazebo/gui/qgv/private/QGVCore.h
+===================================================================
+--- gazebo-11.11.0.orig/gazebo/gui/qgv/private/QGVCore.h
++++ gazebo-11.11.0/gazebo/gui/qgv/private/QGVCore.h
+@@ -96,7 +96,7 @@ class QGVCore
+       Agiodisc_t memIoDisc;
+ 
+       memIoDisc.afread = memiofread;
+-      memIoDisc.putstr = AgIoDisc.putstr;
++      memIoDisc.printf = AgIoDisc.printf;
+       memIoDisc.flush = AgIoDisc.flush;
+       rdr.data = cp;
+       rdr.len = strlen(cp);
diff --git a/sci-electronics/gazebo/files/qwt.patch b/sci-electronics/gazebo/files/qwt.patch
deleted file mode 100644
index d4f1538900bc..000000000000
--- a/sci-electronics/gazebo/files/qwt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: gazebo-8.0.0/cmake/SearchForStuff.cmake
-===================================================================
---- gazebo-8.0.0.orig/cmake/SearchForStuff.cmake
-+++ gazebo-8.0.0/cmake/SearchForStuff.cmake
-@@ -758,10 +758,10 @@ find_path(QWT_INCLUDE_DIR NAMES qwt.h PA
-   /usr/local/lib/qwt.framework/Headers
-   ${QWT_WIN_INCLUDE_DIR}
- 
--  PATH_SUFFIXES qwt qwt5
-+  PATH_SUFFIXES qwt6
- )
- 
--find_library(QWT_LIBRARY NAMES qwt-qt5 qwt PATHS
-+find_library(QWT_LIBRARY NAMES qwt6-qt5 qwt PATHS
-   /usr/lib
-   /usr/local/lib
-   /usr/local/lib/qwt.framework
diff --git a/sci-electronics/gazebo/gazebo-11.10.1.ebuild b/sci-electronics/gazebo/gazebo-11.10.1.ebuild
deleted file mode 100644
index 3291c74fa777..000000000000
--- a/sci-electronics/gazebo/gazebo-11.10.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A 3D multiple robot simulator with dynamics"
-HOMEPAGE="http://gazebosim.org/"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/11"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/protobuf-2:=
-	virtual/opengl
-	media-libs/openal
-	net-misc/curl
-	dev-libs/tinyxml
-	>=dev-libs/tinyxml2-6:=
-	dev-libs/libtar
-	<dev-cpp/tbb-2021:=
-	>=dev-games/ogre-1.7.4:=[freeimage]
-	<dev-games/ogre-1.10
-	>=media-libs/freeimage-3.15.4[png]
-	sci-libs/libccd
-	>=media-video/ffmpeg-2.6:0=
-	sci-libs/gts
-	>=sci-physics/bullet-2.82:=
-	>=dev-libs/sdformat-9.1:=
-	dev-qt/qtwidgets:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-libs/boost:=[threads(+)]
-	sci-libs/gdal:=
-	virtual/libusb:1
-	dev-libs/libspnav
-	media-libs/freeimage
-	sci-libs/hdf5:=[cxx]
-	sys-apps/util-linux
-	media-gfx/graphviz
-	net-libs/ignition-msgs:5=
-	sci-libs/ignition-math:6=
-	net-libs/ignition-transport:8=
-	sci-libs/ignition-common:3=
-	sci-libs/ignition-fuel-tools:4=
-	<x11-libs/qwt-6.2.0:6=[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-	x11-apps/mesa-progs
-	test? ( dev-libs/libxslt )
-"
-BDEPEND="
-	|| ( app-text/ronn-ng app-text/ronn )
-	app-arch/gzip
-	virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=(
-	"${FILESDIR}/qwt.patch"
-	"${FILESDIR}/cmake.patch"
-	"${FILESDIR}/ffmpeg5.patch"
-	"${FILESDIR}/ffmpeg4.patch"
-)
-
-src_configure() {
-	# find OGRE properly
-	sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
-
-	local mycmakeargs=(
-		"-DUSE_UPSTREAM_CFLAGS=OFF"
-		"-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
-		"-DUSE_HOST_CFLAGS=FALSE"
-		"-DBUILD_TESTING=$(usex test TRUE FALSE)"
-		"-DENABLE_SCREEN_TESTS=FALSE"
-		"-DUSE_EXTERNAL_TINYXML2=TRUE"
-	)
-	cmake_src_configure
-}
diff --git a/sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild b/sci-electronics/gazebo/gazebo-11.11.0.ebuild
similarity index 92%
rename from sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild
rename to sci-electronics/gazebo/gazebo-11.11.0.ebuild
index f34484f385e7..27daf4976fd8 100644
--- a/sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild
+++ b/sci-electronics/gazebo/gazebo-11.11.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-libs/tinyxml
 	>=dev-libs/tinyxml2-6:=
 	dev-libs/libtar
-	<dev-cpp/tbb-2021:=
+	dev-cpp/tbb:=
 	>=dev-games/ogre-1.7.4:=[freeimage]
 	<dev-games/ogre-1.10
 	>=media-libs/freeimage-3.15.4[png]
@@ -32,7 +32,7 @@ RDEPEND="
 	>=media-video/ffmpeg-2.6:0=
 	sci-libs/gts
 	>=sci-physics/bullet-2.82:=
-	>=dev-libs/sdformat-9.1:=
+	>=dev-libs/sdformat-9.8:=
 	dev-qt/qtwidgets:5
 	dev-qt/qtcore:5
 	dev-qt/qtopengl:5
@@ -43,13 +43,13 @@ RDEPEND="
 	media-libs/freeimage
 	sci-libs/hdf5:=[cxx]
 	sys-apps/util-linux
-	media-gfx/graphviz
+	>=media-gfx/graphviz-4
 	net-libs/ignition-msgs:5=
 	sci-libs/ignition-math:6=
 	net-libs/ignition-transport:8=
 	sci-libs/ignition-common:3=
 	sci-libs/ignition-fuel-tools:4=
-	<x11-libs/qwt-6.2.0:6=[qt5(+)]
+	x11-libs/qwt:6=[qt5(+)]
 "
 DEPEND="${RDEPEND}
 	dev-qt/qttest:5
@@ -63,8 +63,9 @@ BDEPEND="
 "
 CMAKE_BUILD_TYPE=RelWithDebInfo
 PATCHES=(
-	"${FILESDIR}/qwt.patch"
+	"${FILESDIR}/qwt2.patch"
 	"${FILESDIR}/cmake.patch"
+	"${FILESDIR}/gv.patch"
 )
 
 src_configure() {
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index b0191b583d2f..5d1ceedb4258 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 8c7404c0f3e2..ff47d8b89fea 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -14,5 +14,5 @@ EBUILD hdf5-1.12.1-r1.ebuild 3468 BLAKE2B da5ba395f8971076a6a3186332f94446dadc7b
 EBUILD hdf5-1.12.1.ebuild 3144 BLAKE2B 2bd023c0ade920fc795f4434260318095a34b200ddb6a458a6ee7d647fac79d4e31029f93a0d2aafede8682e515a9f9c9db46b5a976f07cd83d5086f77538079 SHA512 10ce8493fd3fa421d8c71267e7c57adaac490244742ed93166ce634f5b956b392efb3b86814c17ad8bfba3347c4e3be54b5688b8eec3af848f1d13c341bb8bcc
 EBUILD hdf5-1.12.2-r1.ebuild 3389 BLAKE2B 536c7a51533849c8b19f2a086b35352a9a845d89417ba10464ef53b0ee444fcab2fec0e369d5bdf9a1aa4746c0f004726200db1b60b67b3876eb425504d6d173 SHA512 1ccc6ce4ca8712bdd39d79e5acd82886a592d0578f14162ed374675e9bfcd2e8fe838354acea030298b340c9fac22f250913e205a9e943a4919237c0603766cc
 EBUILD hdf5-1.12.2-r2.ebuild 3456 BLAKE2B d59c684d4494e7f7f484dc87297ef1465998a8f9d75c2cf268e1d689353fd5e092c27dd0a61907ffe11cb35c424e2f9e972a7e3770f0938808bd704cdeca7961 SHA512 4e0b609458298ab12214aa68bb298063d35f64c12c4eff0cc656546b930dce5cc5891e9cdd6d030f7d616aa4ca13386dbbb020970cbea6d939bbe2356fb310ed
-EBUILD hdf5-1.12.2-r3.ebuild 2894 BLAKE2B 06d7deecc32f4918077f206b01819623ec95f3cc9c5cef485481ba84e9430e56149164482c136cb1326d247d73acd8930a67e5fa42cdeaf886e70a4f784b8320 SHA512 80dfc6597292cac4bcead6d855f72055f2d15b3667dccca4acf33e36cd87c536358b83275e79ff8f9c24d916e05e3398e77f2dcbaa7b46e774d7d872615e12fb
+EBUILD hdf5-1.12.2-r4.ebuild 3122 BLAKE2B a05e92c972418eb029d0f39e7b30a8892cf79f5cb7bbd53a2e8b36324ace6678213a7a9f317a8be58cdb93ae32cc95d8b7636f5a99c1b118c408da3828008970 SHA512 3adfe26a3fd32fecf557de4e0d94efd1109052ea7acd685ed062d3e07dda5996633889ef9faef1d15e12e213075455877dcf7441cbd56744cdc1ac40c1fc3a5a
 MISC metadata.xml 935 BLAKE2B b9195ac707556cdb2ee2c4d032fabd88aad674ad4fa52a60fbeb31c47ae51b9511bb097d4271d19b05d1dbc3b59b3cafb3b7d407bd9b8095bfd449fa8728ab6a SHA512 57c4694ea2c024c7babdf34474a61b92165b6c322fa11ec7fefdf16d66b44f91f66d63eeb355311b121fbeec8da810e393e3e785a4c434ff658c7b4bd7baf22b
diff --git a/sci-libs/hdf5/hdf5-1.12.2-r3.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r4.ebuild
similarity index 92%
rename from sci-libs/hdf5/hdf5-1.12.2-r3.ebuild
rename to sci-libs/hdf5/hdf5-1.12.2-r4.ebuild
index 1a00c0b61e8b..dc668a1d721d 100644
--- a/sci-libs/hdf5/hdf5-1.12.2-r3.ebuild
+++ b/sci-libs/hdf5/hdf5-1.12.2-r4.ebuild
@@ -105,4 +105,9 @@ src_install() {
 
 	# No static archives
 	find "${ED}" -name '*.la' -delete || die
+
+	# Remove "perf" executable due to file collisions with dev-util/perf.
+	# Previously with the CMake build system we only installed h5perf, so
+	# let's simply remove the file for now.
+	rm "${ED}"/usr/bin/perf || die "rm failed"
 }
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 1547900ffab5..4b40144b57c3 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index c35c8d311aa9..16c5f797f363 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -11,5 +11,5 @@ DIST pspp-1.4.1.tar.gz 7848393 BLAKE2B c9232aa3d4905d4be54ae993db6a4b37b3696c748
 DIST pspp-1.6.0.tar.gz 9553836 BLAKE2B 4c12003838d7f6c3613d76626d88b24f4dac4b6f507db54b03be5f09027472704ae8ee6ce44d8756c7cd1e12a65ab836cb1f7d004220df8da47f47af85c4a771 SHA512 c8b746b9ea802a95f048e377b22d723701c5e532358aa3e4993edcc73046c4823c440dd988833b69b4ea84ac6b02a442db7daac415bef4c1081efddd9857982d
 EBUILD pspp-1.2.0-r1.ebuild 2307 BLAKE2B bcb43ec5798bce0ba6c35375153f67a652fafa0d7534d182f9f771fdbe11cedceb318753bbb9b323200104c49a8dceaf89e9d0acc774707a80372c669df0cb8a SHA512 13c90965bedb3b18498f79ebd4e785bce6254c25b56a51bdb7f36c58f2c082c9e335f584edd0365c39da43700c59a9b08a489651cc9836ce19684ccfb8e5fb38
 EBUILD pspp-1.4.1.ebuild 1885 BLAKE2B 0094e1923dc639d9e03509b66cf8c8292bf959220f94065f2c0e9c44fda4bc9e9a15e3976cccfef24cf1ef3dad2f254780bdcbba3d7fead2fb8d9c5590de61a5 SHA512 668d3070ac16d94bc999de0ff355e9354bcfc6ce5553b9ac5ea46cb1ff509c9cdba4a40956e65758b284140541a34cd62cc6b14e30686391f664cfd9a6edc270
-EBUILD pspp-1.6.0.ebuild 1684 BLAKE2B df90b513f751621b0c3a049d2ab005340bc31f9bee7b6918f588a6eabd005a6fea5db727296bd8b21f2f608fd24732365c83a7929bfcf46a590496bf2ac95c42 SHA512 1c518d99c6acb17ed8cad344b0125d6d2b11876ea42de3e022dc3c2385baa0f7cd83c3032e0e2eb635c7430fbfa0a010984b9db0e714ee63699fc0719fe31982
+EBUILD pspp-1.6.0.ebuild 1682 BLAKE2B 8d60867a775e2edcf50999c14503208138d9c5f19074c7baaf68d4ef18ccb6abfd17360b77e0a582c8664087e5652453f6237f05a6ff53dbfd5673fd218dd3a7 SHA512 63aaca9e0197a9b5e48739f871e186047fde79ab612ed41bd6407d4048906ead5a4214a49ee23e527598a1066ead30835506c23cd1fc1f6baab8d11b40442c12
 MISC metadata.xml 712 BLAKE2B 63bb6ce6a7465796361c98191ff057fbc335d5f2494f279a52ed2ebbbafb765364cb5efafe82c5d687f4dba5a162fa9a12b42bd5fe1cd093e39554383564c556 SHA512 4aa1baf360b95156198a0bf18c10db0f5f5d78d7745f5ff29c71cb3871ec810d9f9da3fd3dc9279ff83620bd05afed9b57f18f8483a1b3860cd9e23d32a9e9be
diff --git a/sci-mathematics/pspp/pspp-1.6.0.ebuild b/sci-mathematics/pspp/pspp-1.6.0.ebuild
index 0fcce2c4be8d..886cf3d5f542 100644
--- a/sci-mathematics/pspp/pspp-1.6.0.ebuild
+++ b/sci-mathematics/pspp/pspp-1.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples gtk ncurses nls perl postgres"
 
 RDEPEND="
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index a5087ac4eeab..8ed0226d43f3 100644
Binary files a/sec-policy/Manifest.gz and b/sec-policy/Manifest.gz differ
diff --git a/sec-policy/apparmor-profiles/Manifest b/sec-policy/apparmor-profiles/Manifest
index 147c2dbd0dfb..e96ff17035e2 100644
--- a/sec-policy/apparmor-profiles/Manifest
+++ b/sec-policy/apparmor-profiles/Manifest
@@ -1,7 +1,5 @@
-DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
-EBUILD apparmor-profiles-3.0.1.ebuild 620 BLAKE2B 307cbe904ff2dcc267dab13b478c89cbb449c3eeeb4d4e3fc972c1ce3abf6ae8e86d3eb66fa9926f9856d3357ea0f0a0ca11d9fe5c33a0b1637a2910b1586011 SHA512 c334bb3c8b135a46a58db08f16dd9a9532c79d6f29e3d960263792243d412322d95676722db10ce752fd5f0faccd5cdc25e765d8615fd65a6b4af5b388b04fe9
 EBUILD apparmor-profiles-3.0.3.ebuild 619 BLAKE2B 9ecd10e83dc7bcfe419090b883a22b8dab2f55588dad44d1c4f88229aed9ab9cb706d3403a9828dc265ac0178f0564de52523d9dc4e15aa0d313e5d42be2d779 SHA512 7ff6ebf876e2148d0d75adfa9cb2702a623587adb2935003010adfb7ec7d09de8a402b83b1bd5dcab52a4126dbd36e3b6b07d2701aeef08365d979b396a881a1
 EBUILD apparmor-profiles-3.0.4.ebuild 620 BLAKE2B ae90a9a81c56885d7ffc87bd7edf63b74212e4ea4928f2a3d92553c111b743b1137754947faf220569cddc590d01d9539ad9d5e3120dedff8f1e1f9c9e3241c5 SHA512 4e6462626b2411cce46c6a64645ee07236a6b353e51792b9e6870768d26c10ea967b4ca204bd4fe950030cb7c3858d6ff8ee12acd98c34495115145665a14369
 EBUILD apparmor-profiles-9999.ebuild 731 BLAKE2B 21d9b23294a71fcb480aba7c64f33a133038a3171b6c4bd3999ea30489788def582d9ab1cdde85424753d0c66280488fc2c88421222973405efdcaaad7faa030 SHA512 8ebe8207d72e3b06bf32cafa49e78e52b29a9d4fcae3fcfb87c605281ebf88e836317957635691d440a069e30705e44d9f51abe636069eb79483b2091f23da62
diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-3.0.1.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.1.ebuild
deleted file mode 100644
index 2231d39bbf24..000000000000
--- a/sec-policy/apparmor-profiles/apparmor-profiles-3.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="A collection of profiles for the AppArmor application security system"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="minimal"
-
-RESTRICT="test"
-
-S=${WORKDIR}/apparmor-${PV}/profiles
-
-src_install() {
-	if use minimal ; then
-		insinto /etc/apparmor.d
-		doins -r apparmor.d/{abi,abstractions,tunables}
-	else
-		default
-	fi
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index cd24bde94141..9b6f2b9a8490 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 74428bcef15d..7fd694e31cfa 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,7 +1,5 @@
-DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
-EBUILD apparmor-utils-3.0.1.ebuild 2270 BLAKE2B 2f634eb96254e823dd57e77b41b756dc330914e238876bc54586452d1b215b0b46f27092bd3677f4768c20765ad9132f8578da01f9055409149b6741757757af SHA512 1be4dd0bd8adf724cb48757c3005622c8a58a07655628b4c296dbfc7aa39c9941f30780903a27dbd4f5900d5702799dfc36371df7844cace317903938fdba28b
 EBUILD apparmor-utils-3.0.3.ebuild 2264 BLAKE2B 6e929919d318c0f9ae00dee5a01a27f7fe5a3c1ee020a66d2153fb6755ee74bb6d922e4eb6dafa6145c9051ca7ac23f8ebb17eb360784fd8945dc1d466deacfd SHA512 2a9fe806c3091c1e27d3a792f6c890a33e049639892a54945d743c395bca1c0c2c58ac013e2ed4d3b8f637c8814567a132a103362f9dbdd3becadd2bb353eb43
 EBUILD apparmor-utils-3.0.4.ebuild 2265 BLAKE2B 191c173a77ce2d94cad20703a7e35ee1b5080a17d1f2176b47c9057ffa9cf03fd1bf06d180a5cca0dc73c22454fb0708bb0c434b3b1463cce5b3cb284332a4ef SHA512 2e06fbe024337c8f7146374882f3cef9e22e4df010f3e64485e283d03bbe103df6c6f2239e1771f4749022ee65c8fdb8d7e92f3fdf60377cd33d167901abb3fd
 MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
deleted file mode 100644
index a60091bfffbc..000000000000
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-inherit eapi7-ver perl-module python-r1 toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-lang/perl
-	~sys-libs/libapparmor-${PV}
-	${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
-	~sys-apps/apparmor-${PV}
-	dev-perl/Locale-gettext
-	dev-perl/RPC-XML
-	dev-perl/TermReadKey
-	dev-python/notify2[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	virtual/perl-Data-Dumper
-	virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-src_prepare() {
-	default
-
-	sed -i binutils/Makefile \
-		-e 's/Bstatic/Bdynamic/g' || die
-
-	sed -i utils/aa-remove-unknown \
-		-e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
-}
-
-src_compile() {
-	python_setup
-
-	pushd utils > /dev/null || die
-	# launches non-make subprocesses causing "make jobserver unavailable"
-	# error messages to appear in generated code
-	emake -j1
-	popd > /dev/null || die
-
-	pushd binutils > /dev/null || die
-	export EXTRA_CFLAGS="${CFLAGS}"
-	emake CC="$(tc-getCC)" USE_SYSTEM=1
-	popd > /dev/null || die
-}
-
-src_install() {
-	pushd utils > /dev/null || die
-	perl_set_version
-	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-	install_python() {
-		local -x PYTHONDONTWRITEBYTECODE=
-		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
-			--root="${D}" --optimize 2
-	}
-
-	python_foreach_impl install_python
-	python_replicate_script "${D}"/usr/bin/aa-easyprof \
-		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
-	popd > /dev/null || die
-
-	pushd binutils > /dev/null || die
-	emake install DESTDIR="${D}" USE_SYSTEM=1
-	popd > /dev/null || die
-}
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index dbc43cd2894c..cd7d6046df48 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -4,10 +4,8 @@ AUX apparmor-init-1 1235 BLAKE2B dbc333d8a90ec66303594db87b1865488813ad6698a3bcf
 AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86f354126fd044e2da316303b3ba63ad6dbc747d59d423ea8e4df0f131090d0d7b405e0d303b3c32a71 SHA512 f6ba92053a93db0654a4290eb358afae4d7669cb89a02242544576d951fe57437c3570d92ac89ce4e9fd96c04c121f44523dd6bb136d58fea11424064375df31
 AUX apparmor_load.sh 84 BLAKE2B 05195286287d5cdf56a7f67e18073f75625cbfb1c9283a22c72ff60aa4a3fe4129b81702801ddd4045629558a022f084906464f8bb5325f31d43680c626a5ede SHA512 72bd10fdd32879854ee044941636d530453488596bab7aa6785b109f6cd7e2f822e9ff04b43c7c4265b2f42de13ec7f6649f9a58fed3d93b51dd1a2b541be3d7
 AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f30aeddeba29bce2e1896126e8e4c82b41dd403f94d3f8ae9128448b0c5431c418ff82fd65df370653b5 SHA512 18a46176d043511af33fc77917e85dce5cb5deb30d2d86ea5261313a72c385b96c87fcd1fece9e555b6c424305d420876430a0a8fb11a5ec5edfef30f80dfd8d
-DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
-EBUILD apparmor-3.0.1.ebuild 1737 BLAKE2B 3fbdc0897be4dba7cde237622448ce7f3678a35dcce054854a9f13c734d5eb79214928b6a452f517e438174eeac165d84686befdad4a9a82261a53eacdb68247 SHA512 40e9a056910756f9c34cad803a69da2700589a095cc940c58c155ce7efeb7eca4189921e6d031755d4272727aa2c86aae9fc1c95e4ec92efb128dc0fa7fc5998
 EBUILD apparmor-3.0.3.ebuild 1737 BLAKE2B 88cc50798024505f5881cd0f4435a26af3f9aa05ee6ab9c52412a46c48e6123f15371c47b521f98c25f586de8114c530d84097e47cd23cd32b3c4646baf5e9bb SHA512 5761aba7122404eb5e0e8004176e1061e7e97b533f9fc388eb6f9baab81d70c8e2f1cf5c653faac38e702666cd625c3e598e740d41911c488378552b11955042
 EBUILD apparmor-3.0.4.ebuild 1832 BLAKE2B 8f24f750584000b1aa2cb55f5047e90199206370dac66a676203942882f3b59e4bdf3310caff39454ce58d27e2f1690a8d39f7987e8d67f611c08bf5155320fa SHA512 d8b119a8f3977f4442125b94870137c25fae4d61cb4943552dc649a056a3e4496aa0c945e8162abfba2cbb9ab4fba72879c99335190185cbf7c347177409e269
 MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef
diff --git a/sys-apps/apparmor/apparmor-3.0.1.ebuild b/sys-apps/apparmor/apparmor-3.0.1.ebuild
deleted file mode 100644
index 5dd3f3e6c2de..000000000000
--- a/sys-apps/apparmor/apparmor-3.0.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="doc"
-
-RESTRICT="test" # bug 675854
-
-RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/gettext
-	sys-devel/flex
-	doc? ( dev-tex/latex2html )
-"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-makefile.patch"
-	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
-)
-
-src_prepare() {
-	default
-
-	# remove warning about missing file that controls features
-	# we don't currently support
-	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
-
-	# bug 634782
-	sed -e "s/cpp/$(tc-getCPP) -/" \
-		-i ../common/list_capabilities.sh \
-		-i ../common/list_af_names.sh || die
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CPP="$(tc-getCPP) -" \
-		CXX="$(tc-getCXX)" \
-		USE_SYSTEM=1 \
-		arch manpages
-	use doc && emake pdf
-}
-
-src_test() {
-	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
-}
-
-src_install() {
-	emake \
-		CPP="$(tc-getCPP) -" \
-		DESTDIR="${D}" \
-		DISTRO="unknown" \
-		USE_SYSTEM=1 \
-		install
-
-	dodir /etc/apparmor.d/disable
-
-	newinitd "${FILESDIR}/${PN}-init-1" ${PN}
-	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
-
-	use doc && dodoc techdoc.pdf
-
-	exeinto /usr/share/apparmor
-	doexe "${FILESDIR}/apparmor_load.sh"
-	doexe "${FILESDIR}/apparmor_unload.sh"
-}
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 9899ff1e74a0..fc8eef06660d 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -3,6 +3,6 @@ AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334
 AUX pciutils-3.8.0-no-which.patch 1207 BLAKE2B 6012046e4d0831e5a20b351e43bde4c1450c076989ed42741eac76510e2bc279940c80a04d978f6947878adca3140f5fc205615540871eefc9d62a68482fd4fa SHA512 240bb7142f5af044a8fdac96fcc63af7938b1e7f5f3d1689d213df09e71c1d6da84d1d1ee421511fa4c07f212e5605485c1f5ad8ad30052d181f0020e256d387
 AUX pciutils-3.8.0-pkg-config.patch 691 BLAKE2B c12a6a6f19a62d5d161479e401f5bd9e373821fb72648c6ef0d9a49312a0ed930e790a9153eddadfaca28b8c0c330166c915c43d9439e1163a385defa08760df SHA512 d616aadc83c40cde4f8e0261ad0a99259d5b66bf32c7db3f5b47cd0981b27ec93ff5547b1927806e3b045ac61d884cd5eb96e4ff58955b1881616056a95cab4c
 DIST pciutils-3.8.0.tar.gz 575255 BLAKE2B 7339189f7115af31ccc19663d54e12ef966fbcd75c6b6b4c28c8ddcaafa3e233313ca14300ef70100edb00f5f2e1e767af9d6527a9d836edd07b598f0a40f4f4 SHA512 4b0de02a54c6ed19d5ea85a01d89a62386000bc0f816498872479aba26fb007a8c394cba3f95e77a7ffe52d36ad2726169b7b83bda5ab0647f00e49d8a34bf15
-EBUILD pciutils-3.8.0-r1.ebuild 4800 BLAKE2B c70d19800b2f730fd1e418e4d457c94c079e7a52fc68b7dd38579d31600b3ad1ffe1c50afe5dddaa18c4f34677695da0006e3d18e7004227202df65193d163ca SHA512 1fb14d96cdca83c42f9b281a219773fb2685edc5d8591e29f926171838f4cfe987c675f90579cce6769d235c30eb96e538439379441a2572cbec2b9db827d1f8
+EBUILD pciutils-3.8.0-r1.ebuild 4882 BLAKE2B a25f7136f8ed59963eca2c3a36e8be95fe007a5a84b1be136abaa63b1e0ef5b3c2911c825f49b91042099e8e1c45409ca6688d7721623cdc3b8d3295c17014e9 SHA512 4febe95aea85c906b361d876467f1ba68162101dce1d770c310d42516c506377bb0c20962c1d7c4ae120c9ab04a4403b516f41efa7f08c2f579ad6eecb1d0f50
 EBUILD pciutils-3.8.0.ebuild 4709 BLAKE2B f3954f5bf30d0fc063fdd27b7e1c6824ef396a8f922d5ed0b3180a1ea5036a6d04f79acfb863919f1f00466f6070e1f42338d89fa937fbf2b9318987bea4d7bc SHA512 dfacfe7264bacac6e00c252f20b04366a72cccb47f7629bd8dd12541be9d4daea82c0359f6407bbc566bbcef0d6f875de69bbdcf147506bf19080d2a347d0b98
 MISC metadata.xml 525 BLAKE2B 5a7a502d28b6e74db1f1f008adfc5d9c398fb7832c8c82e066c9d4834726a0cd1e97b9738ca21906468f3c2444f20bfcf715339a1314e34b2b43d4f5c631a659 SHA512 5e53a4261ea0aa0d58f7a16b5c8ddbc2e6bda130e49642a9dc220f39cd6a77b8fdf22c22fd7def106d4728b880b75371feea3d552981d03294b86b8cb7fd08c0
diff --git a/sys-apps/pciutils/pciutils-3.8.0-r1.ebuild b/sys-apps/pciutils/pciutils-3.8.0-r1.ebuild
index 59f4aa0192a4..1bf858cd8fbf 100644
--- a/sys-apps/pciutils/pciutils-3.8.0-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.8.0-r1.ebuild
@@ -81,6 +81,7 @@ check_binutils_version() {
 			eerror "Old version of binutils activated! ${P} cannot be built with an old version."
 			eerror "Please follow these steps:"
 			eerror "1. Select a newer binutils (>= 2.37) using binutils-config"
+			eerror " (If no such version is installed, run emerge -v1 sys-devel/binutils)"
 			eerror "2. Run: . /etc/profile"
 			eerror "3. Try emerging again with: emerge -v1 ${CATEGORY}/${P}"
 			eerror "4. Complete your world upgrade if you were performing one."
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index f3a9f659894b..cba3b490150d 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -1,7 +1,10 @@
 AUX pmount-0.9.19-testsuite-missing-dir.patch 1360 BLAKE2B 3a44bfe3de89169f5666886b9c192e0f530b3a3785c8a64fbfbdbbbc93331a9c74cbc19cab25ebcc0f5e3fb64d23348f1dd8deaf028545d444000a64d6a5b45a SHA512 3bc940550f59d62106c610d7846ddea09cab674b176cd7361848d283b0f19a0fda5573c6bafb99abe99c806651493ed07ac21f92d32f7dc30d0ccb77a4c1928e
 AUX pmount-0.9.99_alpha-exfat-support.patch 499 BLAKE2B 11045f138c9b20c03f39760d2da8c36600f1be539b2fdfba6e5ba9f97b953945fed7fd9d127ed0f1874cf9f36efe455c32a726e52bf8274c381da476a64e723d SHA512 d2b0024a73343646d688212749ef4e1b6b01f93e2e5059eb1a94b3e0a84a1c2491551c80d295fa62815e609c5f7c442920cfa832fa74a836904b6cef1048c847
+AUX pmount-0.9.99_alpha-limits-musl.patch 176 BLAKE2B 34e41d6c1b5e0a13db17ec5341cbc66a95a6e52f0edccace07f067655d7c72fe186203368941c4b5172c32b826e86becca25a50cb7fdde9ffc6d213029887ade SHA512 20d90921827b6bcc89dc8df01c2b83279c334d096b4f17591acf8d042d7813d6e16bcc7b3fa40feddfbc740fdc98d1c16e6e95359af8c3f40496e1ac8c3ab82e
 AUX pmount-0.9.99_alpha-locale-regex.patch 753 BLAKE2B a79805f883143f6beea9597ab88059e15ccde83d08ce69625c8c3387b419e46f8a6ea3c3937c17adfdbaeaa4dd5c3f9ad7aef8d67cc5dd406e79dbc250196c1b SHA512 423d52a372c7cdd73206a9001fcc717b50b834023130cc77e4e063ac2b62ae5c84698d127646e3658ae44e3a47f2c77522d007664cf0c4277dc49b47413c8563
+AUX pmount-0.9.99_alpha-missing-includes.patch 1522 BLAKE2B d1adc8c74fb67010df912eaa650f6d06fb0dab513edbcce403834b9679cb95c56681f6785bc1a8bdc306335c49339384e912de51550d062ef595733bda77bd97 SHA512 5457a641e5a40c90119d25d835757d7f4ed127cc36838715ddb6d957b83b3dddb5fb0357cfef7fe0b4b6133249476fc585a8d78cda1057debf9576c316df8ddc
 AUX pmount.bash-completion 2935 BLAKE2B 8d89d6098764dbbbddcdc45e3aaac377eb71ead5ca0ea3f44b9eda1dbe1573e3cde154d51b9486903c6fe104948af1ad29031837375953239956651efff7dfad SHA512 b57a37afc2a124c6a4f19924a367d03b315e93575d0b152acde06e43c7dcd1b3d5df46c02d2e5ceef35911edb4f96d1d4113fb6d7cd1e9531fd9840c3729f924
 DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 BLAKE2B a023d75623374186fb2de07bf1a41b01b2fc2570f9560b8bddec04441ffd083c6a0ece32b53db4e6067d181269f74cb7044f2c60bffece4b0e4c8dba9f1611b5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9
-EBUILD pmount-0.9.99_alpha-r6.ebuild 2054 BLAKE2B 6fd8f5a1d5a3f68636fa85c0ac07e2ad666694173e7d6712fe85c0b0caa8908c12133159c5d19b56972060eeb19b1e7f7966eb29690d734ba357e49d521190ee SHA512 dd24bfdbe6f7cd5e2d1ca844976d440ef0c76476c4c0808a689ba2fc607613b916dab12b091e7a29492e898bdb7bf2fc7d3a1aee719699a0285a79ff0136553b
+EBUILD pmount-0.9.99_alpha-r6.ebuild 2091 BLAKE2B 1765473acb740cad9ec5d9fd44f31b2742b82ff375156824cc7fb34b921b767cfa5887558e7ffedf04df3cd3afbfae78f3ff7a4ee4898768a38fad659fc4bd5c SHA512 93ea2e28487a0fd771afc81f0d413dbeaeb63d3337b849976b035efb4e3666f148cce9d9fd871991e2e4073c47910c23a962677919bec161b4e3ce31d638fc63
+EBUILD pmount-0.9.99_alpha-r7.ebuild 2274 BLAKE2B 11ade87d1a94362701f85ed5f243833b041bbfa85fed6d32cf7a9a02336a0de10056458f3bbf788e5ca93e89a192a6e33019072c846d831dee1c2da05e163af4 SHA512 3da339d0e774a8236f1b2317acebe6634f9dcc7c122319aafccdcb90bd3fb422bfa1d189d8f8288b147de9f764153a0d84b4b0e4a9470329bb5173792def1494
 MISC metadata.xml 435 BLAKE2B 66040336d89bbeae61ac4385f1744bff6cd3f0275efae4c57df0dc6a9a74a0594a046e25092b21273b83cd80ee86f29963702063ee3b9ef73a3f6d6ff9fd7289 SHA512 c1f52d17d0922fe6809259d0394453110c796e94114e348a70e32e5af134a843c7a4b2bb61ca67361a2dc1e8e7c41822cffe7118590b63eeb7afcd285816d341
diff --git a/sys-apps/pmount/files/pmount-0.9.99_alpha-limits-musl.patch b/sys-apps/pmount/files/pmount-0.9.99_alpha-limits-musl.patch
new file mode 100644
index 000000000000..af6a1ebc521d
--- /dev/null
+++ b/sys-apps/pmount/files/pmount-0.9.99_alpha-limits-musl.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/713422
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -25,6 +25,7 @@
+ #include <libintl.h>
+ 
+ #include <unistd.h>
++#include <limits.h>
+ 
+ #include "utils.h"
+ 
+
diff --git a/sys-apps/pmount/files/pmount-0.9.99_alpha-missing-includes.patch b/sys-apps/pmount/files/pmount-0.9.99_alpha-missing-includes.patch
new file mode 100644
index 000000000000..cdcb65ad822d
--- /dev/null
+++ b/sys-apps/pmount/files/pmount-0.9.99_alpha-missing-includes.patch
@@ -0,0 +1,82 @@
+--- a/src/conffile.c
++++ b/src/conffile.c
+@@ -22,6 +22,7 @@
+ #include <sys/types.h>
+ #include <pwd.h>
+ #include <grp.h>
++#include <unistd.h>
+ 
+ #include "conffile.h"
+ #include "config.h"
+--- a/src/luks.c
++++ b/src/luks.c
+@@ -13,7 +13,9 @@
+ #include "utils.h"
+ #include "policy.h"
+ #include <stdio.h>
++#include <fcntl.h>
+ #include <limits.h>
++#include <unistd.h>
+ #include <sys/stat.h>
+ #include <libintl.h>
+ 
+--- a/src/policy.c
++++ b/src/policy.c
+@@ -13,6 +13,7 @@
+ #include "policy.h"
+ #include "utils.h"
+ 
++#include <ctype.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+--- a/src/pmount.c
++++ b/src/pmount.c
+@@ -29,6 +29,7 @@
+ #include "policy.h"
+ #include "utils.h"
+ #include "luks.h"
++#include "loop.h"
+ #include "config.h"
+ 
+ /* Configuration file handling */
+--- a/src/policy.c
++++ b/src/policy.c
+@@ -33,6 +33,7 @@
+ #include <pwd.h>
+ #include <utmpx.h>
+ 
++#include "configuration.h"
+ 
+ /* We use our own safe version of realpath */
+ #include "realpath.h"
+--- a/src/pumount.c
++++ b/src/pumount.c
+@@ -24,6 +24,7 @@
+ #include "utils.h"
+ #include "luks.h"
+ #include "config.h"
++#include "configuration.h"
+ 
+ /* error codes */
+ const int E_ARGS = 1;
+--- a/tests/test_policy.c
++++ b/tests/test_policy.c
+@@ -16,6 +16,7 @@
+ #include "policy.h"
+ #include "utils.h"
+ #include <stdio.h>
++#include <string.h>
+ 
+ int testsFailed = 0;
+ int totalTests = 0;
+--- a/tests/test_spawn.c
++++ b/tests/test_spawn.c
+@@ -12,6 +12,7 @@
+ 
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <unistd.h>
+ #include "utils.h"
+ 
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
index e6a575c9f139..1d336844462f 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.19-testsuite-missing-dir.patch
 	"${FILESDIR}"/${P}-locale-regex.patch
 	"${FILESDIR}"/${P}-exfat-support.patch
-
+	"${FILESDIR}"/${P}-limits-musl.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild
new file mode 100644
index 000000000000..baad4714b833
--- /dev/null
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r7.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="Policy based mounter that gives the ability to mount removable devices as a user"
+HOMEPAGE="https://launchpad.net/pmount"
+SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV/_/-}.orig.tar.bz2"
+S="${WORKDIR}"/${P/_/-}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt"
+
+# cryptsetup is executed at runtime only, no libraries used AFAICT
+# but in DEPEND too as it's checked during configure
+RDEPEND="
+	acct-group/plugdev
+	>=sys-apps/util-linux-2.17.2
+	crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.19-testsuite-missing-dir.patch
+	"${FILESDIR}"/${P}-locale-regex.patch
+	"${FILESDIR}"/${P}-exfat-support.patch
+	"${FILESDIR}"/${P}-limits-musl.patch
+	"${FILESDIR}"/${P}-missing-includes.patch
+)
+
+src_prepare() {
+	# Restore default value from pmount <= 0.9.23 wrt #393633
+	sed -i -e '/^not_physically_logged_allow/s:=.*:= yes:' etc/pmount.conf || die
+
+	cat <<-EOF > po/POTFILES.skip || die
+	src/conffile.c
+	src/configuration.c
+	src/loop.c
+	EOF
+
+	default
+}
+
+src_configure() {
+	econf --disable-hal
+}
+
+src_test() {
+	local testdir=${S}/tests/check_fstab
+
+	ln -s a "${testdir}/b" &&
+		ln -s d "${testdir}/c" &&
+		ln -s c "${testdir}/e" ||
+		die "Unable to create fake symlinks required for testsuite"
+
+	emake check
+}
+
+src_install() {
+	# Must be run SETUID+SETGID, bug #250106
+	exeinto /usr/bin
+	exeopts -m 6710 -g plugdev
+	doexe src/{p,pu}mount
+
+	dodoc AUTHORS ChangeLog TODO
+	doman man/{{p,pu}mount.1,pmount.conf.5}
+
+	insinto /etc
+	doins etc/pmount.{allow,conf}
+
+	keepdir /media #501772
+
+	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
+	bashcomp_alias pmount pumount
+}
+
+pkg_postinst() {
+	elog
+	elog "This package has been installed setuid and setgid."
+
+	elog "The permissions are as such that only users that belong to the plugdev"
+	elog "group are allowed to run this. But if a script run by root mounts a"
+	elog "device, members of the plugdev group will have access to it."
+	elog
+	elog "Please add your user to the plugdev group to be able to mount USB drives"
+}
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 91e9c01402ee..0744abd9dcb3 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,3 +1,5 @@
 DIST s6-linux-init-1.0.7.3.tar.gz 58607 BLAKE2B 081c452761d96308b496e4ec3281c8b50d6cc1760b34d74647bd27cfef213e73f0cb1e1919c7d238242e8295c91a8fb3bf51638b1216e922516c71eb5718486a SHA512 ff4e1727f7d68ceb72db501de5abc36962b0083baef376899aefa4cd81420852c7966ca1c625339c052d205a28261cc928e87a2e5715854b5fcc4666c56eeff3
-EBUILD s6-linux-init-1.0.7.3.ebuild 1734 BLAKE2B 07dab4e8bf35369ed28fe1a0a6118495cc62144382e4da690eb375baff40b8e8671cd59599fac4d6fad4a8e85661617d0906984240eb3c0dcada1f6dedcbcf2d SHA512 f78e875df2c7e1c33a91c2809f2cbd051dfc38d796682532b4bf00949ac5de5240e8984a84fa124b191c0ebbf113b84993c6de65310a81d5d8fceb005fdbebf9
+DIST s6-linux-init-1.0.8.0.tar.gz 58732 BLAKE2B 15e90b1987729f4771ffd294d2a6b4738e0e2d3438c694c1739c6c8ff8bff3a3b9c31565f446e7387fda226b4f0480c36051a593e2e8081301bc83973f9fcb5e SHA512 b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346
+EBUILD s6-linux-init-1.0.7.3-r1.ebuild 1743 BLAKE2B d2687d2be6ea3e4c6add5cf3cae82cd661fbd63ab51fbb9131c16535027002589c8c4dc11d1ec1be4a4ff987ec7929f00faf1dc466d6900193754d8ad1f93388 SHA512 4d4028b445e3a4c6f7d7c126cea23007163e6e590139a6e29db60cb108f8d959ad4f50e8e00c8668fbb24ca34aedaa898311916e649b205a8371459212a2f070
+EBUILD s6-linux-init-1.0.8.0.ebuild 1547 BLAKE2B b442d9b7539c96f8956a59cd60230a2061c1877a922ba0a491c21653b2b910060f16ace0869dc2c58b2dff5dc6fa757f2cefb609dc3727960bceffd95c46540d SHA512 1f27ab694807e37e6162dd9850939aedffd239de3432e080da91f1822fde6f16c5ee8ab6e7883a4026cce4a21f222ce9e2392300c90ccdf162822202381baf36
 MISC metadata.xml 762 BLAKE2B c6fcd5da4965ab30aa041c568356cbe8fefb5df76f5396d5d47264d1463730be034b8a8fa96bfa8961bd27ea253495b340ce07da6f16f59ed1d657da560d36bc SHA512 ef5a96b38cc3b927841a7d7e9bdc27d6609c95f585b93c8e6496c57743cdb3d0335434c63d0634207c4554d8a0aaaebd2c0ec06e953d3065dd119db6972e1666
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild
similarity index 91%
rename from sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
rename to sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild
index 01807f8d704e..415a46d9f524 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.3-r1.ebuild
@@ -16,9 +16,9 @@ IUSE="static static-libs +sysv-utils"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND=">=dev-lang/execline-2.8.3.0:=[static-libs?]
-	>=dev-libs/skalibs-2.11.2.0:=[static-libs?]
-	>=sys-apps/s6-2.11.1.0:=[execline,static-libs?]
+RDEPEND=">=dev-lang/execline-2.8.3.0:=[static-libs(-)?]
+	>=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?]
+	>=sys-apps/s6-2.11.1.0:=[execline,static-libs(-)?]
 	sysv-utils? (
 		!sys-apps/systemd[sysv-utils]
 		!sys-apps/sysvinit
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.ebuild
new file mode 100644
index 000000000000..134f021dac5e
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.0.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
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+sysv-utils"
+
+RDEPEND="dev-lang/execline:=
+	dev-libs/skalibs:=
+	sys-apps/s6:=[execline]
+	sysv-utils? (
+		!sys-apps/systemd[sysv-utils]
+		!sys-apps/sysvinit
+	)
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir=/usr/$(get_libdir)
+		--skeldir=/etc/s6-linux-init/skel
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/s6
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		--disable-allstatic
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if use sysv-utils ; then
+		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
+		into /
+		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
+	fi
+}
+
+pkg_postinst() {
+	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+	einfo "for usage instructions."
+}
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index acef37a60e4c..a95245da0051 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,3 +1,5 @@
 DIST s6-linux-utils-2.5.1.7.tar.gz 36574 BLAKE2B 53b5c46e84873df2263eb05ef6dae2321957e2065966854402f819cff6712de991a3a3c480325556e53491c9016deb52c0a437a8b9bcc721dac97e31c98ba501 SHA512 dabe510d0a4d045578309beeec17aa1b4f88acb09513be65c31a7b338bd50fcb7cc809015fa7328c4a310b838f1335e754f49a12dcf369483c83294b5957156c
-EBUILD s6-linux-utils-2.5.1.7.ebuild 1071 BLAKE2B 5eb4a0a9d77d72e6ff3fc82f0d0a6b959ed7bef4288667b059c9f39c01e33fa16b7ca8e17fd39d4ddbe02aedb00c7bb5560dbf5e021ae7b6d91cfd7a46299b40 SHA512 8ed1649c5e5e1da603cca0a09897a9ff399685da241c3c521f43c9f066f8a866d852c1921ae2f0bdbe02fed68f6b5903fee420107c278e1ae5ec6811fe455deb
+DIST s6-linux-utils-2.6.0.0.tar.gz 39674 BLAKE2B 146b5ef47c00c4e96eb6ea697137cd11732087612df98781e45169ff8503fe3ba9b84cab06e6b96ba373f11c65902f4f5111322d51b0fdb395b3422ba092d836 SHA512 cecd745d473b200e10071d73191d5ec425533818a9775e882a2b8a2fbc98779f2309e17d41f844b171e0625b233804bc7af9585709e8e42dc73ff30afcee06e9
+EBUILD s6-linux-utils-2.5.1.7-r1.ebuild 1063 BLAKE2B 76ad5faf56fc65ab8e6f0130f0aef9440f86652bcbb334e1c6cfec065c428f02d8bbc0ca84b92aafb8f70cb0b1cd3b1e40e135e782401fc2236a9216a389ad24 SHA512 ff21ecb28ed7126c75df198c54a8b2d4e992069765144fa8626ade2b9aed7a930ec46d574a6b62ae57355f4e57510fafe9b3e6b24a12cb621c2a89853d56b1b0
+EBUILD s6-linux-utils-2.6.0.0.ebuild 969 BLAKE2B 76fbbb8aab26239984077a596b18c811cbc83beab9fa4353b0f775ba2337fa293372e2ce951af43cd6579973be86719e7d857af10d395af334f0a54a69e9226a SHA512 0b004d37df1142b9925eefce19c187ec387b3e4e8370da056d411ca7d79c26312a5c40743c2239b731023778d75971a9a23c47a9b8df3c1150d6c1928006ab37
 MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7-r1.ebuild
similarity index 90%
rename from sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
rename to sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7-r1.ebuild
index 3a7aed22a1ac..8b385d9a68ab 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.7-r1.ebuild
@@ -14,9 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="static"
 
-RDEPEND="!static? ( >=dev-libs/skalibs-2.11.1.0:= )"
+RDEPEND="!static? ( =dev-libs/skalibs-2.11*:= )"
 DEPEND="${RDEPEND}
-	static? ( >=dev-libs/skalibs-2.11.1.0[static-libs] )
+	static? ( =dev-libs/skalibs-2.11*[static-libs] )
 "
 
 HTML_DOCS=( doc/. )
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
new file mode 100644
index 000000000000..36d949ef12f9
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--disable-allstatic
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index f828d7f72dd8..e6cd912b7454 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,3 +1,5 @@
 DIST s6-portable-utils-2.2.4.0.tar.gz 50343 BLAKE2B edfbe4ab48914ae485072f220931e6af4d53fc8d1c1dc5e1186bc1688a429e6d14a370b02dbe0a9b641a8204f65e6f6bfb6cb0c0c9318acf89d9f6ad7f7f914f SHA512 35b62aff76b9fbf978e81dad2f343a2542cb4a853530948cc3b446b20e8d5f976d1624194c2aad6e0277b73d23d5cecf2142e3f2916bd152ad62342fc30fe07a
-EBUILD s6-portable-utils-2.2.4.0.ebuild 1075 BLAKE2B a25cf9c339bd5c7da9324d22531fe0f9b7b6f7600ffc63a9cbbfa6dd9dfb40921346926d32cc6a305024d9c50ee68a695829538afa79c7f3c6717b3c1dc555d3 SHA512 fff29b2d3008e501cc42b0a8d55018d926e0c6a5a01603e2fd9cfcbc01c8a5ddbc71a6cdf7bde953899c27856df3ef377a5694535fc38db03b65bf66cfc12e5a
+DIST s6-portable-utils-2.2.5.0.tar.gz 50911 BLAKE2B e79d803544e8df6b791ecd22bd61b7c9535945c5557a25d7bc5488f5015967c4a750f1c0a136cc49b30ddd5bf3fbc17927e5ec01184106e44d0c08643e98e41a SHA512 2e90a1390140818268bd83629579098552c22160537874a90d4be94fae157cb9cdb864859c40847e8588fa9f62fb5af7bf89aa12561f1e6678a7cffc0f0a6d68
+EBUILD s6-portable-utils-2.2.4.0-r1.ebuild 1067 BLAKE2B a9d5f552beec4cc602fdc8dc1dfb933b282eaa63aed91161f2a7baa42f63fbdbeebd38eb20272135ee805266c3166f2d79c34c9bc8bdca77946f63334aedb2f4 SHA512 f0082da58ea6b2d158cfc7256e2bee3aa8e3f4edcfc35056e3053401cfa958dc859e6c831b121e479f06d7d8b02c5b3a371e93cbdf90705182ed2cc5da58c356
+EBUILD s6-portable-utils-2.2.5.0.ebuild 973 BLAKE2B 6676a2451c4f534b6c87b5e4233d7ad8e969c0d16411d457a3216b43ea2728743b6d50607aa0522e4dcb8f9d174428cdff7b7a39889d773f9308885cd007d772 SHA512 db620eb11e4b63ee5add49cb9770df8a88fe42e51d5a9aa1c93922a7c4c6f5bd4db85bdd8941d597442827e28fc1b5e7f4283f2df6c8863c1eecd07530f5c115
 MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0-r1.ebuild
similarity index 90%
rename from sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild
rename to sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0-r1.ebuild
index 4b3acc96437c..175012649933 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.4.0-r1.ebuild
@@ -14,9 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="static"
 
-RDEPEND="!static? ( >=dev-libs/skalibs-2.11.2.0:= )"
+RDEPEND="!static? ( =dev-libs/skalibs-2.11*:= )"
 DEPEND="${RDEPEND}
-	static? ( >=dev-libs/skalibs-2.11.2.0[static-libs] )
+	static? ( =dev-libs/skalibs-2.11*[static-libs] )
 "
 
 HTML_DOCS=( doc/. )
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
new file mode 100644
index 000000000000..34e4528aaa94
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny portable unix utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.12.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--disable-allstatic
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index f2cb14805166..c39bdf5ecbb2 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,5 +1,7 @@
 DIST s6-rc-0.5.3.0.tar.gz 99155 BLAKE2B 8d65ba95b9d3b9b68a9830c79b3c419513e00aff87fb7b9fa18e007107afd8f41c561ac37db9ff28b3fa5b0bf5656aa5053f4337cf24b0fcbc1ce7138712edf1 SHA512 0b5dda996d96761f1df192675ed117f2acff9f2ad24e6c1405f3eaa46fdd2767178005582fbc9938152232f85ff01b008efedab6c80051bc65f1193d468a56f1
 DIST s6-rc-0.5.3.1.tar.gz 99212 BLAKE2B 6f2bb8b25669dd0a87f716842c6a3018f8157e5193530fa84ce622169db5e8bb14cc145c64e4ea23d1905933b47411ad5b2b059e81435881c117c0377037be63 SHA512 1e181604510f39d0b10a3552c13e25d9a379552daa1c174c8856ce2e24ecbfb3271bd0236e1744de3a55053b1e96d550b816dbfff7aa3f75e0642003ab8e8bc9
-EBUILD s6-rc-0.5.3.0.ebuild 1555 BLAKE2B 4999b9c4e4c54a6054a4f51b5a7c1bcb10ea6da1c78c664f2cb0e039451bc3ee4b8e1c3e5e324632278da9f8836da40594cc108315bb17024de12d56ead0d039 SHA512 596b1f9c1261ad6dcac1bba72080285a51d2ccb00714970824ac39ab5cfa49b92a28a231571ffd57947d2f930ba7b3ec85f4b3c1b9913fb5a1f0b2079192d3cc
-EBUILD s6-rc-0.5.3.1.ebuild 1557 BLAKE2B 8664c7b568cf24bc0be8bfd9f9da90b9cce86bc401b7fbb9fc1846a7f3fdffdbbedf3aaf6d5ffcd07aeabd42baf8c5be64b8469d5cf6e20cd4aa3064a778e380 SHA512 8fd4309f0ccad69000f0b86266d181cec5ee32a70074e0feccb4ecc3aad6aba96e320cba26824b7982b3d6a768a624e6606de06c439426b8870d58304e29e0f0
+DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b SHA512 72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051
+EBUILD s6-rc-0.5.3.0-r1.ebuild 1564 BLAKE2B bd55d06fa05b0d563266477c137ac78de5a46afd74001e9393f08a9713426e1b9e1f19bb62703f4b1e41a7a1b3825b01cde70f2245bed79eb3ec18fa2988bd2a SHA512 e5877057af14429fcd0cf05d087b6df7f8d83f0691044938d63c7e79d01ad3f05a88e141c871475eb4cb983e097341580a60b21fbf5d063d7f6e34995bf5d4f4
+EBUILD s6-rc-0.5.3.1-r1.ebuild 1564 BLAKE2B bd55d06fa05b0d563266477c137ac78de5a46afd74001e9393f08a9713426e1b9e1f19bb62703f4b1e41a7a1b3825b01cde70f2245bed79eb3ec18fa2988bd2a SHA512 e5877057af14429fcd0cf05d087b6df7f8d83f0691044938d63c7e79d01ad3f05a88e141c871475eb4cb983e097341580a60b21fbf5d063d7f6e34995bf5d4f4
+EBUILD s6-rc-0.5.3.2.ebuild 1115 BLAKE2B 00fed9fbe5865de7315607d24ec115c7f250dbf2002eb665294acee5432014ffa36229f0bcd21bb5b5fbf3cc2add539bc1ac8877f139022a8207f499617fbc13 SHA512 ac171864566939e4314d9043de2e106b49478ce903295fbbd9a730ad5c453960f466921374a5038b89d5d44edc9fa7c66f3bc663985f2739e21805e7deb6c637
 MISC metadata.xml 624 BLAKE2B 42e42ad932d528935b581814d0c4b07a6cf54d800b44e77eca63f0b8fab7f91d423b6aa8b74ade323f5bf9909b3d5e67af06caacab810bd8a5fad6ce4c127496 SHA512 6516bb423a7b7a18c226f5eab903fee5147d15aaf29bbe3def230ae70d6190c8360b9645fc379acf8163103f986ffad727096729d5feee7610899ad8d98764a9
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
similarity index 90%
rename from sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
rename to sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
index 6feff233b4ae..4c6c8d4c1bca 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.0.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.0-r1.ebuild
@@ -16,9 +16,9 @@ IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?]
-	>=dev-libs/skalibs-2.11.1.0:=[static-libs?]
-	>=sys-apps/s6-2.11.0.1:=[execline,static-libs?]
+RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs(-)?]
+	>=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?]
+	>=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
 "
 DEPEND="${RDEPEND}"
 
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild
similarity index 88%
rename from sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
rename to sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild
index bc3b886ef52a..4c6c8d4c1bca 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.3.1.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.1-r1.ebuild
@@ -11,14 +11,14 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?]
-	>=dev-libs/skalibs-2.11.1.0:=[static-libs?]
-	>=sys-apps/s6-2.11.0.1:=[execline,static-libs?]
+RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs(-)?]
+	>=dev-libs/skalibs-2.11.1.0:=[static-libs(-)?]
+	>=sys-apps/s6-2.11.0.1:=[execline,static-libs(-)?]
 "
 DEPEND="${RDEPEND}"
 
diff --git a/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
new file mode 100644
index 000000000000..9304b3decb02
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.3.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="dev-lang/execline:=
+	dev-libs/skalibs:=
+	sys-apps/s6:=[execline]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/execline
+		--with-lib=/usr/$(get_libdir)/s6
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		--disable-allstatic
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 4180ac206211..9638d470a2dc 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,3 +1,5 @@
 DIST s6-2.11.1.0.tar.gz 228745 BLAKE2B 872ac1f736337a8e6617c46af92f8e894c06a4b40501ebf58568dc6a58cb594fdf36654cdb8cfd8e922431c17f9b4f82441296a3ce8031ba8b1f27fa1ba8a051 SHA512 ab3cb4a61fae21537eacffdaa427a0a6b23b12088586f0cd8dc993e0de29e9863d04c8706cb044acdc08254002b19eb5f894262d37348d467f8c713d8124e738
-EBUILD s6-2.11.1.0.ebuild 1303 BLAKE2B fb2b315a3bd6b52f310274e4b8acc53348bbf5d1d9bed421de83b4d66bdb765e0892f4bb14b0a4aef767bb1dadb872dd32debaad5344623c37cca1975d7f3b09 SHA512 42609b10c9694dea31d1ff7dfa2068384fdc474a2de0b085d9654a82f3c4fa9fa48fd088f3b18dcb202677f55fba94bab3d2e8758f24fbf3c39dc815a817f09d
+DIST s6-2.11.1.1.tar.gz 228878 BLAKE2B c94c18b66862c7945a317ab76d933d40fc360847b71c6fb3d507535ee41637d60327a05486a93ab7aec630a0c8ead61d6c17bfc064bd9f94b39a7cc56f76cb49 SHA512 f5fc903c11b57b2a83d9e120a51f64b63984a2af9b772dd6fd64f268b512a083350abedcae04c926deb6751b5ae30e992d6a4128ddf4ab1d49c548ef8f3d7752
+EBUILD s6-2.11.1.0-r1.ebuild 1309 BLAKE2B 21e324158a89d92f9ff05d6188375435d3b254a722ab222f615224a12fa614dbdb0e5f2e7f40c410b6f104710094f6855fda0c8d50e4df505096cafdf22f3e20 SHA512 0e9b27a30c07af081e0fcb189ba7a9aa4eea03c685434a5c7bbe6a228eeca0bf6ff145215114eec7d760b7eb56bac457070396f7a53e0766473fd31813e30291
+EBUILD s6-2.11.1.1.ebuild 1121 BLAKE2B 3f1d0f3d60e2e7dc19380198c82431fa2362efe082980f62baa11b6c506cb004d28a15f6bb34299c107c03e6ebf13f7f671f895b1f2169a4253fb2569fc1eb16 SHA512 9e5335e94e50136c01df285867204dffb20819eab9bfbca8db92a0c8c8889f3cd166dab85f2bf954f92e79cb8986b42e7ce555f3c97f2ef33aa4fa072f4e4994
 MISC metadata.xml 883 BLAKE2B 501518e15b1abd7badfd84007057b30f5ce972d7da8997ebbc218db6aa4001e06500f3b42f88ff259324bd3ba732231275cd33f27baa1588e28b9b80098befa9 SHA512 98b763747501225ebb0a5a1b8fb8a49757bb64c792c572f01c84dbdfe62ae83f03f72cb4ccfb905f58f9d24f06ded96a158602528ee26c1979c017477a4be183
diff --git a/sys-apps/s6/s6-2.11.1.0.ebuild b/sys-apps/s6/s6-2.11.1.0-r1.ebuild
similarity index 90%
rename from sys-apps/s6/s6-2.11.1.0.ebuild
rename to sys-apps/s6/s6-2.11.1.0-r1.ebuild
index ab9cc3bb0e38..65697c3d13b7 100644
--- a/sys-apps/s6/s6-2.11.1.0.ebuild
+++ b/sys-apps/s6/s6-2.11.1.0-r1.ebuild
@@ -16,8 +16,8 @@ IUSE="+execline static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
-RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs?] )
-	>=dev-libs/skalibs-2.11.2.0:=[static-libs?]
+RDEPEND="execline? ( >=dev-lang/execline-2.8.3.0:=[static-libs(-)?] )
+	>=dev-libs/skalibs-2.11.2.0:=[static-libs(-)?]
 "
 DEPEND="${RDEPEND}"
 
diff --git a/sys-apps/s6/s6-2.11.1.1.ebuild b/sys-apps/s6/s6-2.11.1.1.ebuild
new file mode 100644
index 000000000000..dcdeeef35af5
--- /dev/null
+++ b/sys-apps/s6/s6-2.11.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+execline"
+
+RDEPEND="dev-libs/skalibs:=
+	execline? ( dev-lang/execline:= )
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/execline
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		--disable-allstatic
+		--disable-static-libc
+		$(use_enable execline)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest
index b2d956336af8..d929d40f70f8 100644
--- a/sys-apps/smc-sum/Manifest
+++ b/sys-apps/smc-sum/Manifest
@@ -1,5 +1,7 @@
 AUX makefile 298 BLAKE2B 58431440f52821bf8f1a6070075eace33f173dc1cbe19722c033cc6525b2ae4a6890aec2870f68b282368c9722b87796a14b53d364ce3e7002dfac452480e74e SHA512 862b6a2ae684da3b864eacef8b645c27ef4a6ccc4f577ccc9c5d88cd0426ce66a6462bcaaf01bdd0082898f7e3801cd6a00bc1c702af83faf7ca31b9de1c14e9
 AUX smc-sum-2.7.0.20210903-missing-include.patch 264 BLAKE2B 977008b43b91ff7ee7a1c32ac6ce4221d078c782b36479f5319818c143d99eec0ef69c787e8e170badb54c45bde4bf10f7359bf7e30e84141de816de4334f1e1 SHA512 c75b04f7c44cb273d781648e57c7339eb16c23e37b6cdfe3387444e0f5a4dcb72097d03a78d5f6ec327ba4b739444c93c378f0d2212c845873a387d30517328b
 DIST sum_2.8.0_Linux_x86_64_20220126.tar.gz 14852916 BLAKE2B a65243878ec41c05fc8c71f147883fea29517e93ef0e1460a39827a98e1fd9e533be2f4a6cfceed29562ba2d0e798cac64645bbf4d2b23267396d86516277df9 SHA512 4e11a9916b3386229eb5cfc15830bd1ecab7d79cdc3280f4a736b8882554170e6d1579531c441d0966c816e1f9c98d256d7fbb2c0a6e8c03770a1053860a06f5
+DIST sum_2.8.1_Linux_x86_64_20220506.tar.gz 15414174 BLAKE2B 939e338f7ae3223bcd970dfdabb1e5a0bb2388d21b8fdf3666b82cf77e6c415869518d15675f2a6b4a15312bdb6d44c5b13366d1173e4ac5343ec13c65a8cdec SHA512 7350fefee12c7272d568049d07b18ef5736afc8602cb563691f8887ba046cc19aadbf57c0328e593a797d641cc515ea322de8dfb7a63ecff9b089f463dfb223e
 EBUILD smc-sum-2.8.0.20220126.ebuild 1513 BLAKE2B 71326c2b86218846ff457ea92cee67c0efb390e1a5e970acda131043fd948cc3966b338d693e132d2a997f79b221b4d2b8edf8cdb205ce4f9dd344963982e3d5 SHA512 fbb2b85600c6a5c391b157506d15841eb2538e166bf2ecff2b3a92e919dfb43c69ca4852bd2df44df4756c972ea11540d5b9878f0d275a335f84abde7091c1cc
+EBUILD smc-sum-2.8.1.20220506.ebuild 1513 BLAKE2B 71326c2b86218846ff457ea92cee67c0efb390e1a5e970acda131043fd948cc3966b338d693e132d2a997f79b221b4d2b8edf8cdb205ce4f9dd344963982e3d5 SHA512 fbb2b85600c6a5c391b157506d15841eb2538e166bf2ecff2b3a92e919dfb43c69ca4852bd2df44df4756c972ea11540d5b9878f0d275a335f84abde7091c1cc
 MISC metadata.xml 1098 BLAKE2B af888334fb5709cdaf9ee12821a8d006e4343d27ae89d51683b30c32820a6250b75b762946a6c7d1f23b7c1383eb66ba4d6b450d5d366bdac42d4df350f5e5fc SHA512 aef30566e58c8781faed28eee5e8574fa7017f90c20065a13868a0c6abaa9e069f425c4826cddbbbbbb84c37b3ef83c13eb46ce1eb829dca0380a2f5ed72729c
diff --git a/sys-apps/smc-sum/smc-sum-2.8.1.20220506.ebuild b/sys-apps/smc-sum/smc-sum-2.8.1.20220506.ebuild
new file mode 100644
index 000000000000..e309a7ad7f47
--- /dev/null
+++ b/sys-apps/smc-sum/smc-sum-2.8.1.20220506.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="${PN/smc-/}"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards"
+HOMEPAGE="https://www.supermicro.com"
+SRC_URI="${MY_PN}_${MY_PV}_Linux_x86_64_${MY_DATE}.tar.gz"
+S="${WORKDIR}/${MY_PN}_${MY_PV}_Linux_x86_64"
+
+LICENSE="supermicro"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="module"
+
+RDEPEND="
+	sys-libs/zlib
+	sys-power/iasl
+	module? ( !sys-apps/smc-sum-driver )
+"
+
+RESTRICT="bindist fetch mirror"
+
+DOCS=(
+	"PlatformFeatureSupportMatrix.pdf"
+	"ReleaseNote.txt"
+	"SUM_UserGuide.pdf"
+	"sumrc.sample"
+	"ExternalData/SMCIPID.txt"
+	"ExternalData/VENID.txt"
+)
+
+PATCHES=( "${FILESDIR}/${PN}-2.7.0.20210903-missing-include.patch" )
+
+BUILD_TARGETS="default"
+MODULE_NAMES="sum_bios(misc:${S}/driver/Source/Linux)"
+
+QA_PREBUILT="usr/bin/smc-sum"
+
+pkg_nofetch() {
+	elog "Please download ${A} from"
+	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=SUM"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_prepare() {
+	default
+
+	# Install new Makefile to respect users CFLAGS and LDFLAGS
+	cp "${FILESDIR}"/makefile driver/Source/Linux/Makefile || die
+}
+
+src_compile() {
+	if use module; then
+		BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}/driver/Source/Linux"
+		linux-mod_src_compile
+	else
+		:;
+	fi
+}
+
+src_install() {
+	newbin sum smc-sum
+	einstalldocs
+
+	use module && linux-mod_src_install
+}
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 45735745e5ca..9b3d4d3cffc3 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -6,5 +6,5 @@ DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105
 DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
 DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd373eccdad2c3d6e6c453df79c8df47ee0f9cfbde764b72b1f9d172d07e2d9f1f1f41c1ab254cf4abd0722469ebc3ad7cf8 SHA512 99bc6f0c9757b280cb694f3fb4d6fe04d5ce55583eb2bae5ddeb324bb5ee9930c1720fcc27293d90cddba188473653ec541a471ae8115710a5850c26d0ba215d
 EBUILD systemd-utils-250.6.ebuild 11342 BLAKE2B cbef57c68e15fe5fc76e2ba656fa6636d872781b2849c8558a61085e7ef8411b352469acb9b94b45be48fd5e6d29a5ff37fcff9ab2036870b23a811e3cb7af9a SHA512 3b3970ebd790cdcef1511879a1949e788ddfe0ff03866b3e9d5e932341f3e01be48618978559e4179118fdd025e74703bc5bccefce140740a656ea4751c06fdb
-EBUILD systemd-utils-250.7.ebuild 11350 BLAKE2B faf9c2a6685159fe9352e88ecc5855f38c7806f4a2da41e2e5ad1ce6124a4fbb9b42a71c351070297a821b093856a4b75263865b1ffe0d7fe16ebdced0dfdc64 SHA512 6ebec4e3a65f50467bc3b5995acb0ab483723e87dcfef8d4c5a7b4f26d8116049ed2c4c78f3f03f9216af5dc87767e69195f0bbff909644bfa91e688bf602058
+EBUILD systemd-utils-250.7.ebuild 11344 BLAKE2B 2decd2513f9e282f385ec52bea84a63d4da3912133b252efebffaa0e74bdd09973003f0ea7535da1eef081d1ab525e2b90e79c99a6325bc9119a823528c815ac SHA512 62360533fdb64ff50c073a0654265c36dc3be8e622ffa5a66c6d9a324d120e904aa58a15c926ba5c7fa09dcbf45917d3a4346f33f5829c489477dc5878285196
 MISC metadata.xml 571 BLAKE2B 6b3a69524c5fd3fa0bbe534ccbf3598cedcbe51542d738237ca13b465fd342555f35b2ebd1d784b7a81664c58125e01404434ca48a07502343a24dd395618c4c SHA512 8184f6d8107be83d7411f63e86a8469c4b86c96bf4738ebfda8d654e4ecedf334b4319c9d442832c8373a34e7c35ca14b879e75eb4e006d48fa3d667be0a66e4
diff --git a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
index 9afc4a2e8c10..cf1dfea5be71 100644
--- a/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-250.7.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 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="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
 REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index e97f85c03de2..d4e3d952db8a 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -14,7 +14,7 @@ DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd
 DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f SHA512 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c
 EBUILD systemd-250.4-r2.ebuild 15755 BLAKE2B 5934a91181220d8b80e0302e6b7b2e34efb44739c20cd907bda7d390a1f0aa442b87c270c8907f8bf9ca8337cb2ba9307f9496383fc551dadd837072bf73d9bc SHA512 33881d3746d7bff5e14e55115f883b692cf873cdd23650144b2b356e2635e0fdef6216e5883078f48576ecc80cef02c0bb5f696f9b3f4cc9bbfae5bd14efb7e0
 EBUILD systemd-250.6.ebuild 16332 BLAKE2B 02a861c7d18856a1153b84caba100bfa57c064ab2c62fc804d3acc188f0c2d95365d48123f380216505e3ec94a7537b8c88b54ab5e1204e4be7c51d53ca1273d SHA512 76e38f8e889dc0b5dae9951dcbe8b113c9482b1c5b1f133c1be358fe6177597bc69f80f819da5b20cecd08335d346a9c541ec32f2f29f6969a5234d4fd1aab37
-EBUILD systemd-250.7.ebuild 16375 BLAKE2B 82ebc74f59d662c0ae69975e8a527ccf8484cae035c934339a0548b3a594e5370fef1696a5326b822a092d907b0c6411fb339ebe6135d7c193faae26fbeea318 SHA512 a785f10307c68507b8371e79134a16d46de8317aac54770c48df13f5d348b6f63310ddce4330cb932f4938c36330d7eccda07ec3c0a3e16928a7db35d904205d
+EBUILD systemd-250.7.ebuild 16369 BLAKE2B 31055535fea2a22a355d4f4737b27431c746a11c6cf14e0917796cd75072fdf4ab85d469ad3ff33e08a3c99496185ed40b1ee47311378e8f8f3ce64c341f203d SHA512 c5b2cb32c492ec03590f6f1b5ba7566155a217ca94ae81867da47c45ca6758ae6da5e8d89a199ff2bf19d905b3a1f2a1242ac3c270448d7d38488f54abbb08d6
 EBUILD systemd-251.2.ebuild 15623 BLAKE2B 003543cc788018617ca266f2e9aa445676b81eb94e5e30aa4440037fd8b12ab16f340aca2da4f49be4846c607631cd96566a8f673281512f6f4c7ebd836a3a27 SHA512 e48e06ebfbcb334397907c3e3bdd5edbb0cf82df4cd983c568e5fc151f7f39489b63431f34477cd443218b200678165d3e7f9c0c9d0554825d35375d715a8a0e
 EBUILD systemd-9999.ebuild 15583 BLAKE2B 91c6882615f7ef4c1ddbe49d9b37fa9443715694e18719839813d8f214ace0fd668567f96fc5da0e4dc1c7988a7171fadf90958f2b655fac354344725bb7085b SHA512 afbfca7c3dbfc1a193eb8c9106b83e399f81c269bd36f0d5bc1151a75cea22880b9c5816eadfc2e65477b8b9f0c12a5b90da013eb5a561acd9072071367c0feb
 MISC metadata.xml 2594 BLAKE2B 9ef88b77dba5d66b6902cbc1a4f104e783fa530f7148f48692992dbe2edf8a88a3d96993f6ecc34708ff49f7e7b4d9bbcf001fad6ca5a8d097030bc83b9b3b57 SHA512 22bfbaaaa68142286b36005b685d6955c68b71df064e412f0edbd858c9610c6ad76b5d970292d30b06eb536a9a140af307a3b4fee897b7f281cee00083472430
diff --git a/sys-apps/systemd/systemd-250.7.ebuild b/sys-apps/systemd/systemd-250.7.ebuild
index 23d524b5aea7..180e744ba12a 100644
--- a/sys-apps/systemd/systemd-250.7.ebuild
+++ b/sys-apps/systemd/systemd-250.7.ebuild
@@ -23,7 +23,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
diff --git a/sys-apps/tas/Manifest b/sys-apps/tas/Manifest
index 741f166eaaef..29b29fd5f1c2 100644
--- a/sys-apps/tas/Manifest
+++ b/sys-apps/tas/Manifest
@@ -1,6 +1,6 @@
 AUX tas.ini 81 BLAKE2B 2dd7bc87d72d00d7dd73e496d253810dfe110aa1d754f1fe923f4bf0bafa79c516bf24eaa684822155afd88d9067a6106ee49f7bc8847c75a2a436cf72e893da SHA512 d1e555341bf1aa5e0f4097c948e32cf274d788821eb9bbbc62f15107dbf5893cc14f41ab47f2a59fb6cb5df4b3e431b403f643743eaf7fd3c121d4ee458a8d99
 AUX tas.initd 422 BLAKE2B af394bb87952d7e5ddb20e3b688372f7e526ebde59a3862112a8c723252575683e8218297b801b0ef027b3953e8e78898407f6d85b7bec4f166fad4469d114ed SHA512 0cced493bd7a451bb8a76be1b24171fbc72c0571fb6337e52fe0140184a0990baac9a95e512738366433c3516b859f1958546a8e0ca8f718f7fc48b32f95c792
 AUX tas.service 162 BLAKE2B f9f8d8f9e8dbe1b6aa6e7c531cb69b3e6f39e563cc64f2630a0db2b48cc0425806b166f39d7b2dc356c55b4771da7023ab5c0f10dd2d2857beaff7699fa1a0a7 SHA512 53a6ad9f0d42b26f2a2e9462a5f14a31e4bbde4d8badf7beb9e96e2a916d81ccda96be9bad80fbcc1a8f9e4a72ac5cfb1e13112785de8fe978823d97de145efd
-DIST TAS_1.6.0_build.200601.zip 15528952 BLAKE2B f2514180c1335c2c8afd5cf0234da8dd22563086cf2c85e38b8dc2bc28b27fd3dac6a09123a0d4f57354cf729ad5050a6253608d15682577c75b551c921aa1b0 SHA512 725e8134a51a75b23f566f1321e87faf44f96603d63b4a253f03c262ec2c40c339e024162ba84da37647cd301a039ca4aa34e42936d1a47303c7fa68e1e5f2f3
-EBUILD tas-1.6.0.200601-r1.ebuild 1602 BLAKE2B 193843008f9b7cee9e3e95c9351660812bd9fa6f7d6c65f5f5f257a2e48970f8f26750c679cb185eb9b03d0b8e642e30a11232db89a8446b281ffc5e86aaae8a SHA512 7ba86cc51edd74c79bf5493933223ba0d1dbd071f3fe92406482e2d6a53b722ce4995272c4b187edb92d65b6449868e7ff5114484019f148106b5ee54bf5f511
+DIST TAS_1.7.0_build.220503.zip 15345434 BLAKE2B 48f70d0dbafdb3e2acba8fb2e29007dce21062c843ea601c623664e7df8bf3638f14c489688e25445611d261ab6a30ce2edeae8f4e19749c9d3be61f6c30766b SHA512 dedef4b53afb5607f61d7e8793f966d4345ebb530cb0174c22fb72f41568a0b5c109833609e63d25de562c8de7fec312da3198b023265867b8f1228e0974455b
+EBUILD tas-1.7.0.220503.ebuild 1602 BLAKE2B 193843008f9b7cee9e3e95c9351660812bd9fa6f7d6c65f5f5f257a2e48970f8f26750c679cb185eb9b03d0b8e642e30a11232db89a8446b281ffc5e86aaae8a SHA512 7ba86cc51edd74c79bf5493933223ba0d1dbd071f3fe92406482e2d6a53b722ce4995272c4b187edb92d65b6449868e7ff5114484019f148106b5ee54bf5f511
 MISC metadata.xml 872 BLAKE2B 404d895608719452cfe3ad2c6e2f6737ca970ce4e4bfdbda72fe67dd30975576d2145d3741b202abed66ad11dda16316bf84d02cd082e7cbb3d6169cc93bdee7 SHA512 8ea38656a0659bfedac562db6b89d14ae21ec523e8cb22c60297e128af868bf28712196fe3c5ad64c6971f5f9b28d8606c62264ab29af591b3dcf701ce2bc96d
diff --git a/sys-apps/tas/tas-1.6.0.200601-r1.ebuild b/sys-apps/tas/tas-1.7.0.220503.ebuild
similarity index 100%
rename from sys-apps/tas/tas-1.6.0.200601-r1.ebuild
rename to sys-apps/tas/tas-1.7.0.220503.ebuild
diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.22.5.ebuild b/sys-auth/AusweisApp2/AusweisApp2-1.22.5.ebuild
deleted file mode 100644
index c73e5792cc88..000000000000
--- a/sys-auth/AusweisApp2/AusweisApp2-1.22.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020-2022 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 )
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.22.7.ebuild b/sys-auth/AusweisApp2/AusweisApp2-1.22.7.ebuild
index fd2f4d5730d0..c73e5792cc88 100644
--- a/sys-auth/AusweisApp2/AusweisApp2-1.22.7.ebuild
+++ b/sys-auth/AusweisApp2/AusweisApp2-1.22.7.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 728192a94c7c..ad1b051bba49 100644
--- a/sys-auth/AusweisApp2/Manifest
+++ b/sys-auth/AusweisApp2/Manifest
@@ -1,6 +1,4 @@
-DIST AusweisApp2-1.22.5.tar.gz 11251263 BLAKE2B 8f62864d4e4139b06715765666fb7cc040d7cfc0c3cfb8082399ca24b2edbca754f511a4e7ab1eee6dd4fa3e8ea6cd38d048446877a6cff6ce37d7bddc56e01a SHA512 79cdd749d656aa9b082a80b9db9863bc11f4c5b8e06efefa2eb215724a45894137c5b6b8884d622e4a8203346e1b4d91b292013395a978e06a0201e40693a17d
 DIST AusweisApp2-1.22.7.tar.gz 11406133 BLAKE2B 17bc9824035007bf62037562ebd38c2b3558660060c0eba302ac04e8e9d0eabc7c8cb69d064a1a02be213f91f823030e5afdab74d5614db2c1bc8318ca1f9f22 SHA512 4ea1d2c02e076121b340da6d16973de6dafe513d2e9c96b535063466c06137d8e2a325661478d0cfbd96f506a875dca8d4df6a53af657a8d2eb59e7ad7d1a472
-EBUILD AusweisApp2-1.22.5.ebuild 930 BLAKE2B 3a35bf075945e93c225a1a549db867744cac21a06c84ebd962c44ed80e16ef4ddeda6732d51d3f2164ec726b647097aaaa0e639f8051d61485021a6ebf028be6 SHA512 8db7d6bfd148a053313584f7f13766a018902047816e413ca281fa5d2c3f0dc169139bbdb4dd649d649c7618a9710fcec767d2a80746a89b03713c65a16d18e0
-EBUILD AusweisApp2-1.22.7.ebuild 932 BLAKE2B 788d3c3dd3f87cb286a10625d1cddd2537876a3d78720f81abe770e8a28c767496c1f2a912304c2ae92db4c7ec809e5445e850fa82efa6ebe47637d90a5737fa SHA512 d0a449d2f34d9c671f0f41de39f27159e7a6b73f727177b163b0eff70e302c7aee3e133f3e23b7a6ec90e4d42989b6e90b2881c9c7817df09f414bb38ba81d65
+EBUILD AusweisApp2-1.22.7.ebuild 930 BLAKE2B 3a35bf075945e93c225a1a549db867744cac21a06c84ebd962c44ed80e16ef4ddeda6732d51d3f2164ec726b647097aaaa0e639f8051d61485021a6ebf028be6 SHA512 8db7d6bfd148a053313584f7f13766a018902047816e413ca281fa5d2c3f0dc169139bbdb4dd649d649c7618a9710fcec767d2a80746a89b03713c65a16d18e0
 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 af48d964aa0c..12a613d5b5c4 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/ssh-import-id/Manifest b/sys-auth/ssh-import-id/Manifest
index d55d773e7d25..5252ea3d3152 100644
--- a/sys-auth/ssh-import-id/Manifest
+++ b/sys-auth/ssh-import-id/Manifest
@@ -1,3 +1,3 @@
 DIST ssh-import-id-5.11.tar.gz 146064 BLAKE2B d869ec480d224aa906ef08b5b9acfbf9324d67bffafadcf1c0adae108ad53e76cdfbcf0d1905a947bda5df507fbd69e7ee121890bc48e452ca67c5acd92ac18c SHA512 49703b8b9c127f13bf0626fd013318b9498ec8a67a060fb7607c7a1894da3e3e3e7e995c9b68af8375237f4031d06abda20f2a9a73a1fabbe33055f2f434716b
-EBUILD ssh-import-id-5.11.ebuild 649 BLAKE2B 9c23b39010cb7ff830399334ee125d389a23f70908ac728b29742d77932b450c80066a46daf9b221bbf07a0921040bc29aa6ccca85b047bb8a1ab997d2433897 SHA512 f6a1095c3cd8c40ec39cb222d420f7e458136d26aac3af5bdcfb3d1c9062cdb7ae44aeee4c5bdc61afec710bff769cbc312e4b1169c158302248e38875d4342f
-MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
+EBUILD ssh-import-id-5.11.ebuild 643 BLAKE2B ae3a39d8caae12c70b5de7d2cd22d17aeab0c6f822638519406120564f4cbe450bf85ce5daf2813512a748ea5fca6973d89c153fb4020830985a030403e58946 SHA512 4abe9d31d0192b251b4de025d04be133d4c14cf857811daf9bedb29b08971017d1ca86c15db2914190764af598665485df3152c93eabb79f69bfab8f42e74028
+MISC metadata.xml 277 BLAKE2B c345d754d34cb228e1b27283b6a38bf4e4e87925b27cc8ca7bd1f8a752be7a3fede5ba13df3bb692a5cb3187476767c89fb1205dd8591a183cefe4b8f8b2e127 SHA512 71ba86560b0ee47075fb4bb3e953b5a39fff709ec53cc1c8f795df63f996b4377b9a367057512b7d620764d6744cb92ab2943aeeeba52b940c3a3cffdd270675
diff --git a/sys-auth/ssh-import-id/metadata.xml b/sys-auth/ssh-import-id/metadata.xml
index 8ac26ba5990d..fd9ff4351985 100644
--- a/sys-auth/ssh-import-id/metadata.xml
+++ b/sys-auth/ssh-import-id/metadata.xml
@@ -5,4 +5,5 @@
 		<email>slashbeast@gentoo.org</email>
 		<name>Piotr Karbowski</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/sys-auth/ssh-import-id/ssh-import-id-5.11.ebuild b/sys-auth/ssh-import-id/ssh-import-id-5.11.ebuild
index 4f66eb27a278..7b988386b2a9 100644
--- a/sys-auth/ssh-import-id/ssh-import-id-5.11.ebuild
+++ b/sys-auth/ssh-import-id/ssh-import-id-5.11.ebuild
@@ -13,7 +13,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-boot/Manifest.gz b/sys-boot/Manifest.gz
index c756af5f2ddd..7485afb86342 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index bf5fd17e9075..7106ed4d3834 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -9,6 +9,6 @@ DIST grub-2.06-backports-r1.tar.xz 31900 BLAKE2B d8320eff8cebc408b7c4845d17adf82
 DIST grub-2.06.tar.xz 6581924 BLAKE2B 2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417 SHA512 4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
 EBUILD grub-2.06-r1.ebuild 8031 BLAKE2B fee252fdcc9872dcfe778878401c669ec80fdcaf122467f87c85259348f9d39d4dc9c5c43b95e245103d3cf8d0980e77aebee4eb6777517c170a27aa934d4258 SHA512 31bd5503f44f763b081b516a68328c8860290609f6450b92cf2820b61f117743d3f8830d25f60973c3aaa53fe4df64c7f6421cef18879fc7ba9b428aee6bfc76
-EBUILD grub-2.06-r2.ebuild 8052 BLAKE2B 254a0270fa84cc27580e6820bfee13e16803770c8d80ac83f9214bd537b61115cf34734fdc6812574125a90676631c8a639525d73e4d4f279eeaae7d90548bba SHA512 a1ed2b1346687dec65cddca069751043f3f232a8bffdf6cca79407d1def3fe3a1898d8646f0ac048893893a1588270ddc4d2fe846f5ae33cdf72ff3001f7a882
+EBUILD grub-2.06-r2.ebuild 8051 BLAKE2B a9e11c956bdaf7ad11bd6c4ebdc417aef168c66a0cd44491c899d8ac4c904e2f26547e7eb0e4c7ac683d8927571536e0f65f6649947ce18234365ad30df69296 SHA512 4be2b41cd067ddc85741af3da6ab90940e2cac4a88630d15ad3dcae852dac1fe1a0b7286b8b3701af3cd9511ad343fc1fdf27f03e7495e49a82c72ab0fb8320a
 EBUILD grub-9999.ebuild 7940 BLAKE2B ec2c7cd1028e60c13db74c4e8ef1ae0edb2e26c41c03e58567b8431e9d90ca1d564b06a2c13df19f63bfce7e4654ee9a9e368e1f506b0690892326cd43e6ef0c SHA512 d555bf188380574d0ee33c639b60f19dcc6c36faabd984a01188c9aa3fe5f317c0ce0b18a4d11486659bd0f0dca174e6efd3e24c3c2046985c0bff129d4c3f7e
 MISC metadata.xml 986 BLAKE2B 7c03fac1bf235c1d82e435926c5a9079a21eb16e9937c0ac4e6297bc2f129bc9022efa11c099df07fd9e3b6c47a13246e25ae1c4cc390878ead82394c9b9ed11 SHA512 eb62f4b746c87bf2756669d57e76e60f24cea493948b19429a45e52d02fc1a501b4465ba52940757409258f7ad0ceef0e0f473aeb80cbd9b693b866ae015f13c
diff --git a/sys-boot/grub/grub-2.06-r2.ebuild b/sys-boot/grub/grub-2.06-r2.ebuild
index a93bda4073c4..fce86aecc48f 100644
--- a/sys-boot/grub/grub-2.06-r2.ebuild
+++ b/sys-boot/grub/grub-2.06-r2.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != 9999 ]]; then
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 		S=${WORKDIR}/${P%_*}
 	fi
-	KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index 8736870a5f93..e431b2f74bc9 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -5,6 +5,6 @@ DIST plymouth-22.02.122.tar.xz 1183608 BLAKE2B 8bb1362fcaa7d4c0fb1b69729a8a681d9
 DIST plymouth-5b91b9ed84cc91759c986634a4d64d474e6092cf.tar.gz 1132049 BLAKE2B 0e224aad93fef4039a1a023ece051a64e1fa854f29a814957673c7ba68eb3f2348ca075f59a17f7bad692152ddcc402b2246db413886ac73ad77a36a6fb2cb3c SHA512 3d81ce379d0a11af5b557bfe86e336a40e5abdbb6dbd6cd5e046ede9a46cf2782af75b8e32e3fb2232b8a22efee1890ecb47394742041d9dcb499b38476a814c
 EBUILD plymouth-0.9.5-r2.ebuild 2817 BLAKE2B 9a26e26b344bdede07eac1fcf51423e6f66dbf9d9dd1560f552c58e5595a8dc376e66e2b4818117f233261d364f1ec831bbebf5c88fda9b884de20052197371b SHA512 c5713d81148c8ef409c34035f95eec234fc2591da2115f47d52017766bd3bdc47ed6b95a8b08759b2bb7266d849b65e41c1c66e748b81019ca26ea67db23dc4a
 EBUILD plymouth-0.9.6_pre20211225-r1.ebuild 2939 BLAKE2B b9e69a220112dba150a28130b24b01f5ec15d9234b5371e5f0ac7d25eb52e364cde13b81ecb8592b30c0cea5b8c81ce02e355fb913fe6bce509c5cd81170389a SHA512 92584abfc76c6d3e52c2749373ae0725556bb7781240bdde1c042c10ae2c23c153f873f3a4be5d72bb6e6acce7d2d71cde833edbf1a7b27493ae3a9e466d5419
-EBUILD plymouth-22.02.122-r1.ebuild 2808 BLAKE2B acbe8b37182c47c8ad0c6dd0f4e0ca27da16774f6d86cd6678b29b0bf55225f12013e187ed2dd852d182329d3f754bac7ad7ae0d08d5834193cb45db3f901a31 SHA512 a211e23ce5e30bdffe366f0958363356521ae5cf78d0e19265b1544e5be60b48f22650f135841d4d941d9b42c9fe2773444a59d071d4c0dcc24c51bde3a43de1
+EBUILD plymouth-22.02.122-r1.ebuild 2801 BLAKE2B 3e376ccabec7c0c22b5e61998fbe9aeca53faa9b7266a79a9f790c38d6bf15f9a734d6d9f4546f774e9a80b3495b2da8ad7d907d1c57a4315d38b493316e0f7b SHA512 9418782086394fe5d440cab6a04af54971845ced13e1389bd0cdd00ec55c59bce23be07a39566f4ee3750de201ff915b70c53c68116ca6752a22d2e9e7c2896e
 EBUILD plymouth-9999.ebuild 2808 BLAKE2B acbe8b37182c47c8ad0c6dd0f4e0ca27da16774f6d86cd6678b29b0bf55225f12013e187ed2dd852d182329d3f754bac7ad7ae0d08d5834193cb45db3f901a31 SHA512 a211e23ce5e30bdffe366f0958363356521ae5cf78d0e19265b1544e5be60b48f22650f135841d4d941d9b42c9fe2773444a59d071d4c0dcc24c51bde3a43de1
 MISC metadata.xml 1074 BLAKE2B 0fe5b59b55c5e542bbe094958aad76b60b4eeb25a0873ae751d56045a810b784c95f06d447e2bc28cc5229d6de349ca95c594550490ba41f801d05291c5d4e00 SHA512 fcd7509435d01018fc52666c8214ecf50d3130b3cf0089962aed2c3679571205cb0a173871baa12bc464ce01a5a6a65cb92a01439c3b0b6ed236de876fa541d3
diff --git a/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild b/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
index e3ad01aa6372..b69e14eb1e65 100644
--- a/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
+++ b/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/plymouth/plymouth"
 else
 	SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 fi
 
 inherit autotools readme.gentoo-r1 systemd
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index df62391c2b60..85f0012b11a0 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index e406c604b1af..5ab6d7239991 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -1,5 +1,7 @@
 DIST minikube-1.25.1-vendor.tar.gz 104698545 BLAKE2B 2402594f1a876e16f36f4341136b71a84a8848c90d61789c85b1b962848e029363ec1efa051b0a08a28d38e82ee5fd52ceb0f2836078102a22de0d9cff4cc041 SHA512 661cd0261535728a119d5a0fa5f15c535092ae870f094e85dd03cbb5449ccef89c64dacec02373a7097f0a81bf2c23a91254f2257c09db54cb48249a785d06a5
 DIST minikube-1.25.2-vendor.tar.gz 103616191 BLAKE2B 6707011b208bf96670649192aef0100bee5780bc3321b41eddc12a62b2d4acbc566a8cdf557dae4a84b501c67b31ac35c77effb808bbc3ca56d65e7727977141 SHA512 2e964be6f0708a41ae1aaf1d47eabad8acf13ffafc5ae56cfd66f81ef94673d9661654c807bf2c8790ce5336f95f9fce377b82905e229e4d3534ed5d2622b5da
+DIST minikube-1.26.0-vendor.tar.gz 104726099 BLAKE2B b8dce4c567e370219c568e9b8298dc7d9b9e3b53330d644e943876683c19a80dbb77a938e3428f8662ac55f2359c473920d081c6ac8573ea79e30989ea8dcfb2 SHA512 76b6bc5a004a29864de6a0574a6abed18de6b92fd8a963576a284c8245fde31edf57fc82636299f4acaed0e69ca2134ded2e5606ed64b1de8d1a247e8c83ffa3
 EBUILD minikube-1.25.1.ebuild 2297 BLAKE2B 0bc47384147196b879b400a72263c83397075442d2ce6c93da0931329473699b5d12af4c4c989ca74ef6b97d11b1949f2956334b34a1144ae6cdc5032e43f9fb SHA512 e596b9eaff277be0782a02de06bbaf4c56596294d37d68dd4bff6047bd99cb4cf06488a235f0dfdc5a78c887ec6018b8a79fd2a601acef0ca267a7f7923948e5
 EBUILD minikube-1.25.2.ebuild 2297 BLAKE2B a28cdbca5fcb3d6c5f26cc2cbee198e6f3da06b8897633c0000194e56d3deb283b014b819deeb5a4bf0ffa78d60dc61988b58cc3d31194505f1d1a7eb1469f84 SHA512 6766905da7fcdfc0468f949320fb04c68754aaec3583c37a6e6d61f6cf636df896fef49bad4889afd3f707d4e81c48815323fb705a5884e02bec3a3f9be46020
+EBUILD minikube-1.26.0.ebuild 2297 BLAKE2B 1d5328379eed8a9915c885a1fe3d4efe97c64fd2381632ac4c2f2dfccf5d9a589b2cef5e89fd1872d31c03085946135eebaab3a0cfa4846950cb33d07838e369 SHA512 6b1108d9c1a4b741189c68da4ac38e1e3291573da3f808650bf43305abd8b86d1a0e51ab54e4cd1632a850513428e92f70f0a91ac9c014bb623f7a12d07aaa75
 MISC metadata.xml 394 BLAKE2B fafba25060bc4bb387492659132b39d8b4fd7fbc2136de870eaa87ab9ee3ecaea732093904a3c580b80150da5c47f445fe3b5f85716c343904684dd1fbda2b94 SHA512 da62983710576f02082e75cd84648e47e97d1aae6b25e862fc0c4379b07976ac2838684760b7aebc77e775ff631fc9a57fabfd7997831d2112b58ad010dcd31f
diff --git a/sys-cluster/minikube/minikube-1.26.0.ebuild b/sys-cluster/minikube/minikube-1.26.0.ebuild
new file mode 100644
index 000000000000..e71ab0934cc9
--- /dev/null
+++ b/sys-cluster/minikube/minikube-1.26.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module toolchain-funcs
+GIT_COMMIT=f4b412861bb746be73053c9f6d2895f12cf78565
+GIT_COMMIT_SHORT=${GIT_COMMIT:0:9}
+
+DESCRIPTION="Single Node Kubernetes Cluster"
+HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
+
+SRC_URI="https://github.com/zmedico/minikube/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT MPL-2.0 WTFPL-2 ZLIB || ( LGPL-3+ GPL-2 ) || ( Apache-2.0 LGPL-3+ ) || ( Apache-2.0 CC-BY-4.0 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened libvirt"
+
+COMMON_DEPEND="libvirt? ( app-emulation/libvirt:=[qemu] )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-go/go-bindata"
+
+RESTRICT+=" test"
+S=${WORKDIR}/${P}-vendor
+
+src_configure() {
+	case "${ARCH}" in
+		amd64|arm*)
+			minikube_arch="${ARCH}" ;;
+		ppc64)
+			# upstream does not support big-endian ppc64
+			minikube_arch="${ARCH}le" ;;
+		*)
+			die "${ARCH} is not supported" ;;
+	esac
+	minikube_target="out/minikube-linux-${minikube_arch}"
+}
+
+src_compile() {
+	# out/docker-machine-driver-kvm2 target is amd64 specific
+	# but libvirt useflag is masked on most arches.
+	COMMIT=${GIT_COMMIT} \
+	COMMIT_NO=${GIT_COMMIT} \
+	COMMIT_SHORT=${GIT_COMMIT_SHORT} \
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	LDFLAGS="" \
+	emake \
+		$(usex libvirt "out/docker-machine-driver-kvm2" "") \
+		"${minikube_target}"
+}
+
+src_install() {
+	newbin "${minikube_target}" minikube
+	use libvirt && dobin out/docker-machine-driver-kvm2
+	dodoc -r site CHANGELOG.md README.md
+
+	if ! tc-is-cross-compiler; then
+		"${minikube_target}" completion bash > "${T}/bashcomp" || die
+		"${minikube_target}" completion fish > "${T}/fishcomp" || die
+		"${minikube_target}" completion zsh > "${T}/zshcomp" || die
+
+		newbashcomp "${T}/bashcomp" minikube
+		insinto /usr/share/fish/vendor_completions.d
+		newins "${T}/fishcomp" minikube.fish
+		insinto /usr/share/zsh/site-functions
+		newins "${T}/zshcomp" _minikube
+	fi
+}
+
+pkg_postinst() {
+	elog "You may want to install the following optional dependencies:"
+	elog "  app-emulation/virtualbox or app-emulation/virtualbox-bin"
+	elog "  sys-cluster/kubectl"
+}
diff --git a/sys-cluster/zetcd/Manifest b/sys-cluster/zetcd/Manifest
index 44b4c574c41d..4be6113d9901 100644
--- a/sys-cluster/zetcd/Manifest
+++ b/sys-cluster/zetcd/Manifest
@@ -1,9 +1,9 @@
 AUX zetcd.confd 86 BLAKE2B e553ed0a94a5697ea674e6ef30f1057fba656975d86b32d3b7163687126af56de3963384155a261e1ca484de14bb4b7b0ab5763e490392e190dfe889c80abdfe SHA512 6375022e8ed703ab87d1f8d22377ac831d4488835da566c108f6ee8c1b45bbbb40bab99d27f4845f3f1eb35e562ae3cb1aaec8ca135864b9a24cb612b1234845
 AUX zetcd.initd 588 BLAKE2B 5673fab83c16dce5b0f1cfada5346e5bf2ecb35f9d4efaddb4042e78ff81863dd00c0992e7969e852b4b6f7bbcb65b399a0a7eb02ead7b330836c6a7277d9ba7 SHA512 642aede75ab87f54ca950baa259215527e27de259e623e4ac378beb07bb2f2f410cdb85d4cd90200da784881d45d055b7776713ae497ffc292375f090b169810
-DIST github.com-coreos-etcd-714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz 2522134 BLAKE2B 97706bf671f45c02e4852507678fd98174dfa747f8f7433f82ccbed6939881425089dff10f72e426e1a37a6227099b44fce56ab6ca63a0c17c0357e2160dcdad SHA512 49fda050ed682177b8b61a6b715fc163df307bccae9801547774593b86afe4fa0d80d49cf19a56f3bd4af162263bb9a7f57952a8c9ed824caac1c39d87f178d1
+DIST github.com-etcd-io-etcd-714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz 2522193 BLAKE2B 3c85315af69aebb1694f4e329e56152c20f80f5985363f6f739529f7bc2149982a1c24c6c4bb24bfdf3196510afb5f6ad4cd63adec6eff498843aababf8ebce4 SHA512 4ae964789da6e2f586d7c6f7f390a54fa8dc708cea072195fbca74d3f51f9ea4db89566cc8e32687023c43a6578bf03c3ccdf18204ff0f42d17a918c29282133
 DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31
 DIST github.com-google-go-genproto-ee236bd376b077c7a89f260c026c4735b195e459.tar.gz 968271 BLAKE2B 25c00f9bdb5b6069b3e06bd4e26b5df95110843c894216eef033e10660a5103d4b471ad8b014630292c5001f976c54e1da5dfb4c89d6f655715241d41ee99b7b SHA512 a3a9e923926da62e097ee1775332cc5550334e4f96975f2ac5f0d3bdaa148f6583dcce10db68d1d4606ee471072b3248f40ae276bd9409c0d31a9f9bb3803bc1
 DIST github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz 220340 BLAKE2B 788b394df3b791a558c5aeb0fc1e330053d0dcc58d47308d337498743284a7b0a01eb28a853d619ae0038b27db4c93883cef672f74d7a7442d856b19e3e1cfb2 SHA512 ca79d38bc7d68f1d98869bee21dcdc563c3fee1a8d28b77d474752376fb91cc7b368466dfac41ddebbec13c1560ac3c22257a52deb6d844add5d208646d2e3f5
 DIST zetcd-0.0.4.tar.gz 1781564 BLAKE2B f6d5b69b9679dd53aa2f993979fbe8acc7711544fc43f58624d05223b90ff1aff76a8760708cbe8d3d424516ba67fc44967f1c54c025cd471d95465b2d6ba000 SHA512 d01cf89f500c6caf0ca4b60adda82d662d3f8948aeb3963f72872363f31ecd4e99b2b839ad8ae826906b0abdc46fbdacd6f996778d2a51cf2a1ddc6ba09b3fc6
-EBUILD zetcd-0.0.4-r2.ebuild 1386 BLAKE2B 74aa134c48e0dc58f6bcc530f3e178c8be1a78d2bae269c9a07719fd1cd98e0a38311b5fc275c48ae22e2ec9c5ec6495efd9700fd2fd5736adbc2fbea42b7781 SHA512 35ee46e0abec9043321f1b09005e6894e096d4b41c2f1afc53e814566130ab8032cf50ed3cd9a1fb7c1ccc80274bb4eb26921e2d17c155b897d05d2b6be1dacc
-MISC metadata.xml 245 BLAKE2B 33749df15bcd6d8e285947ba43438d15972ac46ee18303e6e3d38140e14a810bbe3ec75fb3907dc3cd50dd56ee38542c97f05c8c9e18a3f0dc428536461348c9 SHA512 27fc86201553e8bee582ead5ba2a830bcc787f2f543a0026d544d7a972095efa731988b339821acbf0ad8389c4f37a08d29493dcbcdcde5154fee54645535680
+EBUILD zetcd-0.0.4-r2.ebuild 1387 BLAKE2B 5de22029bc776b16ea09c711b8ec4cf168874d616194e5076565f71bb1a9ddd2f53f1ecf7ce58046ec197e3111a27c0560f336d2333eef05c9dedc63ba300766 SHA512 5894b9900e85110c4dfb1b457420b29056387e04f86679b030a5fc6e3e4abe82cf9c726c99830d24bf6be9cf104daad4eb7ca6dd049671435bdfd7f1496c2d62
+MISC metadata.xml 246 BLAKE2B 43e4951b036ee7a399932fd854c8e3f205f4a16bea323630bc97b22c82be1e63f55945572bf2a237ba931901b93f396dc03fe23234efc004ebaca4852ab4c2fb SHA512 23bbb13506163c11f09bb5b4e3272394bc9fe63b6334095216a64f7c824510e3215e834d8cf58e4328c45733b788675345c307316b89af00f16cc7313f5ce434
diff --git a/sys-cluster/zetcd/metadata.xml b/sys-cluster/zetcd/metadata.xml
index afb7248bd92c..70f750172570 100644
--- a/sys-cluster/zetcd/metadata.xml
+++ b/sys-cluster/zetcd/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="github">coreos/zetcd</remote-id>
+		<remote-id type="github">etcd-io/zetcd</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/zetcd/zetcd-0.0.4-r2.ebuild b/sys-cluster/zetcd/zetcd-0.0.4-r2.ebuild
index a1a5da597d9c..69fea40eac84 100644
--- a/sys-cluster/zetcd/zetcd-0.0.4-r2.ebuild
+++ b/sys-cluster/zetcd/zetcd-0.0.4-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGO_PN="github.com/coreos/zetcd"
+EGO_PN="github.com/etcd-io/zetcd"
 
-EGO_VENDOR=( "github.com/coreos/etcd 714e7ec8db7f8398880197be10771fe89c480ee5"
+EGO_VENDOR=( "github.com/etcd-io/etcd 714e7ec8db7f8398880197be10771fe89c480ee5"
 	"google.golang.org/grpc 777daa17ff9b5daef1cfdf915088a2ada3332bf0 github.com/grpc/grpc-go"
 	"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
 	"google.golang.org/genproto ee236bd376b077c7a89f260c026c4735b195e459 github.com/google/go-genproto"
@@ -17,8 +17,8 @@ inherit golang-build golang-vcs-snapshot
 
 ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-DESCRIPTION="A ZooKeeper personality for etcd"
-HOMEPAGE="https://github.com/coreos/zetcd"
+DESCRIPTION="ZooKeeper personality for etcd"
+HOMEPAGE="https://github.com/etcd-io/zetcd"
 SRC_URI="
 	${ARCHIVE_URI}
 	${EGO_VENDOR_URI}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 32d970ff0f7c..4ecda0bfa2dc 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 2e58d98e2275..5a6bf0372549 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,5 +1,7 @@
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
@@ -11,5 +13,6 @@ EBUILD clang-common-14.0.1.ebuild 598 BLAKE2B 2f8544b82c215c7c39037a65fee3e2ec5c
 EBUILD clang-common-14.0.3.ebuild 547 BLAKE2B bb30fa507d6383b92417c55f10a7233e0d48ab7a3ff07b811e135e5f828a2332eafdbee2ee738050a7536b6f956cf8285f0e6d8f40511891580278b2434414d6 SHA512 e70dbbf7bb64ef672de7349d423c41b9ef88471c22be0e3ae326ee1506f3c764f3ca0e695a9953273411c70e4f7ec903533749d030ec37c381819b1850679dd8
 EBUILD clang-common-14.0.4.ebuild 543 BLAKE2B 2531c3a58aee817eb9cf50d95e247834368510254e98bcbb30e722465bc0fd4b1ac939a86db164cb9c47bb3514223e28ce1f3f30b1c487df0dc9ed1e0c3c48ce SHA512 7525381166a93054a9c7b5967aa891c70b81d84c267e9a8ffad27eed340a85acea7b13396de80e1552c73f353de94595b7e4a4a122013ed41c5167da1ed21bfb
 EBUILD clang-common-14.0.5.ebuild 547 BLAKE2B bb30fa507d6383b92417c55f10a7233e0d48ab7a3ff07b811e135e5f828a2332eafdbee2ee738050a7536b6f956cf8285f0e6d8f40511891580278b2434414d6 SHA512 e70dbbf7bb64ef672de7349d423c41b9ef88471c22be0e3ae326ee1506f3c764f3ca0e695a9953273411c70e4f7ec903533749d030ec37c381819b1850679dd8
+EBUILD clang-common-14.0.6.ebuild 547 BLAKE2B bb30fa507d6383b92417c55f10a7233e0d48ab7a3ff07b811e135e5f828a2332eafdbee2ee738050a7536b6f956cf8285f0e6d8f40511891580278b2434414d6 SHA512 e70dbbf7bb64ef672de7349d423c41b9ef88471c22be0e3ae326ee1506f3c764f3ca0e695a9953273411c70e4f7ec903533749d030ec37c381819b1850679dd8
 EBUILD clang-common-15.0.0.9999.ebuild 463 BLAKE2B 78e3106b33b6a5b776a1ae91541ec295e08f284b9017684ea1481097be14084bea03013103163b9a1d059dcd261f85469e34f9e730b34cc957078fa645886f9a SHA512 94970664f46768b3373443c17a1cbdfccc6a75d5343f6effee228284931997129214bf0cc9ffcaa386878e7b405dfd7c876ca303bd1686e72197027ede6d37c8
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/sys-devel/clang-common/clang-common-14.0.6.ebuild b/sys-devel/clang-common/clang-common-14.0.6.ebuild
new file mode 100644
index 000000000000..798f9e9fb858
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-14.0.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+
+PDEPEND="
+	sys-devel/clang:*
+"
+
+LLVM_COMPONENTS=( clang/utils )
+llvm.org_set_globals
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 7b2e94096b00..115db4446ff7 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -4,5 +4,6 @@ EBUILD clang-runtime-14.0.1.ebuild 776 BLAKE2B c0abdf45df4a1fcabc55e9a6bc0c39ab8
 EBUILD clang-runtime-14.0.3.ebuild 766 BLAKE2B db9c38e5d06c9e20d002696b879f61cf79cfe43059224f4a30d9e472a0ecd4a9298d03767e82ac29abcfba283754cb06c1b460e759763dcad130446323af4ff8 SHA512 475cd0538899a4d2a0132f79efbe7fd928a41e7e11798a35b5ba10b3bfcb9bff01b471af5a611f40d3981d2b9d9902fa1bc223199429685de475c38396ffa53e
 EBUILD clang-runtime-14.0.4.ebuild 762 BLAKE2B 79d18f256e6ca655f363497a7d543784744ea7b1dff0a1b0ad56ec7eb105e57f136275d933c6a139368ea646efe38f87f34540750a055957cd2177871ab223c5 SHA512 ec74f133c9b999b481eb7467687fa62f79e2e500bc77203eb67fac0719d47de7f629898bfc4804594f0b3523be8aaf8b227f93daea4ebc794d2f14115b53f9f0
 EBUILD clang-runtime-14.0.5.ebuild 766 BLAKE2B db9c38e5d06c9e20d002696b879f61cf79cfe43059224f4a30d9e472a0ecd4a9298d03767e82ac29abcfba283754cb06c1b460e759763dcad130446323af4ff8 SHA512 475cd0538899a4d2a0132f79efbe7fd928a41e7e11798a35b5ba10b3bfcb9bff01b471af5a611f40d3981d2b9d9902fa1bc223199429685de475c38396ffa53e
+EBUILD clang-runtime-14.0.6.ebuild 766 BLAKE2B db9c38e5d06c9e20d002696b879f61cf79cfe43059224f4a30d9e472a0ecd4a9298d03767e82ac29abcfba283754cb06c1b460e759763dcad130446323af4ff8 SHA512 475cd0538899a4d2a0132f79efbe7fd928a41e7e11798a35b5ba10b3bfcb9bff01b471af5a611f40d3981d2b9d9902fa1bc223199429685de475c38396ffa53e
 EBUILD clang-runtime-15.0.0.9999.ebuild 700 BLAKE2B fc3ea6d50378cd569aa9a2a30cae69dfe59524f7c9edf5a4f6e39d5d07568224625ad286e857d7d852aef95903cfe9804f54e83aa093269ca2287f57fba2ebb2 SHA512 0b88353d5a7fda68a034017bac76c37ef36d8477b52f4446e81ff01861d50f1140933b54058ad3a3bfa5cade8d8ad2c86cfe5c580b682a9bb03f2e471d3e99ed
 MISC metadata.xml 579 BLAKE2B bedb10265d687b5c8c6af5ff9a9612076e7c17c3ddd479c8fe9eccf6e13e74d55b182b4bcb17d213aaa55a57f4b29ee8f90287d6f08e7ebc20b9c4724773f376 SHA512 d872f42ab248387aeb61a42a9858ef80e0c278079e472ccd9d3099515d3c6acc6b38ea2e992ff58df31798a71baea2df19834523bcb64c609a842b8f0abad532
diff --git a/sys-devel/clang-runtime/clang-runtime-14.0.6.ebuild b/sys-devel/clang-runtime/clang-runtime-14.0.6.ebuild
new file mode 100644
index 000000000000..f0ec98510540
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-14.0.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+
+LICENSE="metapackage"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~arm64 ~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}] )
+"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index cc807bfbcf04..884d0d781d84 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -10,9 +10,12 @@ DIST llvm-gentoo-patchset-14.0.1-r1.tar.xz 6132 BLAKE2B c99f57a09f214361f2728938
 DIST llvm-gentoo-patchset-14.0.3.tar.xz 5492 BLAKE2B 48a46d50a81c5572d1573c6923bc404b198f74ee8587a928e0858553dac37f7fa39cc969d72b938ef3d2f04f6872f9e2e2478821ab90c657ecbbacb3f7d99d7a SHA512 b917b549de6d46cd7aab3e59b888b5e5ffb955435b33d6538be2f31dc30217a24740a673cb6bb661087c245121edb079052b179badaf70b86b985ca69b3652a6
 DIST llvm-gentoo-patchset-14.0.4.tar.xz 4072 BLAKE2B cbd8804e33069ca2709503931545a57cfd33c06f28696d876d499285e9add9487a069495b756bbb94d29a162c39ece651defddd302e3ac523c5484c09fb3d2ea SHA512 db00268d01e7ec99b907321384c02468a53020386ee4fc819fabfc1cd0784323044931dac42437968d5fd37190da1b9f8f847af553a65a0595c33cecfd82c293
 DIST llvm-gentoo-patchset-14.0.5.tar.xz 4072 BLAKE2B c35072f70831d5e3c9f7236f8473b098e6b8da4f27ce6a382ff4d3cd235837b25b9a1bc1e406ce0d3feb05e4d1e1c8bf141ff8f218568d5a5339fd1092f86b62 SHA512 646e0515a6cf1aae86f05db4797d7af6e3c9b8a6070f41cbd36535944029e0e5888128e33d8c44af22b5bb9ccba392b9dfeabc7708e5eab11858edefced6b68d
+DIST llvm-gentoo-patchset-14.0.6.tar.xz 4544 BLAKE2B b613582fa048837303168a2d62835688128621236022ca6c232293cb2e4549174ef256e7dcd8303bfef6d5456d0459ddb2cbda4a4d323b82901da4c16f15dcc4 SHA512 fb89a3186c5bffdc6245ed103d79fe6802a86986bd43891b7e128955bd546dffcb5b4083ac9e7966f67ce8dd82322756a11428ab4c62d21f012d614062adab35
 DIST llvm-gentoo-patchset-9999-r3.tar.xz 4076 BLAKE2B 30bdf740606a1718ae45d850803385d425b656fbbe0250f587cad54f55272e3617d5ee0d04f534a58f87408b0a2dea322ebf1bb8cd653a2beba21d0bc5778c62 SHA512 2c7080ffd09d7dcf4c72a97044a5c63ab895250721d60270bc51c2095aef5f9039781892b4c0d14e942611686153f874a1f52a1c854bb8ca093383c08bdc005a
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
@@ -24,5 +27,6 @@ EBUILD clang-14.0.1-r1.ebuild 11718 BLAKE2B 4ab89715310f1d294d43b70e6326b38fd195
 EBUILD clang-14.0.3.ebuild 11722 BLAKE2B fe559baac96ab7a231878a149cc3c153e85a313a36986727bf0b42ee34b71a7999bc89faf8fdb546a7d86d5eae46222c5bd562c04b3563aa20521a7ba7c1eb6c SHA512 4d711a74d2ce7a0b8d9354cbd84e8987d19715f6cb4b621b4f1ccd020fa8a443a95225f93df229a835e5fbc4b9c6749d02734df8d0f7fef63033b9e4969b60e2
 EBUILD clang-14.0.4.ebuild 11718 BLAKE2B 91ecb7520ae7a4292e3064154a6b9678acd1b00a2286b2bfef78823c4402aa1df08ae77c6816d20e5e9178958042fcc889889ef9ad2e0448fc91bc71b56500ef SHA512 8752d1448aa40ec46dff04a02e286eec6d9906f29467207345d5da9c70daec8080272c43a9a2c4734019faa919d9e44138204068d082fde1e89b321c99f1324a
 EBUILD clang-14.0.5.ebuild 11722 BLAKE2B fe559baac96ab7a231878a149cc3c153e85a313a36986727bf0b42ee34b71a7999bc89faf8fdb546a7d86d5eae46222c5bd562c04b3563aa20521a7ba7c1eb6c SHA512 4d711a74d2ce7a0b8d9354cbd84e8987d19715f6cb4b621b4f1ccd020fa8a443a95225f93df229a835e5fbc4b9c6749d02734df8d0f7fef63033b9e4969b60e2
+EBUILD clang-14.0.6.ebuild 11722 BLAKE2B fe559baac96ab7a231878a149cc3c153e85a313a36986727bf0b42ee34b71a7999bc89faf8fdb546a7d86d5eae46222c5bd562c04b3563aa20521a7ba7c1eb6c SHA512 4d711a74d2ce7a0b8d9354cbd84e8987d19715f6cb4b621b4f1ccd020fa8a443a95225f93df229a835e5fbc4b9c6749d02734df8d0f7fef63033b9e4969b60e2
 EBUILD clang-15.0.0.9999.ebuild 11651 BLAKE2B 80cec4f9484772c186f3c1e228e013bd1e8f4d3cf0df7b75b696060b06ba86fe7bc1d14c4c043b7b26d750848c9bd13269585de0d4cf459792e5679fad38ef2c SHA512 1188bbfff21908232e4e1b1b703513cbdbad8abf9c7380f7be835bfaa1fe5125739440d8b3fa8b2c28e4e2fb872d4278bde83a9ea0c2cf8c54e7ed709e373013
 MISC metadata.xml 1337 BLAKE2B 5e4f7d63cd9f3b03600801cbe3b2963a1e6b2fb48e36fdb12862f467829222c182f5958d35b535d8fa8467ebaad05c9641cd645294706e3a0f4a078dc9c2f8cf SHA512 50c1a7c33414f9d6294873478f1017dfb21311b36c916e15a8b068cf2a968fe8d774b51515f61c3632d2b204f103cc7ae6853b14d582291087a0fb8e15c0b35a
diff --git a/sys-devel/clang/clang-14.0.6.ebuild b/sys-devel/clang/clang-14.0.6.ebuild
new file mode 100644
index 000000000000..ed84f3755fa2
--- /dev/null
+++ b/sys-devel/clang/clang-14.0.6.ebuild
@@ -0,0 +1,440 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org multilib multilib-minimal \
+	prefix python-single-r1 toolchain-funcs
+
+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="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
+IUSE="
+	debug default-compiler-rt default-libcxx default-lld doc
+	llvm-libunwind +pie +static-analyzer test xml
+"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+"
+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-common
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? (
+		=sys-libs/compiler-rt-${PV%_*}*
+		llvm-libunwind? ( sys-libs/llvm-libunwind )
+		!llvm-libunwind? ( sys-libs/libunwind )
+	)
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	default-lld? ( sys-devel/lld )
+"
+
+LLVM_COMPONENTS=(
+	clang clang-tools-extra cmake
+	llvm/lib/Transforms/Hello
+)
+LLVM_MANPAGES=1
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
+)
+LLVM_PATCHSET=${PV}
+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=${SLOT} 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
+}
+
+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
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			c-index-test
+			clang
+			clang-format
+			clang-offload-bundler
+			clang-offload-wrapper
+			clang-refactor
+			clang-repl
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+
+			# extra tools
+			clang-apply-replacements
+			clang-change-namespace
+			clang-doc
+			clang-include-fixer
+			clang-move
+			clang-query
+			clang-reorder-fields
+			clang-tidy
+			clang-tidy-headers
+			clangd
+			find-all-symbols
+			modularize
+			pp-trace
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-clang-man
+				docs-clang-tools-man
+			)
+		fi
+
+		use doc && out+=(
+			docs-clang-html
+			docs-clang-tools-html
+		)
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-build-py
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# 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
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
+		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
+		-DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${BUILD_DIR}/bin/llvm-lit"
+		-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"
+				-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
+			-DCLANG_INCLUDE_DOCS=${build_docs}
+			-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
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/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
+	cmake_build check-clang
+	multilib_is_native_abi &&
+		cmake_build check-clang-tools check-clangd
+}
+
+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
+	mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1 "${llvm_version}")
+	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+	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/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/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}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/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/${SLOT}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+	if multilib_is_native_abi; 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/${SLOT}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/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/${SLOT}/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/${SLOT}/share/clang"
+	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"
+}
+
+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/gcc/Manifest b/sys-devel/gcc/Manifest
index 73b04896993e..969bf1fcaee1 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -4,6 +4,7 @@ AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097
 DIST gcc-10-20211126.tar.xz 71674848 BLAKE2B 81f4a572e973db7a3701601e66ea58c8e535a55d4d4ac164de00bdb06f7f265585f45d46171cf40d42ebcd3fb02ac81b643398c560912698eb6c008ac6e09518 SHA512 db887184c649ebeede5a1b9f13c00fe425012434cb93ec960c3ca50c0bcdeab04a1cc13b20de21b940e5d6a09c3b1c7fc415110a0e990ec1d938627bf97b9342
 DIST gcc-10-20220609.tar.xz 71752672 BLAKE2B c29511145d3712624caa3e8a194a5f37f958b6b556afa79d8c360697f3fa9a78fbb2146457e656b4ee9f10ee5e7d87b26e314c01348689e066fdfc186082d739 SHA512 333252e045107688e7a6af397456626b04e2bdd2086f4bbaced4ccacc387af2a63dd8aa46c261f602fc287b55821a91ab772122a3ea252528e52fab7cf046f21
 DIST gcc-10-20220616.tar.xz 71754768 BLAKE2B 6cd2febb886496191183efe593bf918fb8045346987fdcec6c3a36ebb696546cce3d3c2d12d2d32c01fc3765cd287936255187c40e2bda3bb112216938d20340 SHA512 1d574ca79ca22c18f8e7bbac2792c71a4a6102b7c53f8864950df08036ad341ee11fc95be9b2ceca043eb13fd301cf09efe9da14f6138913c7c25dbc045ccf4e
+DIST gcc-10-20220623.tar.xz 71747668 BLAKE2B 3849182a188f4a3b5f19e66008a23ab50ff5bf933d28254432d62ce880b7921124302658553c7bc1e8756c430d11b5d577685d1d70b9851b714d1e15b1d7b4ac SHA512 294093cdd0949238e903f91c4ed28b2fd063d25aa6aa7947acdb318350c582e43d15b98a78756da692d0625c6d190c67b62f215ac865594712d6f8efe298831b
 DIST gcc-10.3.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
 DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
@@ -14,6 +15,7 @@ DIST gcc-10.4.0-patches-1.tar.xz 14392 BLAKE2B 76cc16bb611f1ac2020f0f430fc3f038e
 DIST gcc-11-20220115.tar.xz 75676672 BLAKE2B 12171fd97731dbca67f13cc2a3a3a3989c22d628b289cbd3d46080f77a8d951f15c1e54e83a2e62ab41b69221f9784e970799a11a9ed5b224a77ba4b1b081f07 SHA512 7455b3b29d3c64df9123afef82faf922d97e08a3ea30fbc2d9286d4f6ed2fafbfc0f9d94ae1b9eee45329e95a27bd642b3aa679d83a0c27a3e30967d49e0728c
 DIST gcc-11-20220610.tar.xz 75771324 BLAKE2B ab3d2792b778961db0fedf0d965f37deec87832686ca127475146820c1f9b3a1c6872b9170c811288e891baf9de90e7dcce2f4ace96dbba0d96fff9d2757fb8d SHA512 17f70761378dd3b7bba341abfdb9274abe1bf75e61d6dd59edd5befcd10ddc02cad7fcb8f07eb0d10449b405066aa78fe8945f95e870f20b464ca90072a394d8
 DIST gcc-11-20220617.tar.xz 75767216 BLAKE2B 295197af88f0f06e1d2dae85f3f5aa8fc693d72d07c9b15e42c87a23953ec8362cc0d70a4f3f11e8c47d5ee278e34b2854c4bbf29f601b700b75f22f21a0c8ef SHA512 8162de529dab4aebcb021729454f00e13b71933075d13b5b2f4993ce9ec84159f739788043996a5ff4fbf8b71747acb43275560a401f3503ed0972215b55659f
+DIST gcc-11-20220624.tar.xz 75765436 BLAKE2B 642bbda212f31344822ec90bce1422146515b153ddb306c5fd1bcf25be25fea7ed5bc1aa6f5987755969e73af5de1484fb79a805e87428bcfa0b13257b9c35df SHA512 736a71de166851816914561bfbe7c00110b32f8b7e1666176babdfcfbdef4410ba07c8e2d912da2830fa14c6732f9ca555cae127481b07a85f7e689d87f9d509
 DIST gcc-11.2.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
 DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
@@ -41,12 +43,14 @@ EBUILD gcc-10.3.1_p20211126.ebuild 542 BLAKE2B 43170f8b81699ab102c389f42313ab6d4
 EBUILD gcc-10.3.1_p20220609.ebuild 1140 BLAKE2B 194bf4b9cc661d41554e255090f5da62b4181e4d8ed5036c9354864f16ac7cd317b5b9def8c493d68d66de54116c5d9539478e0cbc0d063014c08a6a4577c71a SHA512 05886317a1d6ef47e0acbdafc0ea6d578be1c873e663bd49416066223fc0e5c9c62d63af3832d6a5dddefd5019bad07b488e6514e4b6db1d4c1e95b0211421d7
 EBUILD gcc-10.3.1_p20220616.ebuild 1140 BLAKE2B 194bf4b9cc661d41554e255090f5da62b4181e4d8ed5036c9354864f16ac7cd317b5b9def8c493d68d66de54116c5d9539478e0cbc0d063014c08a6a4577c71a SHA512 05886317a1d6ef47e0acbdafc0ea6d578be1c873e663bd49416066223fc0e5c9c62d63af3832d6a5dddefd5019bad07b488e6514e4b6db1d4c1e95b0211421d7
 EBUILD gcc-10.3.1_p20220621.ebuild 1455 BLAKE2B 5b8be9b7a57e10edf8968b36583100c4601fc21f2fc78e40e3b9e214a1d4b4ce718a8d139a088d76f3cb55b8faa69fc5b219829c17487e286dc1a171e0f8ea09 SHA512 c8993e6758f554980f765a360aeb994cc636d4d46c423af1ce02ef31084f792256d3c9c228b4bb05fb94336a86d1d7e7c1394c7accf3feae0973394bf49fd380
+EBUILD gcc-10.3.1_p20220623.ebuild 1456 BLAKE2B 1df37bdd7187d54fbdf615aac27ff9c72ede314cb90aa7ceb0b468f270e05e86a40dce77c9b762734df50658e9e5948344fcd3491b314987ca6117922c660e27 SHA512 f761cd77c9129bb0ed0acefdaa091ff40d025178e3e79027acc457ee2355aa9cba94c610d298cf24faee2c2c79a081615e92aa03011100e0c8cb8216e8460676
 EBUILD gcc-10.4.9999.ebuild 1110 BLAKE2B c0aebc30093330cd719626ebb0f887f628ec761d5129e69a89151f551780cb384d848ba71573b413757cd5a16c06366c64f86ba54302b38a7e49928bf9736bdc SHA512 e5feb54cf8eac51374020cb1137f6891299e9a7f571c541cfd7554be6d2b9004ab3065a43673beeb0cbb9979174e5a8285187c88f4c1edd469a865b1861dada0
 EBUILD gcc-11.2.0.ebuild 495 BLAKE2B 122998d820667dbf776aaa7f48a79b3c127f1558f8ec811543e83d3f8534be368749e388254ff14139076baabdcc7ead4be8c5d8f23b3c764ad721cf0478265d SHA512 65a1c11c97d4bde439abad6cd68ee97dd04e8750f4728c3588e923f32eb56b61afa0243570b8c66599e6fe9f6d122113c00c5c1cdf9b7869f01c1564a6c21707
 EBUILD gcc-11.2.1_p20220115.ebuild 688 BLAKE2B c85314316bd63ceae85eaf1ae501932be00c2f5b80092ec4a894aa221e015daceb6687dbf962089b39195ae6470665e7faf09fe9600ae0c74e4d94fcd903e789 SHA512 59d147c88bf9e2a3779320ee89145f01f2acd1110efffc9f967a0c7fee3d910218424b48bf2166c06662a0b1b545b996869f5060ee23da54e8a10f1a0afc3477
 EBUILD gcc-11.3.0.ebuild 688 BLAKE2B 679f254453b4d36a811bd1b7cf0a114fd26737cea9630f81ff7c68ee5c318aad9d53f9ccf1928b77e3c64e95c68f070c98ad827f3e1401a91fad4549f1938334 SHA512 4e0b27bc9e384ce97aeb4ca281bfaee9a98656d72989aca9376a445a50e84b4ddc078faa9c302d40ffdbd4470cd365fcc4815b0a090d51dd007543c575a9637a
 EBUILD gcc-11.3.1_p20220610.ebuild 1304 BLAKE2B 30a6a634b9752f514e1c1529e43d7b6cb842f44cb0a99cb9ae95a543ad9d0a783208f2639c19d577e7806b5dea120327f24893ea91f0de04160fc50184d97423 SHA512 bb90a6e3c2cb8fa31bdb2fcff26c0defe4d4d784ccea2c24169413b70540c4916d802eb21617339dd9d814cf946b8f32b379b4212a5cb2a653bff4e62e337077
 EBUILD gcc-11.3.1_p20220617.ebuild 1304 BLAKE2B 30a6a634b9752f514e1c1529e43d7b6cb842f44cb0a99cb9ae95a543ad9d0a783208f2639c19d577e7806b5dea120327f24893ea91f0de04160fc50184d97423 SHA512 bb90a6e3c2cb8fa31bdb2fcff26c0defe4d4d784ccea2c24169413b70540c4916d802eb21617339dd9d814cf946b8f32b379b4212a5cb2a653bff4e62e337077
+EBUILD gcc-11.3.1_p20220624.ebuild 1304 BLAKE2B 30a6a634b9752f514e1c1529e43d7b6cb842f44cb0a99cb9ae95a543ad9d0a783208f2639c19d577e7806b5dea120327f24893ea91f0de04160fc50184d97423 SHA512 bb90a6e3c2cb8fa31bdb2fcff26c0defe4d4d784ccea2c24169413b70540c4916d802eb21617339dd9d814cf946b8f32b379b4212a5cb2a653bff4e62e337077
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
 EBUILD gcc-12.1.0.ebuild 819 BLAKE2B edb479f30802d9ac62555dc535d388f7630572f44d462d249758f4de5ce62f43c7664cdfe304e48e2009442ff5e8f687ae729947d5e16f8b8dc78d459b74b1b4 SHA512 fa31a6780c63b1ca4f63fb547059528da4f0180c4be307281e54ea06bc0fd8d23599000c166fbdbfc5f618d0ffaf007ac37152efb857f5cb0d2b794a2dd4e9c1
 EBUILD gcc-12.1.1_p20220528-r1.ebuild 819 BLAKE2B c1398689a1f30a4ee55875e289ea81fc63c8a0e5624b29104a370b57e54d7edad1c6c40126f252e74a4c0ff4f1f9ae62ddd79ba900ce5d8e8762c870f8194943 SHA512 56b8adbc634f2138b7fec66379b7e6f6d886ddf53f1dc7ab2dad4c30bf7606cca4c3000173d10ec705cef8a899fc5414cabc0cdedf6b64295bffb494bb707f4b
diff --git a/sys-devel/gcc/gcc-10.3.1_p20220623.ebuild b/sys-devel/gcc/gcc-10.3.1_p20220623.ebuild
new file mode 100644
index 000000000000..3b0410d85b84
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.3.1_p20220623.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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.4.0"
+PATCH_VER="1"
+MUSL_VER="1"
+MUSL_GCC_VER="10.4.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-11.3.1_p20220624.ebuild b/sys-devel/gcc/gcc-11.3.1_p20220624.ebuild
new file mode 100644
index 000000000000..66746a359bd7
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.3.1_p20220624.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="0"
+PATCH_GCC_VER="11.4.0"
+MUSL_VER="0"
+MUSL_GCC_VER="11.4.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))
+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
+
+# 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(-)?]"
+
+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 29cb10df5404..5a3d4015999b 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,5 +1,7 @@
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
@@ -11,5 +13,6 @@ EBUILD lld-14.0.1.ebuild 1882 BLAKE2B a1368fef8cf1bf6d9992ee4e02dc1997c7146db0a5
 EBUILD lld-14.0.3.ebuild 1888 BLAKE2B 9f1e293f57783d8950a3f15494f1063eb831f32e8b4b91eecbfc09e4d99fd322fe9d40f368ab9e7bd016cc55626d00d1c0666a47958a8c161854d79baacd61da SHA512 970885cdbeb7b14dd4ea979c2ff7713159ddaef8a6e576c911a3f7fb2818cfe745ff1c842804233cdba7508a4c8f402f0850052d1376ceefc205e287202a818a
 EBUILD lld-14.0.4.ebuild 1884 BLAKE2B b55019612963f4f4a18c501f00dea7b9bc100275ec728e5b6e2ea9ae4dea0312ecd231d2376471042fa7ee80afc25685763a57f63bb8e5122546b2405767e15a SHA512 815c46d59baec3c121060733d64a74c659e4fd1a12b0de7332f874caf04bbec67dc8166bd04e0a6fac449ed409c9abcc2cf11bf533f1e9965a6bc76c3bc785b7
 EBUILD lld-14.0.5.ebuild 1888 BLAKE2B 9f1e293f57783d8950a3f15494f1063eb831f32e8b4b91eecbfc09e4d99fd322fe9d40f368ab9e7bd016cc55626d00d1c0666a47958a8c161854d79baacd61da SHA512 970885cdbeb7b14dd4ea979c2ff7713159ddaef8a6e576c911a3f7fb2818cfe745ff1c842804233cdba7508a4c8f402f0850052d1376ceefc205e287202a818a
+EBUILD lld-14.0.6.ebuild 1888 BLAKE2B 9f1e293f57783d8950a3f15494f1063eb831f32e8b4b91eecbfc09e4d99fd322fe9d40f368ab9e7bd016cc55626d00d1c0666a47958a8c161854d79baacd61da SHA512 970885cdbeb7b14dd4ea979c2ff7713159ddaef8a6e576c911a3f7fb2818cfe745ff1c842804233cdba7508a4c8f402f0850052d1376ceefc205e287202a818a
 EBUILD lld-15.0.0.9999.ebuild 1846 BLAKE2B 4178207264c3ca1328c4f160affa40e76ae232a3188eaa538ce3a5cfdabf82252e2b67bbbe311ac5ac9917bb2f046d2a6804b8510be08e1200cc795a2b7c46ac SHA512 2b875165bcd1c9814e47822120adc646dcdd739dfed5c9723d866be593d99c67fd1ee88f58a95ea0c7c593619913516f16b25ec94d60590e6928358f1f8cd5f5
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/sys-devel/lld/lld-14.0.6.ebuild b/sys-devel/lld/lld-14.0.6.ebuild
new file mode 100644
index 000000000000..461302a580e7
--- /dev/null
+++ b/sys-devel/lld/lld-14.0.6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)
+"
+
+LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} 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=(
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 431308cd23b9..e94405500523 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,5 +1,7 @@
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
@@ -11,5 +13,6 @@ EBUILD llvm-common-14.0.1.ebuild 613 BLAKE2B 4d0308c12985232c155bf35c4ed1d596ffb
 EBUILD llvm-common-14.0.3.ebuild 608 BLAKE2B 020a3c91ad189fe674f9b5c24b22365b087b4875114dd8928d38f4ed0bbfaf4fcfab2a07f2154c70d9ad137ed41daf6eca5adbdb31802fb40218893898629fa5 SHA512 5fab7e184f76587ab37f878d8c6a103740c43e29c4b6c533da6856e8656ac49e297c885477f0b0e37efa49cf1f232f39a4084741405bb71acb8e6745c0edda33
 EBUILD llvm-common-14.0.4.ebuild 604 BLAKE2B 73b59c03f65c9106a4e8c7cfc220b974176e19fa493c368e44b469ed966713dc4a697eaf6e16d34fa2206d141ab0d757421c3859666a97ede3abbd71b8d39632 SHA512 1f745a96b0845a3f3febafae143f09b6345eb4ce37db7f40b89f5ca2a826c5dd8150e669412e0c0f27a690929688a29eecd2353ea94667e52e44f6d7787b2472
 EBUILD llvm-common-14.0.5.ebuild 608 BLAKE2B 020a3c91ad189fe674f9b5c24b22365b087b4875114dd8928d38f4ed0bbfaf4fcfab2a07f2154c70d9ad137ed41daf6eca5adbdb31802fb40218893898629fa5 SHA512 5fab7e184f76587ab37f878d8c6a103740c43e29c4b6c533da6856e8656ac49e297c885477f0b0e37efa49cf1f232f39a4084741405bb71acb8e6745c0edda33
+EBUILD llvm-common-14.0.6.ebuild 608 BLAKE2B 020a3c91ad189fe674f9b5c24b22365b087b4875114dd8928d38f4ed0bbfaf4fcfab2a07f2154c70d9ad137ed41daf6eca5adbdb31802fb40218893898629fa5 SHA512 5fab7e184f76587ab37f878d8c6a103740c43e29c4b6c533da6856e8656ac49e297c885477f0b0e37efa49cf1f232f39a4084741405bb71acb8e6745c0edda33
 EBUILD llvm-common-15.0.0.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/sys-devel/llvm-common/llvm-common-14.0.6.ebuild b/sys-devel/llvm-common/llvm-common-14.0.6.ebuild
new file mode 100644
index 000000000000..104c8747bbee
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-14.0.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 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 ~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/Manifest b/sys-devel/llvm/Manifest
index 8334810753a0..95c3bb348d94 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -10,9 +10,12 @@ DIST llvm-gentoo-patchset-14.0.1.tar.xz 4724 BLAKE2B 2689298c687fa8b5fa2545afccc
 DIST llvm-gentoo-patchset-14.0.3.tar.xz 5492 BLAKE2B 48a46d50a81c5572d1573c6923bc404b198f74ee8587a928e0858553dac37f7fa39cc969d72b938ef3d2f04f6872f9e2e2478821ab90c657ecbbacb3f7d99d7a SHA512 b917b549de6d46cd7aab3e59b888b5e5ffb955435b33d6538be2f31dc30217a24740a673cb6bb661087c245121edb079052b179badaf70b86b985ca69b3652a6
 DIST llvm-gentoo-patchset-14.0.4.tar.xz 4072 BLAKE2B cbd8804e33069ca2709503931545a57cfd33c06f28696d876d499285e9add9487a069495b756bbb94d29a162c39ece651defddd302e3ac523c5484c09fb3d2ea SHA512 db00268d01e7ec99b907321384c02468a53020386ee4fc819fabfc1cd0784323044931dac42437968d5fd37190da1b9f8f847af553a65a0595c33cecfd82c293
 DIST llvm-gentoo-patchset-14.0.5.tar.xz 4072 BLAKE2B c35072f70831d5e3c9f7236f8473b098e6b8da4f27ce6a382ff4d3cd235837b25b9a1bc1e406ce0d3feb05e4d1e1c8bf141ff8f218568d5a5339fd1092f86b62 SHA512 646e0515a6cf1aae86f05db4797d7af6e3c9b8a6070f41cbd36535944029e0e5888128e33d8c44af22b5bb9ccba392b9dfeabc7708e5eab11858edefced6b68d
+DIST llvm-gentoo-patchset-14.0.6.tar.xz 4544 BLAKE2B b613582fa048837303168a2d62835688128621236022ca6c232293cb2e4549174ef256e7dcd8303bfef6d5456d0459ddb2cbda4a4d323b82901da4c16f15dcc4 SHA512 fb89a3186c5bffdc6245ed103d79fe6802a86986bd43891b7e128955bd546dffcb5b4083ac9e7966f67ce8dd82322756a11428ab4c62d21f012d614062adab35
 DIST llvm-gentoo-patchset-9999-r3.tar.xz 4076 BLAKE2B 30bdf740606a1718ae45d850803385d425b656fbbe0250f587cad54f55272e3617d5ee0d04f534a58f87408b0a2dea322ebf1bb8cd653a2beba21d0bc5778c62 SHA512 2c7080ffd09d7dcf4c72a97044a5c63ab895250721d60270bc51c2095aef5f9039781892b4c0d14e942611686153f874a1f52a1c854bb8ca093383c08bdc005a
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
@@ -24,5 +27,6 @@ EBUILD llvm-14.0.1.ebuild 12442 BLAKE2B 0e550931d2b7b75cff5f6081b04d07f7d8419001
 EBUILD llvm-14.0.3.ebuild 12481 BLAKE2B 4ce96163c371821bb3950ef558bc8124eeafec8fe234fa1771f3f8c08313eb3dd644f6ad7001ac19ac7450bce998f86cf9b5a3bdaacc2a20327f3602671bf2e7 SHA512 d997a4770dfb15f8a9eeb4ca9b2ec4c60523685f3c7e9d9ccdd681074ac394ae8dba9d92930c554bf6907f67d53c7f0543809d885cea7c09b031427d44f50c3d
 EBUILD llvm-14.0.4.ebuild 12626 BLAKE2B 1e2bab5a05205a69faec3d17ad337fde3b55dec31be56f4e41094dd6151f6837bad65851bc13fc8c3d3f5924c7abfc4a095b0e6a2d79d6d1eeeeb614e858022e SHA512 898f4ec4b817afa0c263eeb77e5064e6135b7d8a60b22e71bafd6d0332e40202d2a1429b9cae2167fa5ce07bffce61b44b21da959b7721c05c88251c604bfba7
 EBUILD llvm-14.0.5.ebuild 12630 BLAKE2B a03dd4b21f35730a96f3b7c1d826a36fd0a442dd12626042a2c9562f6221d546c507c29066d0e396a54c3fd93762590180c40c1f435f31a54cb436d3e632364a SHA512 bbc18a5f3bdbdf5e6c5985eb202997a7064f99d07c1bab8499c77d17149321acae9ff57835b38a3e0209bc54aa60f99d85b75807188dd1460e30c1f2552d068e
+EBUILD llvm-14.0.6.ebuild 12630 BLAKE2B a03dd4b21f35730a96f3b7c1d826a36fd0a442dd12626042a2c9562f6221d546c507c29066d0e396a54c3fd93762590180c40c1f435f31a54cb436d3e632364a SHA512 bbc18a5f3bdbdf5e6c5985eb202997a7064f99d07c1bab8499c77d17149321acae9ff57835b38a3e0209bc54aa60f99d85b75807188dd1460e30c1f2552d068e
 EBUILD llvm-15.0.0.9999.ebuild 12395 BLAKE2B 3fe33ac9e80abceedeeb1d4277b8a6f89f4a191cfdf386051837f62200fae6c876281211644436e6231d35d3c0c2fb9cc087fa77ed553dc3b35e16c79b3f7187 SHA512 71e210ea4398d984357a984c594f7c9898a08dec1ef34ad1a3b6275d1acf74dfc614092a77b4996a63e3f7ed58bcfe28236d462a1b3034067859a1af29b1e668
 MISC metadata.xml 2625 BLAKE2B 1017e4672b3ccd5a4f83d9df6a9db3661f548da9d75ad2c5b63e9843bfd737ff1fb64624678704f632544ac403efd8dbb35a006542023153733a6d4037b7245d SHA512 130444ec537891dc43754057c5a68666f52cb2959f351ee5be076ed41e39d49d8fafa2d0dca78d1a751b3a3190db81910b4472e75f9bad571ae42da51a5b25dd
diff --git a/sys-devel/llvm/llvm-14.0.6.ebuild b/sys-devel/llvm/llvm-14.0.6.ebuild
new file mode 100644
index 000000000000..ad91093de640
--- /dev/null
+++ b/sys-devel/llvm/llvm-14.0.6.ebuild
@@ -0,0 +1,530 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
+
+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="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
+	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}] )
+"
+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-$(ver_cut 1-3).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 )
+	test? (
+		sys-apps/which
+	)
+"
+# 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
+	binutils-plugin? ( >=sys-devel/llvmgold-${SLOT} )
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_MANPAGES=1
+LLVM_PATCHSET=${PV}
+LLVM_USE_TARGETS=provide
+llvm.org_set_globals
+
+python_check_deps() {
+	use doc || return 0
+
+	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_live_ebuild() {
+	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 live ebuild is up-to-date
+	check_live_ebuild
+
+	llvm.org_src_prepare
+
+	# remove regressing test
+	# https://github.com/llvm/llvm-project/issues/55761
+	rm test/Other/ChangePrinters/DotCfg/print-changed-dot-cfg.ll || die
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+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
+
+			# 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-debuginfod-find
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			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-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() {
+	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/${SLOT}"
+		-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_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_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
+	)
+
+	if is_libcxx_linked; 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.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+			-DLLVM_ENABLE_LIBCXX=ON
+		)
+	fi
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	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/${SLOT}/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
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	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(:.*)?=$(ver_cut 1)$" \
+			CMakeCache.txt ||
+		die "Incorrect version, did you update _LLVM_MASTER_MAJOR?"
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	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/${SLOT}/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/${SLOT}/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/${SLOT}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/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/parity/Manifest b/sys-devel/parity/Manifest
index 85cff33510cb..4af5fd881dc7 100644
--- a/sys-devel/parity/Manifest
+++ b/sys-devel/parity/Manifest
@@ -1,4 +1,3 @@
 DIST parity-2.0.1.tar.bz2 371662 BLAKE2B c0fca272665bbe346d5d5ca18e06c65209df61454310811b939239f8ba25ec7a08ad2f864fb43780329dc1f0120afdb6ea4ee2b4b42d2888860358aa1dc176f4 SHA512 3c96c87b87f40cb7affd6ee9a87c8e7cf628aedb44a2d3d89370a5b5e32a43cb15a897ae27425e9d6a00581ffd50a70c7a7481f1ca259eddd1e6f2310b554eb9
-EBUILD parity-2.0.1.ebuild 1824 BLAKE2B 6fb12910df5fdbf5e17bca54983739e6d72fb21975399e1d0f867c26be13a14e0511fc5fbab15fd5db49d4de7b010a1a27e2b7a4871b5558f209793a15a6237b SHA512 f17caa80b6115de5f362a0193d515118836c0d491e87ac8c2520dc453d2a7d45127dbdbb0e82f442bb2a32005fe747289d0320d0fd2bac6a103f26093a170d52
-EBUILD parity-9999.ebuild 1824 BLAKE2B 6fb12910df5fdbf5e17bca54983739e6d72fb21975399e1d0f867c26be13a14e0511fc5fbab15fd5db49d4de7b010a1a27e2b7a4871b5558f209793a15a6237b SHA512 f17caa80b6115de5f362a0193d515118836c0d491e87ac8c2520dc453d2a7d45127dbdbb0e82f442bb2a32005fe747289d0320d0fd2bac6a103f26093a170d52
+EBUILD parity-2.0.1.ebuild 1838 BLAKE2B a001b741ef41030ce4f802b68a170adcfadb755085865a388788b077514e6ba7b799f5f4674eb8947c8cfe36567c85bdea99accba191a598a4bcdc25204289e7 SHA512 ce2c481baf5d20aa413ae8de7e88063b2c2dd8b14498f86757d951b3e1cd4b1cc6f58f6619d0b24e6a919316936378b649fbc16927fbedf46777b5a5bf892420
 MISC metadata.xml 951 BLAKE2B 220c8e7b21103b6a3ba4c044e3eb45b5f18d78aac6ed23d967c36c33383d1b927dde458cb02c211f276b8e154d17011a37cf8b696d7fd35ff50ade027373d2df SHA512 9d7262935aad1af1a099faf9d8ba1b40af956d2e090cb7668f2382afcc8d0fadb46ca7169cb0055ccb1fe8e73e36cec8fb2ada6125326b9092df3bb2b51b4065
diff --git a/sys-devel/parity/parity-2.0.1.ebuild b/sys-devel/parity/parity-2.0.1.ebuild
index a6d5f5cfc4aa..3de370518ab4 100644
--- a/sys-devel/parity/parity-2.0.1.ebuild
+++ b/sys-devel/parity/parity-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,11 +8,11 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git@github.com:ssi-schaefer/parity.git https://github.com/ssi-schaefer/parity.git"
 	BDEPEND="dev-util/confix"
 else
-	SRC_URI="https://github.com/mduft/${PN}/releases/download/${PV}/${P}.tar.bz2"
+	SRC_URI="https://github.com/ssi-schaefer/${PN}/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~x64-cygwin"
 fi
 DESCRIPTION="A POSIX to native Win32 Cross-Compiler Tool (requires Visual Studio)"
-HOMEPAGE="https://github.com/mduft/parity"
+HOMEPAGE="https://github.com/ssi-schaefer/parity"
 
 parity-vcarchs() { echo x64=x86_64 x86=i686 ; }
 parity-vcvers-legacy() { echo 8_0 9_0 ; }
diff --git a/sys-devel/parity/parity-9999.ebuild b/sys-devel/parity/parity-9999.ebuild
deleted file mode 100644
index a6d5f5cfc4aa..000000000000
--- a/sys-devel/parity/parity-9999.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="git@github.com:ssi-schaefer/parity.git https://github.com/ssi-schaefer/parity.git"
-	BDEPEND="dev-util/confix"
-else
-	SRC_URI="https://github.com/mduft/${PN}/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~x64-cygwin"
-fi
-DESCRIPTION="A POSIX to native Win32 Cross-Compiler Tool (requires Visual Studio)"
-HOMEPAGE="https://github.com/mduft/parity"
-
-parity-vcarchs() { echo x64=x86_64 x86=i686 ; }
-parity-vcvers-legacy() { echo 8_0 9_0 ; }
-parity-vcvers-current() { echo 10_0 11_0 12_0 14_0 15 16 ; }
-parity-vcvers() {
-	parity-vcvers-legacy
-	parity-vcvers-current
-}
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="$(
-	for a in $(parity-vcarchs); do echo "+vc${a%=*}"; done
-	for v in $(parity-vcvers-legacy); do echo "vc${v}"; done
-	for v in $(parity-vcvers-current); do echo "+vc${v}"; done
-)"
-
-if [[ ${PV} == 9999 ]]; then
-	src_prepare() {
-		default
-		confix --output || die
-		eautoreconf
-	}
-fi
-
-parity-enabled-vcarchs() {
-	local enabled= a
-	for a in $(parity-vcarchs) ; do
-		if use vc${a%=*} ; then
-			enabled+=",${a#*=}"
-		fi
-	done
-	echo ${enabled#,}
-}
-
-parity-enabled-vcvers() {
-	local enabled= v
-	for v in $(parity-vcvers) ; do
-		if use vc${v} ; then
-			enabled+=",${v/_/.}"
-		fi
-	done
-	echo ${enabled#,}
-}
-
-src_configure() {
-	local myconf=(
-		--enable-msvc-archs="$(parity-enabled-vcarchs)"
-		--enable-msvc-versions="$(parity-enabled-vcvers)"
-		--disable-default-msvc-version
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	if [[ -n ${ROOT} ]] ; then
-		einfo "To enable all available MSVC versions, on the target machine please run:"
-		einfo " '${EPREFIX}/usr/bin/parity-setup' --enable-all"
-	else
-		"${EPREFIX}"/usr/bin/parity-setup --enable-all
-	fi
-}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index f6055afe939b..9e6125d5d366 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index bcedce5a61b4..ce2807a8684f 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -36,6 +36,6 @@ AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c9725
 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
 DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca
 DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d
-EBUILD lvm2-2.02.188-r2.ebuild 10131 BLAKE2B b0e8167b45500bfe2e59b8ebedf1de36a12b897776b64e9945084f77049174a7006414072a14ba69738d9dae11ccd8335ca5ed4c7072127380290d4e58c0f8ec SHA512 b3d8fd243c6f00cb89e3e992fdeee7a614512422e07da9c84d4baeb27186d302678334105fb0ef25501a8c8d47e6f76b7ff1f00c77ff3b417a739ba7d8f920d9
-EBUILD lvm2-2.03.14-r1.ebuild 10077 BLAKE2B a3fd6355a2d6352eca5b956728c21263f82bcf87e7f4a2d672472384163e920ffbc360911c2156028cd216ef22f96230b8454acab575bc662d29ae5ca3ef6e72 SHA512 19cc7e80b9a79b6da5752dddbb0ad768b86fbf31681d6e6d91e07ea839d97bbee283c3ee8a3bee44a5932ba78f007eb78d52fa671c049e6e5168a2986082821f
+EBUILD lvm2-2.02.188-r3.ebuild 10149 BLAKE2B d7a19efe883eb5a8fc0ec8fa7d41de9ace13cd72f3dcad28148471dff8dddc458b68f65d8d0c1b57af9ef647a3e5102db340521b43a81b8a9fdba1f3388868d7 SHA512 dc0deeb6fafa4f59888b3b4061a2375e2621c5cfe1e8ae061c3b516c8bb6a7260cbe6907739bed161baa7f8db3fd113563be22018618b8d88f92673bd46cd55b
+EBUILD lvm2-2.03.14-r2.ebuild 10095 BLAKE2B edaaf7652cbb178abd142f06a04125944a26dc15dd54e929f1ff4b95faff34b6a8393bf5ae4db2ba5ab7ab094db020c0be8b8054cff9dc5c2375f00411d18103 SHA512 ea45bc3f47b5464c2240eeef77590bf8be333382f32a85c702f151c58222a3bf8a9aea8a621658c85596378c3730d2f411abbadd5d47d07cd5c4c4abfdff5e26
 MISC metadata.xml 1035 BLAKE2B b9a3162e72e1ea09c7530edca817046434186c3948ef763c1a4efedb45aa8f842b7819efdbb09fb40897368e61b26a43896ef28a4a9d1ae554ea3cdb81f88dc7 SHA512 a16653a343d66eab8bd790eb974cc95d75f48321051ebb37eef87b3c7ad9903b2be1f0c70aff4b711b4469fa2715a5fb0c8566c46e6a83173bf998cf182ce964
diff --git a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild
similarity index 98%
rename from sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
rename to sys-fs/lvm2/lvm2-2.02.188-r3.ebuild
index a3e76755f1d5..50111c5fabb3 100644
--- a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild
@@ -210,7 +210,7 @@ src_install() {
 	local inst
 	local INSTALL_TARGETS=( install install_tmpfiles_configuration )
 	# install systemd related files only when requested, bug #522430
-	use systemd && INSTALL_TARGETS+=( systemdutildir="$(systemd_get_utildir)" install_systemd_units install_systemd_generators )
+	use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators )
 	use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
 	emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
 
diff --git a/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild b/sys-fs/lvm2/lvm2-2.03.14-r2.ebuild
similarity index 98%
rename from sys-fs/lvm2/lvm2-2.03.14-r1.ebuild
rename to sys-fs/lvm2/lvm2-2.03.14-r2.ebuild
index 66b2184868ed..2da81764efe4 100644
--- a/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.14-r2.ebuild
@@ -212,7 +212,7 @@ src_install() {
 	local inst
 	local INSTALL_TARGETS=( install install_tmpfiles_configuration )
 	# install systemd related files only when requested, bug #522430
-	use systemd && INSTALL_TARGETS+=( systemdutildir="$(systemd_get_utildir)" install_systemd_units install_systemd_generators )
+	use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators )
 	use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
 	emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
 
diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 1fe1c5cd9ac8..2bcb94a2fc37 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -2,8 +2,10 @@ DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B f7c5ab92f1241627bd91255b35bdd81782f15
 DIST mergerfs-2.33.1.tar.gz 382421 BLAKE2B 0985a0ad53a12fe5283fd0e953cd74a835efd3e83f65ba4e96bc42814ce151d03f95c032eeebcc9821c7c15ae59d14b9e40055438b4482a337c5b7bc9503d27e SHA512 1178fbd4ad99c6c693e2c21551c7522107701b0d5c608a7c18be29825cf97f2a2b2d6a50094e800a74dddd9a3902c374f8b57e84a76c0640aa8e387aa095d300
 DIST mergerfs-2.33.3.tar.gz 382386 BLAKE2B 49a2b75a2a39fbec178460f94696a918a0f872a7c904355c84180f8be07d9abdf68e342e7acca5093a621b85110d0a0fdb5650de68e04aa176250199eaa5bdb7 SHA512 aca5884a9d5dc03d7095e73461dee843d69463db72dfc033f76611d5417dab63ff29eb2b473f39f0390299c3aa882e6197a7038e82b58ab85799d39cc44b84d0
 DIST mergerfs-2.33.4.tar.gz 382872 BLAKE2B fe369f377f731a6323566cf4d5076e9ba7dca302aae1125635433ab93927d3aad5ca57a95e0791742cdf80c7fa69cacdd16a6519593bad9e933e529974bd5d2a SHA512 e8bd0a502c045d6f93d34bce833108deaf1071a3e5c56eb61a59416067230d6e8f19f9b0f8c8aa9fe84060a886afae7509231c97fc6d9537d3ad3390ce342239
+DIST mergerfs-2.33.5.tar.gz 382895 BLAKE2B e45d6d5890046cce495f788924323052effe63ea570061ed1d031595f166c0e680fdbbcf01dd992263550d6c33a04d91a6fabd5c9f97381c5c3e6858c3e1c122 SHA512 9032142285d85e22d2a880a42ae379209d44d12d71adec6388afd43a9fb77675149ec8558bdb1f01de1b511b3d0bf910dd2ccb6f47c918df377d4d5e41368408
 EBUILD mergerfs-2.32.3.ebuild 1063 BLAKE2B 4ed082d6f17bd69240a60a37e185dbe3c2ffff5dde3abec1c04f6603045c611585fdf8a13d5ffb37c6538bc8a1096c1a6a604528e201653dfadde006f0a59f62 SHA512 68c529bc33c1929e897b0a04e8b6b354abafca9f0d43deb42c443c70938c442b38efab4017969b55918370da71cd35bc75b043e63211e889454a4c44b18936fd
 EBUILD mergerfs-2.33.1.ebuild 1070 BLAKE2B 37bff1091558136fb4cf57cb044ce091563e084d9aed9e7d996bf2854fb088afcba556f52264c7fb96f6cd917085063361636aee4c02277fe77a9d9940afc3ce SHA512 182888f30b44591fe17e9fa8ad57d9f41b508d901ca571b59482a878be2b5a568af6a69fe41f770137e1ec91bd3acb6ac2a7b658f0eeecd181895891b5c85815
 EBUILD mergerfs-2.33.3.ebuild 1072 BLAKE2B af27c19cfa533b94446585119a7611316c8b06af7dddd9fa8764bd47c4fd0c194a5947dfa68ffb381a99c576408d9c8db40058fe594c2291714329cf904c7923 SHA512 f6de50936deb415446d71f465c1b206f9df246d236c2f45b5fffb8c32dfc7955b2586468cf4848990fe04290668285d266131806dad09615a3eff2658764cf4c
-EBUILD mergerfs-2.33.4.ebuild 1072 BLAKE2B af27c19cfa533b94446585119a7611316c8b06af7dddd9fa8764bd47c4fd0c194a5947dfa68ffb381a99c576408d9c8db40058fe594c2291714329cf904c7923 SHA512 f6de50936deb415446d71f465c1b206f9df246d236c2f45b5fffb8c32dfc7955b2586468cf4848990fe04290668285d266131806dad09615a3eff2658764cf4c
+EBUILD mergerfs-2.33.4.ebuild 1070 BLAKE2B 37bff1091558136fb4cf57cb044ce091563e084d9aed9e7d996bf2854fb088afcba556f52264c7fb96f6cd917085063361636aee4c02277fe77a9d9940afc3ce SHA512 182888f30b44591fe17e9fa8ad57d9f41b508d901ca571b59482a878be2b5a568af6a69fe41f770137e1ec91bd3acb6ac2a7b658f0eeecd181895891b5c85815
+EBUILD mergerfs-2.33.5.ebuild 1072 BLAKE2B af27c19cfa533b94446585119a7611316c8b06af7dddd9fa8764bd47c4fd0c194a5947dfa68ffb381a99c576408d9c8db40058fe594c2291714329cf904c7923 SHA512 f6de50936deb415446d71f465c1b206f9df246d236c2f45b5fffb8c32dfc7955b2586468cf4848990fe04290668285d266131806dad09615a3eff2658764cf4c
 MISC metadata.xml 335 BLAKE2B 6650c40b968c0df32e03159d92248d1f54884556cc69175898b149bd2e1dcd7cca5e1d35a3d3478f73fec99ad8d8ea3f5e6873bba6577eb7b78ba1db40e5a295 SHA512 5503d278fe75d307768f01cab25f18452b04c80a954045d8ffc398ff29ff37135009b64401a24f4496da3a098a9e9d46dc430f756f2c020dbe0319fb7ce2b47e
diff --git a/sys-fs/mergerfs/mergerfs-2.33.4.ebuild b/sys-fs/mergerfs/mergerfs-2.33.4.ebuild
index fb2d3b62a41b..a21ae969d856 100644
--- a/sys-fs/mergerfs/mergerfs-2.33.4.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.33.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ 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 ~x86"
+KEYWORDS="amd64 x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"
diff --git a/sys-fs/mergerfs/mergerfs-2.33.5.ebuild b/sys-fs/mergerfs/mergerfs-2.33.5.ebuild
new file mode 100644
index 000000000000..fb2d3b62a41b
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.33.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 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 ~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-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index c4809622f9eb..4cdb4df4aeb3 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 bf6f44067e3a..2f1bb72bd104 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -7,6 +7,9 @@ DIST genpatches-4.14-294.extras.tar.xz 3656 BLAKE2B 904852c394f3208166e557d06a79
 DIST genpatches-4.14-295.base.tar.xz 5715844 BLAKE2B 97d40627d1e29629802e9d6c2bf0d5a2809b855cf2b21f358b1c2a71bc8263fc0dd4d2d645debbf369336eba09a8c3ef6c3d7770e1c32b159cc3e3e27a3bbde9 SHA512 90950eee1a73826145270f3816b1a1f1b66f5d9a31bd8973b8c886d0b5587872d73659482dfb832a809ec4c19708c805e2830026ecd8fa15a2ccbb60d3421c49
 DIST genpatches-4.14-295.experimental.tar.xz 5708 BLAKE2B e2ac48c2ecaf322919e513d5b83eceb0f86002d87ee9934825cf7683c2ad28b5f5226d023c62efb9f0c6c5d9a084c4aaaa43dbc55e0f2cd83d190fb31fb8ba15 SHA512 9a1ef870099c17afbf1102967f5f63c01a1bb0791141d55684a9ace5b8b15389ee048ac771c344891260af281be620b8514e2867b259e098fd916622e9a1d3c2
 DIST genpatches-4.14-295.extras.tar.xz 3656 BLAKE2B a2ea58b18ae25a3e761752377de177e1b4b33b93d9c8bb1df88e7b620058e960444163ef8745bf0911c4670ac0840f4162927707a68a1d67132cdc386f31a878 SHA512 fed2f2d256056f73162836e023e1fa6cc329425a5436a6096381c75641e2ee4c08a2897aa5b65283af727fbb530ba95f45fc3e1bef717565eab2d76022770103
+DIST genpatches-4.14-296.base.tar.xz 5768444 BLAKE2B 874d9cea6cdbfca3f80c32489e1b46ba5fb076c443ef2e804a4c2632a8dd1eb2314ee88051e119a1211491a07c14c4c7d63ab231c5e0553c05433bb1a4f68ce2 SHA512 1005d923b05f215bc88dbcab9ef0000577c738100fda88d587ab2db136d5484012140526e1d806ca009e16b00290ddd7338fbe7ce9eba6fe44e40a0894eeb616
+DIST genpatches-4.14-296.experimental.tar.xz 5708 BLAKE2B 2154c51fea83d38d951c087765c39311803f54e4f78ce871a76ead357121053a0bbf4dd313ea3fd1c97c6f208c34eb1b129a84f90f1faebc026ee4a42f98db9c SHA512 6d8b7725ca76e718d9fe6119388265cb868bf212ae98d6e4a49bf0657a02c8fd53a4895110535adad79b085ad5dcb79b486e114ecdf161d96ec20a7d5b653a55
+DIST genpatches-4.14-296.extras.tar.xz 3656 BLAKE2B c52754503851d81f3935161fdf0c116ef51d220f6bcc8d0a89ea0b1ebba84d78024063184e04ae006e5ec65e70bb70fb94029566ffc37d989488c719d1557eaf SHA512 c587f51b34034080dbd2a1163c2c6c28ba019f3097a5575d2c942b2651d945db06551830f7262b21f21402db29627e45145ffc3c58876f0afa1049e3e3e6ee80
 DIST genpatches-4.19-243.base.tar.xz 5453472 BLAKE2B f90618cd1150dd02ef53e9f42c7fc30f926d7744f7d9bb3b9e31c412a9462c28a1e685f63b5e4c83a754c3b1f5c749750a33be0756c49292a444fb7206c3954d SHA512 768e6897cc38c6ee0d0211d5f67f7ef786dafc343784791195ce81689a506db0862f9805a62b085fba476bfd239ecfc109eb3ae12049d42eb9b18ab738740eeb
 DIST genpatches-4.19-243.experimental.tar.xz 5460 BLAKE2B 3153a542de9536d0ec9d97f9112ec00867100aa25420af852bb356f0687a2d49148a25c18186d46b87587a57976a4c92be1aefa17bea5a6719cd3a9b05a27827 SHA512 7e9a8f0c23814bee9f186564f879bc1702f2b6860508d7888bffef5a5177a31142daa3d8e26431a2b4bce72c5c1c2a4d24b27c636d509aceee692e11b53445fd
 DIST genpatches-4.19-243.extras.tar.xz 3664 BLAKE2B 0201e661888c86275319aaf3c9e63d3b8279eddae2ab34b22f801933c27b7aec3d56c8042f8662583977b84c55f008152f87b8244d429e2cb13696260c7d533d SHA512 d000fa8e7038f6fe46a53e5e4326bc588980696164fd4ae1ba75295dd02eb3d83da2185333becc2732d050c9f291390a5197a219e0cd71ae30249a96d3d18fe0
@@ -19,6 +22,9 @@ DIST genpatches-4.19-246.extras.tar.xz 3660 BLAKE2B 6e8dd7081795129ea29ae3e2ba91
 DIST genpatches-4.19-247.base.tar.xz 5536692 BLAKE2B 33b693e61a9a16ef56837dc3274ad8e4109b860dd702e2155d067896f1c2c070e80eea26cc511773bf6cbe3315abf273519833971f62b9247f03783666bbd850 SHA512 e0dada2a80af7c75a0e3462f8d7cbdecc72d69af407cba46472d12acbefffeb4ea542c60b2473dcfef51ee5bf43731a7db517f4f320886804a2d6930371f7d29
 DIST genpatches-4.19-247.experimental.tar.xz 5464 BLAKE2B 071a480a337fb254e4a5f2435ed932b2fa9adc6a8a18ac2780287228823309a5c3fd4d24ba497515e434bcd23b33fdea5b8ac68a149901b7c15f25eb15aebbb8 SHA512 11a830167dc6f4e34a81066004dc664e388c4d9a3948dc6e4f900c108404e3caa4bf7d89b92c489aa6211e3ac5024f2a181a240ef901a9a6c83ae3219eb3268b
 DIST genpatches-4.19-247.extras.tar.xz 3668 BLAKE2B 855245d7726433a2cd06e0a4e9804cbb13ee04b16bc636eaebd08cbd526fa81753ade5f5a09e2ba88ce0417f6052cac481103236ff2c2add257e5cfbc933aeb6 SHA512 8388fef8332be046d494a83e55325ca464706230b8679f8137bac44c68fd9e50d78e93026b56cdbbadf452fb1812c7a61c55d7a90547993d95f92fe3ead37fd2
+DIST genpatches-4.19-248.base.tar.xz 5591104 BLAKE2B 14c6cb90aaa8ad2a46545ca98836a6a5127d77489e2170232fa0fdb3bd05c8c129f6e30eaebbf74acd98bab83f6310e7e326b6fffdd29d23b269eaf5b7e04a71 SHA512 52ceebda804548f26d31bd4d5d6ca3789ac5445937a3b371fd9128d1abee72672b926d348d5644ea0e8a9b5ff9f556466b2569467288bd2eb60c8a87c0dfaea8
+DIST genpatches-4.19-248.experimental.tar.xz 5456 BLAKE2B 27f250711b4cd6bd967bf2b6378826f6ecce02c220b696eb0f758cbba4d28cbea0425aaf490c9ffd133cd53abb93968514ce7a32ab485e529484074a22ee6bfe SHA512 1b46f68f789f1371fe99c0e6677601a23ad988d7c8fc221d9231a99a99173f8f207e0a90bdaedd33296e5746a0121a572f39a897b81ce5384c4579053ffb0271
+DIST genpatches-4.19-248.extras.tar.xz 3664 BLAKE2B 6987ec67f106cd59d53cee4dc9fbd89e23dbc220d3aca92dc6516f5d4b7a5dacb04c701c70a51e626d355435dc082e6d227976a2b694702e489eddcb14f110a4 SHA512 717ffa362d399563e2883c03840cef40dff006da4d1bb8c4d064605c8cebb5d2c57173d205cdc3d363bec9207398fe9eddcd8b1c9b4e4bdee99ea447b4c9d6d2
 DIST genpatches-4.9-318.base.tar.xz 5151300 BLAKE2B 568a51692657549568ce2d4332f9e0035dc55b86a4aedf9ce28451cf027504359e108ce187ad9f10908126014288a46aa78016e8d52703b8e3f51b9272442c34 SHA512 32f9802e78c54360cae4349611f58c8e5f9c5e8452721802c315fe75b216e2fe2f7d5808e2ad2e915aea0f20ce65ee667fa3db366d0e9b49fa7fca54304bc6e1
 DIST genpatches-4.9-318.experimental.tar.xz 106368 BLAKE2B ee253ba8f55728c546720dbe206a3c70de95f1e15693950254505173a5721d1d682007a9988ea956533e4cef1b615b3da28b79d7c282a2099af66ee20c539296 SHA512 56453356ad599543dd9cace88ed59399556eb4f8e8d56fb150f08c2532d1a8765b4d7005d96aee4a4c9e5871869ce96f590d86d26f0792c7c8c99f0e643e2676
 DIST genpatches-4.9-318.extras.tar.xz 3676 BLAKE2B f8d266992b4fff6a3668347fccffb6573c1a0af85adda7f622d346244aaaaa8123bfa518527dbbb088f804d6f177362f5d7999cca807c5dc69e46acc7707b71a SHA512 52124e1245b3749039e7e2013ac9c30ff6b2dc6d3ffbc37c306483901f1916b0bf0ec5f5064452f7dd5729ef9da8f94ae7b5dc084ddf81b55078948988deb3b0
@@ -31,6 +37,9 @@ DIST genpatches-4.9-321.extras.tar.xz 3676 BLAKE2B c88519eb65cfd9fafc826e50f9ef0
 DIST genpatches-4.9-322.base.tar.xz 5195332 BLAKE2B 5a5c84f6b5d93aaf3787fb43763d48602a463b0a132a0faff2cfd3597328a184ce19e23127c462922db365c0b5a985c16f99e7d8d2fea5456811a662039da1a2 SHA512 9c6e5715d8e8c5b106f06c24077528579fd02dc5ddf6d031b598d7ae6610dafbe5938bf592b2d4994f661fbd19ce45ab08704f38c7332e010bd7d8e8419e2012
 DIST genpatches-4.9-322.experimental.tar.xz 106392 BLAKE2B cb66009c1d658a011cd7cd340b3a0145ec0f2854d23661f17bb8e3ceed7af79e8356ec292a6851fa3c7fd3a58e59c4d6fa34dcd8516b868977aaac8c18fe4355 SHA512 d67fdeffb4553872d1d9d2a1171a66e0efe84ddd46bf0e8acbd41d5b70a36772f86059147ec1bfb0c95d7bdc2d1b13577dcb9f66c6a64d6e88d69ab31d511ab6
 DIST genpatches-4.9-322.extras.tar.xz 3676 BLAKE2B fd9fb9e1d7b021a140d704ca088c7a6429b255a29d4198f27e8036e0a3921537ae4b386d2363dd6c0313f9aff9cde2ce0c37f47818fd24c71aa85b0f4e0b92b8 SHA512 ef11a6becec65725e4d571dd60ec389629b20d3c69f16ae965d5f98d44be0bc912a5ee5721e073cb72f1922e9e5600e9ec8faef162e1102650c547eb23f92d24
+DIST genpatches-4.9-323.base.tar.xz 5251280 BLAKE2B fedf3eb4fcce2c3008f208d93a4a9fc580326d5b22267722498c0d02fce7f149015314b2332d33e80193ffa89f155b8c77701c828849e711b9679b0fb01b7d9a SHA512 93a3172bb2c48d9b531de65310f4956e2743bcbfe0359e11c7e3a32a8e9af2a0bad289eec9477bfc31ee58e2d83a83ba83b02f95b67186df8614205d1b5a043f
+DIST genpatches-4.9-323.experimental.tar.xz 106356 BLAKE2B 798ecb65c34c89409a60e4c60ddeade6f6af65eaa2fc0a6b15c58a1feb12382d5b845c0ffd3c451bf075efaf379a4bdebeea9479226bdf62a68cabc55d20d690 SHA512 c070dbbec9b4e7581ae480e0857397f0c26a022e9d43f81ab75fce55ffc7fb194f9eb34db3e6e30ea009c9b36e8cbc37cae9da79a69f892a929ae836c3b72a6b
+DIST genpatches-4.9-323.extras.tar.xz 3672 BLAKE2B cddb7f597031934f22c378156c0164bbb42968da83f21ec802143b0b31cfd33260d0cd7acabc11fca6920de7b457dab1f9eae6e8fee992033c229ac67a8944fe SHA512 291f3634e88dbfdfae3f7ff47e334c36300a8d8e1b6b7f635c026b925c2f37e649c469cfe9540ce38af13fe14463f750efe3862735b6fbd3b2930fcae986d56c
 DIST genpatches-5.10-126.base.tar.xz 3445148 BLAKE2B f21381f177a1c3de8e9be21c3fbf2b5ffd43dd12a7726fbcbec2e259a44e353fe63a98cc29b3e207d67cdf2642aaf142a69f438c395b0e928b13159e8fcc9fa0 SHA512 fce3451abb11c22afc8ab0ccfa6483ef2ba23916e2ebcd3191af775f1286716f90167a0bb835ecc0738d4e8a13326bd0644f46fbff19edbaa9df6c33fa5bafd0
 DIST genpatches-5.10-126.experimental.tar.xz 16872 BLAKE2B 9a963dc0eaf7170318a18fe8b6f7385e08c5e986428997d2ed6b95c027fa3bcc32b67afbf1ded290ae3f2b70fae3c9e2e902d9723707fc731e5c57f039d61668 SHA512 2be758896ac79b8a4d2bd1c8cf4c6edaa87d1e8b30938af9d26c496b26ec2180700c607dc40d72324859965b097f459be0d3037c1f25b74fddc7290b11c294ab
 DIST genpatches-5.10-126.extras.tar.xz 3868 BLAKE2B b08b05b945fef23421cf8a0f18c7b6c23e86edd4717ad80b24f4109d199373477c0bb16cb2a370a540c2d97bc99c1bb4d9feb7a9c964e9e80b9505cf51ae0ab6 SHA512 57e81535f7cbbeba031c03d0bf634035789266d1be7c7254d44a6777e554b5b6b14649c04e2a910ecc16f8e53f122b6bd0c9657cb5c9bb1fca56ab4d73f1f259
@@ -96,14 +105,17 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 EBUILD gentoo-sources-4.14.280.ebuild 734 BLAKE2B 333a6cc64d73589ac11c139a7648393504d33b3bfe01efeaefaaa3af4cd595880e7666ddcd6818ba51ebe6188131bf7bc5f010190cec03995dbb823b8040db63 SHA512 146a4ab527762860fc885f00cee3f1c22f1a217bd653ac16c95b1f4924b88ba2728740734cc3cbbb31a9b2ef0e14a957d1371776801f173b4ee6c1301cd8e7c6
 EBUILD gentoo-sources-4.14.283.ebuild 742 BLAKE2B 7d8d0462f487719543839d8928ca91181d31d9bf5162aa8ca6ef972b955a287cf0a8d93275203db42162a8f61b5b920c4c127315235b6e7175fe47d41cfbde76 SHA512 41b474f818a37643aa73b504dfa7a08a144d837296aab7e818c06cbc9f90829f78a24b0f23f573a5f13246001366fc0e58b6dfad2e3fe76465a8adc3ca22a40a
 EBUILD gentoo-sources-4.14.284.ebuild 742 BLAKE2B fded4aeccaca719f94802f28cf321d522d0a50068ae5115e32272a42c9efd1264717c0912b06839003cc21f50774fbe05fb3c03c2ff9e1952230ca144771664a SHA512 fb75f19d4b1b7f4307b4eea57f12ccaac398329a03cfadcd376b8b7936dccefa868783b9a3556ab80c59e4e4ad7bd741d49b57efe2a8c5f4ae986488afd70501
+EBUILD gentoo-sources-4.14.285.ebuild 742 BLAKE2B 7885bf89a76ace308cd833579bf29c01de5be629983caf6a80af63c276dfcf56eda6228719c3475e0d3d3b7c11361389829982e225fe285adfa518df839484a5 SHA512 9f6462451d42ed5860cc79e023b7d7c132f4fdb28060270a4204877b200c33478f383b50d61be45a48622e826dcbd91dd06e2d38fbd4b98cea7e605a04cf00e6
 EBUILD gentoo-sources-4.19.244.ebuild 734 BLAKE2B 705c271d2f72b0ccb76a8989463685d16bfaa02c9448a41e33f34b29acb2221160a7c95ec704f19065c14f962788998b19242c9221cf573044b579e503eec9ff SHA512 f126d2b35e91c60a82696b18beb10019103e70c2e019e803a3d67ed6efaf77b3fe7815b1e06a5aec6fffe911499847aece8580e4b0d9d3a59467b93e7ed06d1e
 EBUILD gentoo-sources-4.19.246.ebuild 742 BLAKE2B 5c70dbad7a55c182e6ecdc1f51e4dbe5909a0fd5948283311c0465e76abef8baeb3954153787aab9bf0dd8f8f25ad06f8e061c86386bba21a22ee78da736cd9b SHA512 c349a0028ad7c053df41a8f9f65500f2ca7a2b2676680acc883bd94d44c67e99e035cf95377ad87d37c1aed08d0202e22a325196da1308a9b764a619b3e82d0b
 EBUILD gentoo-sources-4.19.247.ebuild 742 BLAKE2B 14cd1072c320fc48ac2f93339765632d2f6e30c4cc93ccd3101e2e34679893a07042c9e58d922d6047ce9d1815a0d883a3bf9cbd7623036e053680bea2fca1e3 SHA512 450584410edba59100581fb43e992e68d1b88f946bbd16619b65dd7f3a308004154485747028e92dbe123b958f1951e30ef3773a019e656a87ef461da8c2c580
 EBUILD gentoo-sources-4.19.248.ebuild 742 BLAKE2B 0fe228b6b10f23ae856d1bbefe722d1440ca2f094c9e257bdfd84b6488aadb40367cda3b487225d6c885774b8d2c9fab2e6a4d45bb9afbaa85eb024e1eed0f80 SHA512 8cc25c397e15fdedd1bdbaa2e65cf1019848e90022539a20275c71e047656ab8d78bba733b269f0960547ad7c0d36d7dcc15163f6545ec0538a90221127cc901
+EBUILD gentoo-sources-4.19.249.ebuild 742 BLAKE2B 0ac599e8e9a2b7a3529e24801d8a727c82c9f0e8bffc2d3ec64f5fcad66e9f69b4c0b1d2a42bc93a974186f6df57aa7bfe10ce5406612063a3fdba7ef54d1639 SHA512 15676e738c0af2012a41cfe9ac8e719099598960a8e8230f4de2d15b2867ff33e618ce89962c2da541b4939ea755e637e75e576547de38eee6840e43226f7bd3
 EBUILD gentoo-sources-4.9.315.ebuild 734 BLAKE2B 5c84d1adb0c04d2269039bb84a9f8b351cfb914d70c1249d1f00c09ce430e84c7bc8a404043b0fecce8d869f1fc32d82d2a56968bef4e88ceabf28a668100adb SHA512 083e79e987016712dde1c72433fd3b3fb0ae7355eac66abce77d5b5df86f244347f587f7b860cb3aae675d8914c850b9dd22fe3a6cc614c9561b817379649b93
 EBUILD gentoo-sources-4.9.317.ebuild 742 BLAKE2B c5e7b85918e7af71f74c9480054e5dffd8828e59e2cf68cc4e93bde111b99047280311a5823361581fd3ed2b6ce906a6ace42c27d1f691829648ba854004056c SHA512 a99535afcb8e983774f7eeca56e854919cacb5ce66f2d4eec130b6d598c460eeef1757f6f955a65ef27290165229b71e235d9dc9ca72b6afd5ecd6c41342005b
 EBUILD gentoo-sources-4.9.318.ebuild 742 BLAKE2B 6bdd02c94bee05a6db0012a7218e7dadbad92934105238726963fbe58b1ebe4d99fb812f944d6121f5393274f611ff0edf5d6a9baa37cb6805144bb23fca48e9 SHA512 e2f3431092036f27d8f02e429cfb278bc793fa54e79dbf22fbc96d3a76690191ee430805213849cd97cd61d3800952c5b2dc3f247f5400e4abc6cb6702463fd2
 EBUILD gentoo-sources-4.9.319.ebuild 742 BLAKE2B 9ce62a9a4e5d55ff60572bd7e82997e4de05cb02d941799361c9e742f331ad55b4ea33c0cac5dd4ef4af34d67f474d250c4349edcb41928f9859c50454945392 SHA512 b702f4fc142dc826b357cb1c289375af60b5faf9a8f5a8a8ac9b6efe07d86046ffaad79bd8d1104f5e99cb262cd8dd51b15ccb7c59286fc4e6796efc71bc5036
+EBUILD gentoo-sources-4.9.320.ebuild 742 BLAKE2B a5791186662053c679053148901a3c2717bdb8752771dec239da27e40feb6e20041d556277a302689e0cd290c6a3e62eb2f27a06a2ffa5150b7fa2f8b14ef0c6 SHA512 88cfb3966ed9b2594f23da503145a16b3edda08f7e407092ad4f75f3d9be9c598dbd5e6645e17f8a4797d0918fa5077d73202dba0737be900b3ebb5f10126145
 EBUILD gentoo-sources-5.10.117.ebuild 741 BLAKE2B 42c0a36c384315cbe7d2eb4971d25617486f3941bd1ffbbb4dc93733cef0b140d3396ad38b91afb84fb5ca10e1c06b90af3561e41c8ea2e1cc7c2343db5a96da SHA512 814020c6ee86fca7573a5c39d665aa251b72f4ac6c00dc30272265cc95ec444ea355c5c5908693b5976106cc77fe7092d2cedbadaeab9321bfbe660e1eeb7f71
 EBUILD gentoo-sources-5.10.122.ebuild 749 BLAKE2B dffdff30d55e246a2d834a865d12a4e84644fac110041a9503e54b0cff2d98a21be9490c3bc3c3da07921afa612fb19b6610338a6ef9ba32559e6974af68385b SHA512 0d15bd174d671900c51b2bc7c53be01f7e2b9eafd080142678a40d920685595fbd1437764eddb4a1272c04e180800a9152bc9bef614a80d6850dc47646af4f95
 EBUILD gentoo-sources-5.10.123.ebuild 749 BLAKE2B 5e427ef88947b364fed2aa366bea1294b3d5dd5a32466ceb8fdbf9907ed442ef55f6dc87729eb6e8891c26d2f053dbfd654df66155c79227146c3043ea2a8fa1 SHA512 5cd6b4416f92d3f4e38568e6841595d815007504e321933142535d344d039979b5186a6209313337938142ec264335ee967c379db4c8d2aefe5aaef8b162b2df
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.285.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.285.ebuild
new file mode 100644
index 000000000000..d087ca298869
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.285.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 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="296"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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.249.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.249.ebuild
new file mode 100644
index 000000000000..76795046c636
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.249.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 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="248"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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.9.320.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.320.ebuild
new file mode 100644
index 000000000000..316c6284e890
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.320.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 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="323"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 0267f0a9a4c1..a5d8d9165fb1 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -23,6 +23,7 @@ DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
+DIST linux-headers-5.19_rc3-only-arch-and-headers.patch.xz 1330360 BLAKE2B cc6f521037aeb898b2e2470f9e8f06378aa67a1b17679a38fa195c0a599a415eab763f6534701411cb658c8af28e8e28a3ff916fd29e01419713232336ce78fd SHA512 50eba921f2aabbf27a78c966aa1a2920e7a1f6060cce70285d450e4f949890a90ca54114a95f43240d0daa87285561f11c1734aecb15e2d05bc575a3c3145cb6
 DIST linux-loongarch-next-on-5.17-20220423.tar.xz 177296 BLAKE2B 947fd8c2192fe454beb346ea700a09a711f629d87cc5ff5b5d882fa1d57bb5e918fea821f5eddd44152812502479f853527b8317176326f8926bd1a532666a86 SHA512 b18df78802c2718181da95fdd5f83761bec7fced16b0aec05d00dcbd9b5c25fc0f84fbdd7e3b3fa5a3f78aea66e268dde3d9272a3f921b595b16270623ae0b7e
 DIST linux-loongarch-next-on-5.18-20220523.tar.xz 160468 BLAKE2B ccb6df7fbee86fba7ae725362efeb03cdf4187cf877a7f21e470639c14509214ed31c06434207950b219d34ed41a9fd2be0b711faeb5c6c02198836f06ef7dce SHA512 d87b667947a1d41fbea6db80dc2896c2c7e297bac471b99820b10a4d1e8a680f3566a89bdb4e70c0bdfba335ce158f3e82f930eb2f6b64fd6ba736028bf709f2
 EBUILD linux-headers-3.18-r1.ebuild 1363 BLAKE2B 4a0c5ff3c52a22cb7f4c23945887de8acc3e5ed6176e6a899d86cf795a09403152241df75834cf7a3085782052e7f0f785b6831751bbef51aaf3105ca82bbb5c SHA512 5ad47c9ad8776ccabefab9011176a7b6a2d12264a44159d653baa57b57d19f1a02cceb6e537ba055519d1578965229e5a680176b69530003e2cac18fa417581e
@@ -36,5 +37,6 @@ EBUILD linux-headers-5.16.ebuild 1450 BLAKE2B 76b1d118180ada6f141cf86fa69065ff1d
 EBUILD linux-headers-5.17-r1.ebuild 1808 BLAKE2B 8e8ddd9ba579a60c94b7ffbd030fb77827ee2ffaab936b28d4826fd6ae29132e0a6c2094c17db00faf1875f5654fa35b58f6abbf4be4c3284b18571d2cc5d00d SHA512 daedbbba0db22adc3d950fa5c754520d9a6b839304413b8148b0a306ec0014471114e31a62ee49fdc70c591895f0286a1fa8f6d41ce264041207fe43b2742814
 EBUILD linux-headers-5.18-r1.ebuild 1808 BLAKE2B 3139013d9c025d91363a1c88904845ac5462200b3b17267de4d8ea009cf9dce6df30cfaf74abda33835ce1f9d871ad61cc1ee4d2547ad1d1927b58f8204cd31c SHA512 866f71903e085561252462291683e9b524ea2872be2299a2215ab0496c848be695b6e58888b3b916ee06c600d4d2158d4e73daae1c5db1990a6f638a7127b481
 EBUILD linux-headers-5.18.ebuild 1810 BLAKE2B 13ed9f80d145ff0be8da20e85314953c4c73e1ffa983a8312c12ab07fd780a5130b083f2edd6fdb3863ad599579ce9dfb3887ad53c4922af142f0e12dcb68199 SHA512 3f8b2823079455ebf7c5a3450607eca1554c154a174113868f8b9bdb52be118aac86ab7d9f2554b76076838626c13ff81a103307bee96c9b21b063141ca1b0c7
+EBUILD linux-headers-5.19_rc3.ebuild 2122 BLAKE2B 2f34126ea905cc62a79d597c2e8e9b3a7c3edd95c4fea1b5cd8715d8e667b55606520370d976ba914d3c5ae15aef9d92ca214457f7f35a43a9303a2b66907e5c SHA512 ce1a2625f540c5beb71264eb476c79b43c769da1e8bcba07c305a0bedf23bf24b441411b91d40fa2d46c092c85a2ff536f31221bc756f950626076ddfc5adbbe
 EBUILD linux-headers-5.4-r2.ebuild 1254 BLAKE2B 4b8545aff89fbce63ac91030a81aa416664969e1475ab33e40e2612adaaac4918231b12178176dff833e9b8292575d1a9b17d32041d8362a3fd99671e5bedf8b SHA512 ba73a588dfde65af652ad9f8fe39ad4a59cdd285f0afaa7a6c038d1bb351770028864de5c304441fca9db3ebf1f1b2f0b2d57e4c8f2aba1c2ab9466c8e099176
 MISC metadata.xml 435 BLAKE2B ada9ec733091d4cd57861d44af76a14f7c9e89c577ef49503f14a8b4cfcf052d7559bedd84a414cdeb2a250b70fdac7b488a23b31b41cbbb515523947b5b4aac SHA512 91c300ef36a8e9a855f8657033b549f9fb699b3d21d46eddf70fca7c802f61bce1274ffddcb15b1454fff4c5b400ea55fedacbf7a7e24625f391641309238abb
diff --git a/sys-kernel/linux-headers/linux-headers-5.19_rc3.ebuild b/sys-kernel/linux-headers/linux-headers-5.19_rc3.ebuild
new file mode 100644
index 000000000000..44c60013ad3e
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-5.19_rc3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ETYPE="headers"
+H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64 loong m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa"
+# The v5.19 rc patches generated on kernel.org contain a suppressed binary file diff,
+# hence unusable. Here we only let kernel-2 handle the base 5.18 tarball; the
+# v5.19 rc patch is to be handled later.
+K_BASE_VER="5.18"
+CKV="${K_BASE_VER}"
+inherit kernel-2
+detect_version
+
+#PATCH_PV=${PV} # to ease testing new versions against not existing patches
+PATCH_PV="${K_BASE_VER}"
+PATCH_VER="1"
+PATCH_DEV="sam"
+SRC_URI="${KERNEL_URI}
+	${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
+	https://dev.gentoo.org/~xen0n/distfiles/sys-kernel/linux-headers/${P}-only-arch-and-headers.patch.xz"
+S="${WORKDIR}/linux-${K_BASE_VER}"
+
+# this is an rc version, for testing on loong only
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~loong"
+
+BDEPEND="app-arch/xz-utils
+	dev-lang/perl"
+
+# bug #816762
+RESTRICT="test"
+
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
+
+src_unpack() {
+	# avoid kernel-2_src_unpack
+	default
+}
+
+src_prepare() {
+	# apply the gentoo-headers patches after the big v5.19 rc patch, for
+	# avoiding flooding the console because of the lirc change
+	PATCHES=(
+		"${WORKDIR}/${P}-only-arch-and-headers.patch"
+		"${PATCHES[@]}"
+	)
+
+	# TODO: May need forward porting to newer versions
+	use elibc_musl && PATCHES+=(
+		"${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch
+		"${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch
+	)
+
+	# avoid kernel-2_src_prepare
+	default
+}
+
+src_test() {
+	emake headers_check ${xmakeopts}
+}
+
+src_install() {
+	kernel-2_src_install
+
+	find "${ED}" \( -name '.install' -o -name '*.cmd' \) -delete || die
+	# delete empty directories
+	find "${ED}" -empty -type d -delete || die
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 00d0f3b43024..e9cdaab4fa78 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -6,17 +6,17 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST patch-4.14.284.xz 4769748 BLAKE2B 14758a7cab93cb9f863ff5bbc811e99517b7f00bddffa9318691e91bcc43e2b1d76713230f95ae84af888f6b6e74845433087a1b5a80917e5e9cd1b304d20db1 SHA512 552be3102fa4d12c9dd323c774d44b87b859c2f939f6fc82246a4a87c96a89658f4d0a3a21ce5d8e688e8f9eea301422bd55551c14589cfdbdb191ac8070e789
-DIST patch-4.19.248.xz 4687100 BLAKE2B 4102e49520df0fe7ec11d6bd798db875c4368631de44f19d38c8e080fc0a2d866764d1334d5e863f24aba9d5ddf9c924c1a876b03d259b814c9cd91b1f4e482d SHA512 67197f94f67304ef37a74ba88ae601c5804ae68061bc7a4fb2f1c3df41bd8dce7d88b02c084a1866fd9c2d2505f8f774ec0b5de6cd45c892caedb1df22cfdd57
-DIST patch-4.9.319.xz 4360792 BLAKE2B 60ea8047ff51cd4c9b77d6bd43727b2271ca87b22ab6db6d6b6d3376b3134cbc6d184d417032d0afdafc83a181aa9c4c1b27f1c60c25b49c5237bf1e8139f707 SHA512 320ea05d06c5aa67033f9e4192f6efcafe8b93bd5730113b2a92a0d5457473db97367fa3b4b8a24939e824716ec1fe0004dd7e2f5577c0dcf5e7df5d23bcbb99
+DIST patch-4.14.285.xz 4814332 BLAKE2B ce82c530c75157492c289ba678d2516e4f079f26223058912df1272d8cb300eb17e2e1f98d194ba0f5dd8baf73e791c53f6484eebd71e28a90a2219e16b40e4b SHA512 063c41ddc008f3e2ee7c6d1906cbf0517e845dc0a7a4ac760574898434870cd6675618c45d30e1d986d365ea8f6e8d839169e6d5b1e0d0e516c7abcb3cccb73e
+DIST patch-4.19.249.xz 4734108 BLAKE2B f54f746786b499638644a32e074bebdfa5ae793483965c36b672e1e382063e05315395a70230117f135d7a240ebe7c34b0d6fa3e60619adb5298e891bcb549db SHA512 ca511cba3434fdb27e6c065b6d712cc08a143cd5d824d7c62ecb01e4a9022bee358764b9677a8491e8d8cc3b89e9734d0b4cffb5d252c47fc8755ced982ffbd2
+DIST patch-4.9.320.xz 4408732 BLAKE2B a090ad959eea625b0c8a683294d128a5ade945666407f471bc7ace1df387c060973826da360c816645c055b4809f432c94a05d461f4048597e803ab11818b2ef SHA512 b7b65dd1b7a134fc7588aa9af56ea3912b32b203f5cf0651de10d459ec0469976cdd72ec6ca91bf3c425ccde6a1370b2deb23a742bc7aa4c5251c14af7d2d0b7
 DIST patch-5.10.124.xz 3327564 BLAKE2B 5efa4401b4fa1bdc74274c9fd578703ee605861d2ff8c027f7a29eaf168b9437d815a58ff71896319dffd9554ee4aa9cfb9ff53c37f8e92267a5032c8efbd2d6 SHA512 81c73a65a41201c0b504d98447cdd3868c675df0858208ed6aa9185d5bd51b825de24ad030036a41c317877c425e96f3ee2a9f08ee35ca5109dfa637c3db63f2
 DIST patch-5.15.49.xz 2063880 BLAKE2B 4e9854bff7a83ff8286c7df94e7ff58258db4f848aabdeca90ee792c05e07aa5696158966e9166b8b716d20733fe41accc895ab8f5dbe630797fb2a86228a767 SHA512 08ede2bc8363a24a6f843021fee93ebe46d2bc01d2bf732fa140bbd5aa99130f00ea021b2b86a49a021a48368fe4d2e848604c7d86a801d268df83c02a183cab
 DIST patch-5.17.15.xz 1084564 BLAKE2B 72713c22da50783beac854ca3c4b48d016e4b8eb2ec641dd44f56f32be888723e8125ed3f830a114eb63086717a3a00f6188b1a58d09e0d2e4a0f0337149555b SHA512 63680c60851687980dcbbee4534ad8272efc0b0d80bdd6e1c74e61c343b16182f6636942fde3c1177c4607b176c3d342d646876ce4ed72397080f90a816678ca
 DIST patch-5.18.6.xz 486212 BLAKE2B 59243f71884a147197605388fd3ae3f84e2886e0492f960deab66c65e299b5935ace0d0f43b1c1c43f1690f4d978d6d405bbec5add4291c3356b90e80a4a4b15 SHA512 c33e90ef5af07df0bc861ae384a022ff7469c7ffaaaea372f8e292ac75b6817b4d23fcbd3d78583433a395b37e1ebb1cde40890a1e6a9ccf7e452ff8297b8c38
 DIST patch-5.4.200.xz 4063316 BLAKE2B 13e6259ea12253f8833e32db9584ee82821fa06343c6f253c7f5ff04ead618c1d075c21d8ed241e08aafc463d72b4f5394bb1eee9d5912e163f3fdb13c8bc077 SHA512 b4fb5aa0bb70e0337568fb2b4645aeabbbbdf5c67f4b19b8de1b81125bca51ef8dd458c149e05fd690e4cb1890d33c98f84b9356fb4d150e6cd07bae36bf530f
-EBUILD vanilla-sources-4.14.284.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-4.19.248.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-4.9.319.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-4.14.285.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-4.19.249.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-4.9.320.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-5.10.124.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-5.15.49.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-5.17.15.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.284.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.285.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.14.284.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.14.285.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.248.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.249.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.248.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.249.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.319.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.320.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.9.319.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.9.320.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index b56b19b209a7..e8068236e1b2 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 9ce7a9393c6a..8de823c38cae 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -4,9 +4,12 @@ DIST llvm-gentoo-patchset-14.0.1.tar.xz 4724 BLAKE2B 2689298c687fa8b5fa2545afccc
 DIST llvm-gentoo-patchset-14.0.3.tar.xz 5492 BLAKE2B 48a46d50a81c5572d1573c6923bc404b198f74ee8587a928e0858553dac37f7fa39cc969d72b938ef3d2f04f6872f9e2e2478821ab90c657ecbbacb3f7d99d7a SHA512 b917b549de6d46cd7aab3e59b888b5e5ffb955435b33d6538be2f31dc30217a24740a673cb6bb661087c245121edb079052b179badaf70b86b985ca69b3652a6
 DIST llvm-gentoo-patchset-14.0.4.tar.xz 4072 BLAKE2B cbd8804e33069ca2709503931545a57cfd33c06f28696d876d499285e9add9487a069495b756bbb94d29a162c39ece651defddd302e3ac523c5484c09fb3d2ea SHA512 db00268d01e7ec99b907321384c02468a53020386ee4fc819fabfc1cd0784323044931dac42437968d5fd37190da1b9f8f847af553a65a0595c33cecfd82c293
 DIST llvm-gentoo-patchset-14.0.5.tar.xz 4072 BLAKE2B c35072f70831d5e3c9f7236f8473b098e6b8da4f27ce6a382ff4d3cd235837b25b9a1bc1e406ce0d3feb05e4d1e1c8bf141ff8f218568d5a5339fd1092f86b62 SHA512 646e0515a6cf1aae86f05db4797d7af6e3c9b8a6070f41cbd36535944029e0e5888128e33d8c44af22b5bb9ccba392b9dfeabc7708e5eab11858edefced6b68d
+DIST llvm-gentoo-patchset-14.0.6.tar.xz 4544 BLAKE2B b613582fa048837303168a2d62835688128621236022ca6c232293cb2e4549174ef256e7dcd8303bfef6d5456d0459ddb2cbda4a4d323b82901da4c16f15dcc4 SHA512 fb89a3186c5bffdc6245ed103d79fe6802a86986bd43891b7e128955bd546dffcb5b4083ac9e7966f67ce8dd82322756a11428ab4c62d21f012d614062adab35
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
@@ -18,5 +21,6 @@ EBUILD compiler-rt-sanitizers-14.0.1.ebuild 6348 BLAKE2B b5af3a1463dbd380734be4a
 EBUILD compiler-rt-sanitizers-14.0.3.ebuild 6351 BLAKE2B 635b4e58dcd3469c586bd54327640759fc33ea17e86974fc40cdde02a7df22626e4d9e1a7462076fd9d7511a66f0124daf000e3af3ae0206d8080fbe337e63a5 SHA512 8bc9ac8fa1d2eea753b9de57bd27c66903723f4fefeb35781820f80eb2166de6d336240836dca0557e7df8c934aba8f9275f470d1b8129a8bef7122a092db857
 EBUILD compiler-rt-sanitizers-14.0.4.ebuild 6347 BLAKE2B 7f7258ae5bc523d102b9d28684dab8d208260f1688213c23343c8d221122eaa4771740fd687e69c6b4ad2e4933ebdbde5334c00c980abe7d3d9593a4e836fef6 SHA512 c55d4c225070034b601e42fefc55ab7805081ff550e3cd63df9617dbf2eebebe9782f17a4fefa6ce59bff1796bc6364d1808a04ad2c24d4dee59735c5ecd6263
 EBUILD compiler-rt-sanitizers-14.0.5.ebuild 6351 BLAKE2B 635b4e58dcd3469c586bd54327640759fc33ea17e86974fc40cdde02a7df22626e4d9e1a7462076fd9d7511a66f0124daf000e3af3ae0206d8080fbe337e63a5 SHA512 8bc9ac8fa1d2eea753b9de57bd27c66903723f4fefeb35781820f80eb2166de6d336240836dca0557e7df8c934aba8f9275f470d1b8129a8bef7122a092db857
+EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6351 BLAKE2B 635b4e58dcd3469c586bd54327640759fc33ea17e86974fc40cdde02a7df22626e4d9e1a7462076fd9d7511a66f0124daf000e3af3ae0206d8080fbe337e63a5 SHA512 8bc9ac8fa1d2eea753b9de57bd27c66903723f4fefeb35781820f80eb2166de6d336240836dca0557e7df8c934aba8f9275f470d1b8129a8bef7122a092db857
 EBUILD compiler-rt-sanitizers-15.0.0.9999.ebuild 6281 BLAKE2B 1535547da34623ff67d497136d5757a5ff788622e8077fa78c64a388637a27954e0aa39873abfb5f014029bf88d4f0349536a33194d11089137e843cb9fadc9e SHA512 9d79e661e825e3f4670efcbf6efe40c6051ab5100b0fdb2ae4bc761665b8dbcfb795e7147836044d0eb1d57cd9c2eec228004bcb13bc303d919e2d3912c58f7f
 MISC metadata.xml 1330 BLAKE2B 8381c36fb0ee37358cebacf512ee2a0ff6f2c0fc8e05544d9dc1bb1e11bc53f4196c2ecc6c8eb66c833f266c8d12da2c92a5f0b94cb3404397f925f9ebfc2a72 SHA512 6ea6159eb0929dc9f009ab326295549db329f7594dd5ff82e255238ed1fb17e3e8909079c915c6ae4829bb853666456772d17fa2078a332f6340807d6cd4f20e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild
new file mode 100644
index 000000000000..433da0366bd7
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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="$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~arm64 ~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 )
+"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6
+	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
+"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		!<sys-apps/sandbox-2.13
+		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+		sys-libs/compiler-rt:${SLOT}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+LLVM_PATCHSET=${PV}
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${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_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
+
+	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/${SLOT}"
+		# 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/${SLOT}"
+
+		-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_MAIN_SRC_DIR="${WORKDIR}/llvm"
+			-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/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/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/${CLANG_SLOT}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/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/${SLOT}/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/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(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/Manifest b/sys-libs/compiler-rt/Manifest
index 17890ba5cf36..c70750336a39 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -4,9 +4,12 @@ DIST llvm-gentoo-patchset-14.0.1.tar.xz 4724 BLAKE2B 2689298c687fa8b5fa2545afccc
 DIST llvm-gentoo-patchset-14.0.3.tar.xz 5492 BLAKE2B 48a46d50a81c5572d1573c6923bc404b198f74ee8587a928e0858553dac37f7fa39cc969d72b938ef3d2f04f6872f9e2e2478821ab90c657ecbbacb3f7d99d7a SHA512 b917b549de6d46cd7aab3e59b888b5e5ffb955435b33d6538be2f31dc30217a24740a673cb6bb661087c245121edb079052b179badaf70b86b985ca69b3652a6
 DIST llvm-gentoo-patchset-14.0.4.tar.xz 4072 BLAKE2B cbd8804e33069ca2709503931545a57cfd33c06f28696d876d499285e9add9487a069495b756bbb94d29a162c39ece651defddd302e3ac523c5484c09fb3d2ea SHA512 db00268d01e7ec99b907321384c02468a53020386ee4fc819fabfc1cd0784323044931dac42437968d5fd37190da1b9f8f847af553a65a0595c33cecfd82c293
 DIST llvm-gentoo-patchset-14.0.5.tar.xz 4072 BLAKE2B c35072f70831d5e3c9f7236f8473b098e6b8da4f27ce6a382ff4d3cd235837b25b9a1bc1e406ce0d3feb05e4d1e1c8bf141ff8f218568d5a5339fd1092f86b62 SHA512 646e0515a6cf1aae86f05db4797d7af6e3c9b8a6070f41cbd36535944029e0e5888128e33d8c44af22b5bb9ccba392b9dfeabc7708e5eab11858edefced6b68d
+DIST llvm-gentoo-patchset-14.0.6.tar.xz 4544 BLAKE2B b613582fa048837303168a2d62835688128621236022ca6c232293cb2e4549174ef256e7dcd8303bfef6d5456d0459ddb2cbda4a4d323b82901da4c16f15dcc4 SHA512 fb89a3186c5bffdc6245ed103d79fe6802a86986bd43891b7e128955bd546dffcb5b4083ac9e7966f67ce8dd82322756a11428ab4c62d21f012d614062adab35
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
@@ -18,5 +21,6 @@ EBUILD compiler-rt-14.0.1.ebuild 3879 BLAKE2B f67b9247bb931ef6fe9de922e98842a2df
 EBUILD compiler-rt-14.0.3.ebuild 3877 BLAKE2B f86d43aa88361017a82b659262e9d997c4a3520b446836fa4ab48510060d19e246443d1acc0f717f256ecf6dad6f8c93a7c55b9e8373f3d837515c12ea26f168 SHA512 ec4ebd8a3343d28b41bf991a0b00d4df058ef0b53204cbcd786e83f659eadea377822c7ad8043f0fda381255ebd7386c32ebd4a87d3c60bc774e682cbb069807
 EBUILD compiler-rt-14.0.4.ebuild 4004 BLAKE2B aeda9722f7a4205285774ae091a335fdc2cb6a41b993fdc13d548b081619bc9d09504f3c43ae0a25d6a85e55656461002b59117fa1163a2752e73bb32192c550 SHA512 93046a17c051b6750d814d19095c04ab152edd1995c04724171a1340f18768ab9712b7711099ba034a4b237781edfe7c7250893b8de9227c466af95c83b06fa9
 EBUILD compiler-rt-14.0.5.ebuild 4007 BLAKE2B 93de93ea7e4d4d5a7253e1dff4312ef7057189542f48fd690a30dbdeb7e5f10ce781b24fcfc9ac9baaa4b9c5a995c1061f7055f92e7bcd652442b820aa16fd47 SHA512 6cabe071e73261ad972c6aaa5aa17780b2be6aed9565ef4832f35afe57112cbb5b8498f6885946fc0cf5e48590509d3550fd3213cfd20d027ef00c04191a67db
+EBUILD compiler-rt-14.0.6.ebuild 4007 BLAKE2B 93de93ea7e4d4d5a7253e1dff4312ef7057189542f48fd690a30dbdeb7e5f10ce781b24fcfc9ac9baaa4b9c5a995c1061f7055f92e7bcd652442b820aa16fd47 SHA512 6cabe071e73261ad972c6aaa5aa17780b2be6aed9565ef4832f35afe57112cbb5b8498f6885946fc0cf5e48590509d3550fd3213cfd20d027ef00c04191a67db
 EBUILD compiler-rt-15.0.0.9999.ebuild 3933 BLAKE2B ba5c928c5adac110d219b1c578068a538fba6dbae567229d8a7d51026a12cb2f887841722d294138d6f8fbb5d7b1b284911b6f78b8698a772456965e7ccf96c5 SHA512 9f1dbb1c5fc8b1391eeca1244998957dd43fd8088347220d5665b061fb5325962c0f5fa29492f0a4fb756c63d2c20a0cee75d6e5a98064d934f93e43172fffdc
 MISC metadata.xml 334 BLAKE2B e52ad011edc624e8b4c6449a9c77d0972222c4e3ecad01ea24eb9f3175053b191df6267886a186bc3e169581b86b624b6c77f37fac763a12129a1dd8cd6ee285 SHA512 1bf0f62c12690e6596650e8872405fc53bc3c4bbddcf80e02b3bcce9b762f0aa02d462949b9b54c0c930ca6cce5518333e79951ae57378def8eb9719463a9297
diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild
new file mode 100644
index 000000000000..e5c0203110f9
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-14.0.6.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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="$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6
+"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake )
+LLVM_PATCHSET=${PV}
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${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 dev-lang/llvm; then
+		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
+
+	local nolib_flags=( -nodefaultlibs -lc )
+	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
+		# ensure we can use clang before installing compiler-rt
+		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+	elif ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			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/${SLOT}"
+
+		-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/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/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/ldb/Manifest b/sys-libs/ldb/Manifest
index d607d32e5e05..6a41ba8eae60 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -5,10 +5,14 @@ DIST ldb-2.3.2.tar.gz 1718583 BLAKE2B 48b9fb77e414af0f9fffe0cda9cf49971d79ed8b66
 DIST ldb-2.3.3.tar.gz 1719542 BLAKE2B 2a5cfe3ddac2054d167c2857e0cd92e0f88d2c196f9285c029b2a525d781025a956a296bd6d793b65f848188cf7adf70f99542999061a85be473b3fc3b2856f1 SHA512 ffb50208fe971afd544a431b79905ec8fce67d78d20c3fcfb8345a56f3b278fb664bc48079d7239a8ca5b70aae8b32076b6007cb63e080cd536e9fe458efeccd
 DIST ldb-2.4.1.tar.gz 1719769 BLAKE2B 868d3dcc51bd8272d99f2335ed1af2e37506b6a175254f1aca37f758488ba0997e37419a7d8c81def77698128307df97de26d4807ac78c34088f7a623f8d9e68 SHA512 14ab5397d28c369142b2ccf55a2ab4e678a3fe6e018541cfce46241f8226400bc169360bbef254fae4410a6e15024ae986f02298d3d324e3d3a8b88801bf76d7
 DIST ldb-2.4.2.tar.gz 1720169 BLAKE2B d144218bf62dde57560df8b8a641e9f58bee001fdfa7b1527d9eb9a1a55e428662db81912173cbcdb9f993c0b316faab7d758a4878beeff1daadd487e9aa44a9 SHA512 77705ad284eed9105c9aba0459d2e48cd66ca19b657a55f7513e10281dd2e96540d24d1c8df53adc84109a918900687dc75b635cda05c4e788424ed71b5ff989
+DIST ldb-2.4.3.tar.gz 1729139 BLAKE2B 90dbb41ec6db19c562f275cdbf8fe273763633ca6a86d5a2f2428fc2063f5f88fcae23543f588f4df16ae5315e597145eecce3d87b616f8a27c0df91ab8bf81c SHA512 681433c5bbd1cc1fcddc35403c538f1511a83a7555b9113ac9247c6a22718ad6d7b21a86def50e6b5df91c9c8e04f2c45ffd264cd0ad1a715dc4b85681569622
 DIST ldb-2.5.0.tar.gz 1722847 BLAKE2B 880a5a516b0b423854f8a3f9c54da89e4640f8462ccc54a7b147c70c3a9eb073dc9e914d1906ab914a9ddd9b9aa0e7d177ef3ecb4c0b506f5417db931b017849 SHA512 f16a235f1409e06266c51735ac645cf2708d31dd731ee7b95d6778498b115f4252b0a528952e620767d1616a4e1e7c5f2cdc69f3fa32d79288cf14da2f52a010
+DIST ldb-2.5.1.tar.gz 1736209 BLAKE2B f06df9878ca664a456859464895e91c21da55c340e6dc94dc1bae22002e1c93ce9c7c87e3435b362e01e7d3d407d4968a529445d465a3d37ecf95f969866b40b SHA512 679ad695d4467a38e6cb87ba2b7d61049a42c59792b39f0a40256456ac673849adf58dc0759a89be982b80bb4a0834d34b51779424f7b997a53ea95f02f410ad
 EBUILD ldb-2.3.2-r1.ebuild 2942 BLAKE2B d2495240018b7ecece8c88092c30ea64f411ea0f073f0ff2404ca6184fe931ada8342ea3beffd710fb0d3c137174cc01fba37d73d7884ad11edba84855f2ae08 SHA512 8711a2758689c818b66af5548af9881cf217839d5ea951cbcdbc83531ec602a9b39e1d2b12e8452e60691f09ef4e9db0d0d639e7d4a45d16cc7e75db583c714b
-EBUILD ldb-2.3.3.ebuild 2949 BLAKE2B 5ee78f915254ca0ff1f5f107ec4caf24393022e5eeeac6b3bf5593b4da9c802e3f72965fcc023c81676a93e7ba21bfc255c175204f8497fc6031fdfe644d8af9 SHA512 b9441f83f2b078a7bb7492222acb04afb77238c78cb8c77ddf097a51b340c2ba7bc1f7c552a66d297baf825fc4020f3f77143199a6f4c0edd217deb980f911fb
+EBUILD ldb-2.3.3.ebuild 2943 BLAKE2B 198438ef2a7e5f88b9afa1987147df2f6ffcfde85a16baf281ca3ee5e2984f651127ddf7f8c0e95837622487955d59781ccd343c1787b01e9935ddad384d330a SHA512 3fd287734b52449c4a812acf373d2d01abb1ec1e8147c195ac038ccbd1d4e6a6f3041fd5de3b6a52848ea5fa1f3179ccf0d5fce53e4eecdcb447256071ef4a50
 EBUILD ldb-2.4.1-r1.ebuild 2943 BLAKE2B e96f5909024e90dd48096bd1a80d123460cd86c6a1743372992cdab7ed758f0759f889f558ce999cd493b625a231f8185852e18cf678f086bc221a61f895e887 SHA512 60ffaadddc5007e6c3aa8cbad369b20e5691b26ed163e747196cc7c1fb40ee74477ea00e022cfd94ff69eb9c911aaa51945d793913aa3056321b8026bd38bb66
-EBUILD ldb-2.4.2-r1.ebuild 3007 BLAKE2B 543d57e1e3e50a57fdde0a15003fbd04990b16300df7e38b0be8021549f57e2bbfc30417a81b8519ca47d236cfbf3be3bf10d8dbeeff2b5d06e575ab9acff22b SHA512 71027d7877c6af0db3b859aa3271aefb3e9bb0134d732393e5c7d6a2b14da9a55d255fac0e04de271caf269a9d627f4203a932ed13d74137558d1c7adfcccc51
+EBUILD ldb-2.4.2-r1.ebuild 3001 BLAKE2B c899d00e2b5ea40133b77c16f042d8ef9ddbfd384441ccebf9253d89aa821106a011ee9b41563b5f8c9874da2fb4f123fa5f912cbcbbc68737207817eb73ab31 SHA512 3b1393045a0c1a60dcfd2c9f3263fbda153ff8882f7e23e0f0fea9e602f8c80b61b79c5251dda6a03cf6cc912e45e6339d63e4e568c75ad12381d1383ccc5efe
+EBUILD ldb-2.4.3.ebuild 3007 BLAKE2B 543d57e1e3e50a57fdde0a15003fbd04990b16300df7e38b0be8021549f57e2bbfc30417a81b8519ca47d236cfbf3be3bf10d8dbeeff2b5d06e575ab9acff22b SHA512 71027d7877c6af0db3b859aa3271aefb3e9bb0134d732393e5c7d6a2b14da9a55d255fac0e04de271caf269a9d627f4203a932ed13d74137558d1c7adfcccc51
 EBUILD ldb-2.5.0-r1.ebuild 3007 BLAKE2B 0abb5aa964f1b945d2bddd1154421bf35d24e9fb78dde2b0ae34b4495326142dbda601c1aa2579bdfb81face8bf6072f0dafb676524d2aa3c1f2e9947c7a9cf7 SHA512 ff46752cb5c33374665b52eef69398821f7c463deaa1a5c8c05115b94fb97cc56c805df49826f09ded208adf91a50799fa9f43e878f36291676ff7e2c9f917a7
+EBUILD ldb-2.5.1.ebuild 3007 BLAKE2B 170849834a556b081cbc072f591d766eaf65d930165d3cee11cc01de81eb8325b15cdc8e4e2abd083e630f6c956bf70140982172c360d0f49c1a818d8551cfa1 SHA512 62f423a99c35d367122e6edae52aa76a387d569c824bd2cbf4b4c22221be655926b3db3e7b5d0230b7ba34c376c9a274feacc78855e00ded0580f4e1ac605a93
 MISC metadata.xml 526 BLAKE2B 004dbbf0286ced4bcd404eb3caf091f973e67e00b9230d2399f07dcb31d93a423045b353c1813958da151cded2f52996608de1b4294e3cb90cb8da0ac8877f9f SHA512 9f8008b5b57e5f73e79df68d828f1644edb0a154fa97504c3088301aa60e6ba3ac83a2e06d55d14c06cded89196dd635598f1d767ca93398cbf9610af3b49038
diff --git a/sys-libs/ldb/ldb-2.3.3.ebuild b/sys-libs/ldb/ldb-2.3.3.ebuild
index 99aa75a74e34..6e48a31d9be6 100644
--- a/sys-libs/ldb/ldb-2.3.3.ebuild
+++ b/sys-libs/ldb/ldb-2.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc ldap +lmdb python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-libs/ldb/ldb-2.4.2-r1.ebuild b/sys-libs/ldb/ldb-2.4.2-r1.ebuild
index 54d9456e59cd..c0d9bd9b2b01 100644
--- a/sys-libs/ldb/ldb-2.4.2-r1.ebuild
+++ b/sys-libs/ldb/ldb-2.4.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc ldap +lmdb python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-libs/ldb/ldb-2.4.3.ebuild b/sys-libs/ldb/ldb-2.4.3.ebuild
new file mode 100644
index 000000000000..54d9456e59cd
--- /dev/null
+++ b/sys-libs/ldb/ldb-2.4.3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="LDAP-like embedded database"
+HOMEPAGE="https://ldb.samba.org"
+SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc ldap +lmdb python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	test? ( python )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
+	ldap? ( net-nds/openldap:= )
+	lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/libcrypt
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
+	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
+	"${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch
+)
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	# waf requires a python interpreter
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(usex ldap '' --disable-ldap)
+		$(usex lmdb '' --without-ldb-lmdb)
+		--disable-rpath
+		--disable-rpath-install --bundled-libraries=NONE
+		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
+		--builtin-libraries=NONE
+	)
+	if ! multilib_is_native_abi; then
+		myconf+=( --disable-python )
+	else
+		use python || myconf+=( --disable-python )
+	fi
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	multilib_is_native_abi && use doc && doxygen Doxyfile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		WAF_MAKE=1 \
+		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
+		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
+		waf test || die
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	if multilib_is_native_abi && use doc; then
+		doman  apidocs/man/man3/*.3
+		docinto html
+		dodoc -r apidocs/html/.
+	fi
+
+	use python && python_optimize #726454
+}
+
+pkg_postinst() {
+	if has_version sys-auth/sssd; then
+		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
+		ewarn "so please try to rebuild it before reporting bugs."
+		ewarn "See https://bugs.gentoo.org/404281"
+	fi
+}
diff --git a/sys-libs/ldb/ldb-2.5.1.ebuild b/sys-libs/ldb/ldb-2.5.1.ebuild
new file mode 100644
index 000000000000..bfd7de97a612
--- /dev/null
+++ b/sys-libs/ldb/ldb-2.5.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="LDAP-like embedded database"
+HOMEPAGE="https://ldb.samba.org"
+SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc ldap +lmdb python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	test? ( python )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.6[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
+	ldap? ( net-nds/openldap:= )
+	lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/libcrypt
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
+	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
+	"${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch
+)
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	# waf requires a python interpreter
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(usex ldap '' --disable-ldap)
+		$(usex lmdb '' --without-ldb-lmdb)
+		--disable-rpath
+		--disable-rpath-install --bundled-libraries=NONE
+		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
+		--builtin-libraries=NONE
+	)
+	if ! multilib_is_native_abi; then
+		myconf+=( --disable-python )
+	else
+		use python || myconf+=( --disable-python )
+	fi
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	multilib_is_native_abi && use doc && doxygen Doxyfile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		WAF_MAKE=1 \
+		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
+		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
+		waf test || die
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	if multilib_is_native_abi && use doc; then
+		doman  apidocs/man/man3/*.3
+		docinto html
+		dodoc -r apidocs/html/.
+	fi
+
+	use python && python_optimize #726454
+}
+
+pkg_postinst() {
+	if has_version sys-auth/sssd; then
+		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
+		ewarn "so please try to rebuild it before reporting bugs."
+		ewarn "See https://bugs.gentoo.org/404281"
+	fi
+}
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index e1c040a2b9c5..776cd4388911 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,8 +1,5 @@
-DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
-EBUILD libapparmor-3.0.1.ebuild 2069 BLAKE2B 2298671fe021e1abee75376d0439c5a94ffef875495cf621facb87830d1fb69839f1fcd4d13810ce1ee7d6918e31765ec1399bf921529af475f5c4bbdd8f77d6 SHA512 d1d37cac0f6cd23cfe0abc8851b18e3f5b2e123e8a93a43684d6bae1999921f76fd023f4d5a026abfb3d78fcdee0186c65e897294e2095534f88b71e07f5c582
 EBUILD libapparmor-3.0.3-r1.ebuild 2129 BLAKE2B 3cc2641747dbf0f96fa6430a0d7ea3e341792a25c8b75adcb04a81e022f9746a33cdbbb7035568ced8356c9a3c07f7347328714bb03d63cfb752865b25415265 SHA512 66e961cf404dbd7562956051e70ff39863975b006fe3359a9b4a70e7ce66309d59a5ab49538c43e7c84c425743150ce4faed203999bd02800e136492dae05f18
-EBUILD libapparmor-3.0.3.ebuild 2070 BLAKE2B 97f3707333cd6d18e797d370f13aac29618faba7697b02c7185e030447f9782176ff71e6983a5a29649990e663f7465189075cb12807e809b685ef52941a221f SHA512 9cea8403cda7dfe3564054d1bb41e4285a8eac124cc69c5714b96b1f73765afe903feb255aa95cd9f53050b1e2e5e6c3a2652806bbd24dbcfed8b41b947179f5
 EBUILD libapparmor-3.0.4.ebuild 2344 BLAKE2B f9298dafbb6165ec55df508c94d640bd1f1734836076262ec58aa890fe471671733e03bec979292fa1916769c0aba27b36dd30ea68c4cae047701c30a0a1a929 SHA512 677e4731bb07a64ba50a00aca4e1eada454bb9d85f3e130b0bb177d6800f996e63c99989c9fafed67d28599c642d0cab5073b50bd9bd690e70ca8e51c73f7d93
 MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef
diff --git a/sys-libs/libapparmor/libapparmor-3.0.1.ebuild b/sys-libs/libapparmor/libapparmor-3.0.1.ebuild
deleted file mode 100644
index f88e11c0fe65..000000000000
--- a/sys-libs/libapparmor/libapparmor-3.0.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..10} )
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools distutils-r1 perl-functions
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Library to support AppArmor userspace utilities"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="doc +perl +python static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/autoconf-archive
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-lang/perl )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig	)"
-
-S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
-
-# depends on the package already being installed
-RESTRICT="test"
-
-src_prepare() {
-	rm -r m4 || die "failed to remove bundled macros"
-	default
-	eautoreconf
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with perl) \
-		$(use_with python)
-}
-
-src_compile() {
-	emake -C src
-	emake -C include
-	use doc && emake -C doc
-	use perl && emake -C swig/perl
-
-	if use python ; then
-		pushd swig/python > /dev/null
-		emake libapparmor_wrap.c
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C src install
-	emake DESTDIR="${D}" -C include install
-	use doc && emake DESTDIR="${D}" -C doc install
-
-	if use perl ; then
-		emake DESTDIR="${D}" -C swig/perl install
-		perl_set_version
-		insinto "${VENDOR_ARCH}"
-		doins swig/perl/LibAppArmor.pm
-
-		# bug 620886
-		perl_delete_localpod
-		perl_fix_packlist
-	fi
-
-	if use python ; then
-		pushd swig/python > /dev/null
-		distutils-r1_src_install
-
-		python_moduleinto LibAppArmor
-		python_foreach_impl python_domodule LibAppArmor.py
-		popd > /dev/null
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/libapparmor/libapparmor-3.0.3.ebuild b/sys-libs/libapparmor/libapparmor-3.0.3.ebuild
deleted file mode 100644
index c7bd9822dee5..000000000000
--- a/sys-libs/libapparmor/libapparmor-3.0.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..10} )
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools distutils-r1 perl-functions
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Library to support AppArmor userspace utilities"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc +perl +python static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/autoconf-archive
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-lang/perl )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig	)"
-
-S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
-
-# depends on the package already being installed
-RESTRICT="test"
-
-src_prepare() {
-	rm -r m4 || die "failed to remove bundled macros"
-	default
-	eautoreconf
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with perl) \
-		$(use_with python)
-}
-
-src_compile() {
-	emake -C src
-	emake -C include
-	use doc && emake -C doc
-	use perl && emake -C swig/perl
-
-	if use python ; then
-		pushd swig/python > /dev/null
-		emake libapparmor_wrap.c
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C src install
-	emake DESTDIR="${D}" -C include install
-	use doc && emake DESTDIR="${D}" -C doc install
-
-	if use perl ; then
-		emake DESTDIR="${D}" -C swig/perl install
-		perl_set_version
-		insinto "${VENDOR_ARCH}"
-		doins swig/perl/LibAppArmor.pm
-
-		# bug 620886
-		perl_delete_localpod
-		perl_fix_packlist
-	fi
-
-	if use python ; then
-		pushd swig/python > /dev/null
-		distutils-r1_src_install
-
-		python_moduleinto LibAppArmor
-		python_foreach_impl python_domodule LibAppArmor.py
-		popd > /dev/null
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 9818ecc1a8ca..1f57685af7b2 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -4,9 +4,12 @@ DIST llvm-gentoo-patchset-14.0.1.tar.xz 4724 BLAKE2B 2689298c687fa8b5fa2545afccc
 DIST llvm-gentoo-patchset-14.0.3.tar.xz 5492 BLAKE2B 48a46d50a81c5572d1573c6923bc404b198f74ee8587a928e0858553dac37f7fa39cc969d72b938ef3d2f04f6872f9e2e2478821ab90c657ecbbacb3f7d99d7a SHA512 b917b549de6d46cd7aab3e59b888b5e5ffb955435b33d6538be2f31dc30217a24740a673cb6bb661087c245121edb079052b179badaf70b86b985ca69b3652a6
 DIST llvm-gentoo-patchset-14.0.4.tar.xz 4072 BLAKE2B cbd8804e33069ca2709503931545a57cfd33c06f28696d876d499285e9add9487a069495b756bbb94d29a162c39ece651defddd302e3ac523c5484c09fb3d2ea SHA512 db00268d01e7ec99b907321384c02468a53020386ee4fc819fabfc1cd0784323044931dac42437968d5fd37190da1b9f8f847af553a65a0595c33cecfd82c293
 DIST llvm-gentoo-patchset-14.0.5.tar.xz 4072 BLAKE2B c35072f70831d5e3c9f7236f8473b098e6b8da4f27ce6a382ff4d3cd235837b25b9a1bc1e406ce0d3feb05e4d1e1c8bf141ff8f218568d5a5339fd1092f86b62 SHA512 646e0515a6cf1aae86f05db4797d7af6e3c9b8a6070f41cbd36535944029e0e5888128e33d8c44af22b5bb9ccba392b9dfeabc7708e5eab11858edefced6b68d
+DIST llvm-gentoo-patchset-14.0.6.tar.xz 4544 BLAKE2B b613582fa048837303168a2d62835688128621236022ca6c232293cb2e4549174ef256e7dcd8303bfef6d5456d0459ddb2cbda4a4d323b82901da4c16f15dcc4 SHA512 fb89a3186c5bffdc6245ed103d79fe6802a86986bd43891b7e128955bd546dffcb5b4083ac9e7966f67ce8dd82322756a11428ab4c62d21f012d614062adab35
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
@@ -18,5 +21,6 @@ EBUILD libcxx-14.0.1.ebuild 6937 BLAKE2B 04722fb717fcf971cfad08599681619a1f003ef
 EBUILD libcxx-14.0.3.ebuild 6955 BLAKE2B ae137995613e1805f7ebbb2240e7b925ba8571c28a023294134e3609e7bb721839d96680bdff63ee7ae1ab03ca82b3bb19e291b33d16493fb73e490ba170ce79 SHA512 ef1a30de8f760b53f6aacc9f09a7bf69142868b5df59e095b728ca334c7153122be581bd9b0c96c2e36cedbdc6d017eb7ea4caee86c21cdf711aa37d929a2caf
 EBUILD libcxx-14.0.4.ebuild 6952 BLAKE2B 2062c5f33c7deb14491adb83e9ab3924d12142159c0e6533672d1fdc8c9d89e25959aa16d1f7d84153b24891dfacb4e175cbaa160b926377ff0a984064569370 SHA512 e958bdb92bfef9727bf0f891639085d4924f0c506c3f7f8ab0b1759ff6ffc13045ccc6bba4f4d9649c60bdc1fcdaff302f8945fb540abd807f710e10153cf2d4
 EBUILD libcxx-14.0.5.ebuild 6955 BLAKE2B ae137995613e1805f7ebbb2240e7b925ba8571c28a023294134e3609e7bb721839d96680bdff63ee7ae1ab03ca82b3bb19e291b33d16493fb73e490ba170ce79 SHA512 ef1a30de8f760b53f6aacc9f09a7bf69142868b5df59e095b728ca334c7153122be581bd9b0c96c2e36cedbdc6d017eb7ea4caee86c21cdf711aa37d929a2caf
+EBUILD libcxx-14.0.6.ebuild 6955 BLAKE2B ae137995613e1805f7ebbb2240e7b925ba8571c28a023294134e3609e7bb721839d96680bdff63ee7ae1ab03ca82b3bb19e291b33d16493fb73e490ba170ce79 SHA512 ef1a30de8f760b53f6aacc9f09a7bf69142868b5df59e095b728ca334c7153122be581bd9b0c96c2e36cedbdc6d017eb7ea4caee86c21cdf711aa37d929a2caf
 EBUILD libcxx-15.0.0.9999.ebuild 6915 BLAKE2B 57856c3d8585b4661c87e41f73d033d6060ea8d9ee8adf6f0892bd88ed0d4aa5600f71fa59f4f4094103d8ed58a67ced6b245d11aefbc8c8d68b066fabde40c7 SHA512 c373d2052b681063a7939066866a2d52213626f588c022876dc8f36da5d37f0ddb87a31ae93708043d8a95b88a9e8f101e9c2a507a606b82fe507d1adc8f20ae
 MISC metadata.xml 622 BLAKE2B 33ff3f89844694f08cdcdb12d7098ad937041c31aa6f453fbd887bfebec688bc05552f9a39431daccd2b309a58c2fb75b04a6350410f90beb96f32c14ab3ca95 SHA512 8b3d12f8904c336cc35f31352014ffe247dd4475f143921cdd56e5396590ebd64fb700df64f76e83aece127d8ed39af5f45da086fa75fca841c9a5ad767cbed2
diff --git a/sys-libs/libcxx/libcxx-14.0.6.ebuild b/sys-libs/libcxx/libcxx-14.0.6.ebuild
new file mode 100644
index 000000000000..4d6be5bcc7f2
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-14.0.6.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib 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 ~riscv ~x86 ~x64-macos"
+IUSE="+libcxxabi +libunwind static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="libunwind? ( libcxxabi )"
+
+RDEPEND="
+	libcxxabi? (
+		~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}]
+	)
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+"
+# llvm-6 for new lit options
+# clang-3.9.0 installs necessary target symlinks unconditionally
+# which removes the need for MULTILIB_USEDEP
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/llvm-6
+"
+BDEPEND="
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		>=dev-util/cmake-3.16
+		>=sys-devel/clang-3.9.0
+		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_PATCHSET=${PV}
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	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 dev-lang/llvm; then
+		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/libcxxabi"
+	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() {
+	# we want -lgcc_s for unwinder, and for compiler runtime when using
+	# gcc, clang with gcc runtime (or any unknown compiler)
+	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
+	if use libunwind; then
+		# work-around missing -lunwind upstream
+		extra_libs+=( -lunwind )
+		# if we're using libunwind and clang with compiler-rt, we want
+		# to link to compiler-rt instead of -lgcc_s
+		if tc-is-clang; then
+			local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			   ${LDFLAGS} -print-libgcc-file-name)
+			if [[ ${compiler_rt} == *libclang_rt* ]]; then
+				want_gcc_s=OFF
+				want_compiler_rt=ON
+				extra_libs+=( "${compiler_rt}" )
+			fi
+		fi
+	elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then
+		# clang-based darwin prefix disables libunwind useflag during
+		# bootstrap, because libunwind is not in the prefix yet.
+		# override the default, though, because clang based libcxx
+		# should never use gcc_s on Darwin.
+		want_gcc_s=OFF
+		# compiler_rt is not available in EPREFIX during bootstrap,
+		# so we cannot link to it yet anyway, so keep the defaults
+		# of want_compiler_rt=OFF and extra_libs=()
+	fi
+
+	# 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=(
+		-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_HAS_GCC_S_LIB=${want_gcc_s}
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
+		-DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s}
+		-DLIBCXX_TARGET_TRIPLE="${CHOST}"
+		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
+	)
+
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxx
+}
+
+# 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() {
+	local libdir=$(get_libdir)
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
+
+	# Move it first.
+	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/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 ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.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}" > "${ED}/usr/${libdir}/libc++.a" || die
+}
+
+gen_shared_ldscript() {
+	local libdir=$(get_libdir)
+	# libsupc++ doesn't have a shared version
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
+
+	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
+	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
+}
+
+multilib_src_install() {
+	cmake_src_install
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		gen_shared_ldscript
+		use static-libs && gen_static_ldscript
+	fi
+}
+
+pkg_postinst() {
+	elog "This package (${PN}) is mainly intended as a replacement for the C++"
+	elog "standard library when using clang."
+	elog "To use it, instead of libstdc++, use:"
+	elog "    clang++ -stdlib=libc++"
+	elog "to compile your C++ programs."
+}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 2dda30241d10..d663aa0824ef 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -1,5 +1,7 @@
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
@@ -11,5 +13,6 @@ EBUILD libcxxabi-14.0.1.ebuild 3500 BLAKE2B ae2784bce2de92f63f5a0c30a74738ec77e8
 EBUILD libcxxabi-14.0.3.ebuild 3519 BLAKE2B a697541ba82ecf955b816ee75be0f1607cbe37d7cb8372aca749b0c42f6e3a247591cace54ab010de166a1167ba5448c5e3ae1f8d585a8b6080fa0adaaedd243 SHA512 0f296a7b432f6e5a657ad54b5062b8aeb9a814da36021a4b5a0b7455f3d5c2fd69dc854203a388d016bff89e063426fea7b81f6b5d0f57bfa1f09cf9d48c3665
 EBUILD libcxxabi-14.0.4.ebuild 3516 BLAKE2B 14930dc89a4defc1b2acaba6a96f8c72f3713059b36cbb1500bcc7b27daa325fa701c9732d112009ae34b163ad9f9834965156e1d593514bf19109575e5799f8 SHA512 16428c4e19b23b7cab28ab4c836a92a1a3f8348fa149be79cfc31c83e996e2a9714d61b302768ff016b3d3a9efe95d3a7c5911993a900abc1f54f3b52c1eb481
 EBUILD libcxxabi-14.0.5.ebuild 3519 BLAKE2B a697541ba82ecf955b816ee75be0f1607cbe37d7cb8372aca749b0c42f6e3a247591cace54ab010de166a1167ba5448c5e3ae1f8d585a8b6080fa0adaaedd243 SHA512 0f296a7b432f6e5a657ad54b5062b8aeb9a814da36021a4b5a0b7455f3d5c2fd69dc854203a388d016bff89e063426fea7b81f6b5d0f57bfa1f09cf9d48c3665
+EBUILD libcxxabi-14.0.6.ebuild 3519 BLAKE2B a697541ba82ecf955b816ee75be0f1607cbe37d7cb8372aca749b0c42f6e3a247591cace54ab010de166a1167ba5448c5e3ae1f8d585a8b6080fa0adaaedd243 SHA512 0f296a7b432f6e5a657ad54b5062b8aeb9a814da36021a4b5a0b7455f3d5c2fd69dc854203a388d016bff89e063426fea7b81f6b5d0f57bfa1f09cf9d48c3665
 EBUILD libcxxabi-15.0.0.9999.ebuild 3478 BLAKE2B 4a9508f17dbf7f1587915b565d9a572b20762c75dd1d89472df2ff4c01cb06b02c9d48bfa0a636b187d943fce1cfe3c826445ebd34657dcbe3b2314287fafc2d SHA512 79d6e8b143d1d4f8e08634eea94c5c02f175aca3f330ef008a95377dc03dc33fe8a9c36a77e7e636f74a365954020a57853a241b52ee246681703ae61f4bcadb
 MISC metadata.xml 351 BLAKE2B 9071a2cbb0eee25e4396bd720f39cd09b011e70fa4a2a87bab63801fa54d307304219a6bddc9b6fb8d0e3b32b07ea09d0419b8ea74af25d601505c3b577c656a SHA512 096b95417b8cdaeed177108ac27e54cd44c4488e8dd3b6ca0aa07f2c70fc59d42343c926d44adf54349e3f9791b9151293383e471df1282678a3c60031184d13
diff --git a/sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild b/sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild
new file mode 100644
index 000000000000..7d864cba3621
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib 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 ~riscv ~x86 ~x64-macos"
+IUSE="+libunwind static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libunwind? (
+		|| (
+			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
+			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
+		)
+	)
+"
+# llvm-6 for new lit options
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/llvm-6
+"
+BDEPEND="
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		>=sys-devel/clang-3.9.0
+		$(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
+	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 dev-lang/llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# link against compiler-rt instead of libgcc if we are using clang with libunwind
+	local want_compiler_rt=OFF
+	if use libunwind && tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			${LDFLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			want_compiler_rt=ON
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-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_LLVM_UNWINDER=$(usex libunwind)
+		-DLIBCXXABI_USE_COMPILER_RT=${want_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
+		-DLIBCXXABI_TARGET_TRIPLE="${CHOST}"
+
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
+		-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
+		-DLIBCXX_TARGET_TRIPLE="${CHOST}"
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-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
+}
+
+multilib_src_install_all() {
+	insinto /usr/include/libcxxabi
+	doins -r "${WORKDIR}"/libcxxabi/include/.
+}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 7e07be482494..f7f4d1110005 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -2,6 +2,8 @@ DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841a
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
@@ -13,5 +15,6 @@ EBUILD libomp-14.0.1.ebuild 3817 BLAKE2B 7f5c80c1a8e6995b58576911a3ab73a3dd1b663
 EBUILD libomp-14.0.3.ebuild 3828 BLAKE2B 0887d1ac8543821e06bb09a1c3b3331c7d727fc9101232893f19270a7bdc0092c9be0c85e5a9976450e7c131fff8918346515fbf880c700ebd113a5c399948a8 SHA512 d82f5e9129e7515cbf2d836519de4b7ddecc14ed9948584f3a49ea58d6dbd27a0b90a88d5329a9bc568e4063daf0c9ce8755c6c9ddcadad1a56a1f7142511721
 EBUILD libomp-14.0.4.ebuild 3824 BLAKE2B af89b4531c3b7b27ba98bc08f34b544bbb22b9b140c296c347e1662d3a4960fd886b8174e5a889bd5f7f20d23d90f9b13adfe5be12afd321d208ac7e3850d7c6 SHA512 2f0fe64953485799bdb7b820987cbff8b6c6025803da9f5af7c664179f3c0ba753cdcc54b90fca54bc3a2fe4c007e5f2dceff69c539739d3ec4d0e3d1ed561c6
 EBUILD libomp-14.0.5.ebuild 3828 BLAKE2B 0887d1ac8543821e06bb09a1c3b3331c7d727fc9101232893f19270a7bdc0092c9be0c85e5a9976450e7c131fff8918346515fbf880c700ebd113a5c399948a8 SHA512 d82f5e9129e7515cbf2d836519de4b7ddecc14ed9948584f3a49ea58d6dbd27a0b90a88d5329a9bc568e4063daf0c9ce8755c6c9ddcadad1a56a1f7142511721
+EBUILD libomp-14.0.6.ebuild 3828 BLAKE2B 0887d1ac8543821e06bb09a1c3b3331c7d727fc9101232893f19270a7bdc0092c9be0c85e5a9976450e7c131fff8918346515fbf880c700ebd113a5c399948a8 SHA512 d82f5e9129e7515cbf2d836519de4b7ddecc14ed9948584f3a49ea58d6dbd27a0b90a88d5329a9bc568e4063daf0c9ce8755c6c9ddcadad1a56a1f7142511721
 EBUILD libomp-15.0.0.9999.ebuild 3762 BLAKE2B ec449c1019da76ad9d1835e9a86f776e97a83740da240a2e98221d3f5d5eff7911b894584bb37da8fe2375670d5a6a67e41a5523f957694cd3e138543b5ba925 SHA512 643d3c43a9fba97ea44b94d3edd07ffbb487aa8260856fed8a158646873a7e45797c11aed020b224642db7e90da0fb705cd10f69fd0da5139d42b9560b9f2542
 MISC metadata.xml 826 BLAKE2B 94bad2982b52156c2755f4fcdc534648e30b45b514f486028d7beba9af050c3c6847a33fdc11cbf26195794b8e8a7cbeb4e110b8b4398f784c7b7c3edeea02ca SHA512 60de2890b1edc3d60feb5b04dbce840b17e0812ff301f00fd7c12242d3b81cdb3b8ad7afeb3624d70526a93cf8285c96a65b5fcd0384dd093b722c1ae645fa2f
diff --git a/sys-libs/libomp/libomp-14.0.6.ebuild b/sys-libs/libomp/libomp-14.0.6.ebuild
new file mode 100644
index 000000000000..987d01113d97
--- /dev/null
+++ b/sys-libs/libomp/libomp-14.0.6.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib linux-info llvm llvm.org python-any-r1
+
+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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+IUSE="
+	cuda debug hwloc offload ompt test
+	llvm_targets_AMDGPU llvm_targets_NVPTX
+"
+RESTRICT="!test? ( test )"
+# CUDA works only with the x86_64 ABI
+REQUIRED_USE="
+	cuda? ( llvm_targets_NVPTX )
+	offload? ( cuda? ( abi_x86_64 ) )
+"
+
+RDEPEND="
+	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		virtual/libelf:=[${MULTILIB_USEDEP}]
+		dev-libs/libffi:=[${MULTILIB_USEDEP}]
+		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
+		cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	)
+"
+# 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_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		sys-devel/clang
+	)
+"
+
+LLVM_COMPONENTS=( openmp llvm/include )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+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=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+
+	if use offload; then
+		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
+			mycmakeargs+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
+				-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
+				-DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
+				# a cheap hack to force clang
+				-DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
+				# upstream defaults to looking for it in clang dir
+				# this fails when ccache is being used
+				-DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
+			)
+		else
+			mycmakeargs+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
+				-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF
+				-DLIBOMPTARGET_BUILD_NVPTX_BCLIB=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/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index d000359fdf2b..c1fcca1957e3 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -1,7 +1,9 @@
 AUX libseccomp-2.5.3-skip-valgrind.patch 516 BLAKE2B d5dc87fcca8e20b7edd427c434d875c9c3c7aa130a651dbe06c2c648825312e330400f89177afcfe4985fa48e0f95de9937773deb6d3d83da9b2351e6e0488fc SHA512 96053f8ca6abc97ea7c5565c3c25563881e8c0363e9c38fa05836d59b5d9ea1a375f9e072bd5f89a67ddac159c1219be7ed829facd651b3fb8bd5071c89bddcb
 AUX libseccomp-python-shared.patch 759 BLAKE2B e2c42e18ca93fe5fddbc3a5b47ac0e6a29e566292fd62b87e6b45f6cb230570a2d1907a8b192e80b32c1900d069a4f10a866fa50bd9b88f5b78abff4206bd4cb SHA512 74548c7969869ff8f937a75eac720f1c654fad87dc17aed1c041bcb765586b4ee978a3ff7c6281be03277f6c74f2ec32624f91beb55afec3066a06a9e51483e2
 DIST libseccomp-2.5.4-loongarch64-20220425.patch.xz 132768 BLAKE2B f3ab165b028b5f8b4c16574936b915595807ebeb49ef7365d6051f3dfafa7da46ef2a9de458e0a268298cb340152abe1f3c0c293446462a06696bc9ce92d2f72 SHA512 94f23c7a2cc2ea8acb01fef00ef184295c276b14b2b3ba0c65687fd72081df8478f3f04c51b0b391ba44529c4f914e6edbb4132af935e3be55902f641d478780
+DIST libseccomp-2.5.4-loongarch64-20220622.patch.xz 67668 BLAKE2B faf1b5653a4d454626e310cdfd7def1fb8b768b88d3f792a28170d969a834be7ced8bb7b511a11e0e44691d626046e4c387c08f3fbacdedd6689813f65c129aa SHA512 9aba715c6f120f8df249158f73bc64097243f911d5864294048dc3976580e9ca96cc538c890918a375c3b35369fdbf2383424b6f3d41822c834228ff188680fa
 DIST libseccomp-2.5.4.tar.gz 637228 BLAKE2B 38b134cb578f9355667546f92950ebcf8c53ccaf98db568db9aadfa9629c054136849e03d4bf9f09f73998fe66a5e8a9038573d19740b2bddf5518a8a0119229 SHA512 92650bd7d1d48b383f402a536b97a017fd0f6ad1234daf4b938d01c92e8d134a01d2f2dd45fd9e2d025d7556bd1386ec360402145a87f20580c85949d62cea0e
+EBUILD libseccomp-2.5.4-r1.ebuild 2892 BLAKE2B c5f8c96295283e429d7346da50803cc5df30b2bda6c94df66d8705f8454aa9c2a2311a141e4aeb024cdca26088c469996650dab2ba410072bb4b8e2d5729faa2 SHA512 13dfdb41c3133186d2b5d11ec5d9f0a7480b0213d932db29997b790a105b79a4d9cea1a77335bbe1d0582128fd57f7621a1d6eb6d6a8d6e752180878728d6164
 EBUILD libseccomp-2.5.4.ebuild 2869 BLAKE2B f3e8e7fc905fa93b77132cb5b0bc48f3ee306340a244d649abc509f3f3bc6bf0a18bc27817a29abf23c5240adc7a80be8e721d8ff8e4c9b3a1b96fce85a0bc7b SHA512 6934f113f5a07ad4e48040762a61f41139bcf1e9671a66f97bae056d6757c3359e24648f6e56309c88777acf9c24555894e0673632c58c0cc76f5776da4ad470
 EBUILD libseccomp-9999.ebuild 2382 BLAKE2B ecad29840736e18f35e0470a20674fe9aa0996bbf0a14c2297fda4b8873eaa028a8b0537bfd7cb64f67eeaa094ce7a4e981a94eb5a6008a771832931694cf1da SHA512 f41729b208db944ceddab46aba24d59a850a28379e11c1ac7405e82477bffe13050158c2bdf52ffc51f78d001f8ac320e4a27f1b876f9f3cc9c60c0f3513f2b3
 MISC metadata.xml 561 BLAKE2B 48e95fec426ff6123ed948660b9e88aa9e2ecd5f8cc51b6e13d0034c4f3fff988ce2bcb2a9b73557fe5c15065ee09d14c4c4b4bbce488bbf9bd54138b0d6750e SHA512 b45ed0989e466fc27998553f584fdcbd33a9a57c31774f062508eabc834848c7776e91d3ae854707523958282822499e030b785b018c356fdf3590a5a8dc6090
diff --git a/sys-libs/libseccomp/libseccomp-2.5.4-r1.ebuild b/sys-libs/libseccomp/libseccomp-2.5.4-r1.ebuild
new file mode 100644
index 000000000000..bd94a086c76d
--- /dev/null
+++ b/sys-libs/libseccomp/libseccomp-2.5.4-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 multilib-minimal
+
+DESCRIPTION="high level interface to Linux seccomp filter"
+HOMEPAGE="https://github.com/seccomp/libseccomp"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/seccomp/libseccomp.git"
+	PRERELEASE="2.6.0"
+	inherit autotools git-r3
+else
+	SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz
+		experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/${P}-loongarch64-20220622.patch.xz )"
+	#KEYWORDS="-* amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="-* ~loong"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="experimental-loong python static-libs test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# We need newer kernel headers; we don't keep strict control of the exact
+# version here, just be safe and pull in the latest stable ones. bug #551248
+DEPEND=">=sys-kernel/linux-headers-5.15
+	python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}
+	dev-util/gperf
+	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/libseccomp-python-shared.patch
+	"${FILESDIR}"/libseccomp-2.5.3-skip-valgrind.patch
+)
+
+src_prepare() {
+	if use experimental-loong; then
+		PATCHES+=( "${WORKDIR}/${P}-loongarch64-20220622.patch" )
+	fi
+
+	default
+
+	if use experimental-loong; then
+		# touch generated files to avoid activating maintainer mode
+		# remove when loong-fix-build.patch is no longer necessary
+		touch ./aclocal.m4 ./configure ./configure.h.in || die
+		find . -name Makefile.in -exec touch {} + || die
+	fi
+
+	if [[ ${PV} == *9999 ]] ; then
+		sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die
+
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--disable-python
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+do_python() {
+	# setup.py reads VERSION_RELEASE from the environment
+	local -x VERSION_RELEASE=${PRERELEASE-${PV}}
+
+	pushd "${BUILD_DIR}/src/python" >/dev/null || die
+	"$@"
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use python ; then
+		# setup.py expects libseccomp.so to live in "../.libs"
+		# Copy the python files to the right place for this.
+		rm -r "${BUILD_DIR}"/src/python || die
+		cp -r "${S}"/src/python "${BUILD_DIR}"/src/python || die
+		local -x CPPFLAGS="-I\"${BUILD_DIR}/include\" -I\"${S}/include\" ${CPPFLAGS}"
+
+		do_python distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python ; then
+		do_python distutils-r1_src_install
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "${PN}.la" -delete || die
+
+	einstalldocs
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index ad185024f609..582b9e286080 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -1,6 +1,8 @@
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
 DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
 DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
@@ -12,5 +14,6 @@ EBUILD llvm-libunwind-14.0.1.ebuild 3186 BLAKE2B e5412e6d38ce37d72640805ee3befc8
 EBUILD llvm-libunwind-14.0.3.ebuild 3205 BLAKE2B 94ee3640bf57770f52d8bf0adb53ac5eec90884af970ad72e23d0208986a3801bb327a8cf791bd97c2e9414710201e7b61cc5d1d5aef16233b015bf9c4630b4a SHA512 46e2f37981fb1e6e454da41fdeba5d9c3a97173631caf4b619756a1b3bed6b3f4904a73d799ec5fc21a96b4cd46a92033d5fdc113a9be9707c2e1dbc2237b8c6
 EBUILD llvm-libunwind-14.0.4.ebuild 3201 BLAKE2B edf5edd0c5fcfc3b8162c2b8ccfedf1a9399f686e55c163bf953889b50bc713af56a695f988beb883c006d30f59ae762e1730d034b43bead972812b919ef6bbe SHA512 faa8233f6a9108e1444584a2ea2161afac36413db1663f904c09e0172089d5f1ce4f0aeb575ac92952ef6492f0f36fe0d5d6bc47f8609432bac40ec619f6cb1e
 EBUILD llvm-libunwind-14.0.5.ebuild 3205 BLAKE2B 94ee3640bf57770f52d8bf0adb53ac5eec90884af970ad72e23d0208986a3801bb327a8cf791bd97c2e9414710201e7b61cc5d1d5aef16233b015bf9c4630b4a SHA512 46e2f37981fb1e6e454da41fdeba5d9c3a97173631caf4b619756a1b3bed6b3f4904a73d799ec5fc21a96b4cd46a92033d5fdc113a9be9707c2e1dbc2237b8c6
+EBUILD llvm-libunwind-14.0.6.ebuild 3205 BLAKE2B 94ee3640bf57770f52d8bf0adb53ac5eec90884af970ad72e23d0208986a3801bb327a8cf791bd97c2e9414710201e7b61cc5d1d5aef16233b015bf9c4630b4a SHA512 46e2f37981fb1e6e454da41fdeba5d9c3a97173631caf4b619756a1b3bed6b3f4904a73d799ec5fc21a96b4cd46a92033d5fdc113a9be9707c2e1dbc2237b8c6
 EBUILD llvm-libunwind-15.0.0.9999.ebuild 3145 BLAKE2B 37362f37ade47d59ebee5c65337768677a280379541c8468fdd7b31927b4eb93c2576a46838bb320bd526aa2191828cd8f7ae502adafec594b172065f5b90c35 SHA512 132b91d72b419267ef51ef5be15393a882897587f6190d62a3c39b091ef97eaef06e8f1fe62e3d8303c0f23581604357a10bc7b958b5b71ec3316c1a1dcc5e54
 MISC metadata.xml 303 BLAKE2B ed0dbe1165e30ee5c3556aaf467abf212e198590a06c70f0de4e2c12060644df928c8f388fadfe776249a77dc000b40881d7254cfdc30f7a41209e2524136adb SHA512 5a69c07b9b1b37646d29a7287f1ba1c9150a5fae60df644266232871b5e4db41c0e8d102e8b873af2bdbf814935e8f8479e1534b8aa47d0ee31e971e2fa4dc50
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.6.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.6.ebuild
new file mode 100644
index 000000000000..b1b3c2dc140d
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.6.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://github.com/llvm-mirror/libunwind"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!sys-libs/libunwind
+"
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6
+"
+BDEPEND="
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		>=sys-devel/clang-3.9.0
+		$(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
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+multilib_src_configure() {
+	local use_compiler_rt=OFF
+	local libdir=$(get_libdir)
+
+	# link to compiler-rt
+	# https://github.com/gentoo/gentoo/pull/21516
+	if tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+		   ${LD_FLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			use_compiler_rt=ON
+		fi
+	fi
+
+	local mycmakeargs=(
+		-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
+		-DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
+
+		# 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_ENABLE_EXPERIMENTAL_LIBRARY=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_TESTS=OFF
+			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		# meh, we need to override the compiler explicitly
+		sed -e "/%{cxx}/s@, '.*'@, '${clang_path}'@" \
+			-i "${BUILD_DIR}"/libunwind/test/lit.site.cfg || die
+	fi
+}
+
+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/talloc/Manifest b/sys-libs/talloc/Manifest
index 6f64cd8433ec..dc2acdb63942 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,5 +1,7 @@
 DIST talloc-2.3.2.tar.gz 661344 BLAKE2B 957eedc4a367051cb99fa4d2edb8e778de8e0187bb5c0d84a1afef20aab122a8b7310d10c694e15ddd6a0a45194889fe3d26dae0ceb8e406d51512af95a23014 SHA512 c851a6f43025720453a3bff8734bfcfff0e29fb7cf2ffcc6c03b6ab8589098daf01d668deec61aa2f238d4df3eb3c47bd080e26eec760cf04a70e1afcad5c5e1
 DIST talloc-2.3.3.tar.gz 650493 BLAKE2B 4312d8bbd54da2cb8917946e46bb77dae1c6fdfeb72bd85d86ef8d5900f2132a36c5f0075608116a9bf036a2f02671472d389eed704f8e2923f8320d29aa12bd SHA512 1e4b90769b9be72421d76bf9149fd0736f43d034b1573ab2dfb5cd613b4fb3fdf67d575f81789851787e1cbbc7353cdfc114cefbccb15fc0f39e222f40aff65f
+DIST talloc-2.3.4.tar.gz 674196 BLAKE2B 1fac0a45a4ba16c7741e6d810e1a1e56352c04f266b99de62770177c1218a8c8253be2d5d1793aae67ce61e6a1159cbcd4888a49702822e6817b86eb7a1fea31 SHA512 c46488deda99753fd79566d42cae88899b71196513a127813be2cb855e7f36b77132f0552297ee4153ba4d8f177cea3bb0dc93340caabf321c026657744684d9
 EBUILD talloc-2.3.2.ebuild 3371 BLAKE2B 3aba9d4a7982d0b2a7bddc1cd94b07fb6a2b652e2d23b704c43c901eb0e8123b78a6e5db2d41f83024cdc2234dff8b8e6c2bd6e2a356679660ed914ed5a182c8 SHA512 8a767d540f1aa7e4b5b33b45a5077f725cbe9eda7509f38ee7c0d97ac73b3093df30b31b77564e1898dbb643f3eb42951d1d5bd7f9cda0dafd8963786ce15930
 EBUILD talloc-2.3.3.ebuild 3373 BLAKE2B 865c39b59cd1f3f4882bee93d52bb86ab67314a7f848e91575cb299583bf6fdc73baf6c87df9449d254665d6cb8d405b802b79cf5ab95b72ca3a4d36512d4c71 SHA512 3613df0ff221020451aa1f733fedfd6b396a9918977fce7b559a395a7c1c84aeb18a959eb0c4ccfaf84041f8b782641287b001ff65b243a925e9cca85472ac5a
+EBUILD talloc-2.3.4.ebuild 3405 BLAKE2B 32cb827b62395343bcb33b1c2a8843565a5447999176ae744976a28a224ca2c25ffc2d5028e779035094950b09bdf24bca8ec21426f4d089fa335c148744cc88 SHA512 448c7e93113513f1992b25209ced99f4f349710f9f1b5fa2722b4db7eb4d63a90c2c58c09ebb5566bf3ddfdac9e296cf331508fb4aedd2494fb4765b82203ed1
 MISC metadata.xml 326 BLAKE2B 4788d8b536b43840fc3a6d6ef36d860589ebb1137cd07d11ce75c54869b8b65027f9332901c1882ce8fd97f446d90973cec03332b4e693283162f3c731b7627e SHA512 e700e6f5810ad2d6618f52ff3607a2dc3254751dc8172744512c956f001045accfa28d8aa79be67935c02aead13c2c22c54aa4e221f487ba3cb25ebe9273d57f
diff --git a/sys-libs/talloc/talloc-2.3.4.ebuild b/sys-libs/talloc/talloc-2.3.4.ebuild
new file mode 100644
index 000000000000..a7cc48314beb
--- /dev/null
+++ b/sys-libs/talloc/talloc-2.3.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils python-single-r1 multilib-minimal
+
+DESCRIPTION="Samba talloc library"
+HOMEPAGE="https://talloc.samba.org/"
+SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3+ LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="compat +python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="
+	!elibc_SunOS? (
+		!elibc_Darwin? (
+			dev-libs/libbsd[${MULTILIB_USEDEP}]
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libxslt
+	sys-devel/gettext
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# python goes only for native
+	/usr/include/pytalloc.h
+)
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+	export PYTHONHASHSEED=1
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Drop irritating ABI names (e.g. cpython-37m)
+		# We're only installing one implementation anyway
+		sed -i "s/+ conf.all_envs\['default'\]\['PYTHON_SO_ABI_FLAG'\]//" wscript || die
+		sed -i "s/name = bld.pyembed_libname('pytalloc-util')/name = 'pytalloc-util'/" wscript || die
+	fi
+
+	# what would you expect of waf? i won't even waste time trying.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local extra_opts=(
+		$(usex compat --enable-talloc-compat1 '')
+		$(multilib_native_usex python '' --disable-python)
+		$([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions')
+	)
+	waf-utils_src_configure "${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# waf is stupid, and no, we can't fix the build-system, since it's provided
+	# as a brilliant binary blob thats decompressed on the fly
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+			"${ED}"/usr/$(get_libdir)/libtalloc.${PV}.dylib || die
+
+		if use python ; then
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die
+
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die
+
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libpytalloc-util.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \
+				"${D}"$(python_get_sitedir)/talloc*.bundle || die
+			install_name_tool \
+				-change "${BUILD_DIR}/bin/default/libtalloc.dylib" \
+				"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${D}"$(python_get_sitedir)/talloc*.bundle || die
+		fi
+	fi
+}
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index 86abf3d5aabf..697f4c8000f8 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -1,5 +1,7 @@
 DIST tdb-1.4.5.tar.gz 729650 BLAKE2B 5d8a226cf251268d70f68759fb792628559fa3b10e7843d1a53914ea24f0ceca61fe0c3f348d704ebc8df4c56fe2365690b585b1c96cf53d63ecae1960aca58a SHA512 373b2ce5b2c68fbc28b7679f0e7531115b91ddc6a68b27acada39b995f66b508b19f24d712fc4388654199abd69857e53ebd435d1ed47e3a69ba85ff667fed56
 DIST tdb-1.4.6.tar.gz 736747 BLAKE2B 53b989955993e970f3ca0874ade4d7404e180fedaac94d409753b209ea9dfa5136f2cdce4eb6d67a44b208731466eb0557c4dfcd9db20ea5806c5da1a3917e50 SHA512 8af549867fdf2e0daf073c26933ae0d475ea64efaca23d3d7b0eb20839376e817f4c0a0ba2504f60f9e27a2b35d3b6ae7c329d88a5c2c0408e98ad9dfde84712
+DIST tdb-1.4.7.tar.gz 741714 BLAKE2B ec2f991bbaa61d46f16b7a68a4e47a2f690cda261dd0e9fd9708e51ad64eefeb54ac8b1102cde6935916f840d3c89d7a2903f58175cceb78ea4ef889e82ddbc6 SHA512 2b5b20c299b60545943f106d854b6e0d4a559e16f08a7ed62fe57ee962bebc888c2e663bd5fef907aace05b316826fe8fbbf3f323b6d3427531e59ffe47d48e4
 EBUILD tdb-1.4.5.ebuild 1406 BLAKE2B 56a4ece339321f667bff0b6b9bd4c28aad7faf6acd3403cd407078694a55075c53e351ac2188024d7433dad5fd2a3ca4771ac90768844406104506d4e06008ee SHA512 d74105542ac51aa62ba933d313eef429a0fecf78cc1995c5b7d54e33e2ec46068e2f4ddd9409ab5496915870724f59fde6f7f6425e06061cf3d80b894a89c6e5
 EBUILD tdb-1.4.6.ebuild 1451 BLAKE2B b367b02365f7e2381130fae1e8d8bfb581ef5f3d7f297f64183c21836e076c32b1d318c963239d7b46251cfca64631caeef09befa727339d09042544119dfc45 SHA512 50f476fda8a145124a050b0197b0cf5550ec5998f9a46c2dce5543cf9c4e5ec3aa004d08ce87467efad882a35c2d09442acd16d8a03879ffa3b6df553b738715
+EBUILD tdb-1.4.7.ebuild 1521 BLAKE2B 1967af92fb38639f4497d33bc11790f93f4e44548c1357d5f79a4e448b97ecf56cdd407e33224075b82d04d00d7acb28600a73af743882d5b2b09a28ade0ab05 SHA512 ae200e77febef995c6ed6db04e275d7008b2144c71394ef95d737ea4c80fa694a48c869ffedf3a9b41218f1b272b408c20a827e83a7486cdf8696d0e218aa56a
 MISC metadata.xml 245 BLAKE2B 015a6303c153dcdb4a4b6ec58ea97e6798d3316c6d211559022bd2a26d481356e481ba2ade200171bb182264ce9c132727cf8ce077fba38fabcef92c3431b6ba SHA512 5d1b6ef089165b3325df35b31d33f7c994bbc302399bb47abf3138885f0dd7b04176114de8ffea6ee1ae26a53fc83be9016426714e547fd6405c454b918e39da
diff --git a/sys-libs/tdb/tdb-1.4.7.ebuild b/sys-libs/tdb/tdb-1.4.7.ebuild
new file mode 100644
index 000000000000..5a2043ce9f40
--- /dev/null
+++ b/sys-libs/tdb/tdb-1.4.7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="Simple database API"
+HOMEPAGE="https://tdb.samba.org/"
+SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/libcrypt"
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.2"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export PYTHONHASHSEED=1
+}
+
+src_prepare() {
+	default
+	python_fix_shebang .
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local extra_opts=()
+	if ! multilib_is_native_abi || ! use python ; then
+		extra_opts+=( --disable-python )
+	fi
+
+	waf-utils_src_configure "${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+	# need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
+	unset MAKEOPTS
+	waf-utils_src_compile
+}
+
+multilib_src_test() {
+	# the default src_test runs 'make test' and 'make check', letting
+	# the tests fail occasionally (reason: unknown)
+	emake check
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	use python && python_optimize
+}
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index 7a4111a83610..8506cdc9ddc5 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -2,7 +2,9 @@ AUX tevent-0.11.0-missing-include.patch 310 BLAKE2B b6c54840d64cec798968e58ee766
 DIST tevent-0.10.2.tar.gz 800731 BLAKE2B 5ea6b83378b04dbe1666432db0dbd4c0df2e6b0bf5ebcc8ec4ec9bdeb834efec75c87b2019dc78c691aba6c4f6467394101febd6010f106046a1fb8848e27405 SHA512 1da8f28898f35daab515892b880d1de601062cc3e2b2570cd62e6913df17b0195a05acb7b484c628cddc0eb8b0cde893105ede3feb32bc5764e7d25684f332ba
 DIST tevent-0.11.0.tar.gz 866327 BLAKE2B 9e6e958597e21c0d228346aa102987f89bb6630a5661cef21b908735469a59e7b4f46bc4473e9c25fe636913a1eebc1f26234448c09739ad812cd3ce97bf5048 SHA512 740346b19bf290ff31b0c1b36e232021b8ad107c3ce27e0e8b1ec1a77485214b07a9b7837ba57f3650a50e4c04f530674e486b5fa4d118a1778259be63b49790
 DIST tevent-0.12.0.tar.gz 877767 BLAKE2B cbfb823f9a8ce8a9a88964c9daa15643c077163c03a792468836e5bbc7e7500c745e1fc1203063ed01f899cf598794764c6d465afc3ed31cd711f420ebc6ce55 SHA512 ae955b64a683bc6aaba66592ca5d205eb48f62a70bd2674b5b3a0e3b0f4de30c93f400bf183d3bef5993845a3281716584b24cf8a93c849ba4fa7d1fcfb9cc99
+DIST tevent-0.12.1.tar.gz 879683 BLAKE2B 51521aa26dc3ac38dcf69cdb77a7ad33fede88947e3a91cc5917fae9746951643a70615db24449437e133b575ca41d961ed63c23a0b4f1a01edf090952672032 SHA512 ab70262702d70ce00e8b3aef41930c674b04c147fdbf0006e57cfa057d82f6049ba6da4b2c2b7b53aa191dd4f0f3d55e72b0666ae8f5b6948eeb9fde1988c938
 EBUILD tevent-0.10.2.ebuild 1591 BLAKE2B 63043bf0d721a46e303bc72f1166470068f57582ea529f8cdcf0dae3228b681c0649d20dab279f0e3a46c85c9ba755ba95bdf3944abd951899715f1c46a504ae SHA512 768d207948ac5a27d1ca62b108e3ee4d91f849b2f887596b469e5338e9e00050d34d518b8adc4e1283f1db9f88e519813dc7aced6df94449b784965fe72c5992
 EBUILD tevent-0.11.0.ebuild 1672 BLAKE2B 876840924440fc319c04b0ff51d9cc50fedeaefea973d3117da5ea039e817f61a42f8f4fd1b986594b026ee485927375047c16bf53be0098f1b6133b43ecd7f3 SHA512 f01a7ccb816617fbdd4ea46ee7d99a40b02dadca8759c9c36985cdadce309adec81a1ae47b8cc019a58e661983ecaa179805941e637bc04262401e68fc15040b
 EBUILD tevent-0.12.0.ebuild 1650 BLAKE2B e97a67eb78b6ab05e6acf102b037c517abcaed134eb2d94101f0c5b32047ff26f282d998cec379176ab1b7269692c59afd24fb1516e176729e7d317a4eb3fd54 SHA512 460fd4d48232642732f1401dfd78a04517378f5809f596a4a5f34d3e8b5f28bfb833dd299a7522602b884c19accaa6a8e4a5ffb0a67eac1b2a44e34a49735f20
+EBUILD tevent-0.12.1.ebuild 1650 BLAKE2B baffcf5e8d90c3a156f805c5e3678994c15875c089fd3ee54415b3dba90bfcc507e2714d77967c281e7d03399a44e8075b13b76c1b45748e22c6fbf1569cae8e SHA512 888c49193931d03f09eea196f3940d465811046516b7018cc997309c8399e63368575e0bad6dec5932d5965f568bf6b94c5261653f66334a6323d76e2afeb94b
 MISC metadata.xml 239 BLAKE2B 7127a2a67e79dc98a78fcaca706fd348389c7f08465112215855afe5978d2932ecbee93944efb1df528fbb6d09e884b277cb1d55a8b3926487b6ca07f9330b8a SHA512 4ea42efe4d083d013b85796ca25a132678bcefe6e3687fd6dd371814fd307118fbc8da8c15ce7f4d956e5f824cd0202f49d3469406c88008e84ff9f4d360f424
diff --git a/sys-libs/tevent/tevent-0.12.1.ebuild b/sys-libs/tevent/tevent-0.12.1.ebuild
new file mode 100644
index 000000000000..7f294f50dfb2
--- /dev/null
+++ b/sys-libs/tevent/tevent-0.12.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="Samba tevent library"
+HOMEPAGE="https://tevent.samba.org/"
+SRC_URI="https://samba.org/ftp/tevent/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.3.4[${MULTILIB_USEDEP}]
+	python? (
+		${PYTHON_DEPS}
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/cmocka-1.1.3
+	elibc_glibc? (
+		net-libs/libtirpc[${MULTILIB_USEDEP}]
+		|| (
+			net-libs/rpcsvc-proto
+			<sys-libs/glibc-2.26[rpc(+)]
+		)
+	)
+"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export PYTHONHASHSEED=1
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--bundled-libraries=NONE \
+		--builtin-libraries=NONE \
+		$(multilib_native_usex python '' '--disable-python')
+}
+
+multilib_src_compile() {
+	# need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
+	unset MAKEOPTS
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	multilib_is_native_abi && use python && python_domodule tevent.py
+}
+
+multilib_src_install_all() {
+	insinto /usr/include
+	doins tevent_internal.h
+}
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index b381d73fa102..5f9a1a887db2 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -11,5 +11,5 @@ DIST zlib-1.2.12.tar.gz.asc 235 BLAKE2B bb1efc89b10b894ebc8e8008ee3e98104348f197
 DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
 EBUILD zlib-1.2.11-r4.ebuild 4414 BLAKE2B 28fff60b4ea6e23298dd32bd782c7a174c0c8fac1395f010b3e93769c3de32e7b26cb2a1fdd631c5dafb86d5a2f4f1e87a1833032d2043b629515254eeaccc5f SHA512 eef5a1d3f41a60a672a8432d6ca514d712dbd227c4e74c461193e35482bb47953a905e513f8a67571621e3f68bf12cc201c3a28a6a418f5c8e2b9f3debdc6acb
 EBUILD zlib-1.2.11-r5.ebuild 4501 BLAKE2B a1162467779ba8a5d0d3f23c95fd7afeddd427ab1c351472bcc6d0f40efab1ff989682f3963f3428fe28ca77f20cb5f19520c85a43025211dfd8de5a2917cf9f SHA512 7dd887d89dd54f6833d31e7de5095c36e9d312a2fed601b077119ee37da5ac53b69ae56755eaed578bb44f2026a34dfcf125d107e7dee311b842bdad0b9992ca
-EBUILD zlib-1.2.12-r2.ebuild 5152 BLAKE2B b47e94d2bb3cce4653588aedf3191bc58114808dcf1287c14fb595d6850bd2a3d3a8409f9cde7f63dc68b163b1c75ae562de1a724fc0ba7b31a3b2188614c635 SHA512 f04d76f5fad2b96a1b8a3ace6a5664abea28e5042e6a5915401ce6934c16259fed6753bbd6d7febeacaa05a319d0c10b9b7955b565f1bc336cf38e4104c6e99f
+EBUILD zlib-1.2.12-r2.ebuild 5151 BLAKE2B 699857f73789d3c57387e8a383de99dd9f689acf83662ffb73f57ae96b8dab41908d399209923bcf0efd78b185045ecea14712100df31865cb1ea3e33dcc5c4a SHA512 c7786221d8b50043e12c64abb538faeb458514d464eb45268e8c0b4c6c85ff9ac2c21ade5f6cc545f17ff533224ce1321d58925d32ccc517493d68be1a9ce17a
 MISC metadata.xml 494 BLAKE2B a4a57a4153aefc189e407bcb8ce84f7c94581cc66967f69097087da7e6ff48d2de683b919fb00445d095c47ef39d31e01590f8c989ce0e5e01474e73ee2a0565 SHA512 a7e0160c127b3c2a6afe99e95992d9dbd017061303759c299ec38800efd6a9e11a35ae850c23c77c09c8833cd9d61ac1267f6becadf9c22437ee35e4304400c9
diff --git a/sys-libs/zlib/zlib-1.2.12-r2.ebuild b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
index 8a79a818b45d..5741a146d6fb 100644
--- a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
 
 LICENSE="ZLIB"
 SLOT="0/1" # subslot = SONAME
-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"
 IUSE="minizip static-libs"
 
 RDEPEND="!sys-libs/zlib-ng[compat]"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 2d585c689557..06e82e700ffd 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/cron/Manifest b/virtual/cron/Manifest
index 22e8e54ac87a..3cad02531a92 100644
--- a/virtual/cron/Manifest
+++ b/virtual/cron/Manifest
@@ -1,2 +1,2 @@
-EBUILD cron-0-r2.ebuild 367 BLAKE2B b0902966f412212e8969b185099d0f33a42c8de218b2916ecf0fdaa590fb98e57a6d5b9ab2b23f8cb20eaa411460c2ba55c25b203dcba4e5ff5c8cf888c35ef5 SHA512 d6ffb866a281c3c5cf39b64a2c1cf56ee9e228b278111841f486e9c0ece28d4ab46f37529da5b3c7f6636dbea487faec84a2be175033a213b7b7300c027ecc1e
+EBUILD cron-0-r3.ebuild 367 BLAKE2B 3c89291922db61bd9aa5884ae0eddf550ae0dfcb464bbf8114af10d1ffd61e8c2ac14642be87c919513d8fa83e35046e2c12e1eb0e68b3390031bb3912ae618a SHA512 44449eb982f035ff88325df7fcb4553f05f3d431b1dd856a0b0140faa10c4075265a965a0f268ed2494161ef02f142fd87983a214c641b286c4352aecded029e
 MISC metadata.xml 277 BLAKE2B 424c3611f6f418785b1dafe230de60c8e2ef3ae41cbdeaf9e037b7ff279f2e86728f000c9ddb27794814293b7845a3e563c02ee635918cf133338c06c9d473b6 SHA512 0119efd75b63b2d10e30cea58f04e6fb7434691cb3a78801d8922c73b3fed4ff2b642d14bae37f7805457e95ae092d49712147bf4b339a3b268656ca15d7a23a
diff --git a/virtual/cron/cron-0-r2.ebuild b/virtual/cron/cron-0-r3.ebuild
similarity index 98%
rename from virtual/cron/cron-0-r2.ebuild
rename to virtual/cron/cron-0-r3.ebuild
index 1b3b65cd3e0c..3db86961ff1e 100644
--- a/virtual/cron/cron-0-r2.ebuild
+++ b/virtual/cron/cron-0-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Virtual for cron"
 SLOT="0"
diff --git a/virtual/fortran/Manifest b/virtual/fortran/Manifest
index c4e62adb9b98..81e0b904041d 100644
--- a/virtual/fortran/Manifest
+++ b/virtual/fortran/Manifest
@@ -1,2 +1,2 @@
-EBUILD fortran-0.ebuild 432 BLAKE2B 04f36e23891ac75a6d9e72d9ec9a95b8bfdc7215ace129dae7f22b1e55ed76346dc8daf8b7262069fee90cd136a206b6583b8057c3f0103ef9971ea31dc21238 SHA512 504f865a337855fc307d32a6ec195c331cac07e29adebfb20c053245b21cd7cb928f3c9f2fcc755949172ab7c11f0e495f454db95f89803ef28b7a5a1741115b
+EBUILD fortran-0-r1.ebuild 432 BLAKE2B 04f36e23891ac75a6d9e72d9ec9a95b8bfdc7215ace129dae7f22b1e55ed76346dc8daf8b7262069fee90cd136a206b6583b8057c3f0103ef9971ea31dc21238 SHA512 504f865a337855fc307d32a6ec195c331cac07e29adebfb20c053245b21cd7cb928f3c9f2fcc755949172ab7c11f0e495f454db95f89803ef28b7a5a1741115b
 MISC metadata.xml 278 BLAKE2B ec2d276da53ec73b30c5f3c1a592d84055592026a448ffdc152835499337f7470cf92d3343f3eca3ec55b44c307878a295a55af0c3d142ef98b1cc892594f187 SHA512 e3ef5c31e448eb600e79d31d402e0822589f5ed22e61df0b45b7a656b6bb0db16d353249debcc480cf6fa0bdcf5f81b360a6e28c796a3dcf432f42f03ab75e71
diff --git a/virtual/fortran/fortran-0.ebuild b/virtual/fortran/fortran-0-r1.ebuild
similarity index 100%
rename from virtual/fortran/fortran-0.ebuild
rename to virtual/fortran/fortran-0-r1.ebuild
diff --git a/virtual/perl-Compress-Raw-Bzip2/Manifest b/virtual/perl-Compress-Raw-Bzip2/Manifest
index df914e42e4fe..b4c83e9bc884 100644
--- a/virtual/perl-Compress-Raw-Bzip2/Manifest
+++ b/virtual/perl-Compress-Raw-Bzip2/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Compress-Raw-Bzip2-2.101.0-r1.ebuild 544 BLAKE2B 59cb2334b18918ce83a388108cfb6479623baf8f35ada5990cd6ce6cb381fbb6c27434e0045b2bc5baca804922612e4a1ca40bb756d794aa7973e63f17e4cd76 SHA512 283ec789a70c2fa0e5b80618539d23e2aec08accc013e42ce6444b5a91b9db1611f6cfacb94383636aa08e7608d898d39139538bdb9ffa994810fa4583c6bc62
-EBUILD perl-Compress-Raw-Bzip2-2.103.0-r2.ebuild 554 BLAKE2B 1d135db3e3971acf0bf9f56a03e1da570acc883f2deea864a4b4f5da2547fe0b15d4c5964f16a3341529498891f9940e8a8f1ef85033c714bd489f1cc6f5a641 SHA512 7b0d3bc211a888cfda3d4b4fb1a042966e367a61d958f29fddf6a7d3d2d03fe9191088f2c572e0b5fa09fb347ca9a9ae965fbf9b7004a72c886824e95f9e01ec
+EBUILD perl-Compress-Raw-Bzip2-2.103.0-r2.ebuild 553 BLAKE2B b32810f76942f91563ba30d1b8dd22ec07c46c9e459d183d38d0976429f036a6b9c9611add73f7be1944dbf0d7872eb5baa752dc8314ff72639b4f74b34e74ab SHA512 f0c9cc9c8af375dbb3078ed2afc334682c00459dc4ec757d9496ca8dada2c4be4dc02cbdfa5ebf1b0b9ca0069fca3e41527385c9e15d51a24d7cfdaeafb6d077
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.103.0-r2.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.103.0-r2.ebuild
index 53bf80e693c9..13cde306ef1d 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.103.0-r2.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.103.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-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"
+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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.36* =dev-lang/perl-5.34.1-r3 ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Zlib/Manifest b/virtual/perl-Compress-Raw-Zlib/Manifest
index 9fe9504fbf60..821566e6123c 100644
--- a/virtual/perl-Compress-Raw-Zlib/Manifest
+++ b/virtual/perl-Compress-Raw-Zlib/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Compress-Raw-Zlib-2.101.0-r1.ebuild 544 BLAKE2B 59cb2334b18918ce83a388108cfb6479623baf8f35ada5990cd6ce6cb381fbb6c27434e0045b2bc5baca804922612e4a1ca40bb756d794aa7973e63f17e4cd76 SHA512 283ec789a70c2fa0e5b80618539d23e2aec08accc013e42ce6444b5a91b9db1611f6cfacb94383636aa08e7608d898d39139538bdb9ffa994810fa4583c6bc62
-EBUILD perl-Compress-Raw-Zlib-2.103.0-r1.ebuild 533 BLAKE2B 0d7e9c19f6473c0598250787efb7c63049d9739ff0c45fb47e1a73a6989b425dd85aca29c8e2a72c055c4142027b31f7f3879f1c3ee9b7101af33ba9f385c57f SHA512 6029cc9eb481d55fcdd82240f804820241cb6b56109ba2ac1fce71a3c3295821b605c4e3baab5eabd07dedaeca2fb42562410f559b1a508ec3b5d806c8eec13b
+EBUILD perl-Compress-Raw-Zlib-2.103.0-r1.ebuild 532 BLAKE2B 0fe458c05766be2861c2724de4bd09ef3971f1860266fbae1ea7e0c169847bcc23ddef36d4b44b1c84a988207ab927f0d9f09c0259beee131c58a91829e49942 SHA512 d35b1a59841f0bfb2229356915cababf325e4a2a2ea58b9a993d4f972ab7a2dd59bb8ed9e8385edf6503303249346e3b2e6ac0e30fcdb042bdb2ec98c6f7c27b
 EBUILD perl-Compress-Raw-Zlib-2.105.0.ebuild 536 BLAKE2B 6d0dd3ed17890340518416594b6e5277fb0c63dc60204f259f3abef0f3bf003c3dd0a51a5e937150ae5696dcb92fa966e80a19e0336dbf10a9ad9adb8ee8add3 SHA512 4faf85dae4fa8fa59cde84b02690be17f635ec5237c1c0142d26d585678a5634c376746b84bff18e67b8d15c1c67b584ca62835e330cb4ab62abef8d2afa9f41
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.103.0-r1.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.103.0-r1.ebuild
index 6a00f8e431e1..5735af29b013 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.103.0-r1.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.103.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-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"
+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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34.1-r3 ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Compress/Manifest b/virtual/perl-IO-Compress/Manifest
index fde8138cf392..6ab0d56024fb 100644
--- a/virtual/perl-IO-Compress/Manifest
+++ b/virtual/perl-IO-Compress/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-IO-Compress-2.102.0-r1.ebuild 731 BLAKE2B 8daed2d1f2da5cd729cf653bcf9175b55b625e0adf70fc554473ab62d47f8a6ed7439c78ecf910e3af8f76450851c64fb82d273fc37751d535f50169781301b1 SHA512 8ef6b8089ca54baab2e2f44b226eb4d463c4b562398a3dc9e15b02827778100e1848b681e1e6b1414cd083e9518a3f2975aae1771b059fc742075e8f19d18599
-EBUILD perl-IO-Compress-2.103.0-r1.ebuild 716 BLAKE2B 587cf493c26551794a9ccde0bd40fe335407831bee111fa7dcdc1f2f94f79dc1c38da77e45ebec0255750740285e0e68ee77cb640c35ff88976e96987f478b75 SHA512 a8f9a879b253ebbba12fde496c50f33b63aeb9678053365cada87d9b99509cda135b11a97b2bbace0d1836ee45d4fb99693781e67a5ad81d882a6326004fece1
+EBUILD perl-IO-Compress-2.103.0-r1.ebuild 715 BLAKE2B 56b39b8a1045c246b173d51adcf5c4e77232fde4b107628cba497ceedd2e28fb39f435dbbb3156539aa68aa8581b731ddcd67a549a8ec59c2dce092430d970c9 SHA512 e50880ac385e5fd6d121522e476458fa40a551f965eda4d11ebff5efe8f65d7e7a03548f52f81c17c770e822fb98715d33b600a96b5d8a4cc535628486f42bf2
 EBUILD perl-IO-Compress-2.106.0.ebuild 723 BLAKE2B fbddca40057c5cc4bc520f777b022928988636c3bb3fc21b95db3dd278797d30f0185b72a6578891d5d13b9100acadb10e85ae3e8c2a7e21c42fd94e0f680d7e SHA512 bddc65d984534b2627ad33848d6da630d1acdab05657112063361450850c37e6a09ecf0758fb413699d9256cf9985bb6b5627e6bc3b7e684c55687b14599dec2
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r1.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r1.ebuild
index 79a9b6c0f241..220590b04d6b 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r1.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.103.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-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"
+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"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.34.1-r3 ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-CoreList/Manifest b/virtual/perl-Module-CoreList/Manifest
index d3a8ddbe2319..9cbbf394cacb 100644
--- a/virtual/perl-Module-CoreList/Manifest
+++ b/virtual/perl-Module-CoreList/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Module-CoreList-5.202.105.200.ebuild 643 BLAKE2B 61ffb8d64b14d242d084417e8f6da66ec3feb7e4411f14793597087a05ceb18ec368729af4fabba6e36c70cb85291715d54e7decb5d364bc7b5e258002d7750f SHA512 2d07a943e6b9ccaecc505271a3865e44854ca4ba7b98a351a22863d0a631e7a66bdefc25e2165614a8cb72c6a871208de9d5c8ee6302509a17df2f3aa5f0bee2
-EBUILD perl-Module-CoreList-5.202.203.130.ebuild 651 BLAKE2B 52d41fc149a99c49a0971eed8334625069bc67dfc27d03ed335e27cb216b71fbdb9491dd90f0047cd97be241e9f269df712b8fb336d9c74511bb34352afe2df0 SHA512 96e565c4e5c734fcf4210d11542b1609cb9589ca8be666fc9d84c3c533a883e2ebefc16778bbc0a3117823f7c2327f4c455772cacd3e9888154efee02dd24fe2
+EBUILD perl-Module-CoreList-5.202.203.130.ebuild 650 BLAKE2B fefee5df50d1650d493bc701ebe32cdaa168618bc3510d02ba8e2f68f263f38198c6e5cc7c02791b795c559c08f56fb9fbf8bdb246b90115312055b57c18adec SHA512 d6089fa5d39fb64ac87ade301d1aaeea1e0179b635a870bff48c5e76c785ca09f701cfcc84c1167646ec4e83405edf0018a36bcf9178bb752840ccfc4f84c5b3
 EBUILD perl-Module-CoreList-5.202.205.200-r1.ebuild 658 BLAKE2B a32ce62d26445c067433a4b7395e0745340f9327cfed0ac9c97f5902691bbbf23f5b15e416e88dca2594910a9280282a2f064f943c2f7b55d0ef922f24e3f187 SHA512 67901c39979662959626eda8898b6ed9b160760de9292161988b4c367ff7928803b6bdaff3dfa38bd4eefbdb6762d0aacc7a2227b74b062e874fd7befaf59914
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.203.130.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.203.130.ebuild
index b186c031dae7..431e2887d782 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.203.130.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.203.130.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-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"
+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"
 
 # Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
 # When bumping this package.
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 11ce31ef8ce9..75543f626d18 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -1,4 +1,4 @@
 EBUILD rust-1.59.0.ebuild 405 BLAKE2B db0aaeb02412a231d1d966d35309298fb556c27fdfd189b57b4255960ed8c9fd8080d3eb02732ef36b99a03b31598693e75c40d1f4d4789e333e3d72b00a1bf7 SHA512 2f58870c2edb5a47b2e206e7a8f624f787b821518cc4f69b577c35d1b88093afe1ab1b27a360db32e9426f992fc076d18b0ae9178e06d28d50be1fc066b09206
 EBUILD rust-1.60.0.ebuild 411 BLAKE2B 650c3f3370d8d4bf42493d08371d5aa1dcdd415c9b417f2b8bfb6678b7f885a3f83a6f8046576ae38c36978933f1824e300969ac6f4caae2bd24a8d120d8b8d9 SHA512 ee4c0c50174ec71d97139ba74f45e35d5084373f98077926f910d1cafd7a57e820c919ffaf2a1e61fac655c4e21ca4f418d4f2446e31766c715f27ce7d4b8131
-EBUILD rust-1.61.0.ebuild 417 BLAKE2B c0e5900e06b4972d785924e70ba1f11e46e10b0f70e41955d1cc1008085190d9fc747504f724cb7ae05edd774fe848e6ad3393d45dcf310201b1875289c6e2c5 SHA512 67b7a4e049c0aac0e35f5663ea40713a5306bfeeb9b8cd49535586f85594a7cb3b33ddeed2394ada13101e21351b397700b2ad4e33175d040f28db2e7dd7750a
+EBUILD rust-1.61.0.ebuild 424 BLAKE2B d515a692188e1e986754522772ad7c5f131e74ad4ff00666279ce3c5b15b77e316c24078fb401952a73e09485c026fd2f82923e52f89b38746d5eed59672320e SHA512 dbaed1e5dc025f059a1b9c0870eb31b8030132376dba5ad082cdf3751f6f4404968a3e44dfab9411eaef98e8c0082e2393b4fdc1fe8836f2d1d57f25f5b83718
 MISC metadata.xml 351 BLAKE2B cf3c7f2e804dbe6ddce9380d9c7b32e734df16a04ea867a474a4e6868edfaa72abb79dd6eb47f67128a1b60cb4872c999949e8237102bc2117e581309307f862 SHA512 d32137e0b4549baf85ffaff35d2c5fb058a44e3fbeb7f560db3ebbfc1d44d9ce3651e033cb8434f211994218a85d5bf89f42ea9e3ab76e361c1014dcc6f25997
diff --git a/virtual/rust/rust-1.61.0.ebuild b/virtual/rust/rust-1.61.0.ebuild
index 27c4c62c8441..b7da1d054aa3 100644
--- a/virtual/rust/rust-1.61.0.ebuild
+++ b/virtual/rust/rust-1.61.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Virtual for Rust language compiler"
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="rustfmt"
 
 BDEPEND=""
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index a716d84dff9f..fdf55e03169d 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 9d5cf6d72b6d..fc0b5fb3ba17 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -1,10 +1,11 @@
 AUX hugo-0.96.0-skip-some-tests.patch 4082 BLAKE2B fe22f1c7fe5dd023c21f45b1dca71b50bb51d9ed993687fa7c654b0e0c3b59f760c4270393e7abf46c84db6d9c1e62d56bd2851541ebfd40ac2abd92c132e6e2 SHA512 8be454a559aba28022ea09003dfdac8701f86edd5805f5b15349e1bd8295aacdf81cc8522b250d7fde24b485303e277ab15bd004aba6a2a0ca2717ae824c33ca
 AUX hugo-0.96.0-unbundle-libwebp-and-libsass.patch 1558 BLAKE2B bce42fce63466424c0e3b2f7f099485cb23ea0e756fe57dfa1a062f9e0afb6ca3213d5b3048c6482e557c8399b392deaca53281866cd8d160ea20e81cb133c89 SHA512 a0ea32e10112047dd3a4536286c853c97d43c548ed4cfaa366711c45ff67960545b317f67fb2f69484b61dabe8d668a0540339a4789f43f8581afe11d611c538
 AUX hugo-0.99.1-fix-testdecodeconfig-basic.patch 1694 BLAKE2B a751d9b4123c48bd8e5e2a6d05f36e6f89793a47ef17093f6b4abb2cdf92d584ca889bf9fd80ccfafa4093ea0410b79db214e703a0a4017bea61d323d78da668 SHA512 43871d36ba3e0fdbc5655d4b5a22de508430888621314bf00ee75bdd95f32e2992803cab606e6e1c17952dc1dd6701cdf84b30307f1af70a40b619fd6cd7660c
-DIST hugo-0.98.0-vendor.tar.xz 5675060 BLAKE2B d876207dfc7c13ff97249bf72bf5191a0d4adbf82af38b8962a8e66d922f5bdf5298c8ecddb05c8a1d13f95f9e8bbbb84dec8cc37538ad47d8d83da951dfa003 SHA512 7b67920c8adcc8aea3a3dd6880716a79df8081cca17bf2d8cbd0ca3861aa69c29b0320eb86e0942db32e362b22faaade7cb65c9a0e0f88578504bfe4ed666d63
-DIST hugo-0.98.0.tar.gz 27716005 BLAKE2B b3cbc9c616eb79a993bd9ddf07658ff1d3ce0680d3788e37cab78dfb48b33a259514b417d3e657afe89f188b3c0c03b88108dbcbd44d80c4d97004f7aa0185b0 SHA512 9d8a65c49be5b7bb181627bd8b557ddc041dc00a673ac0af8aeacbbfc46441a0045a5ab531087fb866d076297d67823a2eb5b14f57f3ecf57cc7b9e6b90ddf3a
+AUX hugo-0.99.1-test-timeout.patch 731 BLAKE2B 677a6ca363f60b875d672df80584734a5feabecea68de57cfe63ebfb97768581372adbe2d171e0f5f746a03b8dc67fad75bd1c0a3bdcb9532f99c1859b31523f SHA512 979161805cc5b7220362b7fefe33d423515b76a366b08500b9765c835399aacff3ff609d6692594739a3f9a078b1708dbfc1c6635416d46d0d8a1279e50417ac
+DIST hugo-0.101.0-vendor.tar.xz 5682852 BLAKE2B 130cf9fda4d857e69144147e408a90fd28273d42919c4ea50228b795b7c35f9641857f642be8628b947b213ee42f11f468ca76317d4742d09c60bc5a272e83ff SHA512 07390ebb9daf2097010013f5e7c789f3fcee485952968b0934cc5d625eec9a79784ccda1414e59a21073b66389c75888704f923675f255df5eaa0d43c0cc3048
+DIST hugo-0.101.0.tar.gz 28130925 BLAKE2B ff35c48c39dac61abe56ba4f75bfddcdda700b71157dc4ed75f1c3724b11b8a9f4546e94d3105a724a5493b3baa73056a55d9d90e87ce4237e39213995db636d SHA512 541d0e04e868845119f2b488fd53b92929ea4dc08685d438a2914b41586e204588b193522013e8eed908dc0c3fbc2714aefb1afad0beae875d57d71aadc59c70
 DIST hugo-0.99.1-vendor.tar.xz 5675228 BLAKE2B 80fdd25fe924bcde7f200b805bf6598dbb726bb628b82e9b0d2809414a7a6e33cbfe069e29953e75b8ed4ecdb9c7303b44a8d8195b43540977cd7461295de109 SHA512 88ffb6bea777e3a72dac05941de542acdc6a17faff9e98517e483e17c7a42d1ab5aa7e65ed3a91f6832468d2da3e98e87346118694a8e20f6375fad56d5d7ff0
 DIST hugo-0.99.1.tar.gz 27721831 BLAKE2B 951840055b345f87cca287ad6391787290296dab44ba2295a49e98c6e93ecb344e9591137e8fdd34d7182e2ec334e36b5ff5ebfd17c3f973dbe31d9444d7bf38 SHA512 cebdad62493b1f734fd0346d94f1480a597ea38bf984d8e91a2ae63a4083c1671d81f289a4396a1e1a2c973c8733eba95623dd7d50c31b8c4b096576a06ae03b
-EBUILD hugo-0.98.0.ebuild 2000 BLAKE2B 88f98e70ae87ba9bd50cea3abeecefdfe79990aaab98fb07dde14736164a74513f256a2ca2875bec3056985db96fb16979bca0e6b3335df72a7d00bb681f9cb0 SHA512 fb60f6591a2ebf1f13293d012a575317ac5c427ecd8677fff9cb0489684656435ef55e9c820e528589bea107bcc7022c3b0cb92268588e5a2c023522f9ae9758
-EBUILD hugo-0.99.1.ebuild 2061 BLAKE2B ad232b6ceb3eb717f7dab88a0c638b8ccd3108dc755eeda9c6804a5d2bc8b386339eb9630476dd01cdf904d3717d66fa76545ce23ca05afdda41c7bb00a8451d SHA512 7dc086b0586147a33c80025098db418c2bc1cefc7f2516d865a83d71c26f32bf8f55079ca65303a717ce15a24835aec688a0b702a7336c51166a153f53655184
-MISC metadata.xml 806 BLAKE2B 94596b9097f4f1277d81c88292eecfaab2480476807edf680350158e704226d335787029f7e898c6cc6ad0452af4266d2aedcfa38209201b48cde75efa88965e SHA512 26e3674ec6775f073d0e10f87b9bbc8364e0c4d1e946a415002bdc11aa62909b2792c6cb7a90ac163860e569fdf6ed303173887c214531f50ae63dc0f9b4e69e
+EBUILD hugo-0.101.0.ebuild 2021 BLAKE2B 86987c3f36a0ffd739ed290112abf2ec2aad96dd757908fcc441282dcb769b988447ad85ae12a6a98d79b067e152a0d005d959ffc214a4f21809ffc0dc4e6b08 SHA512 e4404df8770db2a2527230170a5fbaaf8eb39e7b7f283a138f51021745315acd75801c4931f078d4c929022c9b76146b4d9b697ceb0ab10af6cf7ddb4fed6a83
+EBUILD hugo-0.99.1.ebuild 2082 BLAKE2B f594d9989b55ecfbd73c866ffcfa775bd97f6a50611a85f328690ccab8d37c16e73062f75b5fdf3390b0d9b8ae07584c064a4ac9c8b70fa06611571f211d5dd2 SHA512 1627ac0c42d5c3589cb042f8354c62d27045fbcef7193031e83987943432e10243e2829fc3d26fe24026fc78984460094aa5646c5e5651b2551eb47f472151cf
+MISC metadata.xml 727 BLAKE2B b2632867dbfc5f0d647facb43f54ad3ae6bf5562bc7057dafca2724b4da8574603fff3ab5acf9ce9acb5dd0e20a15bcc052ee1cb5ca3b44d5e02f443c7d9ea2d SHA512 6efed4943de9dd760aac8998fa921d9e38f3ab93baae7c1a808e102619e292d7a067e6fe7c102b89fc432d422d2c8614b339490c5e234210bb219eeca22c6540
diff --git a/www-apps/hugo/files/hugo-0.99.1-test-timeout.patch b/www-apps/hugo/files/hugo-0.99.1-test-timeout.patch
new file mode 100644
index 000000000000..dc0f4898fcf6
--- /dev/null
+++ b/www-apps/hugo/files/hugo-0.99.1-test-timeout.patch
@@ -0,0 +1,25 @@
+From 92ceabab139262750cc6b61ffc3a6341dedfbbd4 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Wed, 8 Jun 2022 04:10:27 +0200
+Subject: [PATCH] Set default test timeout to 2 minutes
+
+Bug: https://bugs.gentoo.org/850313
+---
+ config/configProvider.go | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/config/configProvider.go b/config/configProvider.go
+index 01a2e8c5..c8f199eb 100644
+--- a/config/configProvider.go
++++ b/config/configProvider.go
+@@ -57,6 +57,7 @@ func SetBaseTestDefaults(cfg Provider) Provider {
+ 	setIfNotSet(cfg, "publishDir", "public")
+ 	setIfNotSet(cfg, "workingDir", "")
+ 	setIfNotSet(cfg, "defaultContentLanguage", "en")
++	setIfNotSet(cfg, "timeout", "2m")
+ 	return cfg
+ }
+ 
+-- 
+2.35.1
+
diff --git a/www-apps/hugo/hugo-0.98.0.ebuild b/www-apps/hugo/hugo-0.101.0.ebuild
similarity index 92%
rename from www-apps/hugo/hugo-0.98.0.ebuild
rename to www-apps/hugo/hugo-0.101.0.ebuild
index 455ae3474bd6..5da974c57af6 100644
--- a/www-apps/hugo/hugo-0.98.0.ebuild
+++ b/www-apps/hugo/hugo-0.101.0.ebuild
@@ -13,19 +13,19 @@ SRC_URI="
 "
 
 # NOTE: To create the vendor tarball, run:
-# `go mod vendor && cd .. && tar -cJf ${P}-vendor.tar.xz ${P}/vendor`
+# `go mod vendor && cd .. && tar -caf ${P}-vendor.tar.xz ${P}/vendor`
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc +sass test test-full"
+IUSE="doc +sass test"
 
 BDEPEND="
 	>=dev-lang/go-1.18
 	test? (
 		dev-python/docutils
 		dev-ruby/asciidoctor
-		test-full? ( app-text/pandoc )
+		virtual/pandoc
 	)
 "
 RDEPEND="
@@ -39,6 +39,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch"
 	"${FILESDIR}/${PN}-0.96.0-skip-some-tests.patch"
+	"${FILESDIR}/${PN}-0.99.1-test-timeout.patch"
 )
 
 src_configure() {
diff --git a/www-apps/hugo/hugo-0.99.1.ebuild b/www-apps/hugo/hugo-0.99.1.ebuild
index 1a189d4c142e..16dbceafb579 100644
--- a/www-apps/hugo/hugo-0.99.1.ebuild
+++ b/www-apps/hugo/hugo-0.99.1.ebuild
@@ -18,14 +18,14 @@ SRC_URI="
 LICENSE="Apache-2.0 BSD BSD-2 MIT Unlicense"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc +sass test test-full"
+IUSE="doc +sass test"
 
 BDEPEND="
 	>=dev-lang/go-1.18
 	test? (
 		dev-python/docutils
 		dev-ruby/asciidoctor
-		test-full? ( app-text/pandoc )
+		virtual/pandoc
 	)
 "
 RDEPEND="
@@ -40,6 +40,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.96.0-unbundle-libwebp-and-libsass.patch"
 	"${FILESDIR}/${PN}-0.96.0-skip-some-tests.patch"
 	"${FILESDIR}/${PN}-0.99.1-fix-testdecodeconfig-basic.patch"
+	"${FILESDIR}/${PN}-0.99.1-test-timeout.patch"
 )
 
 src_configure() {
diff --git a/www-apps/hugo/metadata.xml b/www-apps/hugo/metadata.xml
index c1a8bfb7f195..d3bce6b51931 100644
--- a/www-apps/hugo/metadata.xml
+++ b/www-apps/hugo/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="sass">Enable SASS/SCSS support</flag>
-		<flag name="test-full">Pull optional heavier test-dependency packages</flag>
 	</use>
 	<upstream>
 	<remote-id type="github">gohugoio/hugo</remote-id>
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index bdcc99d99549..d64e863e19ac 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,3 +1,3 @@
 DIST Nikola-8.2.2.tar.gz 5483145 BLAKE2B 78950e97016b7a87d41739684de102c548a5dfecfe9c1239a94c757a4d7d00f5d77bf679b6ed1a853aa46e1fcb78c27e7c2276e7aafeb874c0e21c1ae9f1cbb2 SHA512 f2bf38c81c2e01f6d6cb6a24d9b9ea95f047e9bd9987437df61cf1cb10c39c5f9259e8baa4c64dc24e4f69dc3b3e35e3553dced7d42c840645e024d6c21eb9ae
-EBUILD nikola-8.2.2.ebuild 2129 BLAKE2B b377fffd325985d87bc84f311e909ed2da2cc93b43c2482cca7878f252f54359fb2a3e49adfb6631aec8a19c6acd233af23f6bebbfd5a1373868bab2c91b4471 SHA512 25f859dabe3273cecbc3e74ec7ad92cf27642a615b0c5b3e074f176cb0f83796f8c09f1ffdad43ae37252b025f10bae9fb7741a143d678dfc6a56d259c6690a0
-MISC metadata.xml 1104 BLAKE2B 8dd8f320593c4347930b626b6d60ab50bf8090af3ed83401fe1c09e2287e51e1a6df71283b8d341c28b3cbbd21e924a15fd988f7a99a54432939160622f6c516 SHA512 a9945a2a259873f6b76d794393a355d82ccc5553a909827136d41d4b0371c8c4a2e950b3e2a1bbe1f4a17da7ea2cf55df40afe96c174c75336ef19ea8c3f26da
+EBUILD nikola-8.2.2-r1.ebuild 2086 BLAKE2B adecf09a7e847882349655c3739876917d92dd4d5533ef6a6e20829ef8542f08f8835724d8829bdc36a4a6c759b8275e377992dfc874299944ab5ce52ea88468 SHA512 c05dfc6bdac3969c604684f64932d4218e7213ee612c8183380d8b4befe5fbe9b7e26fc1d13f5d061307af9ddc0061ad4f9372035a8a1361cb00c01d734d6d6f
+MISC metadata.xml 292 BLAKE2B 0042bf60cec1af73f2d8e977e53c42adf5c7e4500f02ee08e3673b25962a86905d1d07783fb519a3bf40a12ab64229879e5fb217d1bde97195573fc6faa69f66 SHA512 a8e6a37da4e290629b38ccb4f9087682de58a0e4e4a377b85c3f3bb06eba426e3689cab575f528511fde9ed308e12a2e79a318e4dc55c6f85c3d8e16e22b3d01
diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index f3793128d66f..d03a91b8243b 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -4,31 +4,6 @@
   <maintainer type="person">
     <email>ulm@gentoo.org</email>
   </maintainer>
-  <use>
-    <flag name="charts">
-      Support chart generation through <pkg>dev-python/pygal</pkg>
-    </flag>
-    <flag name="hyphenation">
-      Add hyphenation support through <pkg>dev-python/pyphen</pkg>
-    </flag>
-    <flag name="ipython">
-      Add IPython notebook compilation and LESS support
-    </flag>
-    <flag name="jinja">
-      Add support for <pkg>dev-python/jinja</pkg> as alternative templating
-      engine to Mako
-    </flag>
-    <flag name="server">
-      Enable support for built-in web server using <pkg>dev-python/aiohttp</pkg>
-    </flag>
-    <flag name="watchdog">
-      Use <pkg>dev-python/watchdog</pkg> to monitor file system events
-    </flag>
-    <flag name="webmedia">
-      Use <pkg>dev-python/micawber</pkg> to extract metadata from web media
-      links
-    </flag>
-  </use>
   <upstream>
     <remote-id type="pypi">Nikola</remote-id>
   </upstream>
diff --git a/www-apps/nikola/nikola-8.2.2.ebuild b/www-apps/nikola/nikola-8.2.2-r1.ebuild
similarity index 72%
rename from www-apps/nikola/nikola-8.2.2.ebuild
rename to www-apps/nikola/nikola-8.2.2-r1.ebuild
index 75f7358c791b..efa4bce006ed 100644
--- a/www-apps/nikola/nikola-8.2.2.ebuild
+++ b/www-apps/nikola/nikola-8.2.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1
+inherit distutils-r1 optfeature
 
 MY_PN="Nikola"
 MY_P="${MY_PN}-${PV}"
@@ -18,8 +18,6 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~riscv"
-IUSE="charts hyphenation ipython jinja server watchdog webmedia"
-REQUIRED_USE="server? ( watchdog )"
 RESTRICT="test" # needs coveralls
 
 DEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
@@ -39,14 +37,7 @@ RDEPEND="${DEPEND}
 	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
 	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
 	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
-	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
-	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	server? ( dev-python/aiohttp[${PYTHON_USEDEP}] )
-	watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
-	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )"
+	dev-python/cloudpickle[${PYTHON_USEDEP}]"
 
 src_install() {
 	distutils-r1_src_install
@@ -57,3 +48,13 @@ src_install() {
 	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
 	gunzip "${ED}/usr/share/man/man1/${PN}.1.gz" || die
 }
+
+pkg_postinst() {
+	optfeature "chart generation" dev-python/pygal
+	optfeature "hyphenation support" dev-python/pyphen
+	optfeature "notebook compilation and LESS support" dev-python/ipython
+	optfeature "alternative templating engine to Mako" dev-python/jinja
+	optfeature "built-in web server support" dev-python/aiohttp
+	optfeature "monitoring file system events" dev-python/watchdog
+	optfeature "extracting metadata from web media links" dev-python/micawber
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index de195a81c7f8..70e59d8ca7bd 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index fbededd33867..1ef63e2262aa 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -7,8 +7,6 @@ AUX gentoo-hwaccel-prefs.js-r2 265 BLAKE2B ac3053eb15e2dac446337c29184b5ec54fb30
 AUX icon/firefox-r2.desktop 8137 BLAKE2B 5d0ce737c0e0969cb1a61de7989f5ca1ca0dff413d6d98bb0c93e0fed510b4e075a88fc117d3713e5e11ee7471ceaeffa9bc9dfd4282f3ddb1ea837d823e4887 SHA512 749a50b11d89c1329a52d13745ff8d5f801e565038cb5341319b4b515f36baf1c0c740003d6d01188c27e31d7ddeff58310e7b2420681292d0f2522bc5bd34b6
 AUX icon/firefox-r3.desktop 8116 BLAKE2B 50b476a1be87bcca0bd6175b7a7f5e67ac5d3f40b0a5a99c2244036a9eea53fb518f59c1d87b18723c4ae6c261bfb692ef0b52c6714402b0a98da4b6867ab977 SHA512 07c9d89babe20fba9531396c9aa2b692aae77606be2b8a750481b6b8f9b3eab320fef313d1ed4b15d3fbc4cd94dfb56b62ce1a3e89ba7143c6aa9acc0f919bf8
 AUX icon/firefox-symbolic.svg 7432 BLAKE2B 33a552ffb9850f6b9cd3cb8d9f7f80268ac08f00a0bd5eb15d892c6fbb950f8cacf6058b9c838f5be1ae1b53541f143a1ec0c1302ae85b49100b166fcbccdce6 SHA512 ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8
-DIST firefox-101-patches-05j.tar.xz 37268 BLAKE2B 714eb1ea764f24c21b1610363abb5af7eff2047ed0a2248796ac65fa0e4274d905944de343c6ccb64a7cc25379a4676138e22b500d3c0da2cfdae6b7fbffb784 SHA512 a019fb9f1bf2b8550cdb904fb9fccf73c82718284b53d88fdad2a87e4fea303f78bbf25b85d57427164625030e28e94fe731a8b0a6ee4252e13bcc781a398412
-DIST firefox-101-patches-05jwl.tar.xz 39392 BLAKE2B 4c47e6c024d19cb904918489fd145ff14d89bd855d573b50af6ee03700677373f237a83ad31d2a5b4abbd85fb8aba2e5be0be743a2cbd10229d31af6c3c3eb4b SHA512 db8d6d302d89bdc9b6f7ea433ecc02d95e8767dc3e13e301539f4d35586c1473c17c48424a4fad70954e21063d93c10e91effc29d17d1c1595de079dcb47fc46
 DIST firefox-101-patches-09j.tar.xz 40532 BLAKE2B e41984b7266deb87d520fb2de214fe6e10e75c8b249312adb69f08873076931dcc469e57b44365245f4d46613fd26385137f49a3883e6cd4e2ac4783efa2114a SHA512 300a225ab4e002cd769589c2fbd149ac09a9e1bc916c92c08d3f38ddec9b5a75e6f4d0cbafb7dcd88c5f8a3653b80c7c0eb92ddff63fe2a505ed43819588669e
 DIST firefox-101.0.1-ach.xpi 443457 BLAKE2B 68a1ebdccbce17eeac8824e63e034f0db706a091b4dea9ce1c14d0b769ad404e36004e89a838ef68bfbc44336125bb3494ade8b076ce38e70ea15b78f394f8e5 SHA512 9ee130d4e96bb73ec2ec01bd75faa2687bcb620727f44e199ee17db3e523254e0a0e8bd8d1813f4eebeb80e575ba20b312677d23a4994aadc6a4d4fb9bbfa5b8
 DIST firefox-101.0.1-af.xpi 413389 BLAKE2B d531c87e3df019cd5ff8e497cb3e74f000d238b65329d4eff72fbe80c2e3052abbaa19bac17d9383df1a2d88e60fa20c9511b1c12ca3fc06fb986db4902da772 SHA512 c9ddeb4ddd6dd8704c17f5dd8bf8ebdb881d88ad1bb1e01737b70ba0efd3374fda0829123afcbfbf98b770be4c281a714fbab2ee30d6fceff3eacbfa398df9db
@@ -207,8 +205,6 @@ DIST firefox-91.10.0esr-zh-CN.xpi 575371 BLAKE2B ab139a8305601c53895eab447643461
 DIST firefox-91.10.0esr-zh-TW.xpi 576233 BLAKE2B 1afbb5ad4fb00bd4acbe0b71eb53e08a61b4ec38e22706efe2052454bc53b98bd87e5083e6f9b47574b4793a25551ca3f2e44b587586c7fe2c5de5f277de7ade SHA512 5422dddbc5d7ad54088a9258d5fd0a3a15d7b15dbac5080d7a897539d9dfb6fab258a0d76abceda87c123f66211649fd384bb249405af9e8099a3b7c12cf20c5
 DIST firefox-91.10.0esr.source.tar.xz 380454768 BLAKE2B a28103041af99732545dcf5ff0c6ea999252f7006602b9f74c388afadb32f98927ec10fb1f5ff30029c18a0f7d26dd27584f4d129de6671d6728a49ade07b451 SHA512 8344b829d7bd86250afdd4cb582e27ed5705b3ef48aec50b9a39abc17deba86c9fd721f4667f5c2155e3d7cd1d6e1f82ff8e218ced3a16a4e06bb414ee0690f8
 DIST firefox-91esr-patches-08j.tar.xz 19280 BLAKE2B 017c2b31f7b5b2b8fb1f23ee165b20b4c7490ec86f7385c203a316b8184586fd5b6594bbbd98375725c7f5b0623af026eeabf587b847d4d0ce5d35b005735af3 SHA512 e3e9c869a41eee1082b3822f7de37c7ff984bf90f4cda216c01aeed4ebe682112eb21a3acec83bc31d4f667437e52e06488128be041eb9d32d64dffb007f4b0b
-EBUILD firefox-101.0.1-r10.ebuild 37107 BLAKE2B dcc7861b0404352e99331420caeed24a2cf9ece74d9a6239f017f51950e1f41fd49d845b70f142dbf494377a723ce86145ffad52aeff626436aace08fb4b1787 SHA512 ce0a3bdeccea740b52c90d51ab36c88412725235f441092a0bd944c8a9fdeb993525449c2b5ed971ed96d7e35e7daa646541546561c50b026fe72d77b36ee25a
 EBUILD firefox-101.0.1-r11.ebuild 37139 BLAKE2B 29b6b5b27081ea327607e3574ae2b55e0afdd66b71073ccc50363a7a208e478a5ccc0f9c5e0deb535b6130350afe53291197ac4389d9a3a6a23195d45538b571 SHA512 bd528dad4221bc2f30a9fcc96721e143f4020c1539cd50954904b6d96db0b620c366b394272e2a879d731b6077fe2049b4d49067cc556b120fb7cc144f72f9c0
-EBUILD firefox-101.0.1.ebuild 36761 BLAKE2B c1897652216a930d05e2842a2d59364be96c8fe228fa20e6dfb8796ab4671031028d54376008eeb8340558594d1447a5d79b873e58b307e8908f20f7ac326226 SHA512 66a030921fec178bb467aadcfe547cddda648074cab896149ca64ae37b6c7c89d99473707a36e3bdf7945453958433a1f19d04ef09abf7d28ce87f7bf6b51b6c
 EBUILD firefox-91.10.0.ebuild 35732 BLAKE2B 9ccb5bd3145d3d47a74a9e6501f81aa1f83ed102ef715a4e3e7041b4a74db1f070ee46910a1c08793e65f5d788450ecbba7d3c24ef3740ef4bf0f4aa28694c1a SHA512 49359cc54e2bd677bb566062b15b76cd9d95718be739dc8dd1828a97f4972614eb63c1a1bf09f6f0d79ee83ff76e0fa813c3156cf44551833342b9864da88d16
 MISC metadata.xml 2395 BLAKE2B ee257e2fbeed0224f696b3cef50af4387e8abed54a840131ff3e07892c0571d5a97221848eeeb20639d2f15be600e9b592dc0f9180f9561356b0fad2c2fcf148 SHA512 3d3f5dee740a64c6dc7a29bae5a9c2b205eeb59cb698f0a5a85b1a4bc7c0aa93724c7196008bd0439c12455ea3c29d4187088b6dda39d797b2f2595c1054337c
diff --git a/www-client/firefox/firefox-101.0.1-r10.ebuild b/www-client/firefox/firefox-101.0.1-r10.ebuild
deleted file mode 100644
index 0dee9d411efe..000000000000
--- a/www-client/firefox/firefox-101.0.1-r10.ebuild
+++ /dev/null
@@ -1,1292 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-FIREFOX_PATCHSET="firefox-101-patches-05jwl.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,polynomial-c,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="rapid"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi"
-
-# Firefox-only IUSE
-IUSE+=" geckodriver +gmp-autoupdate screencast +X"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wayland? ( dbus )
-	wifi? ( dbus )"
-
-# Firefox-only REQUIRED_USE flags
-REQUIRED_USE+=" || ( X wayland )"
-REQUIRED_USE+=" pgo? ( X )"
-REQUIRED_USE+=" screencast? ( wayland )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.24.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.59.0
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.14 )
-	x86? ( >=dev-lang/nasm-2.14 )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/libffi:=
-	>=dev-libs/nss-3.78
-	>=dev-libs/nspr-4.32
-	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 )
-	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-0.9.3:=
-		>=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-71.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0: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? (
-		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:=
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	!www-client/firefox:0
-	!www-client/firefox:esr
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${COMMON_DEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-	)"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-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 clang ; then
-		if ! 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
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-# Firefox-only LANGS
-MOZ_LANGS+=( ach )
-MOZ_LANGS+=( an )
-MOZ_LANGS+=( az )
-MOZ_LANGS+=( bn )
-MOZ_LANGS+=( bs )
-MOZ_LANGS+=( ca-valencia )
-MOZ_LANGS+=( eo )
-MOZ_LANGS+=( es-CL )
-MOZ_LANGS+=( es-MX )
-MOZ_LANGS+=( fa )
-MOZ_LANGS+=( ff )
-MOZ_LANGS+=( gn )
-MOZ_LANGS+=( gu-IN )
-MOZ_LANGS+=( hi-IN )
-MOZ_LANGS+=( hy-AM )
-MOZ_LANGS+=( ia )
-MOZ_LANGS+=( km )
-MOZ_LANGS+=( kn )
-MOZ_LANGS+=( lij )
-MOZ_LANGS+=( mk )
-MOZ_LANGS+=( mr )
-MOZ_LANGS+=( my )
-MOZ_LANGS+=( ne-NP )
-MOZ_LANGS+=( oc )
-MOZ_LANGS+=( sco )
-MOZ_LANGS+=( si )
-MOZ_LANGS+=( son )
-MOZ_LANGS+=( szl )
-MOZ_LANGS+=( ta )
-MOZ_LANGS+=( te )
-MOZ_LANGS+=( tl )
-MOZ_LANGS+=( trs )
-MOZ_LANGS+=( ur )
-MOZ_LANGS+=( xh )
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6600M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		AS=llvm-as
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-gpsd \
-		--disable-install-strip \
-		--disable-parental-controls \
-		--disable-strip \
-		--disable-updater \
-		--enable-negotiateauth \
-		--enable-new-pass-manager \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--without-wasm-sandboxed-libraries \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	# For future keywording: This is currently (97.0) only supported on:
-	# amd64, arm, arm64 & x86.
-	# Might want to flip the logic around if Firefox is to support more arches.
-	if use ppc64; then
-		mozconfig_add_options_ac '' --disable-sandbox
-	else
-		mozconfig_add_options_ac '' --enable-sandbox
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-	mozconfig_use_enable libproxy
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	local myaudiobackends=""
-	use jack && myaudiobackends+="jack,"
-	use sndio && myaudiobackends+="sndio,"
-	use pulseaudio && myaudiobackends+="pulseaudio,"
-	! use pulseaudio && myaudiobackends+="alsa,"
-
-	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use X && use wayland ; then
-		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
-	elif ! use X && use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
-	else
-		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	if use system-python-libs; then
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
-	else
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	fi
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	if ! use X && use wayland; then
-		local -x GDK_BACKEND=wayland
-	else
-		local -x GDK_BACKEND=x11
-	fi
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r2 \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-
-		if use wayland; then
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
-			pref("gfx.x11-egl.force-enabled",          false);
-			EOF
-		else
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
-			pref("gfx.x11-egl.force-enabled",          true);
-			EOF
-		fi
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_normandy_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	# bug 835078
-	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
-		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not supported the "
-		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
-		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
-	fi
-
-	elog
-	elog "Unfortunately Firefox-100.0 breaks compatibility with some sites using "
-	elog "useragent checks. To temporarily fix this, enter about:config and modify "
-	elog "network.http.useragent.forceVersion preference to \"99\"."
-	elog "Or install an addon to change your useragent."
-	elog "See: https://support.mozilla.org/en-US/kb/difficulties-opening-or-using-website-firefox-100"
-	elog
-}
diff --git a/www-client/firefox/firefox-101.0.1.ebuild b/www-client/firefox/firefox-101.0.1.ebuild
deleted file mode 100644
index e4e4ad10cb39..000000000000
--- a/www-client/firefox/firefox-101.0.1.ebuild
+++ /dev/null
@@ -1,1276 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-FIREFOX_PATCHSET="firefox-101-patches-05j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,polynomial-c,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="rapid"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi"
-
-# Firefox-only IUSE
-IUSE+=" geckodriver +gmp-autoupdate screencast"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wayland? ( dbus )
-	wifi? ( dbus )"
-
-# Firefox-only REQUIRED_USE flags
-REQUIRED_USE+=" screencast? ( wayland )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.24.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.59.0
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.14 )
-	x86? ( >=dev-lang/nasm-2.14 )"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libffi:=
-	>=dev-libs/nss-3.78
-	>=dev-libs/nspr-4.32
-	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[X]
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libxcb:=
-	x11-libs/pango
-	x11-libs/pixman
-	dbus? (
-		dev-libs/dbus-glib
-		sys-apps/dbus
-	)
-	jack? ( virtual/jack )
-	libproxy? ( net-libs/libproxy )
-	screencast? ( media-video/pipewire:= )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( >=media-sound/sndio-1.8.0-r1 )
-	system-av1? (
-		>=media-libs/dav1d-0.9.3:=
-		>=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-71.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0: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= )
-	wifi? (
-		kernel_linux? (
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-			sys-apps/dbus
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	!www-client/firefox:0
-	!www-client/firefox:esr
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libICE
-	x11-libs/libSM
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-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 clang ; then
-		if ! 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
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-# Firefox-only LANGS
-MOZ_LANGS+=( ach )
-MOZ_LANGS+=( an )
-MOZ_LANGS+=( az )
-MOZ_LANGS+=( bn )
-MOZ_LANGS+=( bs )
-MOZ_LANGS+=( ca-valencia )
-MOZ_LANGS+=( eo )
-MOZ_LANGS+=( es-CL )
-MOZ_LANGS+=( es-MX )
-MOZ_LANGS+=( fa )
-MOZ_LANGS+=( ff )
-MOZ_LANGS+=( gn )
-MOZ_LANGS+=( gu-IN )
-MOZ_LANGS+=( hi-IN )
-MOZ_LANGS+=( hy-AM )
-MOZ_LANGS+=( ia )
-MOZ_LANGS+=( km )
-MOZ_LANGS+=( kn )
-MOZ_LANGS+=( lij )
-MOZ_LANGS+=( mk )
-MOZ_LANGS+=( mr )
-MOZ_LANGS+=( my )
-MOZ_LANGS+=( ne-NP )
-MOZ_LANGS+=( oc )
-MOZ_LANGS+=( sco )
-MOZ_LANGS+=( si )
-MOZ_LANGS+=( son )
-MOZ_LANGS+=( szl )
-MOZ_LANGS+=( ta )
-MOZ_LANGS+=( te )
-MOZ_LANGS+=( tl )
-MOZ_LANGS+=( trs )
-MOZ_LANGS+=( ur )
-MOZ_LANGS+=( xh )
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6600M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		AS=llvm-as
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-gpsd \
-		--disable-install-strip \
-		--disable-parental-controls \
-		--disable-strip \
-		--disable-updater \
-		--enable-negotiateauth \
-		--enable-new-pass-manager \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--without-wasm-sandboxed-libraries \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	# For future keywording: This is currently (97.0) only supported on:
-	# amd64, arm, arm64 & x86.
-	# Might want to flip the logic around if Firefox is to support more arches.
-	if use ppc64; then
-		mozconfig_add_options_ac '' --disable-sandbox
-	else
-		mozconfig_add_options_ac '' --enable-sandbox
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-	mozconfig_use_enable libproxy
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	local myaudiobackends=""
-	use jack && myaudiobackends+="jack,"
-	use sndio && myaudiobackends+="sndio,"
-	use pulseaudio && myaudiobackends+="pulseaudio,"
-	! use pulseaudio && myaudiobackends+="alsa,"
-
-	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	if use system-python-libs; then
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
-	else
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	fi
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r2 \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-
-		if use wayland; then
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
-			pref("gfx.x11-egl.force-enabled",          false);
-			EOF
-		else
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
-			pref("gfx.x11-egl.force-enabled",          true);
-			EOF
-		fi
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_normandy_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	# bug 835078
-	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
-		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not supported the "
-		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
-		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
-	fi
-
-	elog
-	elog "Unfortunately Firefox-100.0 breaks compatibility with some sites using "
-	elog "useragent checks. To temporarily fix this, enter about:config and modify "
-	elog "network.http.useragent.forceVersion preference to \"99\"."
-	elog "Or install an addon to change your useragent."
-	elog "See: https://support.mozilla.org/en-US/kb/difficulties-opening-or-using-website-firefox-100"
-	elog
-}
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 06b6a9d9c4bf..95b3dd376f37 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,5 +1,5 @@
 DIST links-2.26.tar.bz2 6508447 BLAKE2B e0bf5ac4e05a8e14ae7342aed7bb7ac0f5f6c2d9e23adda221cc3ba73f39020c95cef90d10d5c9d0697797683ff1edf1ed55a4d8aca0930b2eb01b547a21bf00 SHA512 b732f88ae0e9f63f577fc3041058c56b43ffec3b797328453d0770e326010b05fcc04128287ef35b0d189bd0768446057d8773e10f8e0a76bab72fb252cdd530
 DIST links-2.27.tar.bz2 6510121 BLAKE2B c7326147c583ad380f1b528a216ecf056a40a2939b290d69061682aa9f397ab3eabb71691cb68efcd0739b67acbe1f38f95a8a347d5045efe671eacfd0e5c40a SHA512 8b46472184f2eab1aeca5de9b957a87f475f5acd9801260678b07475cf36afb1a9602e67ef39ad59da90d2d6cee235521db95d93349fd9bd6cee667eab2e5d32
-EBUILD links-2.26-r1.ebuild 3553 BLAKE2B 6fa2d82eb2fd7281a42517a713b8268a92dc9bd60f37f01924adee1b15711ebde2e3a1f1b1268b5cfc7a60bfc74e52488106e3e6db0110c98f2af9deac20ecdd SHA512 159d65284d005ff96758e30c66b079d2da8809f6d07ec4f88244b0c32a59c60c4172ea664220721db008d1b1d17375fc017f220d5f4828e1a68cb66c2fb60927
+EBUILD links-2.26-r1.ebuild 3552 BLAKE2B 41a6b252f696efd996771500133bce15e50bdb2727e954672ce450268a71fc100a5fe15f61c444df686d80b16c300d099e281e0f7341a17e8721b3818090f767 SHA512 206178c756db79668c9cba4e7107014a2f98b3c57c87b2ca6a48b8ccb136be3aa06e9ea6c3c3da1a8274056d9106298f6de6fc5205e3373e2bc9b606c6a0043c
 EBUILD links-2.27.ebuild 3560 BLAKE2B 19a6720ac267ee91584f11ac17e8126de4a05224e5d1cdcfac4204a5121ba60a44ab299fdc67722a4eb3e311e72dfcf8577f053e616f0a0775105fb0539c0120 SHA512 9a53cbc43159c9d256ca194585d0a93bf9eea880c077e9a8fefa87deacb8134adbcb5fc190f8b2c492b2fcd744a0c290d7309fc7daf50db2d065f64e92b32cdf
 MISC metadata.xml 672 BLAKE2B 5d282c043806b3ce47853e39f6fdee47b4223f0f02eae009124e9e0d9aee81e3f3c4135d27f733b9468760848499233763cd798f74f4ad751e345a6c67e355bb SHA512 198f8bf38632bc4348f8c50f8655dc6575db217ee307dcc8674822bec94c2ee904d650c4ee56a233629165f7085cb1b71eb1267d68b782a67fc88497116fa85b
diff --git a/www-client/links/links-2.26-r1.ebuild b/www-client/links/links-2.26-r1.ebuild
index 3570273a595f..1485b6630a67 100644
--- a/www-client/links/links-2.26-r1.ebuild
+++ b/www-client/links/links-2.26-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode webp X zlib zstd"
 
 GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 8891e65a8df4..9cc5a65d70e4 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-snapshot_5.4.2704.3-1_amd64.deb 89878764 BLAKE2B 2b9cfe2471529f56c18e73f6334acaa802f5b8ee64c7dde531269f773dc437732d0a4be4bd44b5683b9e499b80f0bcf9e339b2ffbda68e15fbc45b7f930d6093 SHA512 a0075be7fb9d72d8b2ba5ad368667725f9e4921ea1de8a0f40b3ac25afd38289aa1f2d65ff5d5b376d3db3d2db0ad4ecd308014b2c23105298cd414691836ae0
-DIST vivaldi-snapshot_5.4.2704.3-1_arm64.deb 81633128 BLAKE2B 458d8a8cf3cc3765d45fa852f93fd61de75c0ac860f2ab8649c7ca10615e25c6dc0c5d28ac0a2800a582d29e17b62f08128d9e980618e3b13a7ae26e9a9f1260 SHA512 3c3d841ff8d00c63af674b6857e765acb4bced1fc0857b09008a701215e9d43a827faccb7e79de141990494ddfdb707958d4dcad13634c133f430eb8c555054d
-DIST vivaldi-snapshot_5.4.2704.3-1_armhf.deb 81291512 BLAKE2B 5a8546636b059db93fbfc3781304d1e935978b02b621f2e65a31d5bae0e457543173f318a58070652f1b037de7082e9f46794bd1f995c9eae5ffd8697115f4f1 SHA512 63fa6f435eef51c3b28a1596277e0601d9cc6ab6a1f75e282ce6aa7b4a1ebfc7ed2528e9014d51672913edd9f85933006ae9ae330f815389921ff2a92e7eb39a
 DIST vivaldi-snapshot_5.4.2707.2-1_amd64.deb 89882276 BLAKE2B c6570714d86f1042bafc51f148df3e9ee82a5027aca413d0fe17ca6edcec64151d987703d45456f858ea1484f5790e3134533a4bf89964bde294cd2dfa1b4303 SHA512 1a2817311751c1f655e59c9b3f28f9a70a7be5fd850ca13b0c25573388bbafe7f7d5dff519cae716b41f7e64cda66650ce48b23704f5038c48b4c804f0a3ea5b
 DIST vivaldi-snapshot_5.4.2707.2-1_arm64.deb 81633992 BLAKE2B 304bcf611f382d1edef1b06d62c861d104cb79acb59e3c5ad4f58a8a2f419cf6953633ba9aa9856c253394a3a9e0faf10a1512c14a707dd33a98e52432581027 SHA512 b4b6f54d11f8e3812d56290a522b02da6129d356adf4ddedc04d4ca84e6f58447fd096aae7e29eaeb4db2ccb5c03c8d9342a98493d5050520a39863eefda8fee
 DIST vivaldi-snapshot_5.4.2707.2-1_armhf.deb 81277108 BLAKE2B 214d75556c20ba73e6cab2a09fd7d40d7275d2dc135df775f039d2414da536e8db010b599a66a88266522300497352a0501619bed8307c54893d2ba7f74a49f7 SHA512 dc5ab115b9c0a61c61b127d135115b663a48d966c7d386b90e61edaae37b7d64f6770f5a877af00e4cbe8eea1a6c0a336ce31400897cfca0ae129916a32883ac
-EBUILD vivaldi-snapshot-5.4.2704.3.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
+DIST vivaldi-snapshot_5.4.2712.3-1_amd64.deb 89880164 BLAKE2B a0aad3c01c153e19b6686651a385311d07d11c172570ba7cf7b074b401156ac213602ec62ea54708253f7624341c343fd5be724db9c8a1a7482c5e2a3a4324c7 SHA512 edf85f69bda626be13f279b741fb95435d94712ddda31beea9a25e02ef588422c0f3578a3ab8224f4f2b3171fab0919805c50660c1cfa15154af41ef45217da8
+DIST vivaldi-snapshot_5.4.2712.3-1_arm64.deb 81621264 BLAKE2B 46d127de5ad09cdaf1d10f6541a369131d47dfa8270d8ee0bf07474399462cc1a0c88613f3bc7e9821d87c009cfa5f96477d584fd0b75ce20744a26b6ca7e6e4 SHA512 4d73e277381e392bc455d4ab803f8a834c75408c77af98bb424926ca04f6287df437aec2e859462a93c4e12c0fd8bbdb25ae303c66502101f1c40c25ef633543
+DIST vivaldi-snapshot_5.4.2712.3-1_armhf.deb 81284656 BLAKE2B 2903fe75668e5f7871abc5a82259aacc61d871439bba554d3b7296420959f932cabf5e9bc52cd14096dbe5c42899cf1ddf049269553ccaeac9ccdec51f5e6657 SHA512 a6d0875d1d6ede0feb04072aa7c2ed0f181cc05aee8439fe8a627a1668564897445bc1a0350eeae04f9bb63fffff7ad4e3d55713fd39e087e42b5d00c6f7c612
 EBUILD vivaldi-snapshot-5.4.2707.2.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
+EBUILD vivaldi-snapshot-5.4.2712.3.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.4.2704.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.4.2712.3.ebuild
similarity index 100%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-5.4.2704.3.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-5.4.2712.3.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 503446e455c1..5081d4e9a202 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-stable_5.3.2679.55-1_amd64.deb 89894036 BLAKE2B 0af9e0e5d1d934ff65f4fee31793c22d2ffabceaa0fac22e9d88f3933bd9a5727444b9fccdf0a2ba46e7da433b92e47714a5d40bf20ba671f00c8537cbea89c3 SHA512 0e004b57e8e3070c813a52f3655d820b5a9090562c03954acdef1b57f18c0a288007953e48504df0da7c091551efbc3bd678d8173473185a4117576850ede70b
-DIST vivaldi-stable_5.3.2679.55-1_arm64.deb 81645288 BLAKE2B b6891464bd0cf88166b110f5127bb69ad856123a24014728a00cf16a642f95891e6f0af0714441d7c92e99075cfa9f2ba1b8959b5ef3997dfd34fc325fe7f9be SHA512 7e6332b174f5d570f4843ff5a6befc083b1332d0decd85a032ee95720a44462d81d92d9d3b8f3c36d8f4701fe670bd01535dcfab1a8c2ac19da2817be0f13dde
-DIST vivaldi-stable_5.3.2679.55-1_armhf.deb 81274636 BLAKE2B a35a228b96790eaf64199ffe53a14a01bd6ebe032d4d0445bde7c4aa76d917d530ec0de2513d675a07c95702224526e4cab8d5ca49258dfb9b7988f8a0f97a9d SHA512 c3e867fd83b6603ed79dbdaf6c0410182162994cea726df6c56fc7065dd7f00fdeebf1747abf31f532b2e7b250a132d236bfaa29421ef07d75bf0819d349ad40
 DIST vivaldi-stable_5.3.2679.58-1_amd64.deb 89868852 BLAKE2B 8370f7e366feed589e316c71b82006039bc7b2a310754a2d45e45739e773c062ff227184508bb0f821842c9994da819e19f9bce9a584e279700b96b92b1543a2 SHA512 348a7cf50d935c6046c19d944e9a04bd7e6c7bab458196cea30a1cd69052284b41bbb423e4bbb3ed0593303033c6f9848386aabfaed5de54d1bff9e1610b7029
 DIST vivaldi-stable_5.3.2679.58-1_arm64.deb 81641544 BLAKE2B 8b5753937312185bec8c38db451edc67d62eb3e755dcacc624b03de5ab7605be5f024bdcb1965c356d49168bc5e277a51ad38454c0d907d4dbd17e5e1ca1debc SHA512 5cba9787e14068564fbb7a27eff176171eccc267f663eea19764afcd228e959d0e23cbc48503adef6dcf0cd81e7ead69ee1c98337e6a882aff675af61d3d2800
 DIST vivaldi-stable_5.3.2679.58-1_armhf.deb 81281656 BLAKE2B 063ec6982a771377b83f21aa4471fadd91b470d0a283361f033842aaa33d71ba628d78a7ac01893e4e45fc3db93a7f482fe6b7e2380a308f2266f078f9d9c949 SHA512 74b7496f7247e4e8caa114b7918f78ac98266c7b32300193858dcb080ff24273a3ea0a0d2bb7a8e9e72dd22346e4da1c2a9736979dbc22ed610042a8f05e3faa
-EBUILD vivaldi-5.3.2679.55.ebuild 3659 BLAKE2B 768633f5a10cf3f65d1419e0bf726d4f74eea7ab20e6e8c0c63be13a4b2bc8df575900e7e833cf591d27779f32981a714ae2b33ed5511225e8dc385ea297629e SHA512 6ae743d7f41787ae3962b9c0821face2373a370687b536ac67996ece63f6a6ad528d406c3375d2406eb2daf4ccb7ea8de96a7b06ed73ee881596c239a222e1fe
-EBUILD vivaldi-5.3.2679.58.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
+DIST vivaldi-stable_5.3.2679.61-1_amd64.deb 89900260 BLAKE2B eb92dbba9ab9d824fef3b125f8deb657588ece692c7128fe384170b4b0059c8a34bcc457bd2ad5b81eb44dadd41d3c05e76f670fc0417a047dcfa4967b57c24d SHA512 0c834cadbcdef130c48e385db53cd3dbdb5b2e919dea7b2d8d642f1dbaa3ea0c04fd28d2539d38397902d7a4d0c77def1125399dae8b067310444c9288dddd8d
+DIST vivaldi-stable_5.3.2679.61-1_arm64.deb 81640336 BLAKE2B dca74cd96b6b87df0faba29ad0b6f7c6bdf1b5c05d40a1cccb5b2bbc33339b9b288be735cd4f191f20696943e5be4c8673e3b45e4703cb409add8f1aba97386f SHA512 3cddfd9a516467c4c09527590845165706627b4976ce0ec7591262efdf6353ce4612b472bfa88e14ea72aa1d2f7c85edda1b7edede6a5946fd8449c0e43ba354
+DIST vivaldi-stable_5.3.2679.61-1_armhf.deb 81312608 BLAKE2B ccf660b747df101e7b07f7cebb9fce26c70b4278f9a7af83abd846d72aa195aedb1c3e769f57502d5ed76c67018e8d6c98ce456173d6990a12314d6f83f8258c SHA512 eb103b48bc265f29590dc09052427d3589ea1d7e68511c4031973c180db382db82b0df9f99e3260ad26214a6861951d4cc9f53a6f61a68c15e162b82b4e4e64e
+EBUILD vivaldi-5.3.2679.58.ebuild 3659 BLAKE2B 768633f5a10cf3f65d1419e0bf726d4f74eea7ab20e6e8c0c63be13a4b2bc8df575900e7e833cf591d27779f32981a714ae2b33ed5511225e8dc385ea297629e SHA512 6ae743d7f41787ae3962b9c0821face2373a370687b536ac67996ece63f6a6ad528d406c3375d2406eb2daf4ccb7ea8de96a7b06ed73ee881596c239a222e1fe
+EBUILD vivaldi-5.3.2679.61.ebuild 3660 BLAKE2B b1ad18fea4f5e8121caa04d2a31d519d1a3f517d11940ba040926eaa69113b89b686c38d2bdac91f423ee857e4586cc816a1ca728db2471f16178ea11a81d978 SHA512 5af4f410d790a00bb58a1fed497fed2eb273d30a3121a7eff08f68de15eafb8fe4548fb22db718bd6b05523acae808b55fa0e4ef3fd1fdc1272e58e824b2867b
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi/vivaldi-5.3.2679.58.ebuild b/www-client/vivaldi/vivaldi-5.3.2679.58.ebuild
index cc815568ad94..24b5ca5420a8 100644
--- a/www-client/vivaldi/vivaldi-5.3.2679.58.ebuild
+++ b/www-client/vivaldi/vivaldi-5.3.2679.58.ebuild
@@ -97,7 +97,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
diff --git a/www-client/vivaldi/vivaldi-5.3.2679.55.ebuild b/www-client/vivaldi/vivaldi-5.3.2679.61.ebuild
similarity index 99%
rename from www-client/vivaldi/vivaldi-5.3.2679.55.ebuild
rename to www-client/vivaldi/vivaldi-5.3.2679.61.ebuild
index 24b5ca5420a8..cc815568ad94 100644
--- a/www-client/vivaldi/vivaldi-5.3.2679.55.ebuild
+++ b/www-client/vivaldi/vivaldi-5.3.2679.61.ebuild
@@ -97,7 +97,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* amd64 ~arm ~arm64"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 8895b342346a..1a3554ca7a1f 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index a7ad5eddf2a8..efb8b0ae473b 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -6,5 +6,5 @@ DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 44acd51a2c18ae66878d64922947f2f24f0ddf
 DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
 EBUILD apache-2.4.53-r1.ebuild 8183 BLAKE2B 098308fd838491fd6acd75f55e65bc38ba863e8b18793590f5986b05f769063c4cb9cf2958b8e959185990807260efd7d50b1e0914030747d3322c399f4c277a SHA512 ec50ca3a6b6496b0865b347a18daa3b477d4b5705bd53b774ea6d62405b343ff0e52e49d744157af383bd5329435e2bb68f381211f4684b1ef53327955b5a6f9
 EBUILD apache-2.4.53.ebuild 8100 BLAKE2B 2b26c13985d9884bc12a4fc1037bc35c7a1696952520bc145df4ba95766e8ff7bba840c9cb34ff8aedc3ef906152a976fc30f342555d71e0a2403f2ea73d76a0 SHA512 9e0ac55a3e3e8528bd773a0c2e3b613c724189c486498460afa236b6c3034ac3460e2a0efbe83872328360b3c1b00b944e69694fcaeb2ee987d45b60bf62bd2d
-EBUILD apache-2.4.54.ebuild 8183 BLAKE2B 098308fd838491fd6acd75f55e65bc38ba863e8b18793590f5986b05f769063c4cb9cf2958b8e959185990807260efd7d50b1e0914030747d3322c399f4c277a SHA512 ec50ca3a6b6496b0865b347a18daa3b477d4b5705bd53b774ea6d62405b343ff0e52e49d744157af383bd5329435e2bb68f381211f4684b1ef53327955b5a6f9
+EBUILD apache-2.4.54.ebuild 8176 BLAKE2B c28fac88808e9d561b3be6ea867d0416e0ca690a2cb0c2adb313b10a74f5b5da5d1916d15a649b17f0d8b0f45b3eea7b424998ea48a02725a5e22811cb639bf7 SHA512 5b51a9089f19bb21ba85727108690785bf1664bd812f613bd993319aea509d72065999dc69e997f63268ed0ce98e3808a48e5c9466762e865d902674be7f05b6
 MISC metadata.xml 901 BLAKE2B 126de8b6d9c924dc1bfedecc23b0ea5b5b3881b13cda7dd35d1ba04c30dabef619b2a57ac83e65695ce5e6e51b0f17c69cf752d6505c0d146dca8e2b7d90cbc6 SHA512 453b98f9ee9af6ebfc11d55e2218d1877a5a3f45fd969f6b3708f97216776c41deb651116826b15d744ea54fdd283497bc4f14917a9b00ae8b6e7af126441263
diff --git a/www-servers/apache/apache-2.4.54.ebuild b/www-servers/apache/apache-2.4.54.ebuild
index 2268b410b14b..3af3cea15036 100644
--- a/www-servers/apache/apache-2.4.54.ebuild
+++ b/www-servers/apache/apache-2.4.54.ebuild
@@ -144,7 +144,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
 
 pkg_setup() {
 	# dependend critical modules which are not allowed in global scope due
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 5b828c1d47f9..b81ccdeb1d51 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index 0c3a63b9b1c1..f6dcde211ef5 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,9 +1,5 @@
-DIST xcb-proto-1.14.1.tar.xz 143588 BLAKE2B 24983ec26632e93ef2d0c854cd41272925b6f3aab2642701232b73bc37d200d794c46f438e4a4102484e6ac9723e78c923b99cc78ada3541f43eaf0ad7ebc863 SHA512 140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d
-DIST xcb-proto-1.15.1.tar.xz 147908 BLAKE2B a85a40f725b4704f23a407862626b34cdaeaecb66877126dbbeadc6993da12a0687d9965d1e72144683e15be53b7fda151480cbe7e2caa572f3b029d9c45a416 SHA512 56fd505e567e1d39b4d46d0e5f79aeb90144c9b1a4429b2f51cd326ec0dea2a5fda5e2ebfe48af0da2781a4b1e29d9a91a4e0da662db5e35a701eac2e5ec1684
 DIST xcb-proto-1.15.2.tar.xz 148108 BLAKE2B 0d6cc87ea0d2de594ba11b11255779e90d3c7507f0002453b3d1b2ac73fb604e5ee52e516bbcf76bce2a89027f8c8de6289d21aa2bb23d7d3e2ee77211b54946 SHA512 9d0b2f0a4dbbf2d64e32ff4658d1663e13d7e5f1bffc1e8d45be7b9dd5bab46e29fc1c2f6e66a7a569e374ba6756faf3c39b0b5e5560df6d7f8b68beec97659d
 DIST xcb-proto-1.15.tar.xz 146628 BLAKE2B d7f38f1a415a7c70af372c64726e089ee454ffb981c031e4b8e93f345a1ada9dc40fb4e8b59adf553af8b4d9b7ef52730c9df56a0c24e53f98b3403346c7e810 SHA512 a333ac7c39f17ff2567419d09a9a77210c943a4e88d79eb152d416ae26bf6fb14e2446f9817abc806edd7aa3733bd4de5852b5ae90a25cbcc9d40e59c211aa36
-EBUILD xcb-proto-1.14.1.ebuild 1267 BLAKE2B d1c880832af5a8c6a774829d97fbd1b28c5cae334bc7a07ec3758f0624b20cc05cda6adb28decf3f8115e59410e49a263516d3a56fb1c244846f2a6fbf113079 SHA512 d1af50d1aacddb902f7bec51a765bdf569c3331ffccaaf2dc080af54bc01c31d2780aaf293364050d18814d8b620bbb9faabc9b89a142463655954fae53a277c
-EBUILD xcb-proto-1.15.1.ebuild 1282 BLAKE2B 62495920c2b8fb09286c5098173b6f7fdc9c3b2e6283fc3b0fad7a26548e1a20417de92a8e5ce100ea7e41e3a6948ad5e2f0ba1c826ec80a9befd0a10900f666 SHA512 bd9db1a66811883bb0c7ebb1e89ac58ef85bf8d8151e47600239d44c209b753d285dca3a96de3812a40bf17adb695e88b9933f4d36f026ae1e541c5bec3378c6
 EBUILD xcb-proto-1.15.2.ebuild 1212 BLAKE2B c5c1880bef3d50009d7dec6075282093f54e28bdcdf4dfc69e5cad8b2b476f464f35301cfa31f0ea1469b0cb9ad59149bb837b0d0315faa265e8b2302a6e2330 SHA512 c26abd6c262487baf6376fa4fe65803ddf8f1ca0db4f534f9dcb1e17ea10d566f53a7b4912711626b020cb32f05bfe2a2eab3529d8cf6b7ba12f586603fbb0a3
-EBUILD xcb-proto-1.15.ebuild 1275 BLAKE2B 8a31067a730d56904b23694fd1b2c31fa7666ac78ecaaf08fcd6c39e773790eebd750d0d9e51ab8d4303f17ae0d6f2095cdc7c4ec770e643c214bec642f2999f SHA512 6df782d56dd4edb30be1b57d4e2d399f0137eb29d7845ff1ce7b96b010e3405afe201757ac7ab00645b711c02650dfa05ae36c0540aa0567c88e25241347d326
+EBUILD xcb-proto-1.15.ebuild 1274 BLAKE2B dacbfa8fd5b5db71b4820ddb6fc46d77099bce70f0df1415a30302a6447415cf4a96f1efcff27f22e460d6d8603ae171ed66aa26388bd33ba585982379bb9d59 SHA512 ee3bf836c669c92f76acebd8cd7bb29ebbd20ae940aa0ff52c99cd901091ff04311e9d0fcedbd1943dfc7dfb8d95dc8b237b0635933b03c7bcff5d3ca2b963a2
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild b/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
deleted file mode 100644
index 26b96ef6fdbb..000000000000
--- a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-XORG_TARBALL_SUFFIX="xz"
-XORG_MODULE=proto/
-XORG_MULTILIB=yes
-
-inherit python-r1 xorg-3
-
-DESCRIPTION="X C-language Bindings protocol headers"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2
-"
-
-ECONF_SOURCE="${S}"
-
-multilib_src_configure() {
-	# Don't use Python to find sitedir here.
-	PYTHON=true default
-}
-
-src_compile() {
-	:
-}
-
-xcbgen_install() {
-	# Use eclass to find sitedir instead.
-	emake -C xcbgen install DESTDIR="${D}" pythondir="$(python_get_sitedir)"
-	python_optimize
-}
-
-multilib_src_install() {
-	# Restrict SUBDIRS to prevent xcbgen with empty sitedir.
-	emake install DESTDIR="${D}" SUBDIRS=src
-	multilib_is_native_abi && python_foreach_impl xcbgen_install
-}
diff --git a/x11-base/xcb-proto/xcb-proto-1.15.1.ebuild b/x11-base/xcb-proto/xcb-proto-1.15.1.ebuild
deleted file mode 100644
index 6340da91f79c..000000000000
--- a/x11-base/xcb-proto/xcb-proto-1.15.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-XORG_TARBALL_SUFFIX="xz"
-XORG_MODULE=proto/
-XORG_MULTILIB=yes
-
-inherit python-r1 xorg-3
-
-DESCRIPTION="X C-language Bindings protocol headers"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-
-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=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2
-"
-
-ECONF_SOURCE="${S}"
-
-multilib_src_configure() {
-	# Don't use Python to find sitedir here.
-	PYTHON=true default
-}
-
-src_compile() {
-	:
-}
-
-xcbgen_install() {
-	# Use eclass to find sitedir instead.
-	emake -C xcbgen install DESTDIR="${D}" pythondir="$(python_get_sitedir)"
-	python_optimize
-}
-
-multilib_src_install() {
-	# Restrict SUBDIRS to prevent xcbgen with empty sitedir.
-	emake install DESTDIR="${D}" SUBDIRS=src
-	multilib_is_native_abi && python_foreach_impl xcbgen_install
-}
diff --git a/x11-base/xcb-proto/xcb-proto-1.15.ebuild b/x11-base/xcb-proto/xcb-proto-1.15.ebuild
index 30504a15ea2f..be888b602cd4 100644
--- a/x11-base/xcb-proto/xcb-proto-1.15.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.15.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="X C-language Bindings protocol headers"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
 EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
 
-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"
+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=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 643aa4d50170..32079d886412 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,8 +1,6 @@
 AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
 AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24
-DIST xwayland-22.1.1.tar.xz 1272176 BLAKE2B 5dabf9d6cf6ed217cdf5694dba9c63059bcc43e2bb413c1edcd5d8775a906270b28e9dddb90bedacdefe27bd792339c346782511102b42250e2a940aa664e9cb SHA512 435cdf59f2be1ff7cb3dbb04e7a8920d9c48471fbeffca96c9dab2be400b168bfdb73b9e818829c555ab5d6fd83345eb693b3ba785d4ef701bdb27c8344077b5
 DIST xwayland-22.1.2.tar.xz 1271848 BLAKE2B 2efb3111396e1ed6ae6a4489c6d8612d511daea95edf456e60136185db9a69f937f0ab838e3c3095b76f9221d3b84ec0a1a7424f849e69d26eada0b988ebb675 SHA512 c8620169f16c2bbd592dbe77bc1f7a2c27a78f49a89bf966d8a449b7faacd69f5ea4aac7adb5b75e06dcc5efca26a2141c9b5d4cf6a592ec7882bad5e235bce4
-EBUILD xwayland-22.1.1.ebuild 2024 BLAKE2B 303818387b24dcda4732e955da2198a1644d58bf8db85663d81644a0fd2bb1bbab88f4880f6dd6f1e169f88fec87d1161144829c01b54bc34e9c25a28c5be291 SHA512 9adb330f7818976f4bded0141ac3c4c3f1aa22668effaeebc29e781162574ff6dbf925b1cd82cab8cedc6bbf7b69b86c377d9525428b921bc3be8ab49835d529
 EBUILD xwayland-22.1.2.ebuild 2024 BLAKE2B 303818387b24dcda4732e955da2198a1644d58bf8db85663d81644a0fd2bb1bbab88f4880f6dd6f1e169f88fec87d1161144829c01b54bc34e9c25a28c5be291 SHA512 9adb330f7818976f4bded0141ac3c4c3f1aa22668effaeebc29e781162574ff6dbf925b1cd82cab8cedc6bbf7b69b86c377d9525428b921bc3be8ab49835d529
 EBUILD xwayland-9999.ebuild 2221 BLAKE2B 7e7383bfa79c1aa60274d44068f63cd06f59c5e4f1c93b78660989068fbea140e2e9ed294a78466bcaa22fd43bae7c7d085f82d498180e7b8f1a08b905c204c7 SHA512 b3cfdae1ada3028a22afc4ffaf1165a8cfbaba345055afea7a4a35649c1900f9f12def59956309eb1c0f80304ce1f00b21566096743d41abd5f2032f367e070f
 MISC metadata.xml 450 BLAKE2B 9bddecffad64304a7d32a52c921ca817db03bb90315ebdb64710def6dfd5a17362e319de94fe26ccb5def82996917005bc3a77b4f673cf19a4f4be19d6d2ffe8 SHA512 13fef8a30ada7880d900603b361337757f93eaeb1d61d97d1119ab11633c1128926ca61c8249d00fa4fe2756191f5f01c974036c9d7ecee0457c0629d8f0da11
diff --git a/x11-base/xwayland/xwayland-22.1.1.ebuild b/x11-base/xwayland/xwayland-22.1.1.ebuild
deleted file mode 100644
index 641cf14cc35b..000000000000
--- a/x11-base/xwayland/xwayland-22.1.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-
-IUSE="selinux video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.20
-	>=dev-libs/wayland-protocols-1.22
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index a8aede782861..6187b72c022f 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index e8273add7fdb..d7a28bea1724 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-input-libinput-1.2.0.tar.bz2 358985 BLAKE2B f6fc97c4cb81ae61604d2a56063127a5a9a548c529eda9c506a77d8591b9a439cd0fac9c471e7429fddac6e8c4c043087e53d5113ac62c8bdb5b11381f3d5dce SHA512 ebff9490d33fd7495df2e03203060a76b3274f0e638bc92f3d95257fac57cdb9dac308e90e54006fe9522b6de3b1f1c38fd5f0b0b75b7051e5422290f43de52d
 DIST xf86-input-libinput-1.2.1.tar.xz 312324 BLAKE2B 2ce0419b19306f38cd8adb4159270b3943893032480325243066800cb1256dc1e497756da004f42510a6f6c78b1a3b73a41feccc66d5ce9c7cf40595008abebc SHA512 3decf694861d1aa3c02d090e66c5ed5513818cb18e9863f1790e0c8122a972230fb903705062b8291e1709db9098623f1205c63ccfb68e552e104813414589c7
-EBUILD xf86-input-libinput-1.2.0.ebuild 460 BLAKE2B c010f570daf37a294af0959dca737969b0991f1abd4ab80729129baf3f217f821b5d19b9dd433bc82dd61c651d871d685a16327d3b177c317eaa0438b60741f8 SHA512 d49995162bc85da6d24f1a4de4ba6fc14d286c2d806f1df68e9fbe6aeb27de0d7dafdaca24053e318e9053769ae5069df7d19d44a365de8e9de42fc7f7fe7f85
 EBUILD xf86-input-libinput-1.2.1.ebuild 492 BLAKE2B 2e2792d154805523609216aabddbab15bcd44410f3d07935ca3fd4838d342a7a3ec7c991d7ca0317daa8c0ca0c768019a86510131e6586a71dabeacbe43b1623 SHA512 f0580375a6989eaf1987c47ece9b303176748e2e945853ea8bff31eab67f8785c4506eea11685a7b66d094e93a32d98f604547e3968053c310e636c442891192
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.0.ebuild
deleted file mode 100644
index 4af16d07326c..000000000000
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-1.2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info xorg-3
-
-DESCRIPTION="X.org input driver based on libinput"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND=">=dev-libs/libinput-1.11.0:0="
-DEPEND="${RDEPEND}
-	>=x11-base/xorg-proto-2021.5"
-
-DOCS=( "README.md" )
-
-pkg_pretend() {
-	CONFIG_CHECK="~TIMERFD"
-	check_extra_config
-}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 33dec8170806..cabda50ba5ab 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index d36a937bbf56..327c95b696a1 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -5,6 +5,6 @@ DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb8
 DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
 DIST gtksourceview-4.8.2.tar.xz 1164876 BLAKE2B 3e6269b4e6a7147d5f4e0ed2096514a0e0bc29a928b73c0cd12eb207f2627c9eadde55ee81183b2a67fe5380fcd96c2335283a1f3da3f06303b7d2b65b49a09a SHA512 6951b9477b1e47b1b25756aef246630c948e8dd212b1b0e13f87ef4f56f39b59b02db3fd18315869e98acfc6454de13cfffa6eeb8fe1cd030dfd537b5f710a04
 EBUILD gtksourceview-2.10.5-r3.ebuild 1317 BLAKE2B 80f626e2a5ded1e372760139354bc61a36c64620a2476c385f24e44d8711536ab162ed299b016fa1e4734afea2a48aa1346507b0c265440857bba8b0740bf406 SHA512 796445765875a51c6467d3a80a20007d892f40c0d71a5c8b768dcc2738f091b46f24e37d9fb45715152a72bfb709b6fa272c9f973ce22eafecbf5fa01a20e15e
-EBUILD gtksourceview-3.24.11.ebuild 1279 BLAKE2B d4e7fb2cccc4d617b9c6a3fe8cc11ecbaf6c3907df32b1251bdc56819b4e85cb945dc224e9c468f69d7077f8645e135b0aa98815bda7339ad553f9f85dfd0dd2 SHA512 2ab149f2e157beada8d782292d96e6aa117364c7815cf83b7f847c46c652442baa0409e12531786b0dcbbf176bdfd634a13f513f28390a9d90b9458e993de145
+EBUILD gtksourceview-3.24.11-r1.ebuild 1214 BLAKE2B 51977406d2d124bb31b3e8c35b9d801a7bbd19e4ef831d292e39ae21b687943e1edde4935c4671d346707cf2becd7df8981d7e8a74e6f49a850e3b20a2835b43 SHA512 877e9688d5c804cc4ab88689eb04019023b8f6d9eecfe3f13b53679fe88204748bd4b45b17d71dd89a0358a1f83a5ba8ae65df8c0b6c47b30645f418ddd674ce
 EBUILD gtksourceview-4.8.2.ebuild 1751 BLAKE2B d20f94cd5f313cf4fed081b8ac6a39894ef809e14e9f3eeeb7822a27ac42833aa1af048ce57e1fc5d5ef93103d93a363ae7349bd380222303295945ac94e09b1 SHA512 738aec48327b3c17fafdf334b5b031fed2e962b518864dfd354074fbf29efad73a8438c51475f102661ac4a1ade9b872fb33ffb73e124613234968da8b4d9cba
 MISC metadata.xml 319 BLAKE2B 383670a9fec1362b5c4cc12cc93d8f94140d3ba3c09ac64f125de13ea990d4fbaad7eae555c864dc18b1c5f1ddcf631e1125d161cffdea9fa97d76f775f42d7b SHA512 dabf9cb57c228ea197a473292336bad77024b7ea122c121a385755096201097215925bb8281359d3cfcdf7879d80c93d522b6f9dd08b5a33df826b8c310ce074
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11-r1.ebuild
similarity index 87%
rename from x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
rename to x11-libs/gtksourceview/gtksourceview-3.24.11-r1.ebuild
index 7db2b001cb01..c2c1e31bf88e 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.11-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-VALA_MIN_API_VERSION="0.24"
-VALA_USE_DEPEND="vapigen"
+EAPI=8
 
+VALA_USE_DEPEND="vapigen"
 inherit gnome2 vala virtualx
 
 DESCRIPTION="A text widget implementing syntax highlighting and other features"
@@ -12,12 +11,10 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3.0/3"
-
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="glade +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
 RDEPEND="
 	>=dev-libs/glib-2.48:2
 	>=dev-libs/libxml2-2.6:2
@@ -25,7 +22,8 @@ RDEPEND="
 	glade? ( >=dev-util/glade-3.9:3.10 )
 	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.25
 	>=sys-devel/gettext-0.19.4
@@ -33,12 +31,9 @@ DEPEND="${RDEPEND}
 	vala? ( $(vala_depend) )
 "
 
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
 src_configure() {
+	use vala && vala_setup
+
 	gnome2_src_configure \
 		$(use_enable glade glade-catalog) \
 		$(use_enable introspection) \
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index cb1a5fee25d2..b0ccffa63c34 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,7 +1,5 @@
 DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a47185a2cd7ad6592c534c17636906b735aa5800d810d13d3e342e3dbe281bb1f1f3ecab9d07e6a6a50f33beef8af SHA512 ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347
 DIST libX11-1.8.1.tar.xz 1818460 BLAKE2B 7602b4d8c65ea3160f81096b4e022b5462e49d96b36dee70fe06e972329dc9d70bbd462e2079da03ba5647d7a72bf03e29aab23c60bcc206c95d770655622226 SHA512 2e36d2c47519e0cb2697f588c0ccdf73fbe75c2163f0855c78f7052dc9e920bca081f9d5e39c707a14067f101faef74fc758c8862eeba675b1535b43119d533a
-DIST libX11-1.8.tar.xz 1782508 BLAKE2B 15a41cbcdb54d68cd54b6fa4147d55d277a6c091af7d38341ec261b42c547acf981270ceebec5abb3fcc15da5c1e05b7908114e157555f8184234922e3c05fde SHA512 64899ba9efbda00211daf08534a2a98eba86bb377980d21ce319106075cd36b511b17245d02e8ebd1045e7c2147f2c005004bcf579121138be7a7b879eeca83b
 EBUILD libX11-1.7.5.ebuild 938 BLAKE2B 6559a7c7633d55efa6774d3b0d100a289e060a32c53cff2fb1c7dcaeffa2119058eeb8aeb1b0ff1d13dfca02fe07086c9d42071233388ede0a5b5f9a74b5bff9 SHA512 340786682d8218feb524815a1813af189f21d5a4b100e3fb61c399afff7897298a34aff2bbe8f6efe96ca9899b89f1e5acc2515f21e9277aad7c423b319f2d32
 EBUILD libX11-1.8.1.ebuild 939 BLAKE2B c8c70725bb4cfd15cb2eeaba451fff53a239c07c0e159d1a905cdeef850222ff1aebd161bbed83ec68f105235b0c2bd96bce2112330e641ad9d55e82aaf871cb SHA512 a582dd6fed67cfd1af18035632e9d3c5e1505232c2287028cad6cdfb24b3892f3d61d715aa26debd41aa85adf8ed61afcd960e8fda71579da6b3df9587ed93d4
-EBUILD libX11-1.8.ebuild 939 BLAKE2B c8c70725bb4cfd15cb2eeaba451fff53a239c07c0e159d1a905cdeef850222ff1aebd161bbed83ec68f105235b0c2bd96bce2112330e641ad9d55e82aaf871cb SHA512 a582dd6fed67cfd1af18035632e9d3c5e1505232c2287028cad6cdfb24b3892f3d61d715aa26debd41aa85adf8ed61afcd960e8fda71579da6b3df9587ed93d4
 MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
diff --git a/x11-libs/libX11/libX11-1.8.ebuild b/x11-libs/libX11/libX11-1.8.ebuild
deleted file mode 100644
index 34171b8bc0c2..000000000000
--- a/x11-libs/libX11/libX11-1.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-XORG_TARBALL_SUFFIX=xz
-inherit toolchain-funcs xorg-3
-
-# Note: please bump this with x11-misc/compose-tables
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="ipv6 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
-	x11-misc/compose-tables"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/xtrans"
-BDEPEND="test? ( dev-lang/perl )"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-		CPP="$(tc-getPROG CPP cpp)"
-	)
-	xorg-3_src_configure
-}
-
-src_install() {
-	xorg-3_src_install
-	rm -rf "${ED}"/usr/share/X11/locale || die
-}
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index afee3d4b764f..64f8531defe3 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,4 @@
-DIST libdrm-2.4.110.tar.xz 436372 BLAKE2B 0d5f8bfe47bdcc96ef7dbe3ecf2da0b21262bae4396fa1e73c0f728d970d041a9925082c4526bc71e00f110c2eb0ba94313d9a7c27a2d4676073fdbc3708c628 SHA512 52f92ef1fe4c218a1d7dba53ef43334dbfca80e3209afe59f3a32c4bf67473126534e990df07a931a12d46a3b997c21ef17c1c4d8a0c88d44d5c6c040e3b6be3
 DIST libdrm-2.4.111.tar.xz 447388 BLAKE2B bd1fe6a1af3dbdd542ea9d3b887121d917c11ef9c3c0074bbe5d18ffd15050e2df63c744aa5e559e7f8a1f1e9561d3b2ba8b9a45ad72d7c1e6393b7eae99cf54 SHA512 17e92e9e4ded8031ac222764bed7e9ff430a1a377f5e435f6b62b4a7f45cb4c4b769b3b79fbcba11512c1ac973abf8cdcca8e0b9659ae095e915d3d5efcf5516
-EBUILD libdrm-2.4.110.ebuild 1971 BLAKE2B 0493208ad962927697e870e8dcdbc7800d184472c7ef121c192a6ea84e0aa1594b9ce72edbb8eec7a2467e6fff756e3bb682178c6f72286e74ac1e0e6fb6beb2 SHA512 944f92796f65158e3974f3b57eaf76237e2ecbbe144dbbb9fb345fa68b8caa83a4fe11f1da74d277d1b860aea66e4c3d351579d134bd3d5635eedb17e37be142
-EBUILD libdrm-2.4.111.ebuild 1943 BLAKE2B 088d84050e23da6e5ba9ee7f2028ee02978588879f1b34868d4b2aa787517b644c9bb8a25660bb325eb9fc672c36986f19888e7aebcdf0f329c74588d8ca5d3d SHA512 d9d6d027a9c10f73c33397fd7283d8e73801ae56c7a6a9b7560bb9c34d75b1c33584c55c891bfa29da6ded166eae4c97f92524cb66383bb062f781e9d92aca37
+EBUILD libdrm-2.4.111.ebuild 1942 BLAKE2B ce7a3fcd053b207c2c78f20667bf9264d7b5c0f75039fcc49f2b771660eb913307462c35b094ff2b309eaf4e0a658ce68fadce94cb091bb8e07ada1342c769bb SHA512 5f7a642ce1571333d431558af4824ce604463e41f5e031e54c24063f8dc0ed8083875bbdab6fd429e32cf3864726c89505b587546c64d3589c4d0de89456f486
 EBUILD libdrm-9999.ebuild 1950 BLAKE2B d892aa28a9055968915a2eb329ca9ac49bbcaec0ae4f417f46d7fcf0641c2ee95086d8b09d3b433b0d07e452db95951f8c80e0ec8466fbdbbe03a60459a0652d SHA512 a2f387299e8d2446a63efb5f7c80061414143dfe8dde9216c7d6f3d9a6f50e1820f97f27fa7d5977d84b0f83e5119e06c0eddd2e290b773f730744160538fa2b
-MISC metadata.xml 407 BLAKE2B 1ec724640ea057ea29a6c84f3dcd34cb6a3f4bd7731c00d486688c9ec1dce393133e58b86ade00e51f91c80fe521e8829cfb796bd7cdc2e3d8c7be450d4c4188 SHA512 b54da0a8739fda9bb388e9893d992323247df89d9e97d20f29c62e64b189bf38092615cf113ae5048ce223270ebfaa128bb6b5fa119e5e8c8cdf2bda76a64769
+MISC metadata.xml 304 BLAKE2B e47f11b45b5c90804d5dfd27dbe2f2156099661ac7546152fb4e62046fd030838a0944d7dea35efd2f7b527eb88992c5049a40282dea58097b991c6bcd843693 SHA512 b798cffebaf330272494b6ef84c9c587a920e27ac0ae26336ff256de21768274cfcbe8feb61b7f63bff52294e460f945ada9ab9ddaeaea91d17bc1d6d41360da
diff --git a/x11-libs/libdrm/libdrm-2.4.110.ebuild b/x11-libs/libdrm/libdrm-2.4.110.ebuild
deleted file mode 100644
index 5fda2ea65c15..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.110.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{8..10} )
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} python-any-r1 meson-multilib
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
-
-python_check_deps() {
-	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		$(meson_use video_cards_amdgpu amdgpu)
-		$(meson_use video_cards_exynos exynos)
-		$(meson_use video_cards_freedreno freedreno)
-		$(meson_use video_cards_intel intel)
-		$(meson_use video_cards_nouveau nouveau)
-		$(meson_use video_cards_omap omap)
-		$(meson_use video_cards_radeon radeon)
-		$(meson_use video_cards_tegra tegra)
-		$(meson_use video_cards_vc4 vc4)
-		$(meson_use video_cards_vivante etnaviv)
-		$(meson_use video_cards_vmware vmwgfx)
-		$(meson_use libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.111.ebuild b/x11-libs/libdrm/libdrm-2.4.111.ebuild
index 97f3b3ba6bb3..25b15697e55f 100644
--- a/x11-libs/libdrm/libdrm-2.4.111.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.111.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
index cfcecf022b00..73e3db5cabfe 100644
--- a/x11-libs/libdrm/metadata.xml
+++ b/x11-libs/libdrm/metadata.xml
@@ -6,7 +6,6 @@
 <name>X11</name>
 </maintainer>
 <use>
-<flag name="libkms">Enable building of libkms, a library for applications to interface with KMS</flag>
 <flag name="valgrind">Compile in valgrind memory hints</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 539d7d8e03a2..d3aada6ce765 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,7 +1,4 @@
-AUX libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch 5795 BLAKE2B 0a864b0fbd998fdc6c151b9f9cdb2a31797ac693b4ffa164a6f9a3c0fc1c5430454ec97be4c52ed48489cb08e820a998086fc588cdd2348b16da122bd483b8bc SHA512 e5148c7c310ca395b7e0f3b76ef98d79e50d0ac58935ad6df3c71bfd426166ce736ccfff4970e9523a2418820cd7cb2cba6e8818f23dd5cc21dac69accc1c3f9
-DIST libxcb-1.14.tar.xz 439404 BLAKE2B 63605e02dd32b4d26b3ac6d3b93b7383dbc30701b9a063e8efa5b387215c9325196451f80c7b0b357df1773c6fd1224eea8eeca2a456055a2cdc61082c726111 SHA512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6
 DIST libxcb-1.15.tar.xz 446492 BLAKE2B d50146ee9b822dfd0c24513110e1706cda05ce588f276005167a911d3097275f36be1ce755c42c2b2970e750f10b2b943f3e373b6e55865fba986e29811a3545 SHA512 f6c7d766b7cf9cab6abe948ee424cbae6951dbfe2f76fa58a109cdc05b0f0919dcc4e38176a22ff4b95fc1e38596115317e32ba33b24cae0035a4e30dbcbdad9
-EBUILD libxcb-1.14.ebuild 1500 BLAKE2B 31d68d2b246e4da3906e3a1507fa83a151a9ee3b66427192dc1917d95fe3e48c43765b8284d8f074d2f8a19c82e2f1055f36aac4c515f0096339547ce753e57c SHA512 6e86fde7e6b6c011b81b946a6a1f22070285d75e8001dd9a31e059e9579287b2c863425c505dac0de14ccf613541b660d06e771313d4b639ba2d2db8b91e1ed1
 EBUILD libxcb-1.15-r1.ebuild 1418 BLAKE2B 71e16e36934cf585735e6981cc27b65d6736ea2dcfafbf7689d71ea974b9945d7723c24e436d307d9b144c06dfd3f39d375692c0f0b243bafa524c454d06dc33 SHA512 e78c446596a8555cc6833b7337d321b4642ff3ac2388d5e40ce7354cc95b9c71556c8a664f98ec75f15df04fad07c95639655e1850eb0c4bdb2ef480d3a2de57
-EBUILD libxcb-1.15.ebuild 1420 BLAKE2B 5d5272b4d9e7ca5476ef4ab9a75556c07ca21518cdd4539d39218c74501dc70f4253125ff2f196d7b8d408a9b4ba5e5512b0b3c1f59568532392677ac23d084d SHA512 afc73b8bb6da7a722ccfa3f75d66add4d73f7f4133c779105e99a6f931e7ad6525646360b74d30183a82687f5bcd60156c6455ae4f6ab6227f262f7bb59b265a
+EBUILD libxcb-1.15.ebuild 1419 BLAKE2B f3cbdfdb4e2e6033dc98dbad1a4a99bca3ced8d444044023bf9f0205d1ab6270c2cb4738aeec1c6654aa96fe9929ab7defd5ad6553b5419bb34b8a1fbeaba1da SHA512 bdac2c0d046ec98dc990a6312f867a413dbff5bde21563e0845bb8d79de5446ebd0f9c9a69ebc2248114920703de5d2af79ce8c292b85e26c4ccda8cf31107ee
 MISC metadata.xml 401 BLAKE2B 67d85ae2c4ac6eecb10245666173d96f896ec9eddc36c8d0890092cbd19c7dd685f327332235937afbb119fa6e69860920fc1e385fdc750d89c85b67a9fbaa20 SHA512 72981a4b87a9219573847178c3d50f9a182c0b0a82917d3d472be062a5bb5e21422bc1776a8988b0ff0a5248a6f5eabe3dee3aa51612b31a7da283fd870b58ab
diff --git a/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch b/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch
deleted file mode 100644
index cc7f22ba4e9d..000000000000
--- a/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From f01f3c378eb0168fbb055c7be1c2d08a7acd3752 Mon Sep 17 00:00:00 2001
-From: Ran Benita <ran@unusedvar.com>
-Date: Tue, 17 Nov 2020 23:43:06 +0200
-Subject: [PATCH] tests: don't use deprecated fail_unless check API
-
-It causes errors like this when running make check:
-
-check_public.c:40:24: error: too many arguments for format [-Werror=format-extra-args]
-   40 |   fail_unless(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
-
-Closes: https://gitlab.freedesktop.org/xorg/lib/libxcb/-/issues/49
-Tested-by: Matt Turner <mattst88@gmail.com>
-Signed-off-by: Ran Benita <ran@unusedvar.com>
----
- configure.ac         |  2 +-
- tests/check_public.c | 30 +++++++++++++++---------------
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/tests/check_public.c b/tests/check_public.c
-index 2094bfe..aed40c8 100644
---- a/tests/check_public.c
-+++ b/tests/check_public.c
-@@ -37,18 +37,18 @@ static void parse_display_pass(const char *name, const char *host, const int dis
- 		got_display = got_screen = -42;
- 		mark_point();
- 		success = xcb_parse_display(argument, &got_host, &got_display, &got_screen);
--		fail_unless(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
--		fail_unless(strcmp(host, got_host) == 0, "parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
--		fail_unless(display == got_display, "parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
--		fail_unless(screen == got_screen, "parse %sproduced unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, screen);
-+		ck_assert_msg(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
-+		ck_assert_msg(strcmp(host, got_host) == 0, "parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
-+		ck_assert_msg(display == got_display, "parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
-+		ck_assert_msg(screen == got_screen, "parse %sproduced unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, screen);
- 
- 		got_host = (char *) -1;
- 		got_display = got_screen = -42;
- 		mark_point();
- 		success = xcb_parse_display(argument, &got_host, &got_display, 0);
--		fail_unless(success, "unexpected screenless parse failure %sfor '%s'", test_string[test_type], name);
--		fail_unless(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
--		fail_unless(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
-+		ck_assert_msg(success, "unexpected screenless parse failure %sfor '%s'", test_string[test_type], name);
-+		ck_assert_msg(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
-+		ck_assert_msg(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
- 	}
- 	putenv("DISPLAY=");
- }
-@@ -79,18 +79,18 @@ static void parse_display_fail(const char *name)
- 		got_display = got_screen = -42;
- 		mark_point();
- 		success = xcb_parse_display(argument, &got_host, &got_display, &got_screen);
--		fail_unless(!success, "unexpected parse success %sfor '%s'", test_string[test_type], name);
--		fail_unless(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
--		fail_unless(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
--		fail_unless(got_screen == -42, "screen changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_screen);
-+		ck_assert_msg(!success, "unexpected parse success %sfor '%s'", test_string[test_type], name);
-+		ck_assert_msg(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
-+		ck_assert_msg(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
-+		ck_assert_msg(got_screen == -42, "screen changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_screen);
- 
- 		got_host = (char *) -1;
- 		got_display = got_screen = -42;
- 		mark_point();
- 		success = xcb_parse_display(argument, &got_host, &got_display, 0);
--		fail_unless(!success, "unexpected screenless parse success %sfor '%s'", test_string[test_type], name);
--		fail_unless(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
--		fail_unless(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
-+		ck_assert_msg(!success, "unexpected screenless parse success %sfor '%s'", test_string[test_type], name);
-+		ck_assert_msg(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
-+		ck_assert_msg(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
- 	}
- 	putenv("DISPLAY=");
- }
-@@ -183,7 +183,7 @@ END_TEST
- 
- static void popcount_eq(uint32_t bits, int count)
- {
--	fail_unless(xcb_popcount(bits) == count, "unexpected popcount(%08x) != %d", bits, count);
-+	ck_assert_msg(xcb_popcount(bits) == count, "unexpected popcount(%08x) != %d", bits, count);
- }
- 
- START_TEST(popcount)
--- 
-2.26.2
-
diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
deleted file mode 100644
index 8cd1a7ed1915..000000000000
--- a/x11-libs/libxcb/libxcb-1.14.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE=xml
-
-XORG_TARBALL_SUFFIX="xz"
-XORG_MULTILIB=yes
-XORG_DOC=doc
-
-inherit python-any-r1 xorg-3
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc selinux test +xkb"
-RESTRICT="!test? ( test )"
-SLOT="0/1.12"
-
-RDEPEND="
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.14[${MULTILIB_USEDEP}]
-	elibc_Darwin? ( dev-libs/libpthread-stubs )
-	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '>=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]')
-	doc? ( app-doc/doxygen[dot] )
-	test? ( dev-libs/libxslt )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tests-don-t-use-deprecated-fail_unless-check-API.patch
-)
-
-python_check_deps() {
-	has_version -b ">=x11-base/xcb-proto-1.14[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	xorg-3_pkg_setup
-}
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc devel-docs)
-		$(use_enable selinux)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libxcb/libxcb-1.15.ebuild b/x11-libs/libxcb/libxcb-1.15.ebuild
index fc2aaabc79f8..4a9b2b45b944 100644
--- a/x11-libs/libxcb/libxcb-1.15.ebuild
+++ b/x11-libs/libxcb/libxcb-1.15.ebuild
@@ -15,7 +15,7 @@ inherit python-any-r1 xorg-3
 DESCRIPTION="X C-language Bindings library"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
 
-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"
+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="doc selinux test +xkb"
 RESTRICT="!test? ( test )"
 SLOT="0/1.12"
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 612d988fb8e8..540d975a7c04 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,5 +1,3 @@
-DIST libxkbcommon-1.4.0.tar.xz 471948 BLAKE2B 5b0a155a3a47adb7302db01f3daa0ef81993a9754b032b01f1cdbd53af74d15df95dc6c9334860211a28272b246f66978ad6e409db74a242afb13c17dc25b76e SHA512 7dd86952c036a6a78455b1ba05b53fcff9d6f133bb01c83fa860b4eaec3fc26bb0b5535948bcc2dafbd27204c3c91d01404ca9fc52896cc36af509384797d4f1
 DIST libxkbcommon-1.4.1.tar.xz 471824 BLAKE2B a784f3612bb52abb79bf1a2ddd3e7709fa52eddce5cabcf8520ed7df8ec8ea557e51205e1e9d116a0b31eb27b1f3bca33144318c5f01be7312cbb3e48f687fbe SHA512 757b340aeab6d187917807a88015b5113475ab2172aaaa8e530b40ea60619b3fbdfa668fd62707d66ed8fb763e68fee19394fcbd519af7c01d8975c59fdf0d89
-EBUILD libxkbcommon-1.4.0.ebuild 1545 BLAKE2B 298465c21b402115970f4e407832afaae66e78da6b55d3def4e07b8974e431a9131e103ca49db3377d88b72d178d53a0c02c0674a51570358a1b059e77de1ea4 SHA512 a26476ddf446e7e27a5e544ac0fa59c665b1dbc28fa2d09a3547c44f1d83983096e15533b867309188546675bc9c664a30bef12373213c40b67ca9e2b66beb72
 EBUILD libxkbcommon-1.4.1.ebuild 1545 BLAKE2B 7b0af3e3b664290fc834f621ccc0c740bdfb31c4e342380fc9847857f8172c4d68b486822547fcee5bf37cc13d4faaf460a9a9930a546d33f4c54266bea5dcba SHA512 ffc63c15e96bcef0ba4c7a28b12ffff1e7a72888f467a9b6f3ee5466330dd7bc98473fedbf0e271b1dd0da48fe829177ec56a3a4b5314ed20bdb3fef5e3f3a4c
 MISC metadata.xml 392 BLAKE2B 387cc216299e7c312552b0fa7abdd744203daff7bc5a51ef5b7d2bcfd39b83904308c8bb2b66f2459f77f593e18fc8ade017491fa45e698e8e6bfce03a819df8 SHA512 0ab9850b467605c1050d70ca526d2a4c2957e3ec9f56113fcabeb9d4a79cb8636ab077f66e17c7e05b79aad6948a7e89a83e5d8c48197ab016a7f5b2f2886f42
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
deleted file mode 100644
index 6a314d97c7cb..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
-	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson-multilib ${GIT_ECLASS} python-any-r1 virtualx
-
-DESCRIPTION="keymap handling library for toolkits and window systems"
-HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
-LICENSE="MIT"
-IUSE="doc static-libs test tools wayland X"
-RESTRICT="!test? ( test )"
-SLOT="0"
-
-BDEPEND="
-	sys-devel/bison
-	doc? ( app-doc/doxygen )
-	test? ( ${PYTHON_DEPS} )
-	wayland? ( dev-util/wayland-scanner )
-"
-RDEPEND="
-	X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )
-	wayland? ( >=dev-libs/wayland-1.2.0 )
-	dev-libs/libxml2[${MULTILIB_USEDEP}]
-	x11-misc/compose-tables
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	wayland? ( >=dev-libs/wayland-protocols-1.12 )
-"
-
-pkg_setup() {
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library="$(usex static-libs both shared)"
-		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		$(meson_native_use_bool tools enable-tools)
-		$(meson_use X enable-x11)
-		$(meson_native_use_bool doc enable-docs)
-		$(meson_use wayland enable-wayland)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
diff --git a/x11-libs/spread-sheet-widget/Manifest b/x11-libs/spread-sheet-widget/Manifest
index cce95679e98b..bd6c188b3357 100644
--- a/x11-libs/spread-sheet-widget/Manifest
+++ b/x11-libs/spread-sheet-widget/Manifest
@@ -3,5 +3,5 @@ DIST spread-sheet-widget-0.6.tar.gz 522827 BLAKE2B 0e68fff897915b9a74fb954d604ef
 DIST spread-sheet-widget-0.7.tar.gz 517216 BLAKE2B 920fa2bc648d60f041e1b5d9d2faa7edb5b93310759de498e75bae42bcbba8493c7985e013a5099e405f2a748904e702ef8f431fa51a5d19c4e5a7a1efeceed0 SHA512 c27647a55e3ae878037a764e879244ac4396406f331ea6bd3795544165dc1a894c21be1bbd7314c45a4e1734f97c70d711520edb4f26438ade00b2ef39732c65
 EBUILD spread-sheet-widget-0.3-r1.ebuild 479 BLAKE2B 0f39da86bd4a8edfd38e75bc2b448e9a7add3b33d433ab0e7887cd7047e4d255d3b63a040d59ab96eefa3f05b261b1782b70bc4e150e979dcd87f1ae90d213cd SHA512 9d3214012b40635fa03de29679898282f0f5919128e9cd77de5debdcec87b39f52ad9bfdf93911944f276184ff7ada6fae028a012cc89ab0283b75f748bc56f7
 EBUILD spread-sheet-widget-0.6.ebuild 481 BLAKE2B 7720c8ec7517e859100b22149c404cc1d320cfe5099e19f1ebe9e5803db29913201750a384835fd83be005088e82c572a2b52aaa67e1e7a562d4f8f8cdeaf3c9 SHA512 9dfeee13140caf1ec0e493e07fe7dbb01439e5881d0b6492fd507b8f1f644d201662ac8a3b5427f12f01858d8392c3b12237888cec9616a1134eccd71d892944
-EBUILD spread-sheet-widget-0.7.ebuild 451 BLAKE2B 2abeb704c15ad84479e56f80a742507aca4a39fa3f765a1849ca332c54326096a103c99baa36275fc3c97919255f454d6b60b1734c3fb8fa79ea15d21dcf24ec SHA512 b38def4a5974ee9b10ca91b04573826098c23ba90566668de7f68706a1283fed929d14b904a43f7ffe20e1c9139bd388015592b2f62d769d630674b08c4d3845
+EBUILD spread-sheet-widget-0.7.ebuild 449 BLAKE2B d2d961b8f8246485a186e4a94487d436de05265dfb3dfbcb437ccaf8b606b336bb04e0efe9a10c5412b624c31f687d82d7866aa55b52b43aadd0eaaee2b69cbb SHA512 488e1f56fc1df59722357a6c07703efa1d437e2cd142168b8ab9cecdfb57a86de474ae9ceb94da6bd7ac2542498015370dacf97b6a192b35181b78838a42db6a
 MISC metadata.xml 784 BLAKE2B 6469c4af18aecc8781c4c329db3d669189d073042b7b30adc828f44974c3243c16dc12a4b20f7cb8886ba176e82d18aa7211589e1bdbc603ff4f029c51605f74 SHA512 b150e53107eb9b8dc3f6bd31ff9409bdb09f038773baee3ff74d3cf0cf908741dd39b6fc6aa546d206b7017fd9b33a945896689fb4bba3a38f23d221049b2640
diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.7.ebuild b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.7.ebuild
index ecc9dcf4f0d1..1baf7cd07c93 100644
--- a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.7.ebuild
+++ b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://alpha.gnu.org/gnu/ssw/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-libs/glib
 	x11-libs/gtk+:3"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 9464318a1bee..d8e02b15c54e 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/bbppp/Manifest b/x11-misc/bbppp/Manifest
index 186ac8c22dad..30a6bb673192 100644
--- a/x11-misc/bbppp/Manifest
+++ b/x11-misc/bbppp/Manifest
@@ -2,5 +2,5 @@ AUX bbppp-0.2.5-gcc3-multiline.patch 2759 BLAKE2B 883dc1f412f6b3c7bd33b95d27dd79
 AUX bbppp-0.2.5-overflows.patch 453 BLAKE2B 45dcee17e6d725b3ba2e2197a75139d5b8dd86ae7b706f88069eda2ef1cf29236fc878a8de363904e88d4269302f9f9c6c49bf0ac2de607df3feeb53656a5420 SHA512 044755d73415d171ec2e0c61fe0affea912ab40dedd567f3e4f29938ca97825c1ab36be9bea50dc7c40227a06e5e2ea2541d0cdf71e5dc8013fef38a6db920eb
 AUX bbppp-asneeded.patch 1062 BLAKE2B 73be09e58f573c58e2cc0afe2c316e737af0ac4a0308975f955002a3b70bb1fd68641725b62a68ca6fc7e8d8a6a1fc23446a5a7bb5b3d19721ac73ceff996091 SHA512 892a7f18ce55c099b86fbb129eee9a0750852d5f152d0619a3e79bf70f9e9a1524c52d9aec53bbb0b65999bd6248cc4eee4b341f5ad0d8f636a7dfacb3fef993
 DIST bbppp-0.2.5.tar.gz 83421 BLAKE2B 3fe18ce71617b792f9430b2bbe123af78b498be9a663fc782246550ed936b81278d27f06b9b454bc47ff6db193fa2a949e97f0fd970532399c3f0b0f335beda1 SHA512 55d1e4d1a2c97ac5a5d34a48cd877891d8d6acf32083d7bfa90e4941cfbc18a91d056a0ec6b7a96182f72be440f6609caf3bc82c9071c6d0bcfbe95577f04930
-EBUILD bbppp-0.2.5-r1.ebuild 1015 BLAKE2B aaf3d1fc51511463cf22c3dfd405997ddb4f0169156bfc8f647ae34aaf4491df960f177300bd838c44cd598ee2974afdddf29d641c93b820134dd060cf5804c8 SHA512 d5fa3b2042fb1a6e202c58aaefc3b4ac20394c243a4c8e54d382a44de9901483113d860aa8b3789c538d4a77ee518f662873a04d6abe4696504426ca7f3713fa
+EBUILD bbppp-0.2.5-r1.ebuild 1090 BLAKE2B 3f9468b361d2cce3100c3f5b7c7afca190581b38d84c59efad34ef79826935d280493e93f60a02818f82df20ca4061c834c4ee019a297696679484cadd47fe81 SHA512 14ecacfed44170d4482a4e5e1b3e54901d9207fe94011c16fe0ea55103194078ff1409305bbf5e6806850e97db9e2999feede738252ff3e24da600776b2912c8
 MISC metadata.xml 322 BLAKE2B 281372f32e95085fb9b3eda84565f4654b4004111fd38ff5345dd1bba3ea5342971b22fb4825a0222c671a6d4056ee0ae9ceab1d3550ebfcd8e08e4cdadd9319 SHA512 5668d105c8615a718c20ea503868087062882f519e98452f45e69ea3cd840b17b19dfc2540f8b808e92288cdbeba73a8070bdb7d10cd70a1c27525d5865754d7
diff --git a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
index a8e1a0cdbba4..5ae4a57762d3 100644
--- a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
+++ b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,8 +13,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}
+COMMON_DEPEND="x11-libs/libX11"
+DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( net-libs/ppp-defs )"
+RDEPEND="${COMMON_DEPEND}
 	media-fonts/font-adobe-100dpi"
 
 PATCHES=(
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index 9f83949c774d..aecf0793e1ad 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,7 +1,5 @@
 DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a47185a2cd7ad6592c534c17636906b735aa5800d810d13d3e342e3dbe281bb1f1f3ecab9d07e6a6a50f33beef8af SHA512 ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347
 DIST libX11-1.8.1.tar.xz 1818460 BLAKE2B 7602b4d8c65ea3160f81096b4e022b5462e49d96b36dee70fe06e972329dc9d70bbd462e2079da03ba5647d7a72bf03e29aab23c60bcc206c95d770655622226 SHA512 2e36d2c47519e0cb2697f588c0ccdf73fbe75c2163f0855c78f7052dc9e920bca081f9d5e39c707a14067f101faef74fc758c8862eeba675b1535b43119d533a
-DIST libX11-1.8.tar.xz 1782508 BLAKE2B 15a41cbcdb54d68cd54b6fa4147d55d277a6c091af7d38341ec261b42c547acf981270ceebec5abb3fcc15da5c1e05b7908114e157555f8184234922e3c05fde SHA512 64899ba9efbda00211daf08534a2a98eba86bb377980d21ce319106075cd36b511b17245d02e8ebd1045e7c2147f2c005004bcf579121138be7a7b879eeca83b
 EBUILD compose-tables-1.7.5.ebuild 943 BLAKE2B 859cec003f23b043e2271eab3aa31a01ee8ff66a7a78749ced99ff98d09eeb085497fe799138d5efa2a30f83f1097305a90ffa7caccf47bffbdfed72faa29e48 SHA512 2355bba44c7af1937aea4cc68248a96e38f9fd6188d85da7a755e344f4e3add63ae19db03409703b103ebb5045401b621a4258866ead6c79fbd1fb78f9e1e9a4
 EBUILD compose-tables-1.8.1.ebuild 958 BLAKE2B 10ca97660777f3ccce45c6f669885e43d970267cce91174caf69a7629e4af791b8a5b6bd311c98786542548eae52655319e2cca7a54788d14b9b53bb49f37fb5 SHA512 d2266d1488116a1d916b967b77676fe40f1ac619e469554075fbb0349b30aab0d98c431626d738ac48fa2771ac45b1fb881cde7a4d1708d0a1e1d36a688b24b5
-EBUILD compose-tables-1.8.ebuild 958 BLAKE2B 10ca97660777f3ccce45c6f669885e43d970267cce91174caf69a7629e4af791b8a5b6bd311c98786542548eae52655319e2cca7a54788d14b9b53bb49f37fb5 SHA512 d2266d1488116a1d916b967b77676fe40f1ac619e469554075fbb0349b30aab0d98c431626d738ac48fa2771ac45b1fb881cde7a4d1708d0a1e1d36a688b24b5
 MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
diff --git a/x11-misc/compose-tables/compose-tables-1.8.ebuild b/x11-misc/compose-tables/compose-tables-1.8.ebuild
deleted file mode 100644
index 64f043d5d3e9..000000000000
--- a/x11-misc/compose-tables/compose-tables-1.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=no
-XORG_TARBALL_SUFFIX=xz
-inherit xorg-3
-
-# Note: please bump this with x11-libs/libX11
-DESCRIPTION="X.Org Compose Key tables from libX11"
-# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
-SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
-S="${WORKDIR}/libX11-${PV}/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# Only needed by configure
-DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libxcb-1.11.1
-	x11-libs/xtrans"
-RDEPEND="!<x11-libs/libX11-1.7.0"
-
-XORG_CONFIGURE_OPTIONS=(
-	--without-xmlto
-	--without-fop
-	--disable-specs
-	--disable-xkb
-)
-
-src_compile() {
-	emake -C nls
-}
-
-src_test() {
-	:;
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C nls install
-}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 35c13bd3a93c..4112886389ee 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,4 @@
-DIST xkeyboard-config-2.35.1.tar.xz 873196 BLAKE2B 22a57cf8858f85dedb78c6fb8d29914e3ba07fc1bafacce40ea1aca485d5db510140af3a5df286ccf3247e8e2715820ea6b6ef412d808b448236f04325eefb8f SHA512 0c62246aa45c9cb883979cc32ba01a6ebf1c3e40673603ddd304a46f1583b997b17ade708849102285f01fe0caafb35abf9c7686ef8be49f4f2b521e03418f94
 DIST xkeyboard-config-2.36.tar.xz 880776 BLAKE2B 3ce6d9e5a1e763beb15614cd1b559ff6d56c2f6438b1c0680755a029ac90e48de4a939b1bcc0054a510cc0e08f6ffa6db98fecd4bf11e01510b151aa664425c3 SHA512 a81054ff6b7928a445a913b80fad995056559feff7bc1f4926657f171a102108b6e22958dc6c814ae2a25445f65c94485f13399628016f1358cf3840e235e3de
-EBUILD xkeyboard-config-2.35.1.ebuild 1030 BLAKE2B 164b75403f67163fd688e5b494574436d85634b2123f6eb73d860d228618ba9d905c9cc8b486f022fa4beaee478b638cddeea4f460d7efe4508f4fc3540e4de0 SHA512 ab9c02ef0ce4fec301ee4667cdc4f57a97e9694f488f13ec25c37300dc75640e73086bd813c5b90d7076be508a21234411d49f640403bfdddb75367e0fcb0a51
-EBUILD xkeyboard-config-2.36.ebuild 1031 BLAKE2B 4cf4dc33095c1b43d55320098aaa90f7cd3fe4b1f328bef8b0586a4fc6a63d1eb6ee49855b71a53b87222a46a48c485bb1286814bb7dcd4e034ec1969a121c34 SHA512 d6228e56f1a8b87a196236b9a4d384d92c29433981ee2f9a001f685b71ff398ae56f605ec2bc9c9e686e728e49590759e463ff39f747df8df561bf12b73eed03
+EBUILD xkeyboard-config-2.36.ebuild 1030 BLAKE2B a0bcd6d3b409bfeeb9b987d57e7edd9dbc131ff7cd78cd2741def7c6a70581ea5fbafca2954d85779ece93731573e00dd259d46332b6b8def5f58d424696a6a5 SHA512 77b303d931dca500ae748271ebef479a793392d85da59c9fd5b565d74ce59a2d798ddf1a16d5ecd0e3c6678604b1b1760f91dd1c82a9f1b4ea5fcc57c4e65945
 EBUILD xkeyboard-config-9999.ebuild 1038 BLAKE2B 8ddae88b4c7009cb60dec8707cbe239054a49bd713079aaf28b1c10b31f8458b9dea63415dcf197008f3827a203ca9489117d474c9dc7e48061584ae0f2415b7 SHA512 38ff78bfc51cd3f8bfe2a0cfb6262f2f46a12f17868ac5b3cb6fb0cabe44e6b0ac562ea7cb39a208f743f24f5a7da67f43b98fb822020eb6371c0682e2373eaa
 MISC metadata.xml 338 BLAKE2B 0abfc9e29fc629961ecbcc525a18185afd4b08cee4b68d35d1e2f863b898b1881b68e53f26079d1dfacbcd1f6961433dddf316435f421ec9f8b7a2e669c89eab SHA512 d1df4e20e9260892555393fddfeac0c9190c13cbf2a654ece211faab0c180ecdf592939992d5abf20a432a68a1ac0400e9e65241a9d3c7a04093c11b13123d75
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
deleted file mode 100644
index 5bb870c11de6..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit meson python-any-r1
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-DEPEND=""
-RDEPEND=""
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-libs/libxslt
-	sys-devel/gettext
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
-		-Dcompat-rules=true
-	)
-	meson_src_configure
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
index 31f9e7c50e8a..fa640550337b 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index d19d557ee38f..46c7300fa4c7 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/purple-libnotify-plus/Manifest b/x11-plugins/purple-libnotify-plus/Manifest
index 72fdc7ee5bd8..41414c8226c6 100644
--- a/x11-plugins/purple-libnotify-plus/Manifest
+++ b/x11-plugins/purple-libnotify-plus/Manifest
@@ -1,4 +1,4 @@
 AUX purple-libnotify-plus-2.99.1-fno-common.patch 209 BLAKE2B bf9349d0700913d19d0d39372d439fc37d6e17c20951183f8ab7cb025531742dd752ea46b7bd30096fd10dc30afcb65b0a84dac30d72ad633cf8c01002ab488f SHA512 e635f984846b25d24172b138928cc9c7e8f87c953ef45d8bcfc10f0ead18c87bd0c7c700d9973606d040d123fa68675cbcdc21c7d916d90216651222390b3460
 DIST purple-libnotify-plus-2.99.1.tar.gz 20168 BLAKE2B bab24be1a541ae50fbbbacb0fa507f0e6000c3e74f1fa75ccceb809de88012f7492ec29ae96cf303cb38463e3af0c916aaead9365d5dce18904b34844e1e8c64 SHA512 436c2363c05b21f0a980e020fe09f3f285e8c9a4d131377f20ec13ecf5ce6ef1bea8ca6ae16de6154657e5d4a9b0229204e7f48a6807d36e516b95248daf11bf
-EBUILD purple-libnotify-plus-2.99.1.ebuild 679 BLAKE2B 3c34bb1090d54a9b9a9de889ae61ece45b57ef71aa9e878e815c398a6083da900b6e5185be7b00162afef958df3904f186ef3b3a7de30b14b12ae84b786def85 SHA512 69160b0a9911b6856b512e17a4b97bccfae4181c99afbc502a2617b318d3de6888d82534561c7251040f6b5edc32a5ec6ce43e10f9be4b37e289942b9028c9a3
+EBUILD purple-libnotify-plus-2.99.1.ebuild 686 BLAKE2B 8d9285554da71b8e13a2e4472d5539a7856e89f24f049bf6966de8af3f76aabef7c2da02cd70627b5d2d240e5d99567f1967525377dd4146fd5455f0aac39901 SHA512 94c800f152efb228d19beb5d9b394f35b075cbd46a699a2a9c8a3cdc99f93942946f3b3aeb24c438c3871b69fb801c1c264900555a9c8b0dab5cd279145dc425
 MISC metadata.xml 406 BLAKE2B 93943505ecb6c40b0530d6e632fbf6c62d54d3975b36b217a23c9cdde770261da90f3d4c88759972dca50cf2f2d39c4a42bf6dc93c6f916a576e8a70d94c0bf9 SHA512 2085bb3cbcc07d2e2b736b15d70f0da5c9ff92423deda3ad124acfbd4a11d0301ab9f6c51d2c4b6ea7d5f4974f5ab00caec1d7589f7814c47e7b83d43534fa75
diff --git a/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild b/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
index 54ed903d1c51..04b255be574f 100644
--- a/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
+++ b/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-2.99.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="Provide libnotify interface to Pidgin and Finch"
-HOMEPAGE="http://purple-libnotify-plus.sardemff7.net/"
+HOMEPAGE="https://github.com/sardemff7/purple-libnotify-plus"
 SRC_URI="https://github.com/sardemff7/purple-libnotify-plus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/x11-plugins/wmnet/Manifest b/x11-plugins/wmnet/Manifest
index 2d0fa99b659f..30d0754b88f5 100644
--- a/x11-plugins/wmnet/Manifest
+++ b/x11-plugins/wmnet/Manifest
@@ -1,4 +1,4 @@
 DIST wmnet-1.06-misc.patch.bz2 11327 BLAKE2B c03f25270c37e9a54731547a51c00983df802b5f4278d02b7051571de45bd326bb5eda330bbba8e09be6bcb4b3afca111956d6506e73c13f955afd40b9c967ea SHA512 34d08676cfa9415c1cc182b148364143589b13c6b060c55b4047fa417146b1939b84fa5e32fc86da92cd92c10a5f5f0abb602c9ba943ed077bc6529c0dbf0ea3
 DIST wmnet-1.06.tar.gz 27506 BLAKE2B 9cd5cb626406238e5dc20ff58f26b13389c5b8bff9569e3cc8fc4f083422d213702fc387521bffc003339ef4e0c6223f5cfcec8617ba3e71b516786c6950cdf8 SHA512 1e62db5e7e3b843d47459fcfa9cc932ba3df8f8498d1b24dcb77602a334d528b90e9c93886b8b330ac7bd5baa4ad1cd3bc94e96c14a841fba8bb9172f624e10a
-EBUILD wmnet-1.06-r2.ebuild 892 BLAKE2B a323ec5793d1f0bcb8e46c05b8f99535f42d0ac848c9db1dc613ea6296f192fdd8b7b7f9312d94cd79ec846451e452b69233956a5b46c39940858cf58a7b8361 SHA512 0b7123e752123c0f3f2e3a4fdaa2f80f92fd48b4e7f1644a4a8f84d154bb888bfa8816a57fba175826445f3ea8543798ed6f8dfcd5f77a76efe83de3dbeb6a9f
+EBUILD wmnet-1.06-r2.ebuild 927 BLAKE2B 67144fd3c6b282d924930a5283eab797f4a435ca220c520a73ac614e7d0752aab141342405a9264ac633a1b9e6a74377b0a1fd7469c18b91420c115bf88888d2 SHA512 633519043358dcd7ee3508438ea76de2a1362003f822cbfcfe7a25d65615551dbf9761c7c5b2340d566f596b8a34ee55e6d76bdc8c19fbfe6a16281d0470675d
 MISC metadata.xml 781 BLAKE2B 8a50e84357c1453851451c76006709e9da608d0fa085e0fc0c749fe5e82bace9dd8e0888eb9409784dd764a45604e779736b233cf76d34871f0d7f25050cc2a5 SHA512 b7f79fd9b2cf1a3bb70348f7bb9c341c5600738489db4ded41751848b2eb46f3dcd0279a472d22f8ea5301351f1ae09bee8fbb2b760d96cf5caa866f1881f628
diff --git a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
index df7520120959..1b2ce83086b5 100644
--- a/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,8 @@ IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	elibc_musl? ( net-libs/ppp-defs )"
 BDEPEND="
 	x11-base/xorg-proto
 	>=x11-misc/imake-1.0.8-r1
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index a1a3f48985af..6b1019975691 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index 980bb3b888ed..c6b874ceed8c 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -1,4 +1,6 @@
 DIST cwm-6.7.tar.gz 53172 BLAKE2B 9e8c6503235ee71f3974a4e64cf45b80675b6ff33a68505b07f003c8d711a68a158f31147f463d5467bb4242c6321ebe0acaee63727689a136ca83c47e7592ea SHA512 5ad0fa56d9c96c36cc32e68128e58d4e3a7483f349bb26be1083c5b5c6d853ff05eec1a783b07ed928bd99a35a2e0b2d7053fc89b828aa9bdfe3589a318c4171
+DIST cwm-7.1.tar.gz 53667 BLAKE2B 6d0b64e95b78201113eb75c537d3ffdc8bd1b2a1d50f88bf9f7126dbdef372e80f36c5c1fd84b5bee29c7e9da7debc479264af34cf8c48abf1358d3d0c046919 SHA512 aa14bc7a43a522f4b83d3f9a3b8a8344c339b52aac4733f410e388df56a2dc4e86ee1ae9f05b53ff3139808f87f38a4b2da57bf0525482613d46651e8f08c718
 EBUILD cwm-6.7.ebuild 942 BLAKE2B e0208c09375fac2d729eebccd7df8ec4af507a34e6810dd45f75349c865977afe906cb166d982eae04172820b319cf8142938faefea6c813ec8be9a517757e83 SHA512 dbf3308532dbc46c1b8200e4c21a7605c2f735ba2918c2c029ad4e4df0170f222b9e86fb67b036d3c6aebef8d35bbdfdd0ec68cd6a68a086c43924dceeef4f76
-EBUILD cwm-9999.ebuild 945 BLAKE2B 3cdddaece0891f8d7904118ca3e35f02b1aaac4005daa6202a31dc32d51d15aebe6534bff91bdc7fa4f5991d3c293a37affb0c2500f4dddc1af2657acf965355 SHA512 fa2222f80c05c59a07e6ba7457164465e9107101154be05e17f1cf0bffe68586bfdde053c8aa0db4ee9cedacf743e5214051e78cfa40e8bf9bbfbd812da1621d
-MISC metadata.xml 249 BLAKE2B ac2e007c4228bbe8d3d5e17842e31f96af4e3ce4c9af4a127e1c0e5be50212c2b931d1022edd8c81f116b21a897e77a51250293830cc8146b7b808cc5e8916c7 SHA512 d471fb1fc96717d11a0b627e970be2a7a9714235412679d7299dc4dbd457f158d0862add04be2f65eeb15b100ceeb9a2f0e1fd5db59751169bbf715b7a158fac
+EBUILD cwm-7.1.ebuild 940 BLAKE2B 18151dc53a4dfbf1701323cacddfb59f446030635eca528243f6760848d4baf62a143675145f27bde7ed09874fd69bcd33266c08dcddf3337d00a8e7fe196d1d SHA512 25390c5c38125483bb442f4e8fa68be60230eb192dcfc5a02d0808601e2a31fcb9086543d5e5895c7c2844636903f7bd6e09ea4f9428e703e1f010ca82cfe13b
+EBUILD cwm-9999.ebuild 940 BLAKE2B 18151dc53a4dfbf1701323cacddfb59f446030635eca528243f6760848d4baf62a143675145f27bde7ed09874fd69bcd33266c08dcddf3337d00a8e7fe196d1d SHA512 25390c5c38125483bb442f4e8fa68be60230eb192dcfc5a02d0808601e2a31fcb9086543d5e5895c7c2844636903f7bd6e09ea4f9428e703e1f010ca82cfe13b
+MISC metadata.xml 486 BLAKE2B d84fc69bd87de18b42a364fef9c88257e4990715a4110942285d29d223c7b5219dba158fee2258c5814ee5ebfcaa5a93a80d6a8975998397bda5933c007f0d7e SHA512 342f65a74a69c04fc92fce18c2722fbb03f23bc85068d3e693a2a2dbc936e2b4cf832606cc76a2cc4d33f364c62d1978ba4aa1c9770d18a69380f56a31c47344
diff --git a/x11-wm/cwm/cwm-7.1.ebuild b/x11-wm/cwm/cwm-7.1.ebuild
new file mode 100644
index 000000000000..9aa6d59cba3a
--- /dev/null
+++ b/x11-wm/cwm/cwm-7.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
+HOMEPAGE="https://github.com/leahneukirchen/cwm
+	https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/leahneukirchen/cwm.git"
+else
+	SRC_URI="https://github.com/leahneukirchen/cwm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXrandr
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+src_compile() {
+	emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc README
+	make_session_desktop ${PN} ${PN}
+}
diff --git a/x11-wm/cwm/cwm-9999.ebuild b/x11-wm/cwm/cwm-9999.ebuild
index c35cf81e9f80..9aa6d59cba3a 100644
--- a/x11-wm/cwm/cwm-9999.ebuild
+++ b/x11-wm/cwm/cwm-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop toolchain-funcs
 
@@ -21,8 +21,8 @@ fi
 LICENSE="ISC"
 SLOT="0"
 
-DEPEND="x11-libs/libXft
-	x11-libs/libXinerama
+DEPEND="x11-libs/libX11
+	x11-libs/libXft
 	x11-libs/libXrandr
 "
 RDEPEND="${DEPEND}"
diff --git a/x11-wm/cwm/metadata.xml b/x11-wm/cwm/metadata.xml
index c24849391d64..ebdff070098b 100644
--- a/x11-wm/cwm/metadata.xml
+++ b/x11-wm/cwm/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">chneukirchen/cwm</remote-id>
 	</upstream>