gentoo auto-resync : 25:12:2022 - 14:05:06

175 files changed, 773 insertions, 3386 deletions

diff --git a/Manifest b/Manifest
index 1e588477a86f..c2f658e319a6 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29765 BLAKE2B fb4b8d4ed508b01da2b3e3ab20f4b0955cedcabfe972bb77bcc79c08ff2d71c07f3c39fd039dc9a7f26b623207eba5a8603358c8cd8236b341f9812c30a9d11f SHA512 ea1e304e972a997deb9d855aaa614ab7e2f4ff973f2279d9f03401ab6857ad91c43dfbddee5ab0fffc8a76480b958ad821678694f4da09453442eb316b7d3574
-TIMESTAMP 2022-12-25T07:09:42Z
+MANIFEST Manifest.files.gz 29765 BLAKE2B 941bc9abcdb9b16c4a71b13e1d7716003d8bfd210a3f645d146cbc940f1c2552bd230140358b0bad93de68446a43ff943c703b7bb78c60b2d568eb3f054d5889 SHA512 bf893e7f4c45b81ee666f8a03593833f16dea9aced560ec9fbd0233c0141ced0cffa07eeb81ee7a28797afb4b4d906690c69f195efaecda594f3902be133dbea
+TIMESTAMP 2022-12-25T13:09:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOn9zZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOoS5NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB7yw/+M9N7Ma547JVTFDe3imnmnn0/LJQSl05XwkUtqHnje65TiqERaho7cx01
-pRn2HbvgEBhDrNfNDQ7Fppg0kV12VyiNqPxeOh6r6lZE5fsWK9EBAZXoKDxgT6+w
-CkNY9L7pFuTcwnds6uLSrYLDd5fOSSXu0GR25eeqsTbyMLa260eLjmYD8bQZcgTV
-h2+1jZn0GZU8bGYLFjkD6FZwVOXnyt/AmudRBQuMNLEFU9Xy1lkt3u0KYZV8cYXj
-2wh22Hhf9Yj6w0HVgrRe+WEztoLFhT8Fkq1MtTvEg3dV9T/+/o3IxEkQGvPBQ68S
-lFczMnUvsfr1OSRWeiro+fwE2hhgUIWHSWXJCemgstwpwx0FhSV9RhZZLKwkfU6P
-n2/3bg9yGaDbETJaaQt3mOMTqM3CrcDrS8Mx+/7KC55sVWOSvdaxZFkKjhwGSNTM
-46vu/DfyCXgRVWNUlC2qg6GeLE7rTV7TmZtfoCFDZVxhxBrXlf4M1yPlctcZNQuW
-omTjoN5gEy711LGBG1N9viVjFb4o2z2Qsxadf7+1wizRsTV+doMZ4PelvamuHbRk
-SPH091FExHg4vRf+TYcyg/oGPEttHUZL6vtgz0WPPeR0NlL57BWAbMC5hgnDlez1
-CLe9imvRgoiWaYdSdoWVmP/CdWsyU3qTC/g0eb5nYcXU07je3vI=
-=5VNY
+klA1WA/+Jd4O5AMT7T9ig85SbUKuKFGOv/nT+008bjVQ8Cbm7dTGgICTvtEVHy1V
+zjfqfZiSHWo6u6Rea0IGPtYyFQaJjWqWoNS6H7XfAcO0CjgIbZroLu2BFUom8gfd
+Pf9vXqG6Qdl41HxQvX7P6o0QuCwndC3NQywZ7reerPjl/dAwhWH8UZN8cc6po3xr
+Q6HQb+mwVhvjzOT1+/IQTcgP67PtZb0iRxFJlAQhWu08/X+AOKSyd5p8/PhSnhS8
+VZhQSTZriX7MaP9bKeBm6Eod86+QLgCEFIJ4gBYVRwJWK7QR6bi0vO6g850xp1uX
+dP7cJAVZWzA6BIQ1pDDXRfcfkdPX1e6qYPp//1Q6hpyReW8aWzy+FHBcpw4/ySdr
+LVye7kiU87KrVcHhRVyeIHRx5rjtvYVpfcoXerNWTC5fosLUPKkzQqPQVTtEQYlF
+2Wu8TDx3+cCmxRl/+VHbKrJbScTn206oDKgGB/P8RlkBRfkSiWzZa/wgLnFOmjqr
+oNO9FeujLkEQUBRMJLTqLq0OuEapEzxF7XdsAEKy3ihIv1vc6gNAf0cpu7uJxlkY
+OsS6Hbx4s4bXxZoudg1GRzDfkheFfb1R7tzEBEkMSmw91Y5LcsykN0C70aNnxPF6
+bu0bNVnE6RVrn7vwITyvvY8CuvxORwAus8dupcA8xgFRuJmNGw4=
+=kNh+
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 9aa43b568cca..21d6342ff073 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index c5f9b4c565bd..38b9f04fd64d 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/coreboot-utils/Manifest b/app-admin/coreboot-utils/Manifest
new file mode 100644
index 000000000000..d6e2f9f8d96b
--- /dev/null
+++ b/app-admin/coreboot-utils/Manifest
@@ -0,0 +1,5 @@
+AUX coreboot-utils-4.18-flags.patch 1264 BLAKE2B 001658e09f1a580d2523c8cd09d1dfdbe6771b787e7e7af9b1f80ae6491a969536d54fb80af8914394ac6193744be2cd23068e2a577b2cd31208e3dd10b9e11d SHA512 5325b7f639f5d010fd8fed565a123f6e9688642c0834bfda2c7b9dbb49b157427f34292069785fe8f8b6d2e6b4d60fa45187d91a79a66db7f6a041fd0a9da562
+AUX coreboot-utils-4.18-musl.patch 2033 BLAKE2B 27bb15016ff4642134c9f01037ba84ae9be2c0e02ad37b5d32b30f7f5186d7411eaa35352017e12db40fbab9d020415b26fc5a602db676eba79ee7456dbf2f8c SHA512 7d74537d36fdb322c4b6182ab1cb5f39a2cb3d2ac8c92e38c5443fd4391a8ceaceed9a93b09a327482912efa96e09fef4dcc5e2587c74c3da503983db754ffd9
+DIST coreboot-4.18.tar.xz 57868424 BLAKE2B 981d8c1cf007be15a85d5860dcfcfa6fa637f66438ff4ef6619491aaf0192e622bfbe9608deb13a975d899c94430bc3d1f0eb3a5a3dc6598f49a726b8ff641e1 SHA512 b363850d31074950bc710bd0a47a896a6c6ef23c53d720ae90ec2257697a3eeeb211e163199064b5e532e5b1e86cdecf997276d742435deeaaacfb19b83f4e6d
+EBUILD coreboot-utils-4.18.ebuild 1495 BLAKE2B a78199ea40f9ba74de386091d5538cefd5d63fb82820b5acc6e9fd073584af2b4fac9fbb095b74e9a82f91085dd140a1af2ea529173446f394939b7f44a9f6a4 SHA512 7c4aade0345eee617360386eaf40be619dfe5b8f6a5906099177012711753a29ff3f68f73af4266dff29957405093b12022434991d6b1a7c34b380971ba30b38
+MISC metadata.xml 223 BLAKE2B 3ade38574009f425c0670f7c377386f6263f08ab222c58e1f433bc81159209e56e52a6709d1858760529606c21c55ec68d24c45358d6f525a9ef6ac1474f80c9 SHA512 4cd7de2eb60e5be6f2eebb7169ffdb9e5255362755527921ba60781640766b58e4ce47da81134ded62746a2f95b7b5591933e4510cec7e94a69f16377bd2bae4
diff --git a/app-admin/coreboot-utils/coreboot-utils-4.18.ebuild b/app-admin/coreboot-utils/coreboot-utils-4.18.ebuild
new file mode 100644
index 000000000000..a9115a5fe9d9
--- /dev/null
+++ b/app-admin/coreboot-utils/coreboot-utils-4.18.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A selection from coreboot/utils useful in general"
+HOMEPAGE="https://www.coreboot.org/"
+SRC_URI="https://coreboot.org/releases/coreboot-${PV}.tar.xz"
+
+LICENSE="GPL-2+ GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="sys-apps/pciutils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/coreboot-${PV}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.18-musl.patch
+	"${FILESDIR}"/${PN}-4.18-flags.patch
+)
+
+coreboot_utils=(
+	#cbfstool  has textrels and is not really necessary outside coreboot
+	cbmem
+	ifdtool
+	intelmetool
+	inteltool
+	me_cleaner
+	nvramtool
+	pmh7tool
+	superiotool
+)
+
+src_prepare() {
+	default
+	# drop some CFLAGS that hurt compilation on modern toolchains or
+	# force optimisation
+	# can't do this in one sed, because it all happens back-to-back
+	for e in '-O[01234567s]' '-g' '-Werror' '-ansi' '-pendantic' ; do
+		sed -i -e 's/ '"${e}"'\( \|$\)/ /g' util/*/Makefile{.inc,} || die
+	done
+}
+
+src_compile() {
+	# selection from README.md that seem useful outside coreboot
+
+	tc-export CC
+	export HOSTCFLAGS="${CFLAGS}"
+	for tool in ${coreboot_utils[*]} ; do
+		[[ -f util/${tool}/Makefile ]] || continue
+		emake -C util/${tool} V=1
+	done
+}
+
+src_install() {
+	exeinto /usr/sbin
+	for tool in ${coreboot_utils[*]} ; do
+		[[ -e util/${tool}/${tool} ]] && doexe util/${tool}/${tool}
+		[[ -e util/${tool}/${tool}.py ]] && doexe util/${tool}/${tool}.py
+	done
+}
diff --git a/app-admin/coreboot-utils/files/coreboot-utils-4.18-flags.patch b/app-admin/coreboot-utils/files/coreboot-utils-4.18-flags.patch
new file mode 100644
index 000000000000..e42e6b2921da
--- /dev/null
+++ b/app-admin/coreboot-utils/files/coreboot-utils-4.18-flags.patch
@@ -0,0 +1,35 @@
+- ifdtool: respect LDFLAGS
+- nvramtool: respect CFLAGS
+- pmh7tool: respect CC, CFLAGS
+
+--- a/util/ifdtool/Makefile.inc	2022-10-16 20:14:31.000000000 +0000
++++ b/util/ifdtool/Makefile.inc	2022-12-25 11:38:47.572534621 +0000
+@@ -16,4 +16,4 @@
+ 
+ $(objutil)/ifdtool/ifdtool: $(addprefix $(objutil)/ifdtool/,$(ifdtoolobj))
+ 	printf "   IFDTOOL\n"
+-	$(HOSTCC) $(addprefix $(objutil)/ifdtool/,$(ifdtoolobj)) -o $@
++	$(HOSTCC) $(LDFLAGS) $(addprefix $(objutil)/ifdtool/,$(ifdtoolobj)) -o $@
+--- a/util/nvramtool/Makefile	2022-10-16 20:14:31.000000000 +0000
++++ b/util/nvramtool/Makefile	2022-12-25 11:39:15.924345609 +0000
+@@ -11,7 +11,7 @@
+ CC     ?= gcc
+ INSTALL = /usr/bin/env install
+ PREFIX  = /usr/local
+-CFLAGS  = -O2 -g -Wall -Wextra -Wmissing-prototypes -I. -DCMOS_HAL=1
++CFLAGS  += -O2 -g -Wall -Wextra -Wmissing-prototypes -I. -DCMOS_HAL=1
+ #CFLAGS  = -Os -Wall
+ 
+ CLI_OBJS = cli/nvramtool.o cli/opts.o
+--- a/util/pmh7tool/Makefile	2022-10-16 20:14:31.000000000 +0000
++++ b/util/pmh7tool/Makefile	2022-12-25 11:39:38.491195945 +0000
+@@ -1,7 +1,7 @@
+ ## SPDX-License-Identifier: GPL-2.0-only
+ 
+-CC = gcc
+-CFLAGS = -O2 -Wall -Wextra -Werror
++CC ?= gcc
++CFLAGS ?= -O2 -Wall -Wextra -Werror
+ PROGRAM = pmh7tool
+ INSTALL = /usr/bin/env install
+ PREFIX	= /usr/local
diff --git a/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch b/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch
new file mode 100644
index 000000000000..435977ac9c0b
--- /dev/null
+++ b/app-admin/coreboot-utils/files/coreboot-utils-4.18-musl.patch
@@ -0,0 +1,75 @@
+Author: Fabian Groffen <grobian@gentoo.org>
+Date:   Wed Dec 14 17:28:13 2022 +0100
+
+    musl: clumpsy buildfixes
+
+diff --git a/src/arch/x86/include/arch/mmio.h b/src/arch/x86/include/arch/mmio.h
+index c2aa0fb910..b2a37a03dd 100644
+--- a/src/arch/x86/include/arch/mmio.h
++++ b/src/arch/x86/include/arch/mmio.h
+@@ -5,6 +5,10 @@
+ 
+ #include <stdint.h>
+ 
++#ifndef __always_inline
++#define __always_inline inline
++#endif
++
+ static __always_inline uint8_t read8(const volatile void *addr)
+ {
+ 	return *((volatile uint8_t *)(addr));
+diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h
+index 5b40721262..2d0da33d72 100644
+--- a/util/inteltool/inteltool.h
++++ b/util/inteltool/inteltool.h
+@@ -12,6 +12,7 @@
+ #if defined(__GLIBC__)
+ #include <sys/io.h>
+ #endif
++#include <sys/io.h>
+ #if (defined(__MACH__) && defined(__APPLE__))
+ /* DirectHW is available here: https://www.coreboot.org/DirectHW */
+ #define __DARWIN__
+diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c
+index ed18c13e62..fa2c6ce35d 100644
+--- a/util/superiotool/superiotool.c
++++ b/util/superiotool/superiotool.c
+@@ -320,6 +320,7 @@ int main(int argc, char *argv[])
+ 		}
+ 	}
+ 
++#if 0
+ #if defined(__FreeBSD__)
+ 	if ((io_fd = open("/dev/io", O_RDWR)) < 0) {
+ 		perror("/dev/io");
+@@ -330,6 +331,7 @@ int main(int argc, char *argv[])
+ 		printf("Superiotool must be run as root.\n");
+ 		exit(1);
+ 	}
++#endif
+ 
+ 	print_version();
+ 
+diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
+index a621ae5274..d5f44fece4 100644
+--- a/util/superiotool/superiotool.h
++++ b/util/superiotool/superiotool.h
+@@ -24,6 +24,10 @@
+ # endif
+ #endif
+ 
++#include <sys/types.h>
++#include <stdint.h>
++#include <sys/io.h>
++
+ #if defined(__FreeBSD__)
+ #include <sys/types.h>
+ #include <machine/cpufunc.h>
+@@ -89,6 +93,7 @@ static __inline__ uint32_t inl(uint16_t port)
+ 	__asm__ __volatile__ ("inl %1,%0":"=a" (value):"Nd" (port));
+ 	return value;
+ }
++
+ #endif
+ 
+ #define USAGE "Usage: superiotool [-d] [-e] [-a] [-l] [-V] [-v] [-h]\n\n\
diff --git a/app-admin/coreboot-utils/metadata.xml b/app-admin/coreboot-utils/metadata.xml
new file mode 100644
index 000000000000..e33cf762c720
--- /dev/null
+++ b/app-admin/coreboot-utils/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="person">
+    <email>grobian@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 5f0779225007..9bbc43b704d1 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 7d5b37c39e02..01cdd59e4f44 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -2,7 +2,7 @@ AUX cpio-2.12-gcc-10.patch 740 BLAKE2B b129aff7f1c61305ba6b05e57d265439aea3b7da0
 AUX cpio-2.12-name-overflow.patch 404 BLAKE2B f15aaffd716a6dca8b00f0831cd3bfa8971ca8beee6eb04b6ad3974c0d2770ac23669839b348013974ee827affb7b943d4dfa1be8d29b0b77c8ebea5e01791df SHA512 725468331dbb24e37333f9f56d8f295a7e521dd855f97993a2f62bf6b3a8f44d924b868ad5315dd90706ac28fcbb0b7da4c30e77ad5f401e7c5543410cc42f7a
 AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11504b075b1216d20cd8643591abdc3a69afe1db254800327ece8f07f83438756d88c5c10c606b4e14c76a309941dc4ed1f9 SHA512 369efc3393affdb91191ab7a55a6dd3a1157ddfa294bd9a4763cc63e6df72af3a7ab614234d69e327edf14a97e4fb800aee32a379ade73c0f80b0dd8ecf33f03
 AUX cpio-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch 1505 BLAKE2B 77be2bbd0df1b7b44e7517aedd4393d5b4cdb5e90508fa45aa961efe32b4061beaf43b23798908c714aa23a252e914402b22a494d0d6def0a4dc8294b8f84418 SHA512 a60cbfb3cc418d9d45e226e6da4c857176ce0517e829e288ffa7dd85b8fcca1c0a7c0ae0e0eab14fdb438be742f2625aa1c3169a41d1fa05c5e3cd426f270687
-AUX cpio-2.13-sysmacros-glibc-2.26.patch 376 BLAKE2B a925fe08309808763b2900b20e880d6bad7cf37810475427c516b9bca9fee7836bfb70a92f8c8fd9cd236428c7639bcdfff85b7afa4c3c9d73fcaf6bfc049c0e SHA512 2cf3466b38fe9d95437c5d413505ff76fe2d917be01c21a450bd952b00c1e6b7330e5326b65b1ff8b6f956e888ac506d0f5c4ac6d69d9206994f0c6dd34aa8c1
+AUX cpio-2.13-sysmacros-glibc-2.26.patch 413 BLAKE2B 3114697d3543abf2d1e8eb8a6443cd094cb378a185dd2e48d917d7cbb395a5bc2c2c1dd8207cc2b383f1118b01077a8f2d2f579466c811b41d1e392fda5ce0f9 SHA512 d709e9373a868681a3b9c5a9ad7c8df667df758162dbc0c701ed0826fd478d84f2fc92b21fb56e9366fc19d9816f64fc475df5e1a5a8b2ac790c89f561b121e4
 DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
 DIST cpio-2.13-CVE-2021-38185.patch.xz 7844 BLAKE2B e338950e03c3eed3b4288435c9c75af8f0c3497b43680be4ee347e628db7cfac616b437a848094bf82cfc2c7f29d59b388bf0f6368b3b99770022e3f9533be11 SHA512 4d2cafefcd1ae9d86cb5171de2896799713490dfd9ed27d3dce0886fa4588c8df2b16ad8508a5dbb9155c9de6e40b6d1083bdb4774d967193a270a1dcbe37a33
 DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3
diff --git a/app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch b/app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch
index 0f902f060f86..abd1b663496d 100644
--- a/app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch
+++ b/app-arch/cpio/files/cpio-2.13-sysmacros-glibc-2.26.patch
@@ -1,10 +1,12 @@
 --- a/am/ax_compile_check_rettype.m4
 +++ b/am/ax_compile_check_rettype.m4
-@@ -70,6 +70,7 @@ AC_CACHE_VAL(AC_CV_NAME,
+@@ -70,6 +70,9 @@ AC_CACHE_VAL(AC_CV_NAME,
  [for ac_type in char short int long "long long" $4
   do 
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++#ifdef HAVE_SYS_SYSMACROS_H
 +#include <sys/sysmacros.h>
++#endif
  #include <sys/types.h>
  $3
  ]], [[switch (0) case 0: case (sizeof ($1($2)) == sizeof ($ac_type)):;]])], [AC_CV_NAME=$ac_type])
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 91c13505d7da..6887b5ff503f 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/crengine-ng/Manifest b/app-text/crengine-ng/Manifest
index b275e342430c..62f4d502d96e 100644
--- a/app-text/crengine-ng/Manifest
+++ b/app-text/crengine-ng/Manifest
@@ -1,5 +1,3 @@
-DIST crengine-ng-0.9.2.tar.bz2 3123671 BLAKE2B 7ecafc398e81fa9771f5728d0fa60fbc6c3fb883a56d09fc4857d92c3d2f997cbbc0d4ac9818bff82d38ffb110463b88663f3298380a15e83df7292dff461cc2 SHA512 09b6f8f9bb747d71258802741d0d8962808279122ed6f2791b2c3813b684bb515206bc8656128e129fc7bcc76bcbb2c485360adb3b60f51377b87f26a1874e05
 DIST crengine-ng-0.9.3.tar.bz2 3125528 BLAKE2B 49f3c99dda63987fefff55184522f635af4c792e96efdc337e5c42c97d5975658a52308d33e314337d20ba9b8c70d0c590c567db567a01cc46d060d059ee20df SHA512 4a393c3ebb5ccc2a94fc06fae34b037c0e5d725d1b58a30d7f19476f94dbeb86e7138a444a84b80f536afb2fbed06a8899c87e322303322066a1d35a5bcd70a9
-EBUILD crengine-ng-0.9.2.ebuild 1634 BLAKE2B 66e9342e3fa43ffc227a022fb82539a755b23fd078989c0851211f0ef798094fd9cc818f67011c9f8010d4efe6457a59eb6e1a4db64c3099e4afef09459ac05f SHA512 c283ac39b48919622238c443af5192440c10ad456d06f049b1f641984e1f1f2597a45c66d52fb8c11a63cf28797e082c6e7a33f9a28462f4b977142883097f5f
 EBUILD crengine-ng-0.9.3.ebuild 1604 BLAKE2B 5a58df581a2e0c326601de20e766240b194f73a8f38c42b1de0783c36a2f36f2431fdacdfccea694bcf5a5c3c5c4abbb690ecdf4cef1aef63bc1b0ff7b86e3c4 SHA512 34ba53829325903c482e23b6c9b8c99f407bf30c1a2b618da60645508cc8f79dbc1172f08de041734b632a64443a8fb24c9e72aa6fbbddd321369244580f5b5c
 MISC metadata.xml 1232 BLAKE2B ecb2f3ff8720e43b48f6e211da27f0f34d3123644a429cb7853ae4044761793f5137dfbeaa0962093f2b722fdcfb6e3bf9ad432835fa6fa3f5bbf5f7f7abd78c SHA512 6aa7904c0d002926d4223c46b31de30f5ab06dee8291909498ecaa6deed3a6b547cfaa40df1ad7dca7e74faa55e95ab4fe4fa4ac0698202b5dd0221a50288036
diff --git a/app-text/crengine-ng/crengine-ng-0.9.2.ebuild b/app-text/crengine-ng/crengine-ng-0.9.2.ebuild
deleted file mode 100644
index 35edaf121645..000000000000
--- a/app-text/crengine-ng/crengine-ng-0.9.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake
-
-DESCRIPTION="Cross-platform library designed to implement e-book readers. Supports many e-book formats"
-HOMEPAGE="https://gitlab.com/coolreader-ng/crengine-ng"
-SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc lto static-libs"
-
-CDEPEND="sys-libs/zlib
-	png? ( media-libs/libpng:0 )
-	jpeg? ( media-libs/libjpeg-turbo )
-	>=media-libs/freetype-2.10.0
-	harfbuzz? ( media-libs/harfbuzz:= )
-	libunibreak? ( dev-libs/libunibreak:= )
-	fribidi? ( dev-libs/fribidi )
-	zstd? ( app-arch/zstd:= )
-	libutf8proc? ( dev-libs/libutf8proc:= )
-	fontconfig? ( media-libs/fontconfig )"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	${CDEPEND}"
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	local mycmakeargs=(
-		-DCRE_BUILD_SHARED=ON
-		-DCRE_BUILD_STATIC=$(usex static-libs)
-		-DUSE_COLOR_BACKBUFFER=ON
-		-DWITH_LIBPNG=$(usex png)
-		-DWITH_LIBJPEG=$(usex jpeg)
-		-DWITH_FREETYPE=ON
-		-DWITH_HARFBUZZ=$(usex harfbuzz)
-		-DWITH_LIBUNIBREAK=$(usex libunibreak)
-		-DWITH_FRIBIDI=$(usex fribidi)
-		-DWITH_ZSTD=$(usex zstd)
-		-DWITH_UTF8PROC=$(usex libutf8proc)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_NANOSVG=$(usex svg)
-		-DUSE_CHM=$(usex chm)
-		-DUSE_ANTIWORD=ON
-		-DUSE_FONTCONFIG=$(usex fontconfig)
-		-DUSE_SHASUM=OFF
-		-DBUILD_TOOLS=OFF
-		-DENABLE_UNITTESTING=OFF
-		-DENABLE_LTO=$(usex lto)
-	)
-	cmake_src_configure
-}
diff --git a/app-text/crqt-ng/Manifest b/app-text/crqt-ng/Manifest
index 95e5881d9c21..5a0cc047c223 100644
--- a/app-text/crqt-ng/Manifest
+++ b/app-text/crqt-ng/Manifest
@@ -1,5 +1,4 @@
-DIST crqt-ng-1.0.2.tar.bz2 419058 BLAKE2B 5d8b6704e6ec226852a0c82cc6c00b386c5b348675f00c4acc9dddbee999f381616083101f183523671ef81bb5036eddb7643b3f31857535d6773a549405ab1c SHA512 f8ebf9d5dec13b69fe7440209cd4da807d25413075b4ad2de885fa73134729be5c23df7d0a73bff061171449e394474ac3779b940120f144d93a7a98eca6cf55
+AUX crqt-ng-1.0.3-typo.patch 946 BLAKE2B d2311ff47a07650cb4c49560dcad7aa29c4c050bb22fc1e8bae1e65eb2d0eaba09d9ad7e556f6d7761151bd0543b10c4aca73531ee844577af03272a7b5b51b5 SHA512 1de876db69a37902563f33fe9b3138027cc3b9e3755e9d08e6395127b3da0db2ed7ba87b64b392b0d706c73a02fb6e1d3d7fc700179f19ecf424292c43a47223
 DIST crqt-ng-1.0.3.tar.bz2 423741 BLAKE2B 70b43b601b9b51673b12467a108683d83d087b20867bd21f919913f98d67f367c5dc40d4bd514e4fa5534a5c0766b486e41566c44d50ab8dd85c1717a4b20742 SHA512 aab30e3f42ffcc6a1d54e777d4968df8ae864e5d25df045634fc8041b8418d1440250fe7edc865648b3031bcd39f051295e1518b9e2078ee6046aa66add42dd2
-EBUILD crqt-ng-1.0.2.ebuild 1087 BLAKE2B edaf6f8101555e0227c516b3ae616849c6b19bdb8418641dfbee2b0a2438d9e379f7b85ce67303a388e205bee9c4c78985593e3f3d1386bf34e53c0eee59ebc0 SHA512 e0c99bf02db0e39d2a6d6adbdc8de192766b54fc8a0a126f1bbcd36836f355363cac3e2c43f634eed45e4c042d966a7152a025321472276678418f9a2159a981
-EBUILD crqt-ng-1.0.3.ebuild 1087 BLAKE2B ef692fac9b3cdeb12dd6fc3794b94ca8055072f180cbb9ebb9457596bb2f93bbf5970d6326dd5f463ef773e8904993499102aff3dd475f073a5bd771977d707e SHA512 ff8923b57dfef117a4dfdcdfd5955f2c469a7ab65dc99d7962e9b7b0def829a3ae66135d5091204964e5f189a9b75d4b8edc302df87d7415f34306a9274e86c8
+EBUILD crqt-ng-1.0.3-r1.ebuild 1130 BLAKE2B 3a1afad0e8bec9aca4459f0983f6b3dd5647f62d133f18767a50da6447cc9758f8342344ee40bb013d5a56965348a63699acd5f3894d1debda6c7c92fcd7e198 SHA512 e0c1417cb31d500fb6a7068c766c5554dce1a1dbde4337b5cbb3f3a90daa03581588279ae3bb3dfa6acbba3ecb78a51caa9a18039ba594624607ce11d7831f5b
 MISC metadata.xml 1177 BLAKE2B 0c28a5a4feb5c6dd5cb1115c063770bb276f2accff5c7a5e695b1492ae5cf3a188ceef2d5fb3519da87f6b68eff452f4f61b87f6ebd196b08cba55a26836047f SHA512 7cd49c422506be812eb080160286b21e0ecd48d6ae877e3bbea2ea8fd2ca0998e36c670db0e75c708a54c0b311b55fcadbfc1bf791e4c0c912c29b42ed6fcee4
diff --git a/app-text/crqt-ng/crqt-ng-1.0.2.ebuild b/app-text/crqt-ng/crqt-ng-1.0.2.ebuild
deleted file mode 100644
index ecb531fad955..000000000000
--- a/app-text/crqt-ng/crqt-ng-1.0.2.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
-PLOCALES="bg cs hu ru uk"
-inherit cmake plocale xdg
-
-DESCRIPTION="Cross-platform e-book reader"
-HOMEPAGE="https://gitlab.com/coolreader-ng/crqt-ng"
-SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc"
-
-CDEPEND="app-text/crengine-ng[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${CDEPEND}"
-BDEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5"
-
-src_prepare() {
-	cmake_src_prepare
-	xdg_environment_reset
-
-	# locales
-	plocale_find_changes "${S}"/src/i18n 'crqt_' '.ts'
-	sed -e "s|set(LANGUAGES .*)|set(LANGUAGES $(plocale_get_locales))|i" \
-		-i "${S}"/src/CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	local mycmakeargs=(-DUSE_QT=QT5)
-	cmake_src_configure
-}
diff --git a/app-text/crqt-ng/crqt-ng-1.0.3.ebuild b/app-text/crqt-ng/crqt-ng-1.0.3-r1.ebuild
index 8ab0c97e1f85..0855e2640420 100644
--- a/app-text/crqt-ng/crqt-ng-1.0.3.ebuild
+++ b/app-text/crqt-ng/crqt-ng-1.0.3-r1.ebuild
@@ -22,6 +22,8 @@ RDEPEND="${CDEPEND}"
 BDEPEND="${CDEPEND}
 	dev-qt/linguist-tools:5"
 
+PATCHES=( "${FILESDIR}"/${P}-typo.patch )
+
 src_prepare() {
 	cmake_src_prepare
 	xdg_environment_reset
diff --git a/app-text/crqt-ng/files/crqt-ng-1.0.3-typo.patch b/app-text/crqt-ng/files/crqt-ng-1.0.3-typo.patch
new file mode 100644
index 000000000000..e14b9145b05f
--- /dev/null
+++ b/app-text/crqt-ng/files/crqt-ng-1.0.3-typo.patch
@@ -0,0 +1,25 @@
+From 90523e75b7e4dbb6e1dbe0ffe41035b9c174c977 Mon Sep 17 00:00:00 2001
+From: Aleksey Chernov <valexlin@gmail.com>
+Date: Sun, 25 Dec 2022 09:36:55 +0400
+Subject: [PATCH] Update src/i18n/crqt_ru.ts: typo fixed
+
+---
+ src/i18n/crqt_ru.ts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/i18n/crqt_ru.ts b/src/i18n/crqt_ru.ts
+index 124dc9c..2d9415f 100644
+--- a/src/i18n/crqt_ru.ts
++++ b/src/i18n/crqt_ru.ts
+@@ -939,7 +939,7 @@
+     <message>
+         <location filename="../mainwindow.ui" line="307"/>
+         <source>Go to the next position in navigation history</source>
+-        <translation>Перейти к следующей позиции і истории навигации</translation>
++        <translation>Перейти к следующей позиции в истории навигации</translation>
+     </message>
+     <message>
+         <location filename="../mainwindow.ui" line="310"/>
+-- 
+2.37.4
+
diff --git a/app-text/crwx-ng/Manifest b/app-text/crwx-ng/Manifest
index 71b0b2775aa2..9b93b0857d69 100644
--- a/app-text/crwx-ng/Manifest
+++ b/app-text/crwx-ng/Manifest
@@ -1,3 +1,3 @@
 DIST crwx-ng-0.2.0.tar.bz2 364917 BLAKE2B f8d541fa479fe3102d495ba43ce51d256f55b9724844d26b89db8396f2cbf90680dd312ecc0c816ee50fb498c8b69ba69d0db73f9ee5dcefc9991e8077754171 SHA512 0890a6066fca7178b483749e946659a6e4304f13694601024fe500e9b79351f7170403b136407a831abe7a040f775dd34c02d9411814c136da68ee6b69e00a99
-EBUILD crwx-ng-0.2.0.ebuild 699 BLAKE2B 4465401ed6b3d25fe49ca2a54ef016b975d144269009fe0314315cbafdaf4b1d95f6cfaaed4b155b73672c983b60e602b9ce4115ac964d01eeeb0804ffcf0a63 SHA512 641649c64ce54a67e83ca3ced03bf4af82f74574cea481791fc4104621d50fb40024045704afd2f81ccd3d56f91d6263bc0675298e7d69b7d23ea512e77199f7
+EBUILD crwx-ng-0.2.0-r1.ebuild 659 BLAKE2B 4f72aaf3febe1eb286053c39009f1f6c4beeaf2ff55a6e7d09e48ec02d90db383e318241156f2ec00b994f00e88d83afecb25126c9f99f73cd07ef7e62b7bb0c SHA512 5156ebf18e2a6671cb2d637c60c6a148aac3df52c8112969b7710c329e349f4b20735ee94036d558ea4de9bad43a6c857b616bca6344118a2a3ba32646793991
 MISC metadata.xml 1177 BLAKE2B d2d0af2338da64845775c14b66725abb760d84d267ca93a44f2ea679e0125f0cb1815ecd312da919ab1d9050f957c9e763ceeb817df7b48bac024b15ed292e96 SHA512 3bdc42749dff929ae4fdb6b9bd2c84eadbae352de4baacdd4f08572cd20d1f336dcd2d003b41bd79d56b3476026ba4d57d89331fe038592b8adaef60d03f34d7
diff --git a/app-text/crwx-ng/crwx-ng-0.2.0.ebuild b/app-text/crwx-ng/crwx-ng-0.2.0-r1.ebuild
index 7317e7272011..c3c0174eacf2 100644
--- a/app-text/crwx-ng/crwx-ng-0.2.0.ebuild
+++ b/app-text/crwx-ng/crwx-ng-0.2.0-r1.ebuild
@@ -6,7 +6,7 @@ WX_GTK_VER="3.0-gtk3"
 inherit cmake wxwidgets
 
 DESCRIPTION="Cross-platform e-book reader"
-HOMEPAGE="https://gitlab.com/coolreader-ng/crqt-ng"
+HOMEPAGE="https://gitlab.com/coolreader-ng/crwx-ng"
 SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -18,4 +18,4 @@ CDEPEND=">=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuz
 	x11-libs/wxGTK:${WX_GTK_VER}"
 BDEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}
-	|| ( media-fonts/liberation-fonts media-fonts/corefonts )"
+	virtual/ttf-fonts"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 32061406ed7d..4e8e965d5275 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index dee18942c4de..3ea87f997fd6 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -4,13 +4,11 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B eb984d3f19f3b147d3974722c11218117240cad75033c12eb6664ef7d492e9ed77fd3c3dfef2fe59bb0c23716072b7ff3b10840b19b213fa96121d5aa7faa335 SHA512 66b74a3cb2ee6c54e6d348d64fe239f2ea72a43f28d1ab0cf22a4757cf87cadde427516d8aa74b4c95a947f38d01571f23e69388a04694527e2be9b0fd1bf94e
 EBUILD libclc-15.0.5.ebuild 1667 BLAKE2B 0c2b3a2a781f1a177214e1da430f2180188ab1d9cbe0001009016fd7cf4aa72391de4bba2c4a9f4c8b275462818a24c4a29861fecb6a235d6c0fac10220144d5 SHA512 a06a0ee32ff783980d6b93e52a4c0b9e92315d05b03443f24121a3170edad5a5a63508617942e5890913d09c90e5fbbc7371c4f0b32c9ab18057a0a8b5d20e3b
 EBUILD libclc-15.0.6.9999.ebuild 1658 BLAKE2B 3874dd2500b10a36ce6dd24bbce66bcba8b1835859e3a07debc3f4d17081b4b8f34d7adba7666b8c106b455a68b1ad41604d44d36b9ffc63ed40e1d5b99b0f8e SHA512 cf3d643b19823e6c0ec33122ea33b21da8300ac8b7476e906002ed7ef3e0501db2874d97c58e32ec71a524fc1278b29098f521cc0d6ca8076211305ab61a981a
 EBUILD libclc-15.0.6.ebuild 1668 BLAKE2B 6e58e4dd7b2a9f740d81bba7b69c25d9b2f9604593364537135b08c75165c668f21850915ade4030a57e1c98188dee98bdf778cecc1702c072e50b6621c07784 SHA512 2ab9c1196c2e07070033e8981468659d51f6f0391d8e98c9cf3a822cf6be2261feeb65bd66d27369fa18c8dd1b5b29c2b5f4e14293f3a037fafb6c97f9b75768
 EBUILD libclc-16.0.0.9999.ebuild 1647 BLAKE2B cd2b48d8a71c6c28f4b1ed65bc3ed87b3b491cd331b6e693c8482b83620c66c407f0cd3317ab168548108cf563b8415b763e11de5a7111db1f2d47283e36d5d5 SHA512 081c408b46360129f4d0632a261708ec9c538050090c9246254c74e930fd86cc0fcb6a0e39e58ec5ca3bede453337ec0b20b11c8fe646f2582ebaa8ece5cbe69
-EBUILD libclc-16.0.0_pre20221210.ebuild 1647 BLAKE2B cd2b48d8a71c6c28f4b1ed65bc3ed87b3b491cd331b6e693c8482b83620c66c407f0cd3317ab168548108cf563b8415b763e11de5a7111db1f2d47283e36d5d5 SHA512 081c408b46360129f4d0632a261708ec9c538050090c9246254c74e930fd86cc0fcb6a0e39e58ec5ca3bede453337ec0b20b11c8fe646f2582ebaa8ece5cbe69
 EBUILD libclc-16.0.0_pre20221217.ebuild 1647 BLAKE2B cd2b48d8a71c6c28f4b1ed65bc3ed87b3b491cd331b6e693c8482b83620c66c407f0cd3317ab168548108cf563b8415b763e11de5a7111db1f2d47283e36d5d5 SHA512 081c408b46360129f4d0632a261708ec9c538050090c9246254c74e930fd86cc0fcb6a0e39e58ec5ca3bede453337ec0b20b11c8fe646f2582ebaa8ece5cbe69
 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5
diff --git a/dev-libs/libclc/libclc-16.0.0_pre20221210.ebuild b/dev-libs/libclc/libclc-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 64df7867eed3..000000000000
--- a/dev-libs/libclc/libclc-16.0.0_pre20221210.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
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-KEYWORDS=""
-IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-LLVM_MAX_SLOT=16
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		(
-			sys-devel/clang:16
-			spirv? ( dev-util/spirv-llvm-translator:16 )
-		)
-		(
-			sys-devel/clang:15
-			spirv? ( dev-util/spirv-llvm-translator:15 )
-		)
-		(
-			sys-devel/clang:14
-			spirv? ( dev-util/spirv-llvm-translator:14 )
-		)
-		(
-			sys-devel/clang:13
-			spirv? ( dev-util/spirv-llvm-translator:13 )
-		)
-	)
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-llvm_check_deps() {
-	if use spirv; then
-		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
-			return 1
-	fi
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index c0e95bb15cb2..bab3e8ec574e 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 79891948c853..4166d59a10cb 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -4,7 +4,6 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-ocaml-13.0.1.ebuild 2596 BLAKE2B 4125904f29738c9d1df5dda7737d2edb1e68512f66b561d4ab4b24ebaa457da1a13ab830ab911b5016e05cb48696aff0f6cd1753615e33e8b06f5b086deb020f SHA512 7b80a864207d4c0ef50725a5e9e64c6ff0956b4dfd3f6c55f4363f44703a7113205a39a53624e288562b08ca3191bd11cd7615ecb53395e07777ae7161a173c4
@@ -13,6 +12,5 @@ EBUILD llvm-ocaml-15.0.5.ebuild 2598 BLAKE2B d04e4d0567e251d2499de4e696d6f0d9308
 EBUILD llvm-ocaml-15.0.6.9999.ebuild 2582 BLAKE2B 941dc173e32fcd3333cd3b8bc0424bfb52ddaab4430a384105d70b03e7a861bf7174c41662faba29e80924d14d874774c5ee5caf163df88d208acd109fa09787 SHA512 05eb8f496fc5bdcc5faa98fc1705af700855264fd0bc033bfde2bd267082dd3c849ba58c0893b427196d04fbffce9b0ec98090b51472bb36e206c86b2904b578
 EBUILD llvm-ocaml-15.0.6.ebuild 2598 BLAKE2B d04e4d0567e251d2499de4e696d6f0d93083cf821662a6f38e17ac3e34d43062acc3599ed5d36a4fbd301c8de95a8d9a6e59506baec477806b92ec88204fc8c2 SHA512 bde4b047ac38ca30c616f2ced8da379e43c770aa6d6985435e444da0602f7f73f03adefe06a58f140e16f5b436ca4ba895601dc9936ff5f21866a5b95c65db8a
 EBUILD llvm-ocaml-16.0.0.9999.ebuild 2516 BLAKE2B 5d42fd7ca1194bfc7fabd05d12d29b793e468ba9d46e36d80f50b1f3e654dfd01a122422ff42ba0616f6654155987be8c23999da1da422467f09ca75a7865d90 SHA512 c9fe4add6b74299cc13c961ff6d9e027d0861dda038130553ccef72189a5df19f408a8e3cb936864fa8f4a3437e1f9c71fb6fe62761c43e5d9ba9b7bd18edd0e
-EBUILD llvm-ocaml-16.0.0_pre20221210.ebuild 2516 BLAKE2B 5d42fd7ca1194bfc7fabd05d12d29b793e468ba9d46e36d80f50b1f3e654dfd01a122422ff42ba0616f6654155987be8c23999da1da422467f09ca75a7865d90 SHA512 c9fe4add6b74299cc13c961ff6d9e027d0861dda038130553ccef72189a5df19f408a8e3cb936864fa8f4a3437e1f9c71fb6fe62761c43e5d9ba9b7bd18edd0e
 EBUILD llvm-ocaml-16.0.0_pre20221217.ebuild 2516 BLAKE2B 5d42fd7ca1194bfc7fabd05d12d29b793e468ba9d46e36d80f50b1f3e654dfd01a122422ff42ba0616f6654155987be8c23999da1da422467f09ca75a7865d90 SHA512 c9fe4add6b74299cc13c961ff6d9e027d0861dda038130553ccef72189a5df19f408a8e3cb936864fa8f4a3437e1f9c71fb6fe62761c43e5d9ba9b7bd18edd0e
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_pre20221210.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 3f12e090b092..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0_pre20221210.ebuild
+++ /dev/null
@@ -1,112 +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 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=""
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 1ad637e0cdb4..86472f1ede4e 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 1243dac4f746..53e000a71af8 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,7 +4,6 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
@@ -13,6 +12,5 @@ EBUILD clang-python-15.0.5.ebuild 1166 BLAKE2B ed1aedc9342d2011eca73510f651e1c31
 EBUILD clang-python-15.0.6.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-15.0.6.ebuild 1166 BLAKE2B ed1aedc9342d2011eca73510f651e1c314018fa23a5ec58cef95098f70f979fe0ba7c6f0880bec50905f084a0d9a7091428ae930683aeac4204c9999a4b3f690 SHA512 7ad0811bedb1938316a95528bae46f20c9e00051a41ed545173de4f36975247ce1a5b1f648655acd0bf3474377a8a32f8c1d573e036afc503cc6a30e24dbd0e1
 EBUILD clang-python-16.0.0.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
-EBUILD clang-python-16.0.0_pre20221210.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-16.0.0_pre20221217.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-16.0.0_pre20221210.ebuild b/dev-python/clang-python/clang-python-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 9b34adc8ac6f..000000000000
--- a/dev-python/clang-python/clang-python-16.0.0_pre20221210.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
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	"${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/doc8/Manifest b/dev-python/doc8/Manifest
index 12d139941425..70a6f86afb77 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,3 +1,5 @@
 DIST doc8-1.0.0.tar.gz 26058 BLAKE2B 0113a4738804a9ed0446ae26b18f0f7da9dd3c4a90c598e03c78d3124f5db42dbc38f1f17af05ef60cb645a8b18bcb20aeb2f5cc00c44814afd572d92b2d0301 SHA512 98ad904a994536de80d6e89a221e3d7159d5188a0f57d07961f646e0591f81790f06c624ef90c32e28ff89ecf9e39b2b052363995aaece6a4e30f643c37964b9
+DIST doc8-1.1.1.tar.gz 26514 BLAKE2B 847e34081f4e00698cbe3ca9b7325de2995c45bd02b2f443459050a2801a5b476222c345c4ba06463fc6ff489c3c59e5b6e7abbd7b98af740f09d5b04771a4b2 SHA512 7ec21c2483f7ebf2a7e1fef6677c6051ac253da6014354a968b8a107d8097f986b6b162850561fd6a103e93d157b2c849554aabe2484a49c4a3726c8e2083a89
 EBUILD doc8-1.0.0.ebuild 832 BLAKE2B b08861a20be43f2ff1164e4b0c74f58abdc30308de47d84d20d6f6ad845110f0e720731d1b18872b8889328b2ca619615258707db797daed6388d1dd2c0038b4 SHA512 3084ec1911d0852a2191e4a09aa13108f218aa441299eb7a9abc07427b951b4ddab069b1b51007dad4b44d5e3da899809bc3505ae876f0cbcf294403ea302868
-MISC metadata.xml 447 BLAKE2B 8be26ccdf9fd1e34e05eccee3abb8182d95438b7eb0f6dda03757e1d4a0f2b1c34861f81b9e8bbbb6634f141dc7867ecdf83022b05df6abe322716d78eafc9a4 SHA512 824cb036e31a498764941d78ebd744d2edaa2cd7a3282dbd5f2c16cbcb0adab12a80b0200528c40e01fc6dde851d1abed5b3d5fc2b27577a02cdfad5fa90663d
+EBUILD doc8-1.1.1.ebuild 841 BLAKE2B b911e77fe8773c10e4613d162da01a8a6d258e0ea21b9ca66bc2477d8cf2ad1b5bdf1952c15d598deb2b5fa2e4896acee4431192b8bcc701b48edb11784d3236 SHA512 e41c12fa62f4dd9f15d3d1ae5e3d4ee9b3e041e8390851c03d799908e957d7cf2738c3278335e05768d9473b253581549a72a482c1e200b3cd7ab196d0b9461a
+MISC metadata.xml 497 BLAKE2B 6e5c2f8a487d967892a471d045fcb0acfb2c4681375c352837820237110cfc8ea193c395730552cadeb09ca66316e91e99785aae821a184c619b32d7d8908b47 SHA512 a626b4ecc4cb4cdd2e0a095a2a26a3d0346e4c47608188fd6138517631d99a0f4c2e5ae8be453ac709dd43c2e4acc79b0ec7f37dd6e00125ebe23c99697658d0
diff --git a/dev-python/doc8/doc8-1.1.1.ebuild b/dev-python/doc8/doc8-1.1.1.ebuild
new file mode 100644
index 000000000000..f8c054851484
--- /dev/null
+++ b/dev-python/doc8/doc8-1.1.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..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
+HOMEPAGE="
+	https://pypi.org/project/doc8/
+	https://github.com/PyCQA/doc8/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/docutils-0.21[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+# setuptools_scm_git_archive is not actually needed here
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/doc8/metadata.xml b/dev-python/doc8/metadata.xml
index 408cd2180853..3f2228a46d56 100644
--- a/dev-python/doc8/metadata.xml
+++ b/dev-python/doc8/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="github">PyCQA/doc8</remote-id>
 		<remote-id type="pypi">doc8</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 743628a76cbe..613429ac0c6b 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -3,9 +3,11 @@ DIST fakeredis-py-2.0.0.gh.tar.gz 112218 BLAKE2B 9bbbf76e6fe00a42d25c1688654906a
 DIST fakeredis-py-2.1.0.gh.tar.gz 128595 BLAKE2B f0b2e8ed9ec4156702f4e65e683f40cf79e1fde12ac70b16388ba65e9e49c8f4c92ade6f02195cc3755768fb2858d7e4f8970f54fa728c9fb32ac8cc2f68fa4f SHA512 584a2a36185674d0fadedcc6018286c3edc8c36de730ac1cf09abcbe3b0cacf8dd0e4c964a7a0a053509dce0063f48ce13f122d230fbec9965af54c77b277ea5
 DIST fakeredis-py-2.2.0.gh.tar.gz 128817 BLAKE2B 8666427966e6a93cd33f521fbc38ecb9bb99e1c1a23506437d48bc6113f272aa89a465dc794b5130ef6dfa584f75f159fce0e3b6a50e5cb89b3bfe43ebcd89cd SHA512 857033a6362a6088cec715571d74a9aa1eb3eb8356ed904b10831540ce5be62d798a211d52fb3d8effab253e50fdb3f2a530d39bd722d8be357426f53fb41fe7
 DIST fakeredis-py-2.3.0.gh.tar.gz 130529 BLAKE2B 71faffa3953e40075cb7cae3b664eb81bd20715c28766678d21449de768c4e621703ceb7053e36f19a0c6561ea9b83097392886e0da306460c9ca75a0a99c3d5 SHA512 b0a07d04cd95abe69c658f67943afa5c07e6fa43a6e467762061e3c112aa9961f550f9fa5dccfe6f0fd5fb941253840c6cd7e76bce5f256bfb1a400e05252651
+DIST fakeredis-py-2.4.0.gh.tar.gz 132163 BLAKE2B fc3858eb364c63d776c81d715cbfb218dc0e763d568c97b0d1dafb0716aaf87e928f9b81bd49d28fcc235f4285277446945595d42ff1d440e5c8491b78abb6c3 SHA512 5fba3e84d0506b52e1561f750e045b6227ea21387ddb3a89b8a61e9698fc0e9ec80c4a7048d9426fb0d8e9f2acd808e7e07fcb11d14d6852d9b057fec86d6e6a
 EBUILD fakeredis-1.10.1.ebuild 2000 BLAKE2B 339ce6cb90e8428fc6e9bfe9b6e8748a454584dfce88518ef4692ef6f1dd5b1109a294c73f3586e1fe5650d746a4debad0b468cbe1465b52cd8dfc310c2b1df1 SHA512 930598092f30e9a84752012377742a8a6926fcc9f41dd360f8345af4853653809e4a9ff8f52c0ad7d6f1c4e0035757c5782905cd25a16e8412503f0c0d7dfdef
 EBUILD fakeredis-2.0.0.ebuild 2004 BLAKE2B f869cd6250a3913369e7bb3796ad47218c58f1d357ef7390f420fb79f9041dc90880e812b1ca0485485e74944e692e32d5b62bd81d29516f3a28d1d176a101d9 SHA512 692ea0c3c24f19cbbdeaa538626a1de4cafc65197769f815bfc9bc7fd44dbe38ddaf1f5844637df13df73682a19f698aaecb1b695fc7c2c7a71e23353e37e99b
 EBUILD fakeredis-2.1.0.ebuild 2004 BLAKE2B f869cd6250a3913369e7bb3796ad47218c58f1d357ef7390f420fb79f9041dc90880e812b1ca0485485e74944e692e32d5b62bd81d29516f3a28d1d176a101d9 SHA512 692ea0c3c24f19cbbdeaa538626a1de4cafc65197769f815bfc9bc7fd44dbe38ddaf1f5844637df13df73682a19f698aaecb1b695fc7c2c7a71e23353e37e99b
 EBUILD fakeredis-2.2.0.ebuild 2004 BLAKE2B f869cd6250a3913369e7bb3796ad47218c58f1d357ef7390f420fb79f9041dc90880e812b1ca0485485e74944e692e32d5b62bd81d29516f3a28d1d176a101d9 SHA512 692ea0c3c24f19cbbdeaa538626a1de4cafc65197769f815bfc9bc7fd44dbe38ddaf1f5844637df13df73682a19f698aaecb1b695fc7c2c7a71e23353e37e99b
 EBUILD fakeredis-2.3.0.ebuild 2084 BLAKE2B 055f7bc849ec4a58b6c7022824ea373f8fc919ca98682c3f5866b43a722798f9a1c7b21356a8d977ed102b51338fd6e5a3d715770ef1fe21e1134aa9b9e22c10 SHA512 523298b98b5b7a6be8bb2ffb9fb19a0a492205dc14574d1356a48e1d74c7e90c99d524b5ac0eaa6e34a8dd52f186091f2fe59667c28638b038e04c4a201b382b
+EBUILD fakeredis-2.4.0.ebuild 2084 BLAKE2B 055f7bc849ec4a58b6c7022824ea373f8fc919ca98682c3f5866b43a722798f9a1c7b21356a8d977ed102b51338fd6e5a3d715770ef1fe21e1134aa9b9e22c10 SHA512 523298b98b5b7a6be8bb2ffb9fb19a0a492205dc14574d1356a48e1d74c7e90c99d524b5ac0eaa6e34a8dd52f186091f2fe59667c28638b038e04c4a201b382b
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-2.4.0.ebuild b/dev-python/fakeredis/fakeredis-2.4.0.ebuild
new file mode 100644
index 000000000000..731d97e0a6f5
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.4.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2020-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
+
+MY_P=fakeredis-py-${PV}
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/cunla/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+SRC_URI="
+	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
+	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin redis
+	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
index d30cef8c6b92..46c2a73680d3 100644
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@@ -1,3 +1,4 @@
 DIST flaky-3.7.0.tar.gz 29591 BLAKE2B 747fbda71055bba937abf3e7b97691c1f4b222f085069d1815d5a9eba669464d2ed5d6dcf1842ae82f1970de5cd5e3aea5b12476bfa2d9282549ad0cc62901e9 SHA512 b399f6e1323d6ca341803ac6f1eb318bf24dc37182d0b49b89bb81b9466dd36271ad6dbb9f48ea6fa4760ee631f1482bb6f49c64f4d4520c40634089c1b64f9a
 EBUILD flaky-3.7.0-r2.ebuild 1479 BLAKE2B 30a25d9b52fb9b2f2cbcafa29ca36ef6d5c662950470a455c2ead011b8992404900bfee84438cfdcdc30a466bdbcae381ea0ee99d49ed31619473ebb06a22eff SHA512 9c57dc6148c02b85f1ff4aca73d5ab293418eaf10a11d88ee3283ee35b24fe4bc6fbd4c0dbf991f97d04dbd3d8286d9a93bc7e5f8aa6e6e4a37272885bdd6893
+EBUILD flaky-3.7.0-r3.ebuild 1157 BLAKE2B 645090baf387db011cb7d35037f45ad85d1ad811729459574a779496bf50a512ad479a925beb5abf2fdd5d9ec2cdab28bccc017628c115e574de5104976f3ee8 SHA512 19c9b738f1f5b27de30afec7caeb239e0a0a097294d65a4d53e6c11c7e7715a0a3c2d111b3f1a6a40c18903d9677791037fabbaf3077ae2054075b9f79440bc2
 MISC metadata.xml 395 BLAKE2B 06158c93157879bd7b181e833d84ea33a315103214cfaa54a092f965900f05f705183b74738543ac6bb83beb62de562a59ef43b734a74c9f3d0d5d677e8e00d1 SHA512 2d237ebccf03db7fc42fac5370f1046834646bdfc5755e2298e9cac131363e47e496d9d0f0d00ad914764bcbc2deaee8b7182ae3c32e18f95766351da50028aa
diff --git a/dev-python/flaky/flaky-3.7.0-r3.ebuild b/dev-python/flaky/flaky-3.7.0-r3.ebuild
new file mode 100644
index 000000000000..608bfc37ec70
--- /dev/null
+++ b/dev-python/flaky/flaky-3.7.0-r3.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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for pytest that automatically reruns flaky tests"
+HOMEPAGE="
+	https://github.com/box/flaky/
+	https://pypi.org/project/flaky/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-python/genty[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	rm flaky/flaky_nose_plugin.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest -k 'example and not options' --doctest-modules test/test_pytest/ || die
+	epytest -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py || die
+	epytest --force-flaky --max-runs 2 test/test_pytest/test_pytest_options_example.py || die
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index e938ed5894b3..a09ec7e233c0 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,7 +4,6 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
@@ -13,6 +12,5 @@ EBUILD lit-15.0.5.ebuild 914 BLAKE2B 8425acc2d890bf889570c4d76703acfb3aab774d3db
 EBUILD lit-15.0.6.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-15.0.6.ebuild 918 BLAKE2B efcbc64c9ec2eda4134030f16996d89445557678d6e74f2975971a46f4f9cba3a9c5d64a24fc7f664c0c71e233f233f9e22419508c0e051d66dde3135ff33a3e SHA512 4c7a0f8ad156d4384c566a1df9abc9c1d728897ec109ddf99dde82b6da2074e7198ab6700ce96d3ff0041d7f9f463ceda33072f29ae4a979805db435a5937457
 EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
-EBUILD lit-16.0.0_pre20221210.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-16.0.0_pre20221217.ebuild 877 BLAKE2B 644acadc79bda6b0fa4b170075a1b97e047e8b9c41e58362894105821fc47e64b78ce0403b9b5eb24925524919186b3fda5266017594a7268520ad85ebc06838 SHA512 f9f52d6475bbd9c2ffcc8bbec22dc5d0b93a01434a7f1016ef0eea117c224f914109dc0e64f939d2602fd1a67de8d9dafb9d000aca2265a674ec126081b06042
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-16.0.0_pre20221210.ebuild b/dev-python/lit/lit-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 8ace6ca8b915..000000000000
--- a/dev-python/lit/lit-16.0.0_pre20221210.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-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/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index a9c76bcf44fc..ebb6f438781d 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,5 @@
 DIST pallets-sphinx-themes-2.0.2.tar.gz 20655 BLAKE2B a5e2d3a02a5996df6e648b8cf9943260d6e0e475108921493300c7d9437837cc66e83b489ad335596c39eac29f3a6e23b7b4abc3cf1fe3bbb018fd874b44aefd SHA512 a37b0f4fe38c098c0508988faa54ed8b2e1ad9ba41f95f862734cf38fd093e2b7c42d408fc10e529aca810f4cc37d16e6d707ed9affa433adfcb481006cd4577
+DIST pallets-sphinx-themes-2.0.3.gh.tar.gz 20835 BLAKE2B 72cea4f0dd6e6b6e862f187c492b892a6646f4db4b57031ae9c3dbac0aca7fe14df0637d6aa41a6e26bfe493839cd20064f2310c628823a70940e4a57e49ffd2 SHA512 a7c84effe85eb56001dab8b326d0160442aa63397d9ae2d0dff9ec85352ee3896a0cd1423b09b99d764290602ec67e0dc3f4b4aaad186a274d5cd74827c525ce
 EBUILD pallets-sphinx-themes-2.0.2.ebuild 614 BLAKE2B 428a798a768a5368b0a93cdc7ea794bda79f09b5a68de1699f7c64dded51aca72407673e66759500cc20b53a1ed833770a2cb6e222aacee7878d53d3e6e5536f SHA512 4c68f518ab7b858c7a5ef3c6fd1e89983555d2486d68227804ad8a61e40a020d76723b79f174ef9fdab60a9f4c5bc3b7cf7518d41587e26fbd67911149842acf
+EBUILD pallets-sphinx-themes-2.0.3.ebuild 733 BLAKE2B 8854e32b449a95c502da24ac7ceb3644db7bcee5509dc20c4b2e4ae82b8b413e4eac2db2d9860ecdaa7b36c31852acd1b835e3b1bb9d1da5e0369dc036d4c478 SHA512 65b183d0e39a27feb00c2e3df9dd5be1616425750891916f7f87c2f4968eb762d57bcc2bf3a431f7798137f9235c124344b857c28203f6c807740d2249c98195
 MISC metadata.xml 418 BLAKE2B dd644619949598d5675c600fbc5c740dc9882042bd04c8ead4b81de2ebc2f3a3e88d79d1e4cbd710b953cae7b116b1cb09012af913914db5a652a1ba2b5f4970 SHA512 537261ae9194a004752e90e3b4972763f9e22c27d18a7655f4ca4005d2999402b46ca7408d0811e44d3b0a12cb6cac506508c89ae5edd245f15bda13da91f216
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.3.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.3.ebuild
new file mode 100644
index 000000000000..b76a4785ce48
--- /dev/null
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.3.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=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx themes for Pallets and related projects"
+HOMEPAGE="
+	https://github.com/pallets/pallets-sphinx-themes/
+	https://pypi.org/project/Pallets-Sphinx-Themes/
+"
+SRC_URI="
+	https://github.com/pallets/pallets-sphinx-themes/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pytest-plus/Manifest b/dev-python/pytest-plus/Manifest
index 757c625ce195..3c952ae41d07 100644
--- a/dev-python/pytest-plus/Manifest
+++ b/dev-python/pytest-plus/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-plus-0.2.tar.gz 8210 BLAKE2B b8a28e72cfb4e10daa021528de9b5df2e9eb0bc4e911557c7c14a0825284787e94992132c0b74881867a41b55a67785c60b9b87a1594ad33fb57ebac8de391a6 SHA512 e16a03433cb6eb30b6881bec99482bc65cb7d1fa3d0db855befe666c0645d4b5ec02debde9dec4322ed0a0b77d3ac3f1cabda0cf98f375ffd68dc29fb55f5139
+DIST pytest-plus-0.4.0.tar.gz 9987 BLAKE2B 11b8f17630601f52ebae11b7a660c8d97b4c9f1699096a376c162952a03b9f1b580ead6ac0b040b15c267eec1123bffe07d128eb00aec7414e996275ebc4c4e3 SHA512 4f4258853280cac8e03c0477763fd588d2b3cf11e7746d2b8e7d3cf5774b845412bc8779d74d232e4b3473470c39753dc788ac09faf8e8b7c9fee22d7164bab7
 EBUILD pytest-plus-0.2-r1.ebuild 659 BLAKE2B 72dba59fa2acfe4ba2f9bd61f4b7a7831646caf5fd6762bf880e32c3ec5973b02df2b447a0075a3bef5488ea906cd1a4b69c5efee99da2b11106d628954f0ee0 SHA512 178cf869c7adaf5c55672298352bc67d73cf5b8a775a87d7b4235e5eacb8231df05f75920686cea155a2c49d48551010a129f9a814096657927df5fae02e46a4
+EBUILD pytest-plus-0.4.0.ebuild 617 BLAKE2B 0f0c3ef330caf0699347df60c96408c402de42d2053e034c3bee48ead690908b3e31ea89a7cadb28690320ae921eafc7e49adaef0595cf7c388a9da35d8c720d SHA512 9409b3b71d8298687d113fbedee505fd793334c87c885c35d4fb54e7de0b71838fa3e5d786e3e84256adc7025cbbb876badf71defa845543b03be17252ae4f6a
 MISC metadata.xml 406 BLAKE2B ae1b1a2c28f45b4dd7f752125161396de88cf2ed3881f37f72dc7938cd2ea6485c995d0409c6fbaebeb7b1d4cf59736496549702d7a9d825a2ee5eb1e6a65fdf SHA512 33668115e05810055fa79f5d74c5d3b6eca5bb53e0108a257cb57bb496ebd0292c1dd3f5b33feee58c20c2c381a926c870f9576355171a91106c21fea41d6ab3
diff --git a/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild b/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild
new file mode 100644
index 000000000000..04fa7dc378ba
--- /dev/null
+++ b/dev-python/pytest-plus/pytest-plus-0.4.0.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=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="PyTest Plus Plugin - extends pytest functionality"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-plus/
+	https://pypi.org/project/pytest-plus/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=dev-python/pytest-6.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 5edaafe28313..086131ee74f2 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,11 +1,9 @@
 AUX scipy-1.9.9999-meson-options-lapack.patch 1013 BLAKE2B 04cb7b3bc281ef06fe4360f31ea6befe91134bc68ce2a981df704f52814487503d35100bf7fd429d854d0716eaac20f5d55aadad02a4d48eeed8ad55955232b6 SHA512 6d8f6e4c6399f5e8a641a87168b1e2abd31b69a23f90582cba5d8d22d46de0c89d7b0719a25f3cf4e6cd9f81c9ebe0c94d1ba8b6c6b0209020491603b1f548aa
-DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0 SHA512 f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
 DIST scipy-1.9.2.tar.gz 42068300 BLAKE2B 0962115990a12339d8b87eabbee02d52a52e57259fbe2e74884fa2f08d66d8b7505f84561f643b539603bc8bf4ef3bf73c3d908453fbb0c99f732c3a81f8a328 SHA512 5f8667aa66aa0b5fad689d960f742874ce09f830bfd5aa241917526f153fbc09c7f709bc84113f83283fcbb8a47113eb215478d9c3473f76d8f7dbf0989429a2
 DIST scipy-1.9.3.tar.gz 42075414 BLAKE2B f19e829d26a5673cccb69bce43a9142637f42a9ec462a3fd2ea44b62564cff6fb27a4deaccc59e0e738cc0c997b0a7de948bf9f2db6fa7896323405a072e0111 SHA512 119f9a5e1ce3b4268ba38a0eb82dff78837593d9a5c5e464663925a4b3b1de060201fe568236e19ed0996a045754333c580e181c4cdec2cc707e57060f59364e
 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
-EBUILD scipy-1.8.1.ebuild 5275 BLAKE2B 0b2f1bb8c37c253aae87941aa9cb15352d82ff5bc34089ae7cf93cad7d264b0ceaecd7f8f0ff02670d24282a61032eaa52bf16de03e1d25d8a18fbfe7d63c981 SHA512 d7ed5f3bc61e27f898937387f88cd934147149ba40ccc01b160571db97074ccba2eb68510899bb4ee70083e47cf3e2c5c6e53435f56933cc5652e9b21a231763
 EBUILD scipy-1.9.2.ebuild 2354 BLAKE2B c013d3f8f9ddf0ba89246c9af4d4285f06b6aefdafb3c988924c93b3f70e97486c352933a6855e0b33d2d62dca49a6a58a0202b590f0b32f7834894a4e97db55 SHA512 dc72624aefd000730f8b8837e0ee7f4b56f57905e211c5eff186d3b9b21d891f8eda4484235edaccbf2505bbb02e25d5945b49f51265dedc9b4fe6ec0fc18b0f
 EBUILD scipy-1.9.3.ebuild 2439 BLAKE2B cfe98bc6faa372817b90889b0c6f96aceb7f5c1df7822b9aee2f74470b8e2615dbc6369844188ffae9ad3c0ec264178a054d708713c84ccabc1f226fb410a901 SHA512 b3d5e11e9e85ad1c76211a26733b8eeb32b307c1bb5473f130ab1f8a6d615115eed4b11e708f10613ef012f9567f421f2b569b7e8bf66d48b2f18a42e00e661b
 EBUILD scipy-1.9.9999.ebuild 2430 BLAKE2B f21f758cfdf268fdf4f58d7e4b856b0c348372e61d7875cd36f08720be587cd07c15ad539726bb4035a98d7a6eac399d2e5eeac925f11e23805bc015eaa81ef2 SHA512 4881d7658c22fed8b7b15d417e12e24e0389637ed5378dee5128aca4647788cc2450dc084fbece5666a629c6136e1a117070e71ecbe1b0b96a0e1ad3902fe8e4
-MISC metadata.xml 1148 BLAKE2B bd532eb47b00da1ff18e9bb5be287ef32136412fd7542e92a522c9d3d9d9663d2312b74fd2fc6d4239e4fc581c8e881ac6e682fcfd14b0debb08210237878398 SHA512 a913d7013caece759f2fd36f8814589a512e7650afca19edf444694b1fceeeda02f0bffb4ced81a46a376b2d6d54b292257a236549418aecf20d99e70715babb
+MISC metadata.xml 1054 BLAKE2B 490b13e1a307b1990f692d43f3bdc2bbe92e8dad809a24c9223358028eeff2e0387043383e7616df3d010d6bf669337c4c7cf57587181c2c77d93e2ef6e3b8e4 SHA512 379160f7146a8e7dbbfb7243e39f76e12399e47cf0eab632fc3e1598f5fa4482151b769d16c6f026192ac16b8fefdd363427b14decf66c7e1f6e1630444abdf7
diff --git a/dev-python/scipy/metadata.xml b/dev-python/scipy/metadata.xml
index 727696087804..3d6d78db5ad1 100644
--- a/dev-python/scipy/metadata.xml
+++ b/dev-python/scipy/metadata.xml
@@ -19,7 +19,6 @@
 	</longdescription>
 	<use>
 		<flag name="pythran">Use <pkg>dev-python/pythran</pkg> to accelerate runtime</flag>
-		<flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">scipy/scipy</remote-id>
diff --git a/dev-python/scipy/scipy-1.8.1.ebuild b/dev-python/scipy/scipy-1.8.1.ebuild
deleted file mode 100644
index df38fbcc3ec2..000000000000
--- a/dev-python/scipy/scipy-1.8.1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-# Upstream is often behind with doc updates
-DOC_PV=1.8.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_enable_tests pytest
-
-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-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 0fbecde4bb93..b1cf41821f3d 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index bc57cb246c8f..f7993d66fe89 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -15,7 +15,7 @@ EBUILD bundler-2.2.29.ebuild 905 BLAKE2B bc9f94a4342ff9431d94c6e85a31d26727d3850
 EBUILD bundler-2.2.31.ebuild 905 BLAKE2B bc9f94a4342ff9431d94c6e85a31d26727d385032caaa57ba9eaadd2ad03fd9f31011e9992499f7c946e3417c46b48695256a4d54c8bef4e9112ada21e9aac5f SHA512 33078fb7351b4384bd3db2006823d1bb4bccbf3f2cba280d3d37e64eedf38f0adbf575cfb0c056d401645e79b2af326626d3b0fb4e2b1b67afc3b122379344b6
 EBUILD bundler-2.2.33-r1.ebuild 904 BLAKE2B 50ae8fea0f9a91e3ca3f30e46b5d1c76585a0c1640f6c74d6d9695c62c3142f53993c716fa5af7f9de6dd7649f829ef252dc79051d44e4ac8dd9fe64f17f1f5e SHA512 8ff14e7ea2f0d71570a9640b147bab3344a6eac12e2bc94c695383ed1675c3cb8eabe80558e3d2087ecea46ea5f619f46595fe5af0397936075c0c8a6171bfc0
 EBUILD bundler-2.2.33.ebuild 905 BLAKE2B 1744e1ff514205f6cda60d53c539b1a89e99608a66ad9b642bf4d66b156ce625ccf8cf2374b7f8fbac96e80a69f6cbe66d790ac061c9644071348db52fd742cd SHA512 5f6c9ab6206aa665917b9728608067af48b80f16b47dcc898b56062e6041990a36c5f6fa9201832736fdfb8c423e3e6c1c912fb48e179e3f3c45ba02bf08eb0d
-EBUILD bundler-2.3.26.ebuild 911 BLAKE2B c79b33c6fed601500611860c19526e597d88886e5b2a5bc6c501ef05cd8a7fc32e181e6ebbca76dca91c7a5b13753e25d8619d5f26ca7410ced8405b60a6ee64 SHA512 27c7ee78fd96610453bc8c80e42ae1d984c50fced7ca925a7bfdfeafcbef6572235c56fd492ed1e041dcd8792a964183271828283e3b80662b0fd9833d7e1e39
+EBUILD bundler-2.3.26.ebuild 880 BLAKE2B 5bf0fa758a73c61eb40f7a5d4c20280b432603485440cb1b0ab86a71f1c03c731f16d33cd642454377f18ab33b3a213c7b1bed0d23d277cb387fef1d852f9bd1 SHA512 e0cf7e44703096b2a4a883e75a53696809d55f4b50858c9f11add5c6ce071e9775d6806c7c1a66346699a229cbb2420e249df079bdda47e614e45ac92f36dd1b
 EBUILD bundler-2.3.8-r1.ebuild 911 BLAKE2B c79b33c6fed601500611860c19526e597d88886e5b2a5bc6c501ef05cd8a7fc32e181e6ebbca76dca91c7a5b13753e25d8619d5f26ca7410ced8405b60a6ee64 SHA512 27c7ee78fd96610453bc8c80e42ae1d984c50fced7ca925a7bfdfeafcbef6572235c56fd492ed1e041dcd8792a964183271828283e3b80662b0fd9833d7e1e39
 EBUILD bundler-2.3.8.ebuild 919 BLAKE2B f360aaf6bcd38d0665c41f6e302a5da0281dbb777c00d0b57394285a31ac895204e34fa73c9ce907115475ffe8cc02664a1e2743cc1f59b8fc4c591b9528b654 SHA512 4a33a068940ce9816e66686c0e1141dde37bb898edd63b5269fe1aafe2551cd16a8dc373978d49f4bb56cc77159110ee1da779731984e0da428db8819354431b
 MISC metadata.xml 343 BLAKE2B 2526cf508fc4002f02cab371f22490c1d7316a06ce2e18eca7563cc672a935e829afd850c99fb6cf8069e8193f1739a4dc6fba3d327b339c564183f43d008f1e SHA512 495c6e0c73b0574ef644c13f2001dcdbc785f07a036b8220e8982fde16983aaf816440f33c060bd7cee9843183c8059c930ab7b5e5cfdb847e2671bee8c33c97
diff --git a/dev-ruby/bundler/bundler-2.3.26.ebuild b/dev-ruby/bundler/bundler-2.3.26.ebuild
index dea6a7a8a97c..591453ef8c8d 100644
--- a/dev-ruby/bundler/bundler-2.3.26.ebuild
+++ b/dev-ruby/bundler/bundler-2.3.26.ebuild
@@ -27,4 +27,4 @@ IUSE="doc test"
 
 ruby_add_rdepend virtual/rubygems
 
-RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
+RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/date/Manifest b/dev-ruby/date/Manifest
index a28703fa78f0..4c5c7eff2ad7 100644
--- a/dev-ruby/date/Manifest
+++ b/dev-ruby/date/Manifest
@@ -1,7 +1,9 @@
 DIST date-3.2.2.tar.gz 108973 BLAKE2B aedb4d5d43b1d7ac277bc6fd36651f36828be7a04f4eb75c45ea02bc56b3a403af9e8a26b23a9839c904ae455e6a02476fe83115d8c816f06168db6e0a788347 SHA512 5a640b550c9ea0c1fa24aa5d114ae9108fd568c8c38b20434168a92c886d66487065e0c6aedc7e55cbe59cc3338fd262ca601267ed0b55377c382fe0502e9604
 DIST date-3.3.0.tar.gz 108249 BLAKE2B 7d85337c1b39b09d15a73a47b5e09788a700a0e044fc74a4138be490d7212174e3cc03c40c7b4814bc69523399826832c48c07a38e0cfb6f28554f584cf81fe0 SHA512 1e20c5a29b0aabc3354b6c39e0dcc4cbeafc6b74afddd5b4446b7a7b608832f072c86b98267893267d0372ba7ab0bfd71862369cd8d35b162cba8bdd81563a57
 DIST date-3.3.1.tar.gz 108337 BLAKE2B 90241a005755c330dab010aa2d1a0c6192b7de3e33f0b3fe8089385d2aed0a834ea96b71e276f2cf5bbddc187c915a5d93e38cfcddeaf267d803113895b9fd3f SHA512 8eb701542619320fc4400440b8c8a03626a389e0c94bf1e17f4bf952d616e5cbbce0f3714d824db255734386fb5b5522e220f619533f4c901746bb7d630e8275
+DIST date-3.3.3.tar.gz 109793 BLAKE2B c7ee6337a520172b692a48c963a67d7fe7f6f56dd6ea5a957eda32d7c21fee7d02d0616f39c32abf61ae5f33f6507c508e98c568fd8f7baf300dfc5658945917 SHA512 a2224fa191fd688593af29b95e40f67e9fb9acea93b7de613d9c4b105343434a9ef30f32599cd6af243dd3e35a9bf1f60b722e6a0bc4393e26e83734196e8193
 EBUILD date-3.2.2.ebuild 1034 BLAKE2B a43e6fc4d8d169070178ed3ff967cb6775bfb40b1842a1579864340b18468f90bdd60815c214483abf317c07867eba1ef8e473553dce9a801a1f0451989387c5 SHA512 a7a3be82be4c51ecc2d3635a79933981ec4e0071b8019edb079a0bca20061dacfc420bae4e1f2c6340334eb5e1437e687e647db49b43d626ff52a07e2eb6bb89
 EBUILD date-3.3.0.ebuild 1058 BLAKE2B 40186664921b3dde314d469654c7294eed9fb4f0023bcf04f4d5205faf65cd243a0abdee0599d9a85931b9a2461ef26299f232d2b7b1cbcf4f66335bf4da56f2 SHA512 26575bb1fb144170f2d86359fe688c2f28b994982cf1f4a7e7888a44168ba473fbe77eee4d13c02fbca51c85b522f80b2b5b1f41a830e43a47285156e5f83e4a
 EBUILD date-3.3.1.ebuild 1058 BLAKE2B 40186664921b3dde314d469654c7294eed9fb4f0023bcf04f4d5205faf65cd243a0abdee0599d9a85931b9a2461ef26299f232d2b7b1cbcf4f66335bf4da56f2 SHA512 26575bb1fb144170f2d86359fe688c2f28b994982cf1f4a7e7888a44168ba473fbe77eee4d13c02fbca51c85b522f80b2b5b1f41a830e43a47285156e5f83e4a
+EBUILD date-3.3.3.ebuild 1058 BLAKE2B 40186664921b3dde314d469654c7294eed9fb4f0023bcf04f4d5205faf65cd243a0abdee0599d9a85931b9a2461ef26299f232d2b7b1cbcf4f66335bf4da56f2 SHA512 26575bb1fb144170f2d86359fe688c2f28b994982cf1f4a7e7888a44168ba473fbe77eee4d13c02fbca51c85b522f80b2b5b1f41a830e43a47285156e5f83e4a
 MISC metadata.xml 336 BLAKE2B ebecdf17ef8daa50c1327043a3c8744971b20f9e58758716a4d39968312ed3426e3902d2be1fc6d1ccc6ff84460fa1c2bd98d5cdf0ccd417167603209c14b66d SHA512 5abad9d2498b1ca553c2500c9ea24b04b3c8f617ee799a45efe48814a8cb926380fdd6c5b963ac6b3f43f8c92ab445e59458a80b569ac5a433b7c89c3d9171dd
diff --git a/dev-ruby/date/date-3.3.3.ebuild b/dev-ruby/date/date-3.3.3.ebuild
new file mode 100644
index 000000000000..303b2f58e831
--- /dev/null
+++ b/dev-ruby/date/date-3.3.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/date/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="date.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A subclass of Object includes Comparable module for handling dates"
+HOMEPAGE="https://github.com/ruby/date"
+SRC_URI="https://github.com/ruby/date/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index 7a74321a520b..886a2aa91808 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -2,8 +2,10 @@ DIST did_you_mean-1.4.0.gem 33792 BLAKE2B 9052b7ba7028f963595eeb79e668296b48db86
 DIST did_you_mean-1.5.0.gem 34304 BLAKE2B deefea833d1fe12733a6b1422e5ae43d0cfa7ff7ddc49665762a83866634ccd0a440e5a3b351cff6d9d308e85de0490d56d7b675d582f090e0e4fb07186c197f SHA512 7fa4cce3fb895bf026788bb5d558f88d4ddb62b7cae1e284969dc4f0570e88871d5f103514da2c9d79399dcf10ffc845a594afc9c676e90cbca4d5a38d74d7f8
 DIST did_you_mean-1.6.1.gem 35840 BLAKE2B 618e11c23135edac66cea95c0cc4212045fcced1148c46543ba243b5993e577c0ae610e168b6b3b5b178c1642ff47436ea765b4880f6cb0da505931e9643b197 SHA512 3d29ed5ea25d163963c7281be2f70d08b47f7aeedf997674e5bcab11d6dacf231ae48a5c9d2a9fcee9ca607883867a5b39c59184da722ad0f822730747380ea6
 DIST did_you_mean-1.6.2.gem 46592 BLAKE2B d24960738dadb3f2881d2a392d8f3aec48b7eb770c19af59fa79971316326f2509f79517b43fc1a42c77f41602938c8a3483c162ab6f74c7df99035ca599eaa4 SHA512 98df1f9820c0b0c19c2493418a0b8e605148757e9958ad0a3a9d19d314b7b6a883bd1a93a1dfed96f62a796c1417f16a8f2ab782bfee60526bbffdcb7cc31e38
+DIST did_you_mean-1.6.3.gem 47104 BLAKE2B 48ae99218c9295a0c9a17825020e875a2ecfcf76b33859b157cfb40279574b257c58973f4b0b16f773522ea9e9d08dc13ab316d4408363aed23323da74cc2207 SHA512 5452afd2bd50d2b77d1695c83c956cf6c3a8d897e9cb3cbc372a9bc8a7d84550829ee837350a1aa55ad9ebc129b92ba78aabb9fbc266311fdc5b4b0d6ddf33d3
 EBUILD did_you_mean-1.4.0.ebuild 669 BLAKE2B 5486983f1c62524241b10f81c1276c89548dabfceba67077b12d40f5eb2bdfb853da72c7fc7493a0ba4fd93f4ca1b166c3e9901c24712b69fb2d7343a2c641ea SHA512 f6f3a2a0f57c11028ff433dc10cb4cd3573219d9fc2801eacc660c144aa0f3704f661a067a4f383a2a6d0498bd7dfaea399ac8c015e9e12ac5fbea6c0669c33c
 EBUILD did_you_mean-1.5.0.ebuild 691 BLAKE2B cce861947b4e1ae7a3a99ad21590ca07bfd6d0a4a67cbcc4390f47692fac04c63da34250e260ef4dfdc5d91d54d23ac73a65aa69efce9947d0f743721e242672 SHA512 50c333eb63aa54ec4e5cf4afa0eb3bf7db6792d3ab607bb7dae5e258e4dcdbbfac25fda84e26be342ae8a6a43e3ea263f4baf2ab998d47e43b1f4b2f77ef9386
 EBUILD did_you_mean-1.6.1.ebuild 698 BLAKE2B 4dd8c8f26e6cb6bb5b2a08e651853c6d1e4abe3adbf894d4eee28e378a6541027d5cf2e09f16cbb1f25cf70bbeb340f3460cd7f9007bb28f1c5c1dff98979e00 SHA512 0b2d968cfa50d337b9b0d5efa96f90de445dc71eb4e4026825b558244075e9422f61c7313a75e437003c3c8c9a8550aa444e7838b0a1c2cba3f8a21e6641bd89
 EBUILD did_you_mean-1.6.2.ebuild 691 BLAKE2B 24a5c175f851b51d249f5666aeaf9ed73d5dca120e9a95ab313afe3ed4fc2b7ee1e838b7afc053dc5cea3b11acd6e8daf6dfa7ae02160f2cf904466158b85c3b SHA512 2e05ef46c842f2a07da88c7e8825988a3c9efffa3976815e3255e0397abfa146e00487a558ac958fea98d3636514216bd15f10c20e568c8dd0afca446ec95d91
+EBUILD did_you_mean-1.6.3.ebuild 691 BLAKE2B 24a5c175f851b51d249f5666aeaf9ed73d5dca120e9a95ab313afe3ed4fc2b7ee1e838b7afc053dc5cea3b11acd6e8daf6dfa7ae02160f2cf904466158b85c3b SHA512 2e05ef46c842f2a07da88c7e8825988a3c9efffa3976815e3255e0397abfa146e00487a558ac958fea98d3636514216bd15f10c20e568c8dd0afca446ec95d91
 MISC metadata.xml 346 BLAKE2B 7168c0159e7fefc614f4574bffe30a5ed799c93fa130be05777e155fb457f1674629a75388f704d82df8931c1b5686b91a62488e27de5dc2a0cfa97238a2e3f7 SHA512 15a8957c29c10e64cf244aec15aa6cc6b8dbc8e993b22dfd82c9f96914ecf5f82b65f924556e01f5124e8fecb122a10cdd889f9af7d5d833fedc0baec0186987
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild
new file mode 100644
index 000000000000..9f69b32f446e
--- /dev/null
+++ b/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="'did you mean?'experience in Ruby"
+HOMEPAGE="https://github.com/yuki24/did_you_mean"
+
+LICENSE="MIT"
+SLOT="2.6"
+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=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/ruby-prof/Manifest b/dev-ruby/ruby-prof/Manifest
index a9fdd6e717b3..ddb0f9843826 100644
--- a/dev-ruby/ruby-prof/Manifest
+++ b/dev-ruby/ruby-prof/Manifest
@@ -1,5 +1,5 @@
 DIST ruby-prof-1.4.3.tgz 232032 BLAKE2B 68df149718869afac89b2240263cd3dd48c28b592f32cd7bc8a918b67de7a10abc3a1af04cb00eeaec9e6f7292e5258d22ba8bec0243361289add943535ffe39 SHA512 fd19d97b88b52c07331bf885c69215267eccb3a0519eb3bb6cd6e5907af55ebbace32f3bdef5b1f340bc3c4779666d7f4100878e647fdfde4da3a4df2a946ebe
 DIST ruby-prof-1.4.4.tgz 232833 BLAKE2B 932f5edd47a9de57f4c394044d1d563935f456b3cf77ac85c912359e34c8c1becafddfda329e05a672d4009b81fba386f76ba4677cee2dde44f40bef5abcaa94 SHA512 5ae25b32b26cfe7faf60c0ba84d3853c74f272783a8dde858ce3de0186683c7cf35dbcb5e89b1e5aa742ee93ea601e55f7ad99491bf9c1a1accef454b08b9921
 EBUILD ruby-prof-1.4.3.ebuild 1143 BLAKE2B 9237d1ef512057ab6f3bdc569de1f414644bf13d379c26cab84cea50a22f6d4a17ae84e6ae19bf4ddd15268a40a92c88a6b77271cbaeeb775c22be5982e6e43c SHA512 1fb62f262b0f07043a8364e7adf851f7309dbd04b855d62d4bbb7a6742d9e116fd4851e635e1f7abd63fa6a1a902ec7738ac61dfef33405a5b2a1b28dac343a2
-EBUILD ruby-prof-1.4.4.ebuild 1141 BLAKE2B 85b4b57ab8b020c9a637da7d7acc06e1069d49d2306fb1b006046ad85fdfb5ce4802920bd34c3079fa2bab93adf7c1ce6495e854bde556f93f4608cc2c022021 SHA512 e25b13d142eadc18eb9e5a732499b2b4814db4e66f41529adcdf353f5a19cb4a045b69cf012b40a393f6712342f18f2b374d54a810d692019a6bae14649a12ba
+EBUILD ruby-prof-1.4.4.ebuild 1132 BLAKE2B defa6b33884ca68ce626efb221237a56a67075e0f8cb5276197a28c1b93ba9b6bfc9624c1eb85a31d56096499362e8598354d01ae9bf0c6cbd459d75f987ca59 SHA512 87b8619262d51e7b8815aba53b27c2f312b784cc7bc899566a501ab1027498f5dc447a6b43ae4f2fd602ea3cbf4865e71e221665d44dbf562de60f051ab8b0a3
 MISC metadata.xml 346 BLAKE2B 245dc508fb9933ff6a69b4e7c8a516ac9bb237798680ae70a8fbaeb57481520760f5a17a62cb045f82a955e0fc882fd84fb60d17b68bec1180b386355ca6b6fd SHA512 2cb1d6e31ac399f7faceccfd9dcc5e1a1e29bc10596ba3e0b3960ecc2bc215b21d351611e3ab6bfe7451fcee3bd4880a229b8266b7c8f6321bc79bdd5109b5d9
diff --git a/dev-ruby/ruby-prof/ruby-prof-1.4.4.ebuild b/dev-ruby/ruby-prof/ruby-prof-1.4.4.ebuild
index 347bff9803d3..a23ae9460ff3 100644
--- a/dev-ruby/ruby-prof/ruby-prof-1.4.4.ebuild
+++ b/dev-ruby/ruby-prof/ruby-prof-1.4.4.ebuild
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_GEMSPEC="ruby-prof.gemspec"
 RUBY_FAKEGEM_EXTENSIONS=(ext/ruby_prof/extconf.rb)
 RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/ruby_prof"
 
-inherit multilib ruby-fakegem
+inherit ruby-fakegem
 
 DESCRIPTION="A module for profiling Ruby code"
 HOMEPAGE="https://github.com/ruby-prof/ruby-prof"
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 65fa01968d91..add4059bdd90 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -16,4 +16,4 @@ EBUILD rubygems-3.2.22.ebuild 3141 BLAKE2B 0e7944a328814a6aa50867212e7a2b114d596
 EBUILD rubygems-3.2.33.ebuild 3313 BLAKE2B 7df80679eca565fe40e90d303ae628aff4ca6c514baf7641fa2b65fc0df5249469beaf0a24847ebed16f9d9b70bae0d7ae662de6adb5259aa3613b0ee44f2257 SHA512 b5f3067bf0f50aa2304062e0873bde9dae16502c71aa7218f37c7e19265eba63b9378632f394f9a119cde5d9e3d6502cbbf6b4d8f3b4d9ba62b57f62366b88b9
 EBUILD rubygems-3.3.26.ebuild 3451 BLAKE2B ac53dc2b46dfdb0f0c629362ecc355ee317071a4970f6eaf7fbc92657466a6c0f3f8ae72bc485ac87e8274108388f3f612bec47fa3cbc439088a722f5d0ba983 SHA512 b9a28984e2e82c2f118602165d07540beb34814e03273942c6fb1f257e011b09a3136feb11cfbf7aa89138073b53a10d36b38d1abf0a66c40923cd93db877eb1
 EBUILD rubygems-3.3.8.ebuild 3327 BLAKE2B 0d9f66367e4b5c96a5fab1b00a17588f44df93523c72eaeef6efa74bb91b8aaeef0322e5f01fe11d56eaefbe1a2b1a35e8fc98a553954838c1403e2a049ca4c3 SHA512 af42c7a1e19d4ed119ffe538e3500eefa404caee98c7b02b4bf2b03692948572a91396f6a4a28e420e686a2e57bb7fcdd03df24c16389c529eda29446eef7d94
-MISC metadata.xml 428 BLAKE2B 9ef0b105d675c9286e0aae2b441c62e671d8bd42e50a9d9fa1933d87d5674681618962d0fa2f2b650248437a498eef6a06cf3e6a9fca7cbe80b8f0de35de4efc SHA512 256c136cf6493f6045ef9b4a4d42b6c11f1134b8db69a38e5dfc4ce39f6604f7f047d2e389e0fe3a553e6d38f1cd2f3fd3740108ff17debddfb2373ce44bf7ae
+MISC metadata.xml 432 BLAKE2B c63e6f07840e2764fda3c1270275351adef92a243292b67181cc06a0fdbb76ee02e64069149c082d33d75f9407ced54156423b023fc1eb34a800282f0aead9ca SHA512 67ce708fa9f5532770b83481d4b33bb1e21be994dd7c5342c4abcd084b5cbfe544ee692e25a468e99e22174fe685312a3f42bb80f01120fcfe138046fb0a54b8
diff --git a/dev-ruby/rubygems/metadata.xml b/dev-ruby/rubygems/metadata.xml
index c24c449c2959..77531829e324 100644
--- a/dev-ruby/rubygems/metadata.xml
+++ b/dev-ruby/rubygems/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<use>
-		<flag name="server">Install support for the rubygems server</flag>
-	</use>
-    <upstream>
-      <remote-id type="github">rubygems/rubygems</remote-id>
-    </upstream>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <use>
+    <flag name="server">Install support for the rubygems server</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">rubygems/rubygems</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sprockets/Manifest b/dev-ruby/sprockets/Manifest
index 2507c9e900a3..ae7e7d736a64 100644
--- a/dev-ruby/sprockets/Manifest
+++ b/dev-ruby/sprockets/Manifest
@@ -9,5 +9,5 @@ EBUILD sprockets-3.7.2-r2.ebuild 1736 BLAKE2B 12f784b4877082a54e1f52dc43e4e152b3
 EBUILD sprockets-4.0.2.ebuild 2073 BLAKE2B 83ca1f1c975ec2f0e84dbdd3b988da08f767ae7773989fc0bed64c75c95e9b8f8dd6ac2f32c53da642b50f1c74bd16d2297e7c9e1622cb33d9e70f1eb872d546 SHA512 934e726b1b3711301bdbe0783d87239965270371b0f80fa910b7483fac24829faf98880b1ef1e205371127e7e629495240f243cba2ee77774cec364063ed5f1f
 EBUILD sprockets-4.1.0.ebuild 2090 BLAKE2B cc6c680b76936346259b71f6d06478dfb242f49a90156f7e9836e4115f27d3c715676d8d8cb93c937f8d0b4d3b1095b75e2d652acb479205671d45d4c0678d2a SHA512 b1892932bdcfd23820bf43bcb269684f89c906fb17883baf27ae4178f8a5d48dbef3abf2685328b3ef156c0613daf30867279dc2c1a068f73e3066b70d87110b
 EBUILD sprockets-4.1.1.ebuild 2090 BLAKE2B c0130e4d7b4b2c476189fd0970485cc416a52776ecbe0e18b1a98c6a3e1b721031c4f1dcd6a491c1520894ea46e3cb9c5cd5bb1f36982e6ed477a86901ea4cc0 SHA512 6aae3a8175e999770ef3ce619b60d5aa2213658b74238f2916980eef3ddff6a0aeb99328d5e97ed25a8ec1327d8901ec48a311ccdf65a0f0fe5c172da3132c44
-EBUILD sprockets-4.2.0.ebuild 2077 BLAKE2B daab53ca2f38182cfc04ad978f9d27449e96f12ba70503a88f5f81a3b3df943c9bddbc417cbd6d9e7eda7dcfa7cbaab2ba32f7188b0d3817c6e52177c71a11a5 SHA512 483136112d6eb3a3a838efa54fc25642ba0a8c0276c0c1b809ab24648669b4e20c9daaa8e5058fe7c48c09c2885dc5366f50380d75e522b9c4de9911988917a5
+EBUILD sprockets-4.2.0.ebuild 2045 BLAKE2B cbd12d02984f241323c86b6f4b2d9f6ec2f7c78c29fe975a707e651ab709dd08607419a2ba8923719f9e5fd8c5ce8b8a4856e0bb6b949b4ac706da81f56d0aeb SHA512 e243144c37bf503c99510d303bf5ea1c9f4cbbc1a878f80f1c5e2287c31be7e466f2ebf4556637d5d85e05b58a9a22d1e615f183aefd7f2245ac69be1bc86aea
 MISC metadata.xml 342 BLAKE2B 227ac77350fe458144d05c09bef5156a9f7c06154b8aba9902f1611b7f3e22b5409231cfb0a44af0d6f5d87138a0d71eb230d8827773830b508d91848f5a8cb0 SHA512 ee0cc0cfbfed5e9e61386b885714cf26a3ca1e2e94b820859ea1b08f82fe3ab5bf13c5a4764dd2b4ca48d668f22e493d76a39cb48a8d3c784b55b78cbfc02ec3
diff --git a/dev-ruby/sprockets/sprockets-4.2.0.ebuild b/dev-ruby/sprockets/sprockets-4.2.0.ebuild
index 521808aed007..5462145cfa71 100644
--- a/dev-ruby/sprockets/sprockets-4.2.0.ebuild
+++ b/dev-ruby/sprockets/sprockets-4.2.0.ebuild
@@ -23,7 +23,7 @@ IUSE=""
 ruby_add_rdepend "
 	dev-ruby/concurrent-ruby:1
 	>=dev-ruby/rack-2.2.4:2.2
-	!<dev-ruby/sprockets-3.7.2-r1:3"
+"
 
 ruby_add_bdepend "test? (
 		dev-ruby/json
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index a5052bc63c81..c15b486a4709 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/mysqltcl/Manifest b/dev-tcltk/mysqltcl/Manifest
index 68c7ade9543a..3b6ee7222b37 100644
--- a/dev-tcltk/mysqltcl/Manifest
+++ b/dev-tcltk/mysqltcl/Manifest
@@ -2,4 +2,4 @@ AUX mysqltcl-3.05-API.patch 427 BLAKE2B a204b1d9895898ccfd7c409464aa092deef29742
 AUX mysqltcl-3.05-ldflags.patch 448 BLAKE2B 7c0bb9294a96c870ffe4ecd0d3f401936695221fceee5a7a2b43aec8097a09849f8daf3e33e987a1492fb34f7c67a7aba5fe8ad3ef9bf2aabcc91c1f39f08315 SHA512 c253797952c5abe6633e9eb1394a1e5c2d6bd88f3c74f5f367a139b6de71fb22a645717c86d0d61a68b33a01240940e0347d184623ed1b889defea58c3c8ee79
 DIST mysqltcl-3.052.tar.gz 187781 BLAKE2B 0fe9b145556de22364187de980d737cae99a5a18763b1e3b28e4aa849f7b0b30be543cfa956c37b15e756f75ec5804e92b8b452410d542c3c3390e52d88d0419 SHA512 f5af18ad9bbaedb1fdcdbaa326b5c4cc3f754b14ee9bdf9cbfa0e1a44227ec918426022aaa0f26a71fa1a3bce6b6d8d75f8612de7f540f287fd418088c91fddf
 EBUILD mysqltcl-3.052-r1.ebuild 699 BLAKE2B b1bd9cb2f3da670634c1b6b05d5996af7d4ef32642e231c071aae089e08c4bfe05a378125c880eba59981d96a9be6cd706b2accae43b84b1984768a445f7a05c SHA512 9a78653158bf1f804e9c4674edd643f5a611d1f380a319866b9c5e63a9be34f608ca35b311f6d2d8e7896739f48ad0eab19ff8f2149a4eb4e6105610c538530f
-MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27
+MISC metadata.xml 250 BLAKE2B f1a89a42f9941c35d4c33e6b1ca5be829cac098278d63286f933d991b1d607e0b36dc7b8f0df39c6dce626aae579f7b1a83c37a1e6a72d02904ecc9a15e5783d SHA512 7468dbefac3a8c659585848363487988f297e7e8f29c7aa866cae9099f1828b2a7a45387df2e2a7d284f1f0b5c239de49b7610dbad7a3e63efba529cd48388a5
diff --git a/dev-tcltk/mysqltcl/metadata.xml b/dev-tcltk/mysqltcl/metadata.xml
index 8973b55f07b5..ec0eb938bf50 100644
--- a/dev-tcltk/mysqltcl/metadata.xml
+++ b/dev-tcltk/mysqltcl/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
-	<email>mysql-bugs@gentoo.org</email>
-	<name>MySQL</name>
+	<email>tcltk@gentoo.org</email>
+	<name>Gentoo Tcltk Project</name>
 </maintainer>
 </pkgmetadata>
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4ef0d78f751e..c36ad131ee49 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 8c3ad1c2478a..fa8ea4b5ef79 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,7 +4,6 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lldb-13.0.1.ebuild 2587 BLAKE2B 1e017726c7d7f9879c96c744c63f950ff2837d3082e5e5f81202b9b6259d71d013285fb48e81a25d8cbdb81b1db8b2f6807f897ea83b9742a24c3c35ac9761c0 SHA512 6e626b26f6ed4c51e9b2c732de21a60d3a5db90ee57c890b40dd8a6c82f738d6e8bd7a02f8f7fe7cdb9cb067ead82513b3ce7d35e20210f10f4d525cb3baed77
@@ -13,6 +12,5 @@ EBUILD lldb-15.0.5.ebuild 2716 BLAKE2B b4b4386fa20bb713bcefba2716a3a0c76a156c5d0
 EBUILD lldb-15.0.6.9999.ebuild 2697 BLAKE2B d713c22a59e74b93d059ca32c71555d89dc5e414994a07fee5a77440753385de23e59d09d4e7424f205adb9d06b639d4ff2ceadf6a074113b7c31c00c293e892 SHA512 d9ab075e295b873b1aad46f495d6e40d36114b7402df3fbb4360897d9d9c946fb6580cd4034fbea48e74ca3b27de925e4ecfdf1c3ef6bc024ecaaabe26ce1965
 EBUILD lldb-15.0.6.ebuild 2718 BLAKE2B 00164a23d8cec820742a5d757711fe836f3eaf00c94bfb39028d832bf7c5695895c0162fb2408fc3c6b51e0d4f1405a280b1fe5fc87254c168c9b2a624ff9efa SHA512 2c0888251ff9d453f5bf24ac68c3164459da0327b99ef78ba85200020de638d3583efcd22febd429e1f3ff1f63863cd42cec146238ca6ba55dda8b300b50625b
 EBUILD lldb-16.0.0.9999.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
-EBUILD lldb-16.0.0_pre20221210.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
 EBUILD lldb-16.0.0_pre20221217.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-16.0.0_pre20221210.ebuild b/dev-util/lldb/lldb-16.0.0_pre20221210.ebuild
deleted file mode 100644
index ee34e2696fe0..000000000000
--- a/dev-util/lldb/lldb-16.0.0_pre20221210.ebuild
+++ /dev/null
@@ -1,115 +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 cmake llvm llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="debug +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	xml? ( dev-libs/libxml2:= )
-	~sys-devel/clang-${PV}
-	~sys-devel/llvm-${PV}
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	python? (
-		>=dev-lang/swig-3.0.11
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LUA=OFF
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-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/${LLVM_MAJOR}"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 71327097c385..b96681a0f5ee 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -7,6 +7,6 @@ DIST ragel-7.0.4.tar.gz 1656687 BLAKE2B d96444f6b8dc356b9effa6c5032952ffb2526833
 EBUILD ragel-6.10.ebuild 851 BLAKE2B 169c5006d45b5ffc52b95143268b3202d870f65747d03ed3b1552d92a1946bb482695420120fa29ceb968d89f3836d1f1c25f10d0a36f5f9a7b64202302664a9 SHA512 11dad52ceb10f8d5be4bdee64bef9c3f04a6db1c5e1da3e7d7404ea6db4e8651f562ae258032f3e2bf4b7d718902f0037df719a17c45f589f0c2428d66437675
 EBUILD ragel-7.0.0.12.ebuild 772 BLAKE2B 97dc91562f31eefe83292cef36885fa5562039e16e866b3456d5f4ff603d456fdc66423f809e02e0414ba9e14b60bb89173301b060352f9f02c161344463882d SHA512 ee3579c12527cabd3bbb25be5b3968fe88d0d7f6351cbdaeae50626ed689d6f8e4bb207090c3504f54f2da28bf2e4c399f816295fa20e518d6f7f8046d9f9ac3
 EBUILD ragel-7.0.4-r1.ebuild 1513 BLAKE2B 9e320220f920e3bfb3ee0a20ddb4691a33409822a209709af69d2a355fee036a7cf45dd9b7d503c04c1de1f0da96e0fa6b51150dfc4f292d24119c9cdabc5a5f SHA512 c97827ddaf1b23d5a236e295b6325354623421d261034aee7a8d6adc7d635f264ca0c9c9ed0695c93f2514d0016baaefc5c3ad9f2941fab954db39e7945d322b
-EBUILD ragel-7.0.4-r2.ebuild 1523 BLAKE2B b23c97d905d2ea5aac5fa9c63049f164219ff1b22265c326e18f2d5a6c57ef56c1291574d518e40ac98e53125ecfbeccf593785356462c392be936a41d79215c SHA512 0aeaa4c21cacdb2307d86a31f648c0239acc10daf2e093c405ef6614884b4b4b620f80fed36510fe9704011ffc882165a36d907b01965ea7c2df92e5bb5e0f3c
+EBUILD ragel-7.0.4-r2.ebuild 1627 BLAKE2B 84ee2858b5cc905256f44cae66fc83fe9aeb4afe254a4c612dfb1bb4209c91440e5100053f944867b51741c868ba461f7587b4ab882116da4cd69ca6c568dedb SHA512 d5b277f02dcc9caeaf94a475975791736dc59add1f5abf77f98df75db6bbe2b2dcaf9c4f248e6758201a71d39dd07192c01d200d89383f6c43d8d696dd03b4aa
 EBUILD ragel-7.0.4.ebuild 1554 BLAKE2B ca94d9ec683bb204a0370dce71d57ff877dcd1d45a9c3b1d18571623c5125fe0d4c83aedd7086a50d64b63f25e35d32870d74e314b9ceee276ddeae9fe33ef4b SHA512 a20e53b945f896184491bc0ab9a07242d62190455abacab8844adad462eff4a348306ae729b262e56b34a5112c7be921079024b1568d24c7ab43ca2d0df2af11
 MISC metadata.xml 305 BLAKE2B 47362779057e51875e2327cb9e1e71db670cf09828b9750ab1558c4160f1938250c3b61b6c9383584c559c276966bdcb5297c0df963e80873cecce749ea886ba SHA512 71acd92aed56e6b79b31d6bb889fbb3586fb9ff9ce4d2fa0c2f3ae68be9ea2cdd865c7adbd4757c3ae4d5ef462f3cf470bf52b696c7133a5f57da69014a4c897
diff --git a/dev-util/ragel/ragel-7.0.4-r2.ebuild b/dev-util/ragel/ragel-7.0.4-r2.ebuild
index 09a0667fa6bc..81f10afdfff0 100644
--- a/dev-util/ragel/ragel-7.0.4-r2.ebuild
+++ b/dev-util/ragel/ragel-7.0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 # Notes from bug #766090
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 26b26d890d24..2aabb0e467ba 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/mailx-support/Manifest b/mail-client/mailx-support/Manifest
index 402e9764fe27..357ac49a0d80 100644
--- a/mail-client/mailx-support/Manifest
+++ b/mail-client/mailx-support/Manifest
@@ -1,5 +1,5 @@
 AUX mailx-support-20060102-add-sys_file_h.patch 397 BLAKE2B c560eb7a53f2c318873f17c2a3543bd02912c7f635a864e987ac333eca8f4fbe33e5c39ae5bc6122607fdf4c1f73ac40618b6a050eec2d520a0fce32da626c46 SHA512 d2906ca15610090ab93d0f839a0687b67556dccc0cd8dcfe1c5ae52d23c45e74d008376d57d84eaa4272a56f209628819a60108eebaf645cc1c3106ae5a954d6
 AUX mailx-support-20060102-respect-ldflags.patch 537 BLAKE2B 34dbdd5f8a9b3537657f98f8ea274349e043618dfba3d20f004be3cb0fe58438b6c3dd9af91e921f776ee8b38bfe296718add6da217893dae001c904bcebf225 SHA512 cec6b2cf6a3f8b85ebdfcd3bdbbeac9ded468b7f34053ef6473aefd413292d9d7dc350782488481a3ae2db273ad9a7005193acc0e601c5556a2fdd49640dfe1f
 DIST mailx-support-20060102.tar.bz2 8822 BLAKE2B aee5141916f3d59f730e52f5e80fc465e7a3d961ff38e5e3d3feead4b772682c999925b7d900e2d3f87d178a6730994c2e0ec3d1625b5794bed5945a219aef81 SHA512 a4bd84253fcb5a97119e75290dfda01004115c3eb5898bb792c75f7b01c7e48fa1189b9ec4ed195c404196893af8b9390062f2f258da68889b464b53aa0ecbc2
-EBUILD mailx-support-20060102-r2.ebuild 809 BLAKE2B b782095398aac9ee411a393195c2594cdeb0f8fd9211819be6d9a818620636be57e9c2038d30abe17513ecb39589192987c5de151a472ddc3e3c573df15c8198 SHA512 32a7f8498e547de424c42f1a997c4661a6642c7b41f15b22a2fc1ed6d7a2bf9a73f73e7dd0e0a830d5c43e553ee0504126a8309a8a533c0328897c8fea7152cb
+EBUILD mailx-support-20060102-r2.ebuild 808 BLAKE2B b357dab5c90b9366ec2718796366a0cbf0f5b938265d0a15dbdf340c01843822859cfa9719e7dcf57dfb399064a31e4eeb239c0bb5e39c6aa89321602831f26c SHA512 48b3fe25e8b1042c047725196afa2c837ac11b45486ad2d6032fdad9cd791b3a54d50a8fd4b334b8a1540c92b5936d195a58dd690b220a1c15eac5828cf61379
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/mail-client/mailx-support/mailx-support-20060102-r2.ebuild b/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
index 1b5290b71468..5be445ff2676 100644
--- a/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
+++ b/mail-client/mailx-support/mailx-support-20060102-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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-respect-ldflags.patch
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index 722365e6d170..46da39214bfa 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -3,5 +3,5 @@ AUX mailx-8.1.2.20050715-offsetof.patch 1566 BLAKE2B 0878d9f3b639e292e1cfc69676c
 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 1360 BLAKE2B be7fe62221417203c013ef56970765f1692383cdcfc15abb0a9752520033ba8febf96009ba72840493798f465abecfb7fd03421a2ab4a12a63159d6e1c552b68 SHA512 dc329661d7fe5a5f8e41928e07ef8f869b0c57eaafd1ef657c0ae955660fa9f8ccc4432b6929ec6275a47f80d0d5d08fdce0b146235f6e0d1d1838654fed115b
+EBUILD mailx-8.1.2.20180807.ebuild 1359 BLAKE2B 33445d83816a989563b725203c148ab7088a1b4e6b3b60d11410b747c482650b48f0e3142ced25469d8b053a4e65245a26079a0552ee93c53c20d9352de491ee SHA512 e82f99cd1fdb20466c34da5686d711ae68550a1fa0101bae64fcc50b32c2c8f21f0c47fc0e7e3a5c513bb5136daa96b91bcf597d90b96f34682387f46095c8d7
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/mail-client/mailx/mailx-8.1.2.20180807.ebuild b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
index 4b3f28a1d294..8a181740f57c 100644
--- a/mail-client/mailx/mailx-8.1.2.20180807.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${DP/_/-}.orig"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND=">=net-libs/liblockfile-1.03
 	dev-libs/libbsd
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 1903db9b0f7a..b8a45acd1654 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index 1c65806dfd11..e5023e146d9a 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -3,5 +3,5 @@ AUX smtpd.pam 147 BLAKE2B 1706fe27cf53621428f563af146d1197dfc59133dda79fe08141ec
 AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae8e0ba15838a2a9ddc677f54f5d5fe191591b2bd5c7f20067fc00b6679f448e25371e27f231589d SHA512 b70b173ac275b871d78bac0e55b2e0c8d8a6538c7f2c4dc86fe67fb37a1ee942e0442353b338b286759618299f51b144396251db13f82c9afa035dcaae11a258
 AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2
 DIST opensmtpd-6.8.0p2.tar.gz 860189 BLAKE2B 603e8516860eddefb1694ea4cb5631cec2df2a19fa3193b25388caf73c41e82d44e57847fc95b5187488cae629542e72ff2d5a17badc15cef1647bdb173d7827 SHA512 48f152b75575146fdd09bdf47123041ea62fefb6e5de33a69826bf91a2126a918f8db1caffadb2f142a1a21de8126d492de88cb65bdf169e61c0b22d3e78d290
-EBUILD opensmtpd-6.8.0_p2-r2.ebuild 1963 BLAKE2B 0ef6ef7d8f4c78a609cd219a61a716857d3820e5e24458515eeacb83673dad7cea31ef10c279fb5c2cefb670aee861ab7e8707bf01bf45a5343943f10921fc56 SHA512 fd2407ddfe22097676f68fc5530aa59d28767a7369c9c23ac16e2d0ed8a333c710d4715b1cbcbbe0e867fed5b510ed41bab08befba6f383e105c5e311af15cc5
+EBUILD opensmtpd-6.8.0_p2-r2.ebuild 1962 BLAKE2B 571a5cd83312ac6584a4e883c9ace89da623b4be6343175c245f648aa935bf80c83cda7cdb306750bd0aea5456cae6e9975408c283317914573cae5517621ec0 SHA512 5cef740ab249461196aa479d39124bde5f24d5363548b439c24924491925b180e8be2c13cb874452d8c568f88489baa211005df4767e74a46becac8241474b2f
 MISC metadata.xml 694 BLAKE2B b72e021afca63807b8139e3e69f8ec8acbc37f2e0abaae0bef0a5afc5fa1b7978dc7e64ecb8aae85251c66d697ad7ef8df214884e60ceb9ed5519a64d551e6e2 SHA512 d5b86e34dcdf22a313869dcae3a1e7a05a05a9e67e701642281e4e174974c3edb7007dc5ac45f666c8bdf0d35014f6f58e72eed527e8dab2c80aa87c09cc3d18
diff --git a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r2.ebuild b/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r2.ebuild
index 0348733b5491..d580b7c929b3 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r2.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 IUSE="berkdb +mta pam split-usr"
 
 # < openssl 3 for bug #881701
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a457ddf12868..206eead7a2c1 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a2982e676f5d..40eedf69061d 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 25 Dec 2022 07:09:38 +0000
+Sun, 25 Dec 2022 13:09:33 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index fb45de7d8b80..da15e3eacf35 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 538471 BLAKE2B b7385901234c82cabfe7b6fe500f9a2de535ba832c5fe98f7b1adcf90342ab9ac009a4eefb2c71141609f93233148e5db41c6f760cbea8413d0a285b67c25f90 SHA512 8b561e583b67bc367b59eefc1d958442632b1001434a1d0874a9ae00334c80cc4a27278dac1813b0d7b255f214d060c5e60573b828bb87fc8e319dc9233f12aa
-TIMESTAMP 2022-12-25T07:09:41Z
+TIMESTAMP 2022-12-25T13:09:37Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOn9zVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOoS5FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAXQA/9E6Qy/ceZl3H9VWkAV2PR3weyBYgYaK0y8yQgGVQ+rlPBZOF3dz0IAyFU
-Zra2QsZS7t35e738n+qq7EJgIvmSf/D/ZGgIXeI0FJ/e87usUpMv8+NKoCOWXtFQ
-dlUjBoiFDE0iVSEOVY5QV4xRBohboJ4vXlzkvBmsdbVQdB0UHd8s95VrSf2+jgjm
-mv4WQexbgu69f37Psl5l2aG8QFjkYU224vDar/ssFdLYJ+NC4RKt2aEV3qkhS9EV
-ZO4faF/Nab79wUtcmZRLxjbTkjD1S3Xi4SFwpwdcrCpQ2vvdTr3E2HsHB2fK64/R
-msythSS7mO8rjfbVsWg2cAXmeK2J2pFFmQ8MPymso8uHV/ei8hyB2VDPl4FTNm1x
-D2St+fKXi2FHHeLnWT0FSsC0IpSnFGUCfQUhHeaMmNMYbAVx8FvfRqY4InRCYdXS
-e03pZgLTxcqb2QJMTZqzJXqXLdyu7RSiAxaBW1kMI83ABv2a7BE8j2b2WyenjnUs
-dJUJOiBfYhB7E29D+YpBxGfqIlg8PnpInxPnSQDWGW1sB9Cu9Ah2bcj0YOf/8Jl6
-vfaeAWh6w9Qtf8/GZKyxHOp/qHxr4ScPczYIYAGalKJAgX8Xfev+8w77QgEBmqzB
-98Qu0CrCM8hRuNZXl3R9uV7K0sHjIoknLzebCFMWpO8WIoGu/y4=
-=gnpP
+klCkQw//XGGQR+wmQdtZnn7HsyDZBydrE4JbeWFFzkiTB5+7h1UEYbLEk9qkKiNF
++Acu4RQWFFDy9WRKKdqsscxB9B7ILX9CMRJUcxXy20I+tCq6JGX4FT8lgbnVjQX5
+jh5iqVB0Lyp28oyIWKRXs3i0dKU7y2vuJeOXScXyyv6HOk7SbzYLJBReYiq9YM5r
+ssYiqJGhf5cP1vc/t1Z3dl+AqRi+dm8Gy49Rvihy3FT/zJ+sFFlCGosa1+hEZOoe
+eEFLtbblSNLMG5poUTpwYDYka2SUnYB/APihKRGqYo56kbhI1ifvs9rnMzNsjnNr
+NMjG3TaS6BwKWpBYVjHN1xxiM92wl7o+Drqar+8Ukfaqr6Oiqiznch1yOqYq+unH
+F1iCOOtxNEA1fU8XhyzZVS8rQ55NIdMYZrHokVL+i9dvHM/SI5Jorv4OMHuMsUEC
+6GMeFL/j8q3mMpfjSwaDn8n9fqgREQbtnm9Gy006oQfs13hLsKOGPxUuIJ3NEn70
+CZVqGEvxVg/j2sgaPgUGqIEZ1gfgkqj2EsoWWbCc6ENEivwvYreeqKh0NK2G9Tzk
+7yu0RgiCsJ+Ma5jzKpQRnjbEiuo2ewrcFK1WqsafvSkLjrRGUOI9Wizdy4f4kbzD
+9Ti1MF5NGSNAHCX27H7kZ4KMzeLRM1stHnNq8SIiWdkDxKRe0Oc=
+=9sgP
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a2982e676f5d..40eedf69061d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 25 Dec 2022 07:09:38 +0000
+Sun, 25 Dec 2022 13:09:33 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 78ae1dae1e84..bf67a3719f8f 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 42d8ffafb70d..849f7f445245 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/coreboot-utils-4.18 b/metadata/md5-cache/app-admin/coreboot-utils-4.18
new file mode 100644
index 000000000000..3b636a83b1e4
--- /dev/null
+++ b/metadata/md5-cache/app-admin/coreboot-utils-4.18
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-apps/pciutils sys-libs/zlib
+DESCRIPTION=A selection from coreboot/utils useful in general
+EAPI=8
+HOMEPAGE=https://www.coreboot.org/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64
+LICENSE=GPL-2+ GPL-2
+RDEPEND=sys-apps/pciutils sys-libs/zlib
+SLOT=0
+SRC_URI=https://coreboot.org/releases/coreboot-4.18.tar.xz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=c85d6850db9f3a862150772db07561d5
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index e2d16ac4cf6e..9c146aa3454b 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/crengine-ng-0.9.2 b/metadata/md5-cache/app-text/crengine-ng-0.9.2
deleted file mode 100644
index a9aab15ac134..000000000000
--- a/metadata/md5-cache/app-text/crengine-ng-0.9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-libs/zlib png? ( media-libs/libpng:0 ) jpeg? ( media-libs/libjpeg-turbo ) >=media-libs/freetype-2.10.0 harfbuzz? ( media-libs/harfbuzz:= ) libunibreak? ( dev-libs/libunibreak:= ) fribidi? ( dev-libs/fribidi ) zstd? ( app-arch/zstd:= ) libutf8proc? ( dev-libs/libutf8proc:= ) fontconfig? ( media-libs/fontconfig ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib png? ( media-libs/libpng:0 ) jpeg? ( media-libs/libjpeg-turbo ) >=media-libs/freetype-2.10.0 harfbuzz? ( media-libs/harfbuzz:= ) libunibreak? ( dev-libs/libunibreak:= ) fribidi? ( dev-libs/fribidi ) zstd? ( app-arch/zstd:= ) libutf8proc? ( dev-libs/libutf8proc:= ) fontconfig? ( media-libs/fontconfig )
-DESCRIPTION=Cross-platform library designed to implement e-book readers. Supports many e-book formats
-EAPI=8
-HOMEPAGE=https://gitlab.com/coolreader-ng/crengine-ng
-INHERIT=cmake
-IUSE=+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc lto static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib png? ( media-libs/libpng:0 ) jpeg? ( media-libs/libjpeg-turbo ) >=media-libs/freetype-2.10.0 harfbuzz? ( media-libs/harfbuzz:= ) libunibreak? ( dev-libs/libunibreak:= ) fribidi? ( dev-libs/fribidi ) zstd? ( app-arch/zstd:= ) libutf8proc? ( dev-libs/libutf8proc:= ) fontconfig? ( media-libs/fontconfig )
-SLOT=0
-SRC_URI=https://gitlab.com/coolreader-ng/crengine-ng/-/archive/0.9.2/crengine-ng-0.9.2.tar.bz2
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=65278d7c3557a1288716ba0870218dcc
diff --git a/metadata/md5-cache/app-text/crqt-ng-1.0.2 b/metadata/md5-cache/app-text/crqt-ng-1.0.2
deleted file mode 100644
index 7f45560ce281..000000000000
--- a/metadata/md5-cache/app-text/crqt-ng-1.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/crengine-ng[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DESCRIPTION=Cross-platform e-book reader
-EAPI=8
-HOMEPAGE=https://gitlab.com/coolreader-ng/crqt-ng
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake plocale xdg
-IUSE=+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/crengine-ng[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://gitlab.com/coolreader-ng/crqt-ng/-/archive/1.0.2/crqt-ng-1.0.2.tar.bz2
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=597b809d9905999690003a381be73f93
diff --git a/metadata/md5-cache/app-text/crqt-ng-1.0.3 b/metadata/md5-cache/app-text/crqt-ng-1.0.3-r1
index 022947597a1d..9c62d773ae6a 100644
--- a/metadata/md5-cache/app-text/crqt-ng-1.0.3
+++ b/metadata/md5-cache/app-text/crqt-ng-1.0.3-r1
@@ -12,4 +12,4 @@ RDEPEND=>=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz
 SLOT=0
 SRC_URI=https://gitlab.com/coolreader-ng/crqt-ng/-/archive/1.0.3/crqt-ng-1.0.3.tar.bz2
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6df62f73a816e597efd0c1ff253160fa
+_md5_=5ea200c28b739619423bf3bfe47ece7c
diff --git a/metadata/md5-cache/app-text/crwx-ng-0.2.0 b/metadata/md5-cache/app-text/crwx-ng-0.2.0-r1
index 3c6083c58347..34e3d57708d2 100644
--- a/metadata/md5-cache/app-text/crwx-ng-0.2.0
+++ b/metadata/md5-cache/app-text/crwx-ng-0.2.0-r1
@@ -2,13 +2,13 @@ BDEPEND=>=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Cross-platform e-book reader
 EAPI=8
-HOMEPAGE=https://gitlab.com/coolreader-ng/crqt-ng
+HOMEPAGE=https://gitlab.com/coolreader-ng/crwx-ng
 INHERIT=cmake wxwidgets
 IUSE=+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] x11-libs/wxGTK:3.0-gtk3 || ( media-fonts/liberation-fonts media-fonts/corefonts )
+RDEPEND=>=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] x11-libs/wxGTK:3.0-gtk3 virtual/ttf-fonts
 SLOT=0
 SRC_URI=https://gitlab.com/coolreader-ng/crwx-ng/-/archive/0.2.0/crwx-ng-0.2.0.tar.bz2
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ce5d7af3ecb15ef19b3171bd7fdf9217
+_md5_=9b383a4b563f4dbbdf86960f810e51bb
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 5823a778b3e8..66ba1f613f74 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20221210 b/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20221210
deleted file mode 100644
index 7895f346ecad..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-16.0.0_pre20221210
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) || ( ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!sys-devel/llvm:0
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	d44b2a59588e4ff995e081d77573dafe	llvm.org	606e23175781a143cb6677bfc3211ee8	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6d87f33e797c3c7b21b27c8186248225
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 68f6b43d06c7..202214f6f2b8 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20221210 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20221210
deleted file mode 100644
index c9d5c7f81d8a..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_pre20221210
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.0_pre20221210:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_SPIRV] ) !!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_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.0_pre20221210:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_SPIRV] )
-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_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV )
-RESTRICT=!test? ( test )
-SLOT=0/16.0.0_pre20221210
-SRC_URI=https://github.com/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	d44b2a59588e4ff995e081d77573dafe	llvm.org	606e23175781a143cb6677bfc3211ee8	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d104c2b9071a4b8897e8436525e8f915
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index b5c95aadf920..43698dd140af 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.0_pre20221210 b/metadata/md5-cache/dev-python/clang-python-16.0.0_pre20221210
deleted file mode 100644
index d40ca9cc0334..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-16.0.0_pre20221210
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) test? ( sys-devel/clang:16 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-16.0.0_pre20221210:* !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 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-16.0.0_pre20221210:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=llvm.org	606e23175781a143cb6677bfc3211ee8	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=e761e83df8aff100a24b6bfad08af640
diff --git a/metadata/md5-cache/dev-python/doc8-1.1.1 b/metadata/md5-cache/dev-python/doc8-1.1.1
new file mode 100644
index 000000000000..3c681332c101
--- /dev/null
+++ b/metadata/md5-cache/dev-python/doc8-1.1.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( <dev-python/docutils-0.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/restructuredtext-lint-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stevedore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[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.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[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 checker for Sphinx (or other) RST documentation
+EAPI=8
+HOMEPAGE=https://pypi.org/project/doc8/ https://github.com/PyCQA/doc8/
+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 ~x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/docutils-0.21[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/restructuredtext-lint-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stevedore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[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.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/d/doc8/doc8-1.1.1.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=001835567cf19ea71390ba5d89521835
diff --git a/metadata/md5-cache/dev-python/fakeredis-2.4.0 b/metadata/md5-cache/dev-python/fakeredis-2.4.0
new file mode 100644
index 000000000000..24a8734119a6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fakeredis-2.4.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-db/redis 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(-)?] ) test? ( >=dev-python/redis-py-4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/redis-py-4.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.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.1.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.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.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=Fake implementation of redis API for testing purposes
+EAPI=8
+HOMEPAGE=https://github.com/cunla/fakeredis-py/ https://pypi.org/project/fakeredis/
+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 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/redis-py-4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/redis-py-4.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.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.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/cunla/fakeredis-py/archive/v2.4.0.tar.gz -> fakeredis-py-2.4.0.gh.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=88e39adc9d19bd2affe84397f4fe6d32
diff --git a/metadata/md5-cache/dev-python/flaky-3.7.0-r3 b/metadata/md5-cache/dev-python/flaky-3.7.0-r3
new file mode 100644
index 000000000000..ff0abd41f972
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flaky-3.7.0-r3
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[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=test? ( dev-python/genty[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=Plugin for pytest that automatically reruns flaky tests
+EAPI=8
+HOMEPAGE=https://github.com/box/flaky/ https://pypi.org/project/flaky/
+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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/f/flaky/flaky-3.7.0.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=846e6948faae8c740bb32679aff93dd4
diff --git a/metadata/md5-cache/dev-python/lit-16.0.0_pre20221210 b/metadata/md5-cache/dev-python/lit-16.0.0_pre20221210
deleted file mode 100644
index 717ee4c4e35f..000000000000
--- a/metadata/md5-cache/dev-python/lit-16.0.0_pre20221210
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/llvm ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[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=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 python_targets_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	llvm.org	606e23175781a143cb6677bfc3211ee8	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=efa1f4ea248be58f79439db9d2f50b07
diff --git a/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.0.3 b/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.0.3
new file mode 100644
index 000000000000..955eb4bdaf4b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pallets-sphinx-themes-2.0.3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[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=Sphinx themes for Pallets and related projects
+EAPI=8
+HOMEPAGE=https://github.com/pallets/pallets-sphinx-themes/ https://pypi.org/project/Pallets-Sphinx-Themes/
+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
+LICENSE=BSD
+RDEPEND=dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[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.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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://github.com/pallets/pallets-sphinx-themes/archive/2.0.3.tar.gz -> pallets-sphinx-themes-2.0.3.gh.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=70d5e4f4ac7dac3c2ede6fd0b5850e2c
diff --git a/metadata/md5-cache/dev-python/pytest-plus-0.4.0 b/metadata/md5-cache/dev-python/pytest-plus-0.4.0
new file mode 100644
index 000000000000..7fea902ff5ff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-plus-0.4.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools_scm-7.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-6.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[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.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[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 Plus Plugin - extends pytest functionality
+EAPI=8
+HOMEPAGE=https://github.com/pytest-dev/pytest-plus/ https://pypi.org/project/pytest-plus/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=>=dev-python/pytest-6.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.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1: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/p/pytest-plus/pytest-plus-0.4.0.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=7bcc959b22b1c51aca7c9ddf271c936f
diff --git a/metadata/md5-cache/dev-python/scipy-1.8.1 b/metadata/md5-cache/dev-python/scipy-1.8.1
deleted file mode 100644
index cd119dbcf11f..000000000000
--- a/metadata/md5-cache/dev-python/scipy-1.8.1
+++ /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.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) >=dev-python/setuptools-65.5.1[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=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
-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.16:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9: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.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	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a1cccb3f60ac2b65371ae49665d7d9ba
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 3d3977945095..1948cb0cfbfd 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/bundler-2.3.26 b/metadata/md5-cache/dev-ruby/bundler-2.3.26
index 102599b40933..db9af7eb1fe0 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.3.26
+++ b/metadata/md5-cache/dev-ruby/bundler-2.3.26
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=doc test test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0 ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) dev-vcs/git ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.3.26.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=edf947c71f57d65bca39f8c888cc50ea
+_md5_=c9633e9f452f3eba1e95b3370cb043ef
diff --git a/metadata/md5-cache/dev-ruby/date-3.3.3 b/metadata/md5-cache/dev-ruby/date-3.3.3
new file mode 100644
index 000000000000..4739a3d32545
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/date-3.3.3
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A subclass of Object includes Comparable module for handling dates
+EAPI=8
+HOMEPAGE=https://github.com/ruby/date
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~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
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/date/archive/v3.3.3.tar.gz -> date-3.3.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=1ba2d799f1f854f1e578dc5881215f81
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.6.3 b/metadata/md5-cache/dev-ruby/did_you_mean-1.6.3
new file mode 100644
index 000000000000..1f9f8788a7e8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.6.3
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION='did you mean?'experience in Ruby
+EAPI=8
+HOMEPAGE=https://github.com/yuki24/did_you_mean
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 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
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2.6
+SRC_URI=https://rubygems.org/gems/did_you_mean-1.6.3.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=408e83254fd7dbcd8fc8e0db0da1549f
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.4 b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.4
index fdfc8ae4152d..bcf3822551b2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-1.4.4
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-1.4.4
@@ -4,7 +4,7 @@ DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lan
 DESCRIPTION=A module for profiling Ruby code
 EAPI=8
 HOMEPAGE=https://github.com/ruby-prof/ruby-prof
-INHERIT=multilib ruby-fakegem
+INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/1.4.4.tar.gz -> ruby-prof-1.4.4.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=dbf0bdc65179fc39e83865e8b9169de6
+_md5_=b54c4f0166e808cfb93c14aeec24f757
diff --git a/metadata/md5-cache/dev-ruby/sprockets-4.2.0 b/metadata/md5-cache/dev-ruby/sprockets-4.2.0
index c5719860438a..2a7ad2494109 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-4.2.0
+++ b/metadata/md5-cache/dev-ruby/sprockets-4.2.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] >=dev-ruby/rack-2.2.4:2.2[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-2.2.4:2.2[ruby_targets_ruby30(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby31(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby31(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby31(-)] ) ) 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_ruby31? ( test? ( dev-ruby/json[ruby_targets_ruby31(-)] dev-ruby/rack-test[ruby_targets_ruby31(-)] =dev-ruby/coffee-script-2*[ruby_targets_ruby31(-)] =dev-ruby/execjs-2*[ruby_targets_ruby31(-)] =dev-ruby/sass-3*[ruby_targets_ruby31(-)] >=dev-ruby/sass-3.1[ruby_targets_ruby31(-)] dev-ruby/sassc[ruby_targets_ruby31(-)] dev-ruby/uglifier[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby31(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby31(-)] ) ) 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_ruby31? ( test? ( dev-ruby/json[ruby_targets_ruby31(-)] dev-ruby/rack-test[ruby_targets_ruby31(-)] =dev-ruby/coffee-script-2*[ruby_targets_ruby31(-)] =dev-ruby/execjs-2*[ruby_targets_ruby31(-)] =dev-ruby/sass-3*[ruby_targets_ruby31(-)] >=dev-ruby/sass-3.1[ruby_targets_ruby31(-)] dev-ruby/sassc[ruby_targets_ruby31(-)] dev-ruby/uglifier[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Ruby library for compiling and serving web assets
@@ -8,10 +8,10 @@ INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 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_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] >=dev-ruby/rack-2.2.4:2.2[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-2.2.4:2.2[ruby_targets_ruby30(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby31(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby31(-)] !<dev-ruby/sprockets-3.7.2-r1:3[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+RDEPEND=ruby_targets_ruby27? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby27(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby30(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby31(-)] >=dev-ruby/rack-2.2.4:2.2[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://github.com/rails/sprockets/archive/v4.2.0.tar.gz -> sprockets-4.2.0-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=3dc4bf52ab9effb32e588d29152da186
+_md5_=66833d5ad7dcc5c2993e4f1a5ff07614
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 67f17c6cec44..6be98be996c4 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0_pre20221210 b/metadata/md5-cache/dev-util/lldb-16.0.0_pre20221210
deleted file mode 100644
index 7bd52abde3d0..000000000000
--- a/metadata/md5-cache/dev-util/lldb-16.0.0_pre20221210
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=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(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_8? ( ~dev-python/lit-16.0.0_pre20221210[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-16.0.0_pre20221210[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-16.0.0_pre20221210[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-16.0.0_pre20221210[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) sys-devel/lld ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-16.0.0_pre20221210 ~sys-devel/llvm-16.0.0_pre20221210 !!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 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-16.0.0_pre20221210 ~sys-devel/llvm-16.0.0_pre20221210 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_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1: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 !test? ( test )
-SLOT=0/16.0.0_pre20221210
-SRC_URI=https://github.com/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	d44b2a59588e4ff995e081d77573dafe	llvm.org	606e23175781a143cb6677bfc3211ee8	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=688e55c120b94b78bdf93e5439691646
diff --git a/metadata/md5-cache/dev-util/ragel-7.0.4-r2 b/metadata/md5-cache/dev-util/ragel-7.0.4-r2
index 222a42195f07..0a7e454c79a4 100644
--- a/metadata/md5-cache/dev-util/ragel-7.0.4-r2
+++ b/metadata/md5-cache/dev-util/ragel-7.0.4-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.colm.net/open-source/ragel/
 INHERIT=autotools
 IUSE=doc
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-util/colm-0.14.7-r1
 SLOT=0
 SRC_URI=https://www.colm.net/files/ragel/ragel-7.0.4.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=cc84f55c86a9ea17720692312c38cd48
+_md5_=e6712e870b21bf790a5974c07d36141b
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 6941b625d33e..769ca8db070e 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
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 3f92d8ebdd19..5d80d0eb3939 100644
--- a/metadata/md5-cache/mail-client/mailx-8.1.2.20180807
+++ b/metadata/md5-cache/mail-client/mailx-8.1.2.20180807
@@ -4,10 +4,10 @@ DESCRIPTION=The $ mail program, which is used to send mail via shell scripts
 EAPI=7
 HOMEPAGE=https://www.debian.org/
 INHERIT=toolchain-funcs
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=>=net-libs/liblockfile-1.03 dev-libs/libbsd virtual/mta mail-client/mailx-support !mail-client/nail !net-mail/mailutils
 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	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=b658f863a13aa55b25d3c6f83e630bd3
+_md5_=775ef6e4c92448ac0a8c4401c9c8f9fb
diff --git a/metadata/md5-cache/mail-client/mailx-support-20060102-r2 b/metadata/md5-cache/mail-client/mailx-support-20060102-r2
index a601c24b0c72..4031b0820ac5 100644
--- a/metadata/md5-cache/mail-client/mailx-support-20060102-r2
+++ b/metadata/md5-cache/mail-client/mailx-support-20060102-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Provides lockspool utility
 EAPI=7
 HOMEPAGE=http://www.openbsd.org/
 INHERIT=toolchain-funcs
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=mirror://gentoo/mailx-support-20060102.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=55225eeb915eb61e325c46f38630ff2e
+_md5_=31b0247054ea10cb1b3cb8fc2f09965d
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 7ccf0f827655..93fdeb62960c 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/opensmtpd-6.8.0_p2-r2 b/metadata/md5-cache/mail-mta/opensmtpd-6.8.0_p2-r2
index b3e4391c18f2..de0c9eba095b 100644
--- a/metadata/md5-cache/mail-mta/opensmtpd-6.8.0_p2-r2
+++ b/metadata/md5-cache/mail-mta/opensmtpd-6.8.0_p2-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.opensmtpd.org
 INHERIT=pam systemd
 IUSE=berkdb +mta pam split-usr
-KEYWORDS=amd64 ~arm ~arm64 ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
 LICENSE=ISC BSD BSD-1 BSD-2 BSD-4
 RDEPEND=acct-user/smtpd acct-user/smtpq <dev-libs/openssl-3:= elibc_musl? ( sys-libs/fts-standalone ) sys-libs/zlib pam? ( sys-libs/pam ) berkdb? ( sys-libs/db:= ) dev-libs/libevent:= app-misc/ca-certificates net-mail/mailbase net-libs/libasr virtual/libcrypt:= !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta]
 SLOT=0
 SRC_URI=https://www.opensmtpd.org/archives/opensmtpd-6.8.0p2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=07a603086ecd340402c0667deb5ac932
+_md5_=5aac3d7d6c2124c3b516decec4fb75f1
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index f043a7ae4579..b1148e21107e 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libasr-1.0.4 b/metadata/md5-cache/net-libs/libasr-1.0.4
index a3ba593aed0f..05c384585bb4 100644
--- a/metadata/md5-cache/net-libs/libasr-1.0.4
+++ b/metadata/md5-cache/net-libs/libasr-1.0.4
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Async Resolver Library from OpenBSD/OpenSMTPD
 EAPI=7
 HOMEPAGE=https://github.com/OpenSMTPD/libasr
-KEYWORDS=amd64 ~arm ~arm64 ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
 LICENSE=ISC BSD BSD-1 BSD-2 BSD-4
 SLOT=0
 SRC_URI=https://www.opensmtpd.org/archives/libasr-1.0.4.tar.gz
-_md5_=8bae69e4c264888bacfb37956e7ed158
+_md5_=c7010d25816f0065445afc9e38d0d26f
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index d832bb5605f7..9b3bac200bb4 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0_pre20221210 b/metadata/md5-cache/sys-devel/clang-16.0.0_pre20221210
deleted file mode 100644
index 92be4efcf6ac..000000000000
--- a/metadata/md5-cache/sys-devel/clang-16.0.0_pre20221210
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=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(-)] ) python_single_target_python3_11? ( dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ) xml? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-16.0.0_pre20221210:16=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_SPIRV] ) !!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 doc +extra ieee-long-double +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV 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=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-16.0.0_pre20221210 sys-devel/clang-toolchain-symlinks:16
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ~sys-devel/llvm-16.0.0_pre20221210:16=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/clang-common-16.0.0_pre20221210 llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0_pre20221210[llvm_targets_SPIRV] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=16/16.0.0_pre20221210
-SRC_URI=https://github.com/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	d44b2a59588e4ff995e081d77573dafe	llvm.org	606e23175781a143cb6677bfc3211ee8	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4325ba237c1c69f7b4132dae456164b0
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20221210 b/metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20221210
deleted file mode 100644
index d53baa57f059..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.0_pre20221210
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install preinst prepare pretend unpack
-DESCRIPTION=Common files shared between multiple slots of clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
-INHERIT=bash-completion-r1 llvm.org
-IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind stricter
-KEYWORDS=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.0_pre20221210 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	606e23175781a143cb6677bfc3211ee8	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a612e6933b73fc9a184aaa82d354b6e6
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-16.0.0_pre20221210 b/metadata/md5-cache/sys-devel/clang-runtime-16.0.0_pre20221210
deleted file mode 100644
index 40114a191193..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-16.0.0_pre20221210
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=pretend
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=8
-HOMEPAGE=https://clang.llvm.org/
-INHERIT=multilib-build toolchain-funcs
-IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~loong
-LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-16.0.0_pre20221210:16[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-16.0.0_pre20221210:16[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-16.0.0_pre20221210[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-16.0.0_pre20221210[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=16
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=6bfdf1aa57bd88f1562551f116c3d94c
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0_pre20221210 b/metadata/md5-cache/sys-devel/lld-16.0.0_pre20221210
deleted file mode 100644
index 3765c3698b00..000000000000
--- a/metadata/md5-cache/sys-devel/lld-16.0.0_pre20221210
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-16.0.0_pre20221210[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-16.0.0_pre20221210[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-16.0.0_pre20221210[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 >=dev-python/lit-16.0.0_pre20221210[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-16.0.0_pre20221210[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1
-IUSE=debug test zstd test
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:16
-RDEPEND=~sys-devel/llvm-16.0.0_pre20221210[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=16/16.0.0_pre20221210
-SRC_URI=https://github.com/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	d44b2a59588e4ff995e081d77573dafe	llvm.org	606e23175781a143cb6677bfc3211ee8	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3fa9fd9150393d3a8be081cc3c049c27
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.0_pre20221210 b/metadata/md5-cache/sys-devel/llvm-16.0.0_pre20221210
deleted file mode 100644
index f1d069dab0a2..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-16.0.0_pre20221210
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-16.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-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(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
-DESCRIPTION=Low Level Virtual Machine
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
-IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 zstd test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV 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=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
-PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:16 binutils-plugin? ( >=sys-devel/llvmgold-16 )
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=16/16.0.0_pre20221210
-SRC_URI=https://github.com/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	606e23175781a143cb6677bfc3211ee8	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6716709610963c76a76a6fcfb9819eaa
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.0_pre20221210 b/metadata/md5-cache/sys-devel/llvm-common-16.0.0_pre20221210
deleted file mode 100644
index bf9a0483c049..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-16.0.0_pre20221210
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org
-KEYWORDS=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=!sys-devel/llvm:0
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=llvm.org	606e23175781a143cb6677bfc3211ee8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=e86f0bc8528e80885606b683255d9c65
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 47522ab978d5..111755fabaec 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/sof-firmware-2.1.1-r1 b/metadata/md5-cache/sys-firmware/sof-firmware-2.2.3
index 4268e4e09a74..f84baef69e87 100644
--- a/metadata/md5-cache/sys-firmware/sof-firmware-2.1.1-r1
+++ b/metadata/md5-cache/sys-firmware/sof-firmware-2.2.3
@@ -2,9 +2,9 @@ DEFINED_PHASES=install preinst
 DESCRIPTION=Sound Open Firmware (SOF) binary files
 EAPI=8
 HOMEPAGE=https://www.sofproject.org https://github.com/thesofproject/sof https://github.com/thesofproject/sof-bin
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=media-libs/alsa-lib
 SLOT=0
-SRC_URI=https://github.com/thesofproject/sof-bin/releases/download/v2.1.1/sof-bin-v2.1.1.tar.gz -> sof-firmware-2.1.1.tar.gz
-_md5_=eaea3b0089fdfebb0332c4fa722fa949
+SRC_URI=https://github.com/thesofproject/sof-bin/releases/download/v2.2.3/sof-bin-v2.2.3.tar.gz -> sof-firmware-2.2.3.tar.gz
+_md5_=663d46deaf91bacb3f24e4b8a07e6758
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 77d50735214a..84eaf596b469 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20221210 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20221210
deleted file mode 100644
index 3bdb6489f703..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_pre20221210
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 >=dev-python/lit-15[python_targets_python3_8(-)] ) ) =sys-devel/clang-16.0.0*:16 ) !test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:16 !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+abi_x86_32 abi_x86_64 +clang debug test
-KEYWORDS=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=16
-SRC_URI=https://github.com/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	d44b2a59588e4ff995e081d77573dafe	llvm.org	606e23175781a143cb6677bfc3211ee8	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f6f676b89a47688e0870587d7ed6dfd9
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20221210 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20221210
deleted file mode 100644
index 8077fb263a43..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_pre20221210
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 >=dev-python/lit-15[python_targets_python3_8(-)] ) ) =sys-devel/clang-16.0.0*:16 sys-libs/compiler-rt:16 ) !test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:16 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-IUSE=+abi_x86_32 abi_x86_64 +clang debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
-KEYWORDS=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
-RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
-SLOT=16
-SRC_URI=https://github.com/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	d44b2a59588e4ff995e081d77573dafe	llvm.org	606e23175781a143cb6677bfc3211ee8	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2638bacb616b6b896ae7b477e5e02419
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20221210 b/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20221210
deleted file mode 100644
index b3399269a399..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.0_pre20221210
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.0_pre20221210[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:16 !!sys-devel/llvm:0
-DESCRIPTION=New implementation of the C++ standard library, targeting C++11
-EAPI=8
-HOMEPAGE=https://libcxx.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang +libcxxabi static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.0_pre20221210[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	d44b2a59588e4ff995e081d77573dafe	llvm.org	606e23175781a143cb6677bfc3211ee8	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=704630e4b652fc6fea6bb6f283dd5643
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20221210 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20221210
deleted file mode 100644
index 5c4f8c6a3ad6..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_pre20221210
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) ) test? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:16 !!sys-devel/llvm:0
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!<sys-libs/libcxx-15
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	d44b2a59588e4ff995e081d77573dafe	llvm.org	606e23175781a143cb6677bfc3211ee8	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=16e6fb4be886f1c920f7e7e40a570ec4
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20221210 b/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20221210
deleted file mode 100644
index 464a48366fa2..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0_pre20221210
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( dev-python/lit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lit[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) sys-devel/clang ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.0_pre20221210[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
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1
-IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=gdb-plugin? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.0_pre20221210[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=gdb-plugin? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=!test? ( test )
-SLOT=0/16.0.0_pre20221210
-SRC_URI=https://github.com/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	llvm	d44b2a59588e4ff995e081d77573dafe	llvm.org	606e23175781a143cb6677bfc3211ee8	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2ce525b4b27de1f714f6508158b70ce3
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20221210 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20221210
deleted file mode 100644
index e5573a61da15..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_pre20221210
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) ) test? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/llvm:16 !!sys-devel/llvm:0
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~loong
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!sys-libs/libunwind
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz -> llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	d44b2a59588e4ff995e081d77573dafe	llvm.org	606e23175781a143cb6677bfc3211ee8	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	1a218637f27d4c027b92e511707264fd	python-utils-r1	6a75203e8a499f0fb42971452ce15388	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=baf57985d5ebe8830e67bd2840aed3c4
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 9b8aee58c681..0098293ec335 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14603 BLAKE2B e2577f15dd9e0d475df5b593952aec19dbd6bd1d98fe3cf3f0798f0d5c069ce285e42d594e3b05990923eecd40549b08f04abe17b02a4fc3856c0cce38640336 SHA512 af95e49316b05b0546f6bd6ea11a1d52c27280a7719f4e850d4b026ff56a8948fca0d992cbe3c778a8a17737da71c2aab3027a71ea2d1805575ee1cc97e3095b
-TIMESTAMP 2022-12-25T07:09:41Z
+TIMESTAMP 2022-12-25T13:09:37Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOn9zVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOoS5JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAr4g//eumnGNRQnJzrrIiXYObzKQbY92l96/r0yVMfjDIm57dXFsgMLBbKfZS1
-DrDvUilx/rUoBn4M6M4/2I6BEKwu7cJ5cAKSvNO9mqfwZLkUhRMknZuF5lclwB/F
-Bk7FU6F11sNDKDpuJAD3R9QGyIgl8/rwOztY1P0JHpA5Xe1kIbD+Z9vrSLon+cg9
-89jl3faq5MGSCQPweg86Q8A3OOeeCLHsnOJb31hRg9OTf//b5ZXIvBZT04y0Q69+
-uItluzEsFoQUKuAFuZ8Xlc1rOMskSjK2tHiIOS9czYdN35L+nYYsCp6l6atdcPfE
-3r87HT7CNnrq36hUnVXcn7bqDGM145+g6RzxH5oRcjSgYzX1j/cVs9GXCwSyROL6
-pykVzpV0YWA5jm4KsLdTchbMxKuMX1dP+qpsf10rPkfmZvXuXBX9gNEbwSBzkTcS
-rQU0SBmvragyaTXglpEtRixMDW7GLyxFjU+fIX9a+SoSO5l7WdTh9Au+RKLHF/52
-u3Y0spaKMYt76nCHjhPNd4gActi03q1IKwEB6xqTzIdAv3JYlvAOJrRVGd4hTXhV
-jAxT9aimKd9P1Cy3ggkhe6mLjqD9KGVCT+TJSvTUpkBtxBvbIhBeMYHIjOHfr4Ic
-+VO5x4h36avqmcxYOpLVmtaNHz23nWVFby0VftaHp26huDF9i0M=
-=i1vW
+klDZpA//RuYcDUYBOSDegQiA6bWNm0Or60DLhchisXOpwRPWtYCJDHcbTWR6qZc5
+LGfUCMF9pNzLBjj1WTJ+i2DvzEN1n4Ux0d9CPl1D5IJtFdHBKEnLe0Z4Own4KTbw
+YzyZO2b+a9wP30uckF4GPL/p1GydM+jvHcB3VKsTU+G+IrU4xk0Tt/Zb0BpNDAad
+FqcjCM7wZePEpQpeVJlFqZL8gXRtOGXx5Z9VXn1+FlYBWFJj/TQ12Ga9oEb4DTp4
+oY+nS4V3BDLfhpoFRYjY6iB0aJKZt/TeTCtXrYFi+qpll031J/MwMMliV4t0TztM
+OzPjtfnRdEk2BFwHY8NtL+Evqd3lpNGCZyYYaGqzV3GVYOMpMLVHxnPMCKRsrEgz
+6Fw77ztWm9XHCSut+K1gXDjhhqkqW3x0PNkT1f2mJVReC5fKD3qS2BghN8mEsc61
+2chA995UXokdeTkUYb9Y8as+8YDfQMi/upksnCEe/6Eb5y0ylRex5zcx7Q5ICDfJ
+qM2ysDNj7JR9z+Syq/wmQfGM91Gup8ykXIdbPJ3a7hR8RvGyFmD0POKguohFf9of
+MBwxpwOaMRf6DUmjYkOB05P40qGF8E9/WCV8WEuCiIH9UFv6zkeQa8Uk8YEK5evi
+t0wLHzvypIucc9R4iZtKo+yiCT0f8o++0yHctoCSMeqaaFMGrpg=
+=TiIO
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a2982e676f5d..40eedf69061d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 25 Dec 2022 07:09:38 +0000
+Sun, 25 Dec 2022 13:09:33 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 028a8f67d96d..e278559adefd 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Dec 25 07:09:38 AM UTC 2022
+Sun Dec 25 01:09:33 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5474140682f5..2004c945a8ff 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 25 Dec 2022 07:15:01 +0000
+Sun, 25 Dec 2022 13:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 612a2cff145b..9d2638af48c2 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-802d74709d8e1a8b936b36229d502a74e327d2bd 1671946628 2022-12-25T05:37:08+00:00
+51612c48d72f36fc6646a75f43827daa085dc5df 1671968800 2022-12-25T11:46:40+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 6c40c7319a1b..c618cf01a03e 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1671952201 Sun 25 Dec 2022 07:10:01 AM UTC
+1671973801 Sun 25 Dec 2022 01:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a2982e676f5d..40eedf69061d 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 25 Dec 2022 07:09:38 +0000
+Sun, 25 Dec 2022 13:09:33 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 5c38a27b32ed..7460ef7fbab3 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libasr/Manifest b/net-libs/libasr/Manifest
index bf7110033c39..285a63438c20 100644
--- a/net-libs/libasr/Manifest
+++ b/net-libs/libasr/Manifest
@@ -1,3 +1,3 @@
 DIST libasr-1.0.4.tar.gz 413258 BLAKE2B 971dabb83e322808344c4b53622623556f662c6ada200862469dcfe4f0277ade438b39e0c0e19d372622dfd3c3bc69c2bf1ca22200e6318c062f280f72efc15e SHA512 6f189f9f492da8204396fe1246b4a0162751b2060a881469649ecf987b7ac1cc834193d2052e80a09bf94fedc8fc64123e9dfcfe3a2e4395f9e26d37afc84501
-EBUILD libasr-1.0.4.ebuild 484 BLAKE2B a10c571b9702de489e93e4e5e5081950c2eb5fc59519729b0013c88ef05efaddf23f2ff8e1e84cd1029288a55b205cf5345a9acb828f6db99a99a327dc078b7d SHA512 f1d075dd624b4ceeefd23a72718ae880e87a7c71fdd8a972a9e373a27784854b936971a1c4a8b16acecce7e7114810329f1af1106ccab18474c374f29512b528
+EBUILD libasr-1.0.4.ebuild 483 BLAKE2B 4bd9dbf5fb74a31a84e38105f59cb5b4af26085ccabd8f68cfbef802f950d6e3050816fe890cbf3e2648c04681a17e23d044e09263c734a4233abd1725c4a355 SHA512 2cd29c32e5895d3a6875a7e11a56c9fc1cb8de6060213b96827a6b1686bf116de43e5f648d73134b800dafbd4132199b2dd7e58210839e618341293e9e817bf5
 MISC metadata.xml 332 BLAKE2B 3f3af0238b0a1eef497cdc7228dbf18f40eb22e3cd63c16da716a43772004082ab42ca007a7e741c5d94b0c7ca54f798667d9c6135ce6a3253a6f703b2e7d348 SHA512 091cde699e17ac21744089d01315ae745ed9e3236544d45bf88fd9317d3559a0e5b1eb85f3ca0e995d48c3cf5fbe2f22383dae8e9acf03ec56d5a4911416de97
diff --git a/net-libs/libasr/libasr-1.0.4.ebuild b/net-libs/libasr/libasr-1.0.4.ebuild
index f85a8c9d0ad5..fbe6a2cb48b3 100644
--- a/net-libs/libasr/libasr-1.0.4.ebuild
+++ b/net-libs/libasr/libasr-1.0.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 @@ SRC_URI="https://www.opensmtpd.org/archives/${P}.tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 src_configure() {
 	econf --disable-static
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 8aa31eccca9d..6d9199d534a8 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index 77560f32af14..8e38fb0548e4 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2022-12-25)
+# Archived upstream.  Last activity in 2018.  Broken with Python 3.8.
+# Broken with Django 2.
+dev-python/oauth2client
+
 # Michał Górny <mgorny@gentoo.org> (2022-12-24)
 # Unmaintained with last release in 2019.  We already patched it to work
 # with Python 3.9+.  The upstream code is also vulnerable
diff --git a/profiles/package.mask b/profiles/package.mask
index d1b158b118cd..e03c30dc6e00 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2022-12-25)
+# Last release in 2018. Poor quality C extension code. Package
+# consistently segfaults on it tests with the latest ruby versions.
+# No reverse dependencies. Removal in 30 days.
+dev-ruby/hiredis
+
 # Ionen Wolkens <ionen@gentoo.org> (2022-12-24)
 # Upstream dropped wxGTK support in >=games-emulation/pcsx2-1.7.3773,
 # and it now always requires Qt6. Masked given Qt6 is also masked in
@@ -507,12 +513,6 @@ ros-meta/visualization_tutorials
 ros-meta/viz
 
 # Michał Górny <mgorny@gentoo.org> (2022-12-23)
-# Does not build against current MySQL libraries.  Last release in 2012.
-# No reverse dependencies.
-# Removal on 2023-01-22.  Bug #692562.
-dev-tcltk/mysqltcl
-
-# Michał Górny <mgorny@gentoo.org> (2022-12-23)
 # Packages that still use dev-python/nose and have no revdeps.
 #
 # dev-python/blessings: EAPI 7, last rel. in 2018, git act. in 2020
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 60888625a74f..36f83c02d73d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2439,7 +2439,6 @@ dev-python/rfc3986:idna - enable support for the IDNA specification (RFC 5891)
 dev-python/rpyc:gdb - Run tests depending on sys-devel/gdb
 dev-python/rpyc:numpy - Run tests depending on dev-python/numpy, dev-python/pandas
 dev-python/scipy:pythran - Use dev-python/pythran to accelerate runtime
-dev-python/scipy:sparse - Adds support for sparse solving with sci-libs/umfpack
 dev-python/shiboken2:docstrings - Expose documentation as Python docstrings (recommended)
 dev-python/shiboken2:numpy - Implicitly convert passed NumPy arrays to Qt lists
 dev-python/shiboken2:vulkan - Generate "QSurface::VulkanSurface" bindings
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 8a0b0e63e0db..85388e47196b 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index fd691db5c808..5036776cdce6 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -4,7 +4,6 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-common-13.0.1.ebuild 593 BLAKE2B f7d78facc226d949240f31d10bb01f6a2bbe3c806d7f7c22a78d715d29de74723bedccdeefd029d309b090afe63821e10a1bd27662ff156640820fbca1896bab SHA512 48e5c5f3d4716c15018aa246cf61fbf898c4c459b1f04710da155084a8cf5b8a6df7697c300d297ac48ee1a8a8cff9bc9b4fca712455032f78cb26e9f77ef955
@@ -13,6 +12,5 @@ EBUILD clang-common-15.0.5.ebuild 3509 BLAKE2B be227d48c3e032de6029d5030eca900d5
 EBUILD clang-common-15.0.6.9999.ebuild 3432 BLAKE2B 92679a03e3a45df587198ce70dfaebbc674c47229b14040c93353dd4c384636df7ff6591138c8aedf00fcee0f75edef3fc9f3257058f1d8fcdcade0c2be8c244 SHA512 e33fd7582bbe2d3ad4ed3405a92db98d7365d040df39f7e32d2f75b093e346ec88230813c607983398f9c310bc0925b61d9b438905e8177665db123e1b7d064c
 EBUILD clang-common-15.0.6.ebuild 3514 BLAKE2B cf083c79b37a0fb37ccfada41de423024732e7ab6e3b84cd771db1f7665376bf8432c787e298cd9d964d30df46e1e360a10970c8bdb1031fecce4b3776c13845 SHA512 5eeaf65d577ee9569787e98bddee4837ef9cef9e9c0a917a23cb13eb92b6275bd556f3bb9802d4934c311f6fae4a5d3de8939aac1d6de676b5eab1359b77f13e
 EBUILD clang-common-16.0.0.9999.ebuild 3569 BLAKE2B fa58a81a826ae45c5287dcd49ba78ad5a5da4cbcdf7f28def7d8691fef5d622ac3dfb116e21b642f143a541d8cb4cdd136056f3d488dc3d4d8fed6383ed55c04 SHA512 3032daff6a584f1b3490738c967e38f26d860841d606e649c394c18237de3cf71c4ae91ce33ac6ca8f8c991e670b750023c10210626f9cdf7e7e3961405885b7
-EBUILD clang-common-16.0.0_pre20221210.ebuild 3575 BLAKE2B 1c2007779af34e1fcb365371e266e0dc86e675792c28a02f53615e207239ab259ee7a71ac2d971a7833a1872409ceb8f8fe95a50e45ef3b8c948af3184dabc38 SHA512 97568c6737ac321f46782ce784a30c31a3d1ce6d2839e38cabfdde9becf56a1b44f2c05ab108fe18681ca021ad8f4d8d6161c5afce773f6b137d2d11f21177ad
 EBUILD clang-common-16.0.0_pre20221217.ebuild 3575 BLAKE2B 1c2007779af34e1fcb365371e266e0dc86e675792c28a02f53615e207239ab259ee7a71ac2d971a7833a1872409ceb8f8fe95a50e45ef3b8c948af3184dabc38 SHA512 97568c6737ac321f46782ce784a30c31a3d1ce6d2839e38cabfdde9becf56a1b44f2c05ab108fe18681ca021ad8f4d8d6161c5afce773f6b137d2d11f21177ad
 MISC metadata.xml 735 BLAKE2B 12ea133df3d7eb9367a65e572ef91893e654d5b77caa27c66e4b5b41ba90ebc5e619eb78dfff2a67183d2c1cbfcf35fa903b2bb75604ce153d5cedfce5346e3c SHA512 8ed6b12d4f2aa1985897a8d81ce898dbc0d14ac222f3d0f259cbe80fbb8b2349dff7677627daeaf39a422f290200da4fac6348abc81c9e35da0ca73a11cfdd83
diff --git a/sys-devel/clang-common/clang-common-16.0.0_pre20221210.ebuild b/sys-devel/clang-common/clang-common-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 0df5a88a9a09..000000000000
--- a/sys-devel/clang-common/clang-common-16.0.0_pre20221210.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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="~loong"
-IUSE="
-	default-compiler-rt default-libcxx default-lld llvm-libunwind
-	stricter
-"
-
-PDEPEND="
-	sys-devel/clang:*
-	default-compiler-rt? (
-		sys-devel/clang-runtime[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind )
-		!llvm-libunwind? ( sys-libs/libunwind )
-	)
-	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )
-	!default-libcxx? ( sys-devel/gcc )
-	default-lld? ( sys-devel/lld )
-	!default-lld? ( sys-devel/binutils )
-"
-IDEPEND="
-	!default-compiler-rt? ( sys-devel/gcc-config )
-	!default-libcxx? ( sys-devel/gcc-config )
-"
-
-LLVM_COMPONENTS=( clang/utils )
-llvm.org_set_globals
-
-pkg_pretend() {
-	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-	local flag missing_flags=()
-	for flag in default-{compiler-rt,libcxx,lld}; do
-		if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
-			missing_flags+=( "${flag}" )
-		fi
-	done
-
-	if [[ ${missing_flags[@]} ]]; then
-		eerror "It seems that you have the following flags set on sys-devel/clang:"
-		eerror
-		eerror "  ${missing_flags[*]}"
-		eerror
-		eerror "The default runtimes are now set via flags on sys-devel/clang-common."
-		eerror "The build is being aborted to prevent breakage.  Please either set"
-		eerror "the respective flags on this ebuild, e.g.:"
-		eerror
-		eerror "  sys-devel/clang-common ${missing_flags[*]}"
-		eerror
-		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-		die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
-	fi
-}
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-
-	insinto /etc/clang
-	newins - gentoo-runtimes.cfg <<-EOF
-		# This file is initially generated by sys-devel/clang-runtime.
-		# It is used to control the default runtimes using by clang.
-
-		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
-		--stdlib=$(usex default-libcxx libc++ libstdc++)
-		-fuse-ld=$(usex default-lld lld bfd)
-	EOF
-
-	newins - gentoo-gcc-install.cfg <<-EOF
-		# This file is maintained by gcc-config.
-		# It is used to specify the selected GCC installation.
-	EOF
-
-	newins - gentoo-common.cfg <<-EOF
-		# This file contains flags common to clang, clang++ and clang-cpp.
-		@gentoo-runtimes.cfg
-		@gentoo-gcc-install.cfg
-	EOF
-
-	if use stricter; then
-		newins - gentoo-stricter.cfg <<-EOF
-			# This file increases the strictness of older clang versions
-			# to match the newest upstream version.
-
-			# clang-16 defaults
-			-Werror=implicit-function-declaration
-			-Werror=implicit-int
-			-Werror=incompatible-function-pointer-types
-
-			# constructs banned by C2x
-			-Werror=deprecated-non-prototype
-
-			# deprecated but large blast radius
-			#-Werror=strict-prototypes
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			@gentoo-stricter.cfg
-		EOF
-	fi
-
-	local tool
-	for tool in clang{,++,-cpp}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-		EOF
-	done
-}
-
-pkg_preinst() {
-	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-	then
-		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-		if [[ -n ${gcc_path} ]]; then
-			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-				--gcc-install-dir="${gcc_path%%:*}"
-			EOF
-		fi
-	fi
-}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index b06472544412..80975a62fe09 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -4,6 +4,5 @@ EBUILD clang-runtime-15.0.5.ebuild 759 BLAKE2B 199c187b5b1b72022e8a11ca375b77bc3
 EBUILD clang-runtime-15.0.6.9999.ebuild 700 BLAKE2B fc3ea6d50378cd569aa9a2a30cae69dfe59524f7c9edf5a4f6e39d5d07568224625ad286e857d7d852aef95903cfe9804f54e83aa093269ca2287f57fba2ebb2 SHA512 0b88353d5a7fda68a034017bac76c37ef36d8477b52f4446e81ff01861d50f1140933b54058ad3a3bfa5cade8d8ad2c86cfe5c580b682a9bb03f2e471d3e99ed
 EBUILD clang-runtime-15.0.6.ebuild 764 BLAKE2B e299328f6a748acdd6cf9ca5f07d66c6ff5a49d3072c41939841934729e33685542b424454fae791f99358a2e56273ab5c24fd586bf1f0cdc2af71df7434a850 SHA512 50ec6479a809d7759a0cbe3d565eaf338e9445392b4c11ffcd7f1f48de5a257741fc06cdc06afdc7fcebf8641841a1e6a2afad6e9ea24cae50b505f331d1e3f4
 EBUILD clang-runtime-16.0.0.9999.ebuild 1369 BLAKE2B a25d32189f78e993706138f339ad0645e3042bd283ddc26b4189c117ea2368d0a1c2b09c2f5f538112bcad65fc14dc0d29f16e4d6ff98e3401c3bdb74d59d750 SHA512 c37860675576d51047f5347400753a19469ea0e2e6ff49a3a5ba6e35f5b33372c06ee2ac1e82aa4a681f35e8c186a1ff8eb25a9eccd0ee35e5ab3d57873f40e0
-EBUILD clang-runtime-16.0.0_pre20221210.ebuild 1357 BLAKE2B 41fdd4a52628924b2e5a2af2a06126e533749f36e15ff66cea9273d2e0afbc9107ed1656431170a121d59d1c39a8731c8ebd966e7ec53d23a833a95526f20fba SHA512 5919d5f398ba8be49072679cdf84bca0dfe16759a5d148b7f3df322d3c9087adac172c302b96bc6b67dffd5ccacfcca44cc7091bf631c0af16d5685aacc4e7ef
 EBUILD clang-runtime-16.0.0_pre20221217.ebuild 1357 BLAKE2B 41fdd4a52628924b2e5a2af2a06126e533749f36e15ff66cea9273d2e0afbc9107ed1656431170a121d59d1c39a8731c8ebd966e7ec53d23a833a95526f20fba SHA512 5919d5f398ba8be49072679cdf84bca0dfe16759a5d148b7f3df322d3c9087adac172c302b96bc6b67dffd5ccacfcca44cc7091bf631c0af16d5685aacc4e7ef
 MISC metadata.xml 661 BLAKE2B 24688c511713ea102b83c71d226d519981b3aee0e05ef7a56d6a80be829efd843194e45cb4fd801f0bb976b6f1976386d6a2b05d2bc907fe2aa42b22b85b7d1f SHA512 2b5ab8783c90795f2e7d1673d876048ed9745f4911fb7a860df56deac13a6dfeba4581a84562eae54eff757c45042ca3fab75c7800313ae61df9ce69780a9294
diff --git a/sys-devel/clang-runtime/clang-runtime-16.0.0_pre20221210.ebuild b/sys-devel/clang-runtime/clang-runtime-16.0.0_pre20221210.ebuild
deleted file mode 100644
index b20d7b8fec85..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-16.0.0_pre20221210.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-build toolchain-funcs
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-
-LICENSE="metapackage"
-SLOT="${PV%%.*}"
-KEYWORDS="~loong"
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		sanitize? (
-			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		)
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
-"
-
-pkg_pretend() {
-	if tc-is-clang; then
-		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
-		ewarn "upstream has turned a few warnings that commonly occur during"
-		ewarn "configure script runs into errors by default.  This causes some"
-		ewarn "configure tests to start failing, sometimes resulting in silent"
-		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
-		ewarn "not yet clear whether the change will remain or be reverted."
-		ewarn
-		ewarn "For more information, please see:"
-		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
-	fi
-}
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 91512a6d9d9f..c107716e24b5 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -13,7 +13,6 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-13.0.1.ebuild 11294 BLAKE2B 33760cbd488068389efed5c011b15288021d1f93a371d5114301a5f86e815b3a1e9ae21ed6304d90916778f2312db17339d85b6d76e5e8255614706ddc3a7cf6 SHA512 b49773a02c15c4e869682664bd5703d7e08f60be9558fdbd78da19be5d5a1158093729260106cffe4cd8a6295ba740e42cc43d07da00ed8ead14dc45899ce80a
@@ -22,6 +21,5 @@ EBUILD clang-15.0.5.ebuild 11951 BLAKE2B e9da079ebece9e8c9d213dd9a3861f703104de3
 EBUILD clang-15.0.6.9999.ebuild 11887 BLAKE2B 54096f168b831260dd077223240e581562d0f85f2b251108b222e2e44926a67688d0aa7cf3e2ae301691f89e72219f9a61d87ae22c06e8cfbc69625a28a2f967 SHA512 c02594b7a0be16c064fc411ada88330ee124912effd732e7d0d8a5bd6bd8b0a51619ec7a73715f8cd17434dfd4d66c692449b95b70312b6b2386e5548db04307
 EBUILD clang-15.0.6.ebuild 11956 BLAKE2B 71af5a091c6b3a4f1fca7282a0d33655154fe163ec50dc678c0425314161f3a4000a120fba58749461c711118d4f4d2ef348387118b1c6e2c36826f7e9ac9fd2 SHA512 381c8038688e68f46453cdf6c42a943d3607e6e93f3bf17c1bfb69792f867e1e79da71a58f37528cc77b4b66735235c309f7590c70c9a26f460a216293285522
 EBUILD clang-16.0.0.9999.ebuild 11627 BLAKE2B cbd615942bca5e36ae06262b708afb3b676745bd5d693e9703c738948331206894c3a2ea4dfaf72bf2863ad7282f3933c6f7cf83b84840f75cd35bde1cd7338c SHA512 954cfe068030aefd8452498bfe5b4c0b95a392fdab871d948f349322f9176924b94213a679d432e6330fe95d9c5b3e4c300caee99704a93d0a935422ffbcdea0
-EBUILD clang-16.0.0_pre20221210.ebuild 11633 BLAKE2B a0e4a596b3eaa975e8da6903df1e4dc936190d9a08a691a24e8e914adf27aa117bedc3bb55a05d77973a5217fcfe91ecadc8b2a695bb8344c4bf1ff02a268c80 SHA512 bec2b0cffc636b5f2cf0065725a95659fd2057dc43e0829f25a67756f3fa2784191e323713f57934ba24512aa54f250d293594746b56fb13c7b36a6774984d2f
 EBUILD clang-16.0.0_pre20221217.ebuild 11633 BLAKE2B a0e4a596b3eaa975e8da6903df1e4dc936190d9a08a691a24e8e914adf27aa117bedc3bb55a05d77973a5217fcfe91ecadc8b2a695bb8344c4bf1ff02a268c80 SHA512 bec2b0cffc636b5f2cf0065725a95659fd2057dc43e0829f25a67756f3fa2784191e323713f57934ba24512aa54f250d293594746b56fb13c7b36a6774984d2f
 MISC metadata.xml 1600 BLAKE2B 8e49e099132445cf695e904acad8a699f3d8c4c1e4cd6ba9d0b97180dfa5b67e9c30b00d1e4cb6cd2f61b27f022accc8d6ee889c6569fc58fbc058186ad216fc SHA512 96b7cf4988ff1fd923ec87311caed458b64888b5acaaf20cc1ad893f2a963158f7f59398f9fd4f9e65cab3df265c0d002048ff874f7a76b94f36377bf9e8f5f6
diff --git a/sys-devel/clang/clang-16.0.0_pre20221210.ebuild b/sys-devel/clang/clang-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 25c3b72735ff..000000000000
--- a/sys-devel/clang/clang-16.0.0_pre20221210.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 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="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~loong"
-IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-	>=sys-devel/clang-common-${PV}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	doc? ( $(python_gen_cond_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-	~sys-devel/clang-runtime-${PV}
-	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-	clang clang-tools-extra cmake
-	llvm/lib/Transforms/Hello
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-	llvm/lib/Testing/Support
-	llvm/utils
-	third-party
-)
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# create extra parent dir for relative CLANG_RESOURCE_DIR access
-	mkdir -p x/y || die
-	BUILD_DIR=${WORKDIR}/x/y/clang
-
-	llvm.org_src_prepare
-
-	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-	eprefixify \
-		lib/Lex/InitHeaderSearch.cpp \
-		lib/Driver/ToolChains/Darwin.cpp || die
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# meta-targets
-					clang-libraries|distribution)
-						continue
-						;;
-					# tools
-					clang|clangd|clang-*)
-						;;
-					# static libraries
-					clang*|findAllSymbols)
-						continue
-						;;
-					# conditional to USE=doc
-					docs-clang-html|docs-clang-tools-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# common stuff
-		clang-cmake-exports
-		clang-headers
-		clang-resource-headers
-		libclang-headers
-
-		aarch64-resource-headers
-		arm-common-resource-headers
-		arm-resource-headers
-		core-resource-headers
-		cuda-resource-headers
-		hexagon-resource-headers
-		hip-resource-headers
-		hlsl-resource-headers
-		mips-resource-headers
-		opencl-resource-headers
-		openmp-resource-headers
-		ppc-htm-resource-headers
-		ppc-resource-headers
-		riscv-resource-headers
-		systemz-resource-headers
-		utility-resource-headers
-		ve-resource-headers
-		webassembly-resource-headers
-		windows-resource-headers
-		x86-resource-headers
-
-		# libs
-		clang-cpp
-		libclang
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# common stuff
-			bash-autocomplete
-			libclang-python-bindings
-
-			# tools
-			c-index-test
-			clang
-			clang-format
-			clang-offload-bundler
-			clang-offload-packager
-			clang-refactor
-			clang-repl
-			clang-rename
-			clang-scan-deps
-			diagtool
-			hmaptool
-		)
-
-		if use extra; then
-			out+=(
-				# extra tools
-				clang-apply-replacements
-				clang-change-namespace
-				clang-doc
-				clang-include-cleaner
-				clang-include-fixer
-				clang-move
-				clang-pseudo
-				clang-query
-				clang-reorder-fields
-				clang-tidy
-				clang-tidy-headers
-				clangd
-				find-all-symbols
-				modularize
-				pp-trace
-			)
-		fi
-
-		if llvm_are_manpages_built; then
-			out+=( docs-clang-man )
-			use extra && out+=( docs-clang-tools-man )
-		fi
-
-		if use doc; then
-			out+=( docs-clang-html )
-			use extra && out+=( docs-clang-tools-html )
-		fi
-
-		use static-analyzer && out+=(
-			clang-check
-			clang-extdef-mapping
-			scan-build
-			scan-build-py
-			scan-view
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-		-DCLANG_INCLUDE_TESTS=$(usex test)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-		-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
-
-		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if ! use elibc_musl; then
-		mycmakeargs+=(
-			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
-		)
-	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DLLVM_BUILD_DOCS=ON
-				-DLLVM_ENABLE_SPHINX=ON
-				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-			if use extra; then
-				mycmakeargs+=(
-					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-				)
-			fi
-		fi
-		mycmakeargs+=(
-			-DCLANG_INCLUDE_DOCS=${build_docs}
-		)
-	fi
-	if multilib_native_use extra; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		[[ -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
-	local test_targets=( check-clang )
-	if multilib_native_use extra; then
-		test_targets+=(
-			check-clang-tools
-			check-clangd
-		)
-	fi
-	cmake_build "${test_targets[@]}"
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	if use extra; then
-		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
-	fi
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
-		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
-		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
-			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
-		done
-	done
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
-	if multilib_native_use extra; then
-		# don't wrap clang-tidy headers, the list is too long
-		# (they're fine for non-native ABI but enabling the targets is problematic)
-		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
-	fi
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
-	if use extra; then
-		elog "Some of them are vim integration scripts (with instructions inside)."
-		elog "The run-clang-tidy.py script requires the following additional package:"
-		elog "  dev-python/pyyaml"
-	fi
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 5474462d1bbe..4f21b8d9ef3e 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -4,7 +4,6 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lld-13.0.1-r1.ebuild 2003 BLAKE2B bc67645d251f5c2883a32cd57ebcedefdf4fe8853c709139cc9ca11299e5f28d8b000eba622521cb5aba19ffe36189cf682e921386d2731538b05308f7c67257 SHA512 d933299ffeecdaea55e37a085c181322fc9d1d0f2e69e2c5f064b6db43c11bc152203908444b66423adbd299eeb13a1f6a0863b7ea359734fe919efd96bec639
@@ -13,6 +12,5 @@ EBUILD lld-15.0.5.ebuild 2094 BLAKE2B 0346f444a9e76604151593a73bfb1c1d966baeffee
 EBUILD lld-15.0.6.9999.ebuild 2057 BLAKE2B e41e0265a761f3ca21d7cbb32987b7f083f73979ab1ebdc4b76e98cc2415d2062783e46cc53b0cb6c21f2471df57f6f6209715d26e5baee01f20431a31c17b04 SHA512 8a4bab6ea39ff8bf25762658e6b1bf2df6523659049240390e9517c30a716b83823948b42b7aad22979e0a60b7dea2d6a5309938fb1810d07bc1566a2d903698
 EBUILD lld-15.0.6.ebuild 2097 BLAKE2B 53c1a4950dd420629325653a6529634a995e79e318d2e5dfce858868c7e431f35d251dab6637eed07262972df8e7535ce29cfcc7eaa1213d61adfbde70d34982 SHA512 ad895e4516bfa51e9085495764c1966e0f59f6f9c6fa13de5a2f36eeb4612dcdd6a8ca0e1ff2fdc8ab1c7294cb8e7a6c6e8ca264dc3421dd20ca52437e920d08
 EBUILD lld-16.0.0.9999.ebuild 2029 BLAKE2B 11f5ed949a1bee56186364445e5a64a64b7e4b51c10664cab20dfed1f22e3809ac10a474e1cf0991f38b1d0f47cee8dfbf601af5500480d928a8f186925b1db5 SHA512 7a92f13d78403f0e44781392446e63dd4cbab564872f5156fa53ba7b04eae6ddcb0f7c809e45080dff92bcaf6d1eff1ee8e6dd4991d51c1d6dc0a0c724f7b304
-EBUILD lld-16.0.0_pre20221210.ebuild 2029 BLAKE2B 11f5ed949a1bee56186364445e5a64a64b7e4b51c10664cab20dfed1f22e3809ac10a474e1cf0991f38b1d0f47cee8dfbf601af5500480d928a8f186925b1db5 SHA512 7a92f13d78403f0e44781392446e63dd4cbab564872f5156fa53ba7b04eae6ddcb0f7c809e45080dff92bcaf6d1eff1ee8e6dd4991d51c1d6dc0a0c724f7b304
 EBUILD lld-16.0.0_pre20221217.ebuild 2029 BLAKE2B 11f5ed949a1bee56186364445e5a64a64b7e4b51c10664cab20dfed1f22e3809ac10a474e1cf0991f38b1d0f47cee8dfbf601af5500480d928a8f186925b1db5 SHA512 7a92f13d78403f0e44781392446e63dd4cbab564872f5156fa53ba7b04eae6ddcb0f7c809e45080dff92bcaf6d1eff1ee8e6dd4991d51c1d6dc0a0c724f7b304
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/lld/lld-16.0.0_pre20221210.ebuild b/sys-devel/lld/lld-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 8113bdadff2e..000000000000
--- a/sys-devel/lld/lld-16.0.0_pre20221210.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
-
-PYTHON_COMPAT=( python3_{8..11} )
-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="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="debug test zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}[zstd=]
-	sys-libs/zlib:=
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-	!sys-devel/lld:0
-"
-BDEPEND="
-	test? (
-		>=dev-util/cmake-3.16
-		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)
-"
-PDEPEND="
-	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-LLVM_TEST_COMPONENTS=( llvm/utils third-party )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	llvm.org_src_unpack
-
-	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
-	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
-	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
-	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
-	# to existent directory ${WORKDIR}/libunwind/include.
-	mkdir -p "${WORKDIR}/llvm" || die
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	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 f41747dab670..423f95eb3fb1 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -4,7 +4,6 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-common-13.0.1.ebuild 607 BLAKE2B 01e55167e8a1a1568105090883f42c0c56c496eaa3ae179d1e44acd1d2f59977a6ce0d4d9c5bbbec38df5afc5cce7aff77a38c1618d415f431c4a413ea90bbf1 SHA512 4a5370e4e43bc5268ab32bcf4ae328890aeeab293da8fe74f3b52504ce57e5adc36de5240ff91e54a35f1f48840df7d821fd94600b1193c676c55590379bb8fe
@@ -13,6 +12,5 @@ EBUILD llvm-common-15.0.5.ebuild 601 BLAKE2B e5a531d1e1eb3661b733929eaecb7fcd3df
 EBUILD llvm-common-15.0.6.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
 EBUILD llvm-common-15.0.6.ebuild 606 BLAKE2B 831983952073003ab26566b9d6d0405d10d21cb8c925333b7808ebfac12d50bbcd708f9baec34e4f952e561e890b69d1fbde2c08fd7a4a3adeb60431c1008019 SHA512 78931db6d65af5b8609e52e96dfe4e1e6ff745050b5962ae14c0abfcd6481497dae0094d1da35a71686d1626987f7ec21033f5a14fa8f5bbe5cc7c51d80f6505
 EBUILD llvm-common-16.0.0.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
-EBUILD llvm-common-16.0.0_pre20221210.ebuild 530 BLAKE2B 006dd37bb215961550b533dbe6e2b8b72451bef5cb73579ea1f865732ce1b2667c446391b05eda5af61bcd90530a15e8b40adf3435f20e016e50f81acd76d7c3 SHA512 b6cb45020ce26ca2666e841467ac1206d58c3cc628a3c68d4cf57ce5da2497609a55a0546e987562893f66d6636d3d24a466475bd075edc3c0255b2d0aa24178
 EBUILD llvm-common-16.0.0_pre20221217.ebuild 530 BLAKE2B 006dd37bb215961550b533dbe6e2b8b72451bef5cb73579ea1f865732ce1b2667c446391b05eda5af61bcd90530a15e8b40adf3435f20e016e50f81acd76d7c3 SHA512 b6cb45020ce26ca2666e841467ac1206d58c3cc628a3c68d4cf57ce5da2497609a55a0546e987562893f66d6636d3d24a466475bd075edc3c0255b2d0aa24178
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/llvm-common/llvm-common-16.0.0_pre20221210.ebuild b/sys-devel/llvm-common/llvm-common-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 80430a85b696..000000000000
--- a/sys-devel/llvm-common/llvm-common-16.0.0_pre20221210.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="~loong"
-
-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 cf1dfd2b6e1b..34fca38d2fbb 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -13,7 +13,6 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-13.0.1.ebuild 12006 BLAKE2B 06535b1c0f568959b526a1e198361a8db46bea1ec37bf694438b0c0721741f61b340460d383f0693bcc45a27004c2ae6342c5fb97a2f276e9f7b2a160dbf90f1 SHA512 9c3f6c38f672bb1d8edba76e689fc567c797fa8d2410d7924b6121527e85709bf66f8ef5f475f9d0632b06b4da211c3ba6a9825c92fb6914b76bb06e93f19a5c
@@ -22,6 +21,5 @@ EBUILD llvm-15.0.5.ebuild 12536 BLAKE2B 857d7c1fbf7ed1963aff58933f8370c4f8d927c1
 EBUILD llvm-15.0.6.9999.ebuild 12457 BLAKE2B 52496ac8ef1cb0d61f1f7c6dc5b3db0a0778d841ad67c983c140b0c7858125bd34bdbab31fd1862e5b6c6eca4554764dd1dd2422268ef485c6ee8ecf8fcf3c57 SHA512 0e4e356633dc5d9660e0d440f74ef709ebf88919cec1cb2f317c3744000e8db25e0036be3404a01dd8817ff8e77c64f95c38a27c8cd8e9445e7f037a0a8a5f7b
 EBUILD llvm-15.0.6.ebuild 12541 BLAKE2B c2db6e18e43722ae466e91cd2336fff3cb3c9d4fe9e7bc4d558e561407f11501ef5c7888c14858406aa8bec0625bc7b47a4d5e523161d8569f4bae0a55be1ef2 SHA512 163ee968338010e7c7eaa335a8aa1ab3a659a721206e56675283f2531b106886bc9767327269db017bf942d4d25c22bb8fa396925a16077f7c02e2a70b4f1dbd
 EBUILD llvm-16.0.0.9999.ebuild 12584 BLAKE2B 54adab5484a93dcea378220dbeea3cc461be770e5a6484bfae3c5bef0866ebb42c1c3996244a02789fa76ecd7fd9dcb81b6c186389cba34b6be584af47a4f98d SHA512 cb1d3a09c4d3745b18a718e3d497f72b563726db4badeaf24a87972c3ac8be5021a00be98ec1f49cac33ac0e4915386e2c62c614c37665d0d7109bed510a7cba
-EBUILD llvm-16.0.0_pre20221210.ebuild 12590 BLAKE2B 16512fc7c4eb6c9aa1997883e9ebc637f443339b4bf742dc1e802b84d47dc833d9f63c15bb7be7eb835f869d8f5cdb99390953be8e7bcf468b8e118f354a3a77 SHA512 3ef9826bad76a4439bc65bdbdba5c37de8ab6b49f4451b7a2c146fadb56fccd3bf2885bfb065616b422504ee0b05098083db0f30e38ef2ea4b43539b7347b545
 EBUILD llvm-16.0.0_pre20221217.ebuild 12590 BLAKE2B 16512fc7c4eb6c9aa1997883e9ebc637f443339b4bf742dc1e802b84d47dc833d9f63c15bb7be7eb835f869d8f5cdb99390953be8e7bcf468b8e118f354a3a77 SHA512 3ef9826bad76a4439bc65bdbdba5c37de8ab6b49f4451b7a2c146fadb56fccd3bf2885bfb065616b422504ee0b05098083db0f30e38ef2ea4b43539b7347b545
 MISC metadata.xml 2654 BLAKE2B c27983265b6c9b33200ee42565648f30a6cc9c51be53a1cb82a3353d7c1f7aa9c9501c58254280c2880ff2d4992b4834e4b5e2f1c9b1c60e9b21945f234b9973 SHA512 b331d9186908762907f5713b00e357785b62afbee83afefac8701beb1a20f7ebd68df4a030bb82c6f9164719d4ccfcaf16c189833ad40e9f5900c36247d9cff2
diff --git a/sys-devel/llvm/llvm-16.0.0_pre20221210.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 5102c71fb739..000000000000
--- a/sys-devel/llvm/llvm-16.0.0_pre20221210.ebuild
+++ /dev/null
@@ -1,524 +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 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="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~loong"
-IUSE="
-	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
-	xml z3 zstd
-"
-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}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	binutils-plugin? ( sys-libs/binutils-libs )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	>=dev-util/cmake-3.16
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	libffi? ( virtual/pkgconfig )
-"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="
-	${RDEPEND}
-	!sys-devel/llvm:0
-"
-PDEPEND="
-	sys-devel/llvm-common
-	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
-	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
-"
-
-LLVM_COMPONENTS=( llvm cmake )
-LLVM_TEST_COMPONENTS=( third-party )
-LLVM_MANPAGES=1
-LLVM_USE_TARGETS=provide
-llvm.org_set_globals
-
-python_check_deps() {
-	use doc || return 0
-
-	python_has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-check_uptodate() {
-	local prod_targets=(
-		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
-			| tail -n +2 | head -n -1)
-	)
-	local all_targets=(
-		lib/Target/*/
-	)
-	all_targets=( "${all_targets[@]#lib/Target/}" )
-	all_targets=( "${all_targets[@]%/}" )
-
-	local exp_targets=() i
-	for i in "${all_targets[@]}"; do
-		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
-	done
-
-	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
-		eqawarn "Expected: ${exp_targets[*]}"
-		eqawarn
-	fi
-
-	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
-		eqawarn "Expected: ${prod_targets[*]}"
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# shared libs
-					LLVM|LLVMgold)
-						;;
-					# TableGen lib + deps
-					LLVMDemangle|LLVMSupport|LLVMTableGen)
-						;;
-					# static libs
-					LLVM*)
-						continue
-						;;
-					# meta-targets
-					distribution|llvm-libraries)
-						continue
-						;;
-					# used only w/ USE=doc
-					docs-llvm-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-src_prepare() {
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# Update config.guess to support more systems
-	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
-
-	# Verify that the ebuild is up-to-date
-	check_uptodate
-
-	llvm.org_src_prepare
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# shared libs
-		LLVM
-		LTO
-		Remarks
-
-		# tools
-		llvm-config
-
-		# common stuff
-		cmake-exports
-		llvm-headers
-
-		# libraries needed for clang-tblgen
-		LLVMDemangle
-		LLVMSupport
-		LLVMTableGen
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# utilities
-			llvm-tblgen
-			FileCheck
-			llvm-PerfectShuffle
-			count
-			not
-			yaml-bench
-			UnicodeNameMappingGenerator
-
-			# tools
-			bugpoint
-			dsymutil
-			llc
-			lli
-			lli-child-target
-			llvm-addr2line
-			llvm-ar
-			llvm-as
-			llvm-bcanalyzer
-			llvm-bitcode-strip
-			llvm-c-test
-			llvm-cat
-			llvm-cfi-verify
-			llvm-config
-			llvm-cov
-			llvm-cvtres
-			llvm-cxxdump
-			llvm-cxxfilt
-			llvm-cxxmap
-			llvm-debuginfo-analyzer
-			llvm-debuginfod
-			llvm-debuginfod-find
-			llvm-diff
-			llvm-dis
-			llvm-dlltool
-			llvm-dwarfdump
-			llvm-dwarfutil
-			llvm-dwp
-			llvm-exegesis
-			llvm-extract
-			llvm-gsymutil
-			llvm-ifs
-			llvm-install-name-tool
-			llvm-jitlink
-			llvm-jitlink-executor
-			llvm-lib
-			llvm-libtool-darwin
-			llvm-link
-			llvm-lipo
-			llvm-lto
-			llvm-lto2
-			llvm-mc
-			llvm-mca
-			llvm-ml
-			llvm-modextract
-			llvm-mt
-			llvm-nm
-			llvm-objcopy
-			llvm-objdump
-			llvm-opt-report
-			llvm-otool
-			llvm-pdbutil
-			llvm-profdata
-			llvm-profgen
-			llvm-ranlib
-			llvm-rc
-			llvm-readelf
-			llvm-readobj
-			llvm-reduce
-			llvm-remark-size-diff
-			llvm-remarkutil
-			llvm-rtdyld
-			llvm-sim
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			llvm-tapi-diff
-			llvm-tli-checker
-			llvm-undname
-			llvm-windres
-			llvm-xray
-			obj2yaml
-			opt
-			sancov
-			sanstats
-			split-file
-			verify-uselistorder
-			yaml2obj
-
-			# python modules
-			opt-viewer
-		)
-
-		if llvm_are_manpages_built; then
-			out+=(
-				# manpages
-				docs-dsymutil-man
-				docs-llvm-dwarfdump-man
-				docs-llvm-man
-			)
-		fi
-		use doc && out+=(
-			docs-llvm-html
-		)
-
-		use binutils-plugin && out+=(
-			LLVMgold
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_INCLUDE_BENCHMARKS=OFF
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-		-DLLVM_ENABLE_ZSTD=$(usex zstd)
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		# used only for llvm-objdump tool
-		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	local suffix=
-	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
-		# the ABI of the main branch is not stable, so let's include
-		# the commit id in the SOVERSION to contain the breakage
-		suffix+="git${EGIT_VERSION::8}"
-	fi
-	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
-		# Smart hack: alter version suffix -> SOVERSION when linking
-		# against libc++. This way we won't end up mixing LLVM libc++
-		# libraries with libstdc++ clang, and the other way around.
-		suffix+="+libcxx"
-		mycmakeargs+=(
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	fi
-	mycmakeargs+=(
-		-DLLVM_VERSION_SUFFIX="${suffix}"
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-		fi
-
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=${build_docs}
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=${build_docs}
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use binutils-plugin && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/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(:.*)?=${LLVM_MAJOR}$" \
-			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/${LLVM_MAJOR}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${LLVM_MAJOR} ))
-	newenvd - "60llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 3d1234ed967c..8e0ab0118374 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/sof-firmware/Manifest b/sys-firmware/sof-firmware/Manifest
index 3077d8fdd78d..f87e28902f55 100644
--- a/sys-firmware/sof-firmware/Manifest
+++ b/sys-firmware/sof-firmware/Manifest
@@ -1,7 +1,7 @@
-DIST sof-firmware-2.1.1.tar.gz 4056718 BLAKE2B 0246f6240504d3e8b609b402c41ffe6ed9b8350b6a31c6567851069354e5de5b4ca6d803e78fdde77cdaba7be87c8a8923b2d0fdd0544fd3b28d1e332cd59b63 SHA512 77e9562f67014d78b213fe428edef6a08dcc058a9a762da09a486c002c3aa0b907ea7c8ba6d4f88f5ddab5e564de06df9f2ed77206341a0fe2e1aaab1d9740ce
 DIST sof-firmware-2.2.2.tar.gz 4116116 BLAKE2B e5722242e4b0130086ddb1b12d2adf29254bcae294f3ff49ac07dab3eab75e352a30346dd07c73ac51112b4c5234dc116de81251e01b146328cab673711f1f4c SHA512 6a3be7088f8a93a052563e040a588c600512d08d4b75ae5567db255e334997a6401d41863dcb416562eee07fef0bd2abe1d9d0403cd236ab007474f66271db50
+DIST sof-firmware-2.2.3.tar.gz 4358105 BLAKE2B 2b3bfd53b9c0207720068c0ac7639acaf653bb276c20f353396e1a01255839c34514c52640526dfa8f5cbc9229f75ba08363c40cf756b78f0b0c6b12a6e033c9 SHA512 c4e345d0932d1c607072feea41acf2f3a5b3694b0c468515a28889b6d0ba46775f91ef9edf91a321a3be056705dc8b4df9c836096c2e73063afcbc166ca10abc
 DIST sof-firmware-2.2.tar.gz 4211499 BLAKE2B c0ab39cba3ef3dd19b67d714b5a4e5a6a6cb3e8fb2d290c3fceadeb3f7dd96db986411184e16bca56bdd1905a697f8d416cd4aa5bdff90fe32e96713ff87bb71 SHA512 3cd06f6b8f8d6c3379b987cffa019a0d84263b8e00de40c18516c3e90745d5e150bdf71a8005b1ba704e44bf84d7030195e9c0ebfcd6e35228f4c14e9290cd95
-EBUILD sof-firmware-2.1.1-r1.ebuild 898 BLAKE2B 074de783ce38f7f5dba413a40fbdfd46913dc6b1ed16cac2935f721d4a40d5e9313f47127f619d3c66bfafe6a14453ae2077c4f9e7c4005eae1b78488df0ef0e SHA512 dcaea87ffd52b5494c4600a5f7702b1069e7c2c7acb7efec65014f33501f0d8f4027516646b4c610962f019175be7ef7d2bf2c501001df0af9cecd88db8da577
 EBUILD sof-firmware-2.2.2.ebuild 899 BLAKE2B 6510a99bbadde60caad29440742a93c9f31878f65122f428f991efab01e2fbe9c13ffb26dd3e80b19f9b5556536f17e386b58db60d38867846690c7e5bd4f7d2 SHA512 91a698791d36560e74d1bed08fa1bc26f64788985efaa99f9cfd80d9bf6a9c78a29b573ed161d7724a5870e1d55a55150352ade276e4aea2f485d2bff0f0d288
+EBUILD sof-firmware-2.2.3.ebuild 899 BLAKE2B 6510a99bbadde60caad29440742a93c9f31878f65122f428f991efab01e2fbe9c13ffb26dd3e80b19f9b5556536f17e386b58db60d38867846690c7e5bd4f7d2 SHA512 91a698791d36560e74d1bed08fa1bc26f64788985efaa99f9cfd80d9bf6a9c78a29b573ed161d7724a5870e1d55a55150352ade276e4aea2f485d2bff0f0d288
 EBUILD sof-firmware-2.2.ebuild 898 BLAKE2B 074de783ce38f7f5dba413a40fbdfd46913dc6b1ed16cac2935f721d4a40d5e9313f47127f619d3c66bfafe6a14453ae2077c4f9e7c4005eae1b78488df0ef0e SHA512 dcaea87ffd52b5494c4600a5f7702b1069e7c2c7acb7efec65014f33501f0d8f4027516646b4c610962f019175be7ef7d2bf2c501001df0af9cecd88db8da577
-MISC metadata.xml 218 BLAKE2B b13b149202bf20882c38ce2cfd0e1c4ea9a15f584ff819022fd74261c2f73dc52efe21fe1e621fd84406527ab86bd29147ef34c895ccf9de3596ce58cb59d846 SHA512 068fda6c090090d62a719b26812505efa881b855004ed63dea86b1ee9b698d5d6ccd3210366e7cfa886f886c77e31b90cd69ec015e67286ce0611483304e798f
+MISC metadata.xml 304 BLAKE2B 66a80b69974755eb63ca7f97c3721f87f39f6cd93bdf269cd4ad8f4dd8ce39919ceb2d9ee7fa2963e42d6bee219296f64b79351ac82ef9b11283642fd13c120c SHA512 9cf2218b98365cee88eecba8ae3ff6a61ed724b030accc9f0168fcbf024898c1cd9745223874f80af795c8e7d18230d7d9c4c94cb57928b6c28f7323fbf50af3
diff --git a/sys-firmware/sof-firmware/metadata.xml b/sys-firmware/sof-firmware/metadata.xml
index 437d32a9f916..dd12d6c6afb5 100644
--- a/sys-firmware/sof-firmware/metadata.xml
+++ b/sys-firmware/sof-firmware/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>alsa-bugs@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>alsa-bugs@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">thesofproject/sof</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-firmware/sof-firmware/sof-firmware-2.1.1-r1.ebuild b/sys-firmware/sof-firmware/sof-firmware-2.2.3.ebuild
index 11f617551116..b51c9026bd32 100644
--- a/sys-firmware/sof-firmware/sof-firmware-2.1.1-r1.ebuild
+++ b/sys-firmware/sof-firmware/sof-firmware-2.2.3.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"/sof-bin-v${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 # Needed for sof-ctl
 RDEPEND="media-libs/alsa-lib"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 11fcde7f8fb4..ad85b1fd794a 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 47bcfb42d7f8..b32b9ffa19e4 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -9,7 +9,6 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD compiler-rt-sanitizers-13.0.1.ebuild 6369 BLAKE2B 4e8a715cd19dd39087fe7d6cad9e30a7e130c69bde12ea382fc748cc152099607c23b75915c644785820ded954eaba31779f7c58b63a71255f9c6b610afcee7d SHA512 f5a680a5de09feecde1a3038ab185cc3b321eb2dc15b5841cd58863323fd6da727307c44127d2af5077ce2b17744ee5d3f8a17dd3bceea71b1dec2a13555dd66
@@ -18,6 +17,5 @@ EBUILD compiler-rt-sanitizers-15.0.5.ebuild 6433 BLAKE2B 25dfdd2696b3c861dce89b7
 EBUILD compiler-rt-sanitizers-15.0.6.9999.ebuild 6363 BLAKE2B 640625391bc73444ed357c25028b641351e5e4f2661271e2d762a9d0a8bbf70a916018c82ddabb25f95679121eea1f35726e011f12d99bb88f1aa6aafef9f5ba SHA512 0c9b3e50c61cb6129fcc20e2fc08f7d32fd2ee180d2bad3e6ed9c7b71819320af9c74457332afac8c14b476d18b47ce7a353813e7bb29e0a568771d314f9c46a
 EBUILD compiler-rt-sanitizers-15.0.6.ebuild 6436 BLAKE2B 8f595efb33bbb3e5f70192e7131f6dedaa5668a637ccf35e36a69306b410f34564d006cf8ac9d99f7f21b7340f66c0c3e51c9a7489bc042f9a180d2aa2e11a28 SHA512 7266a9a049a1e6ced4c7d9b03520cab33ac0491cf1cdf1a987aa00d60406e3dbfba928f951a5a78f87537649906b6beafcd98a6db02ef15f10b3bbc9bb8db245
 EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6248 BLAKE2B 9845329e29b14c13818de01405cf3932c08c903e562b435502e0da0d3bf269adbb60b320c5f362dd0374123fc57f3d5e90c35a2b755ea129306b861b60e7c2b8 SHA512 2e7c8b7b1020602b1489dde3b0b1993059f1cdcc6d94f6087ddb9d4ce71e7daeed507bdc62fe8a8a0dce59edd8977a9c02e2ffa0f50edbcd2cde95f74dc728e4
-EBUILD compiler-rt-sanitizers-16.0.0_pre20221210.ebuild 6254 BLAKE2B a9959d562d550af23e4af7c4a3d83d66675e6bbdf1ea9e4139b3cadd0c4f4960e407ff3f24f590cb470525e3bd355b2be21a9444593631a1df8b0ef675c9d568 SHA512 c752234f7b2d1b5f9a743a93ea27424c472da4cdeec3b7172f5746bc3c40c0e3a7a7ddaafe34da58bc2ae70dabc8952d14884b04a5a888b7abd083dfdfa55ff5
 EBUILD compiler-rt-sanitizers-16.0.0_pre20221217.ebuild 6254 BLAKE2B a9959d562d550af23e4af7c4a3d83d66675e6bbdf1ea9e4139b3cadd0c4f4960e407ff3f24f590cb470525e3bd355b2be21a9444593631a1df8b0ef675c9d568 SHA512 c752234f7b2d1b5f9a743a93ea27424c472da4cdeec3b7172f5746bc3c40c0e3a7a7ddaafe34da58bc2ae70dabc8952d14884b04a5a888b7abd083dfdfa55ff5
 MISC metadata.xml 1412 BLAKE2B 75675507000fa6a6b8182e6b45a08a2716ae7fb9a7e3428dc8420464e4c1d1bdb5bea62cc2f553c579de5a4faa752b35cb3529d980fb07a055ff4ddf6e752707 SHA512 f05ea5168b923db72f4f5b53e9b748ebbcdae9eff09d86323313055933b47fc0089e1b2d73cd997d73dcfb2dca032344955816425fbddc09d27ca751463aadbb
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0_pre20221210.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 0615c74fe85d..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0_pre20221210.ebuild
+++ /dev/null
@@ -1,216 +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 check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS="~loong"
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-# base targets
-IUSE+=" +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-	shadowcallstack gwp-asan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-	test? (
-		cfi? ( ubsan )
-		gwp-asan? ( scudo )
-	)
-"
-RESTRICT="
-	!clang? ( test )
-	!test? ( test )
-"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-	local flag
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if ! use "${flag}"; then
-			local cmake_flag=${flag/-/_}
-			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-				cmake/config-ix.cmake || die
-		fi
-	done
-
-	# TODO: fix these tests to be skipped upstream
-	if use asan && ! use profile; then
-		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-	fi
-	if use ubsan && ! use cfi; then
-		> test/cfi/CMakeLists.txt || die
-	fi
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local flag want_sanitizer=OFF
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if use "${flag}"; then
-			want_sanitizer=ON
-			break
-		fi
-	done
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# builtins & crt installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_CRT=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
-		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX
-			# This disables i386 for SDK >= 10.15
-			# Will error if has_use tsan and SDK < 10.12
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	cmake_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake_build check-all
-}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 550a6bb1224e..971db3d02786 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -9,7 +9,6 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD compiler-rt-13.0.1.ebuild 3880 BLAKE2B 83202517f413772d355aa49b5a3bd8b7000c86f6538da1a5ae96de5e84bc7536d0e639b530d1f504dc68b769565504434cc80d25426207b19283b9bc41df3388 SHA512 fe5329aee6c29d408c67af9e9891205fcdf313676780b948975f94ddce31b3f54e68cc041233c81b3005ff94f7685dcc09044f3634760d90e8c18c61f63651c3
@@ -18,6 +17,5 @@ EBUILD compiler-rt-15.0.5.ebuild 4259 BLAKE2B b14a1d7d6d7d6ba021074ca6c22d6a0db1
 EBUILD compiler-rt-15.0.6.9999.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153
 EBUILD compiler-rt-15.0.6.ebuild 4262 BLAKE2B f005f16b0826028d16ffafca6a7335b462fe58a15c5857c94a42e06c2d6df6056d4f66787c75572b7bf2f56e711d3c60a736399109220f349a034c540018d058 SHA512 948a4ac08bd9811bec072db56a77046da5ea52a0f9e02d1507fdf9423d12ec91afcb1c40b8fdfb2126278d4ae847840c1b284e7c44dfa77794d42436c87d19ad
 EBUILD compiler-rt-16.0.0.9999.ebuild 4164 BLAKE2B 25adbf7603984b3cb09b1e3bf08d465e20997654fdf5276f6a992092cc11a43210a134c7aa0c1bab7c4f6b023de517c34e265c1249d2671c577d4930066f2629 SHA512 893fdc38fe3d885f1fcddb4e72e9173f6af74db1e20ef34c1d2a903cd8ef8fe4acae85843b752a5b8474a3abe1212a254657c5f7ca4fb2357cf62b57427f3935
-EBUILD compiler-rt-16.0.0_pre20221210.ebuild 4170 BLAKE2B 1518378370b16ba1ee9119abcfeb9d0c8b64db502257463a7dddf801f7cd90d3d801906d759448b978fdde60b3d9fc3d1e5220c086144d6b053398b412a17773 SHA512 cbcc7470bb060f9295c7cf0fce7906a8210a29f3990ee7f730f4562c0f17b26b58a60431f5f8cb30bac711e8e59e0995319c1299774ce76934f008d6295168b7
 EBUILD compiler-rt-16.0.0_pre20221217.ebuild 4170 BLAKE2B 1518378370b16ba1ee9119abcfeb9d0c8b64db502257463a7dddf801f7cd90d3d801906d759448b978fdde60b3d9fc3d1e5220c086144d6b053398b412a17773 SHA512 cbcc7470bb060f9295c7cf0fce7906a8210a29f3990ee7f730f4562c0f17b26b58a60431f5f8cb30bac711e8e59e0995319c1299774ce76934f008d6295168b7
 MISC metadata.xml 416 BLAKE2B 79a58249c94b605ba57f346c4e05b43853cf6cfb8bb65a4f4e3c44039cccfdb83dd31bfaaaf398bcbdc393efabdfc7ed186fe775976c46227e74decf2c8f4fb2 SHA512 ce30c79a575e5933effb1fec36f9a4ef02d9f97f312feb39c55a88cbda9a1bae1d7af2ec4ad5f66212cbb2cdbfb26f1a436689f16f410153c9d65eb010264c48
diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20221210.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 33bcc08a8c37..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-16.0.0_pre20221210.ebuild
+++ /dev/null
@@ -1,149 +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 cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS="~loong"
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	if use clang; then
-		# Only do this conditionally to allow overriding with
-		# e.g. CC=clang-13 in case of breakage
-		if ! tc-is-clang ; then
-			local -x CC=${CHOST}-clang
-			local -x CXX=${CHOST}-clang++
-		fi
-
-		strip-unsupported-flags
-	fi
-
-	if ! test_compiler; then
-		local nolib_flags=( -nodefaultlibs -lc )
-
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
-			# Avoiding -nostartfiles earlier on for bug #862540,
-			# and set available entry symbol for bug #862798.
-			nolib_flags+=( -nostartfiles -emain )
-
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-		-DCOMPILER_RT_BUILD_MEMPROF=OFF
-		-DCOMPILER_RT_BUILD_ORC=OFF
-		-DCOMPILER_RT_BUILD_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX.
-			# This disables i386 for SDK >= 10.15
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-builtins
-}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index d21de3a7184b..37a4f5052c50 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -6,7 +6,6 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD libcxx-13.0.1.ebuild 6768 BLAKE2B 71b0f62e35538d718d99e3d43447f98752933868d999bf831969a6940d3a817452789c2044e9ca3bb4d5d1f0c2976fc276c4d10cb018c44e0cc6109095d9c6d6 SHA512 a12023fa135a7945e8088b34421f575cab32bb8ac53f1aeaa61bcf2a7b9fe045a6e21efba168056ef47b165ef3100e382100f910c84dee972017de6355d2e9c0
@@ -15,6 +14,5 @@ EBUILD libcxx-15.0.5.ebuild 5281 BLAKE2B 416897d7d127c49d4c16c1c6f6f46efcc261c99
 EBUILD libcxx-15.0.6.9999.ebuild 5238 BLAKE2B bf9c8df5c949f999fdcfad82deb548231c5ef16c25b55c76fcdf3e8fa2e5c3be90fd6ceb4c747fb639de46ef2d192b7317ebf435dfcff44ba9ca5956e59012cf SHA512 519779336613cd1110194d8a7768d2e8c3f286c7ad72da87937bae694f1830dcbec686e2b8afa212b29a3d3406a504fc903e09599a4dc7c99f277ee8f5193a1c
 EBUILD libcxx-15.0.6.ebuild 5284 BLAKE2B 4a39bdc17a4b6f4e61d5938a0269b7818ec38f0edcb2d5e42f53b31596cff42ddbfba4c17ddb8e3018c294055a872eadee55f9a7ee3ef4ec036e3e8fade24bb5 SHA512 4d7a3f4407a2570c447672674822032075538eea696bd80e2ec59b7b1410c4e46c45dfe3d8a579b246dd527a25221a0278c9c7e87a03868a269e498436c4d5c8
 EBUILD libcxx-16.0.0.9999.ebuild 5238 BLAKE2B bf9c8df5c949f999fdcfad82deb548231c5ef16c25b55c76fcdf3e8fa2e5c3be90fd6ceb4c747fb639de46ef2d192b7317ebf435dfcff44ba9ca5956e59012cf SHA512 519779336613cd1110194d8a7768d2e8c3f286c7ad72da87937bae694f1830dcbec686e2b8afa212b29a3d3406a504fc903e09599a4dc7c99f277ee8f5193a1c
-EBUILD libcxx-16.0.0_pre20221210.ebuild 5238 BLAKE2B bf9c8df5c949f999fdcfad82deb548231c5ef16c25b55c76fcdf3e8fa2e5c3be90fd6ceb4c747fb639de46ef2d192b7317ebf435dfcff44ba9ca5956e59012cf SHA512 519779336613cd1110194d8a7768d2e8c3f286c7ad72da87937bae694f1830dcbec686e2b8afa212b29a3d3406a504fc903e09599a4dc7c99f277ee8f5193a1c
 EBUILD libcxx-16.0.0_pre20221217.ebuild 5244 BLAKE2B 3be3871b1c7cdd482ed3c3f79b0943fd79b99dea6f1ca30be5623a1b54d104297b7be8015303936578f2138559c970e54319b63933b650efabcc506fe4b91f2b SHA512 6044b4277a7537af8fe5ec678df40a523a6c33018b48a7b6e1e1361f33cccce8822c25a942b9445ad87818349919de5bc17ab5c1b4cb1bd8033bc82145f5798a
 MISC metadata.xml 718 BLAKE2B 3cc1e43a6f1ada368cfc0bf8aaf49007f6792062b684ab9299b5180d778b158325b6931169b52dd14e85ae9ad6dc1a03be323b814fb920fe8434ad86425d699c SHA512 c2cef3e481c0c3db7de6de8c0a5aff42a1e7fe81155d99f1f0f0988f6d5ca041f787a27a2dde0073037d59e082e2f6da7eefe1303f1c1837ebc12e8e0d28729f
diff --git a/sys-libs/libcxx/libcxx-16.0.0_pre20221210.ebuild b/sys-libs/libcxx/libcxx-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 9b9bd5a335cb..000000000000
--- a/sys-libs/libcxx/libcxx-16.0.0_pre20221210.ebuild
+++ /dev/null
@@ -1,204 +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 cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="https://libcxx.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clang +libcxxabi static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libcxxabi? (
-		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
-	)
-	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		>=dev-util/cmake-3.16
-		sys-devel/gdb[python]
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# note: we need to do this before multilib kicks in since it will
-	# alter the CHOST
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=system-libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	# bootstrap: cmake is unhappy if compiler can't link to stdlib
-	local nolib_flags=( -nodefaultlibs -lc )
-	if ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES=libcxx
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxx
-}
-
-multilib_src_install() {
-	cmake_src_install
-	# since we've replaced libc++.{a,so} with ldscripts, now we have to
-	# install the extra symlinks
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		dolib.so lib/libc++_shared.so
-		use static-libs && dolib.a lib/libc++_static.a
-	fi
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_static}.a || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps=(
-		libc++_static.a
-		$(usex libcxxabi libc++abi.a libsupc++.a)
-	)
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=( libpthread.a libdl.a )
-
-	gen_ldscript "${deps[*]}" > lib/libc++.a || die
-}
-
-gen_shared_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_shared}.so || die
-	local deps=(
-		libc++_shared.so
-		# libsupc++ doesn't have a shared version
-		$(usex libcxxabi libc++abi.so libsupc++.a)
-	)
-
-	gen_ldscript "${deps[*]}" > lib/libc++.so || die
-}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 1fb5ad72f967..00968eb175d4 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -4,7 +4,6 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD libcxxabi-13.0.1.ebuild 3468 BLAKE2B 0da66a538e0efab041fa5f56c31a116c9274bec95aa18f10b5759d6347e3e864922207cba0ddc6821eadad4243c247b01869d34f42e34c213f410896f5ac5b8f SHA512 2eaf47c438cae3b024eb64cecedf2643ff2ecbd35610d5cff6fb2f06847af766ff105d4923dfaf2f4d014944f2ef3ac54edd5f7c83e31d49c071ac57f56cd38f
@@ -13,6 +12,5 @@ EBUILD libcxxabi-15.0.5.ebuild 2909 BLAKE2B 653771bab6c9056095f905d4462471d998a0
 EBUILD libcxxabi-15.0.6.9999.ebuild 2866 BLAKE2B 00dc8f0473e5a8081727c83e3fc5459dafc7c680a68f7b237be5f3c8da6cee1916748083e3baf4fda71af8b55dfecb97d7a195b35d4958b8376dc7777df328a5 SHA512 f0f14175c68e080b199d8bcb62fa1387e1b6755bd804dc342dcaf671b84d9dfe29cf8a3559acfe0c9308a73e61416944519b94839c736837fd4bea059c91ec91
 EBUILD libcxxabi-15.0.6.ebuild 2912 BLAKE2B 952b4e0cf81a81c8a9e7260110b479783d72b46ac7ef8a99e29bf651e5cd01717584b67afb4e639dd9985eafcfaa26fbf4238631596efd7b0070ff536be1e35e SHA512 f6c271ac3977888977369b6e489b64a5afe5985b7755a8e6c4589301834db4eb44d47b3a8fdd97ad5f3aaec60ea306507d622e3a8b12510064da255299396805
 EBUILD libcxxabi-16.0.0.9999.ebuild 2866 BLAKE2B 00dc8f0473e5a8081727c83e3fc5459dafc7c680a68f7b237be5f3c8da6cee1916748083e3baf4fda71af8b55dfecb97d7a195b35d4958b8376dc7777df328a5 SHA512 f0f14175c68e080b199d8bcb62fa1387e1b6755bd804dc342dcaf671b84d9dfe29cf8a3559acfe0c9308a73e61416944519b94839c736837fd4bea059c91ec91
-EBUILD libcxxabi-16.0.0_pre20221210.ebuild 2866 BLAKE2B 00dc8f0473e5a8081727c83e3fc5459dafc7c680a68f7b237be5f3c8da6cee1916748083e3baf4fda71af8b55dfecb97d7a195b35d4958b8376dc7777df328a5 SHA512 f0f14175c68e080b199d8bcb62fa1387e1b6755bd804dc342dcaf671b84d9dfe29cf8a3559acfe0c9308a73e61416944519b94839c736837fd4bea059c91ec91
 EBUILD libcxxabi-16.0.0_pre20221217.ebuild 2872 BLAKE2B 14046e7a175f1925c50a4eca05ce4a0f31afd600475432db6991e0723a60e260d1e9da1e99d9d8adac4ec18ec2963f4730cde2e9c19a192b7c95e655f021250e SHA512 82e1e5fd19ab5b5c54ed4361d190c53727d7d1a64cb2fa88f3eaf517d6fc8cbba5fa261c2b8eb44a93ba7e1f0fa6e6350e9ac896b8e40e27f7334597b5dc0ddc
 MISC metadata.xml 557 BLAKE2B 4f6b0acb7cfdf74971a6fd96051d9f9020141c6117333a8de42bd043935b7bff8d9942faabdf3b1c94597c460393f64eb7d3f7b7d49f39ecfd0094de460f563e SHA512 67a812ef768e681ae77ef6e13bccffcbe53b41e94901f0558b3c7acaf896605ca670c4bb5a690bd9afa3b5a76271341710520a6abc0024c18f437fabde20e847
diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221210.ebuild b/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 8d8f8212d31e..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-16.0.0_pre20221210.ebuild
+++ /dev/null
@@ -1,116 +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 cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clang static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
-RDEPEND+="
-	!<sys-libs/libcxx-15
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
-	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
-
-		# upstream is omitting standard search path for this
-		# probably because gcc & clang are bundling their own unwind.h
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_build cxxabi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxxabi
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" cmake_build install-cxxabi
-}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index bb778f01c91f..8f75c0153e04 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -6,7 +6,6 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD libomp-13.0.1.ebuild 3907 BLAKE2B 46ed471cb355b70f78b59faeffbcc5148d47a3b971818c831e7b155f4f0973238fdbfb5f2fa91913fef93e01beed45f42b1158af92e56cd8445c4a8157508bb7 SHA512 13f150c5223689e4d98e16cafa11e44164b177eb68d3df213582b85c5194e7f736143b49b2075f4178689efcfa8320e2b1faf34242c09dbfcda923b443d42741
@@ -15,6 +14,5 @@ EBUILD libomp-15.0.5.ebuild 3400 BLAKE2B 4e953541edede2f6a71b037853830db5ee78e7f
 EBUILD libomp-15.0.6.9999.ebuild 3339 BLAKE2B 4fb077e0f5195f1c2fef3691aba3e8b674d340df9f3d1de8c9962a03267662bcf55a43af75db6e3ab5121de6c129c7f7514c127ec27c3b940cb2fbbf619788d4 SHA512 49aa1cb488a8e428892dd3b74a82462206e9c11e139b5b9b8e2edca496279c274f81ece0dcb9e71eea43c4e6f99ca4aacd5bdc48e4595743b7f98e7a1f7ae3d9
 EBUILD libomp-15.0.6.ebuild 3403 BLAKE2B 88879a154fed58720306fe4cf1f60b84a8f9b521d277949123f8dcd91ff33325b3cb6686bb6c273d1c107242b0503d9004a4218dc40114fe34a11534c76b478e SHA512 00cda7988e0495c559fb850728da27b32af84415a095da7cdcf0271243a3bac37b07ac52a392c49be21df03c284c81b19390963ae6548acfa84622e2fd3a2c1f
 EBUILD libomp-16.0.0.9999.ebuild 3444 BLAKE2B fb82f952dc3be9c2b651dc0d26552f1d5b89fbc3eeda67ed7a102a403a462d1e8c2d6d06d3fbf376fc17d4a0b5ada9dc1d1e60b468af5eeb61c597ec04c98dbe SHA512 3c5b094ac77e709b3c55e9fb4e005ec1725faa8be9abe48d1e4ac8eaa56920c5d143f61cc18997bf017c8abb0ac8121671b26dea311a5ac62eba3cd5983d57ae
-EBUILD libomp-16.0.0_pre20221210.ebuild 3444 BLAKE2B fb82f952dc3be9c2b651dc0d26552f1d5b89fbc3eeda67ed7a102a403a462d1e8c2d6d06d3fbf376fc17d4a0b5ada9dc1d1e60b468af5eeb61c597ec04c98dbe SHA512 3c5b094ac77e709b3c55e9fb4e005ec1725faa8be9abe48d1e4ac8eaa56920c5d143f61cc18997bf017c8abb0ac8121671b26dea311a5ac62eba3cd5983d57ae
 EBUILD libomp-16.0.0_pre20221217.ebuild 3450 BLAKE2B 8b575e570dd23bbfe9cd8a5c3f08be010561fc313e24d7ae528ae3dd1b3340031c0c5ca0347f0c8aa0c14c6e311ff7fe10e298ac47a3cc541b3684f86aa9ae72 SHA512 22215c52a9cb946f1122dee4a7bfb55614594ac111f96ae9d0a67e0a50074dca66c2ccf7ba2729730a657dc1daaddf40047f752e8f1fbf41015e3c037cad7184
 MISC metadata.xml 963 BLAKE2B fdea4545db21492049061b85eaa7038965183e10aceae7c41daadc1ce10e7e1bcb2e86344659787ee244360b50b51c99e1a348d3acd2185dac80097541a00dd7 SHA512 c279f8e9c2463dc3f6e02856e520105d6f3321b633439bfe7409bfd6e7e43f1450053dc4f6663492caf7077caf3f4ab0f5cf0161631639e3aefa9ff985dc476f
diff --git a/sys-libs/libomp/libomp-16.0.0_pre20221210.ebuild b/sys-libs/libomp/libomp-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 3fd312c5eb2c..000000000000
--- a/sys-libs/libomp/libomp-16.0.0_pre20221210.ebuild
+++ /dev/null
@@ -1,136 +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 flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-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/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="
-	debug gdb-plugin hwloc offload ompt test
-	llvm_targets_AMDGPU llvm_targets_NVPTX
-"
-REQUIRED_USE="
-	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gdb-plugin? ( ${PYTHON_DEPS} )
-	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
-	offload? (
-		dev-libs/libffi:=[${MULTILIB_USEDEP}]
-		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-	)
-"
-# tests:
-# - dev-python/lit provides the test runner
-# - sys-devel/llvm provide test utils (e.g. FileCheck)
-# - sys-devel/clang provides the compiler to run tests
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	offload? (
-		llvm_targets_AMDGPU? ( sys-devel/clang )
-		llvm_targets_NVPTX? ( sys-devel/clang )
-		virtual/pkgconfig
-	)
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/lit[${PYTHON_USEDEP}]
-		')
-		sys-devel/clang
-	)
-"
-
-LLVM_COMPONENTS=( openmp cmake llvm/include )
-llvm.org_set_globals
-
-kernel_pds_check() {
-	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
-		local CONFIG_CHECK="~!SCHED_PDS"
-		local ERROR_SCHED_PDS="\
-PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
-< 4.14-pf9) do not implement sched_yield() call which may result in horrible
-performance problems with libomp. If you are using one of the specified
-kernel versions, you may want to disable the PDS scheduler."
-
-		check_extra_config
-	fi
-}
-
-pkg_pretend() {
-	kernel_pds_check
-}
-
-pkg_setup() {
-	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	# LTO causes issues in other packages building, #870127
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		-DOPENMP_ENABLE_LIBOMPTARGET=$(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+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX)
-			)
-		else
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
-			)
-		fi
-	fi
-
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	addpredict /dev/nvidiactl
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-libomp
-}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 62e1c61abfb5..6922e307160e 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -5,7 +5,6 @@ DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6
 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5
 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
 DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
-DIST llvm-project-d5987fe324fcaedcea12914d6f9644cc5329f364.tar.gz 172157522 BLAKE2B 3c201380e727f7db53d61ff7c411b85aef8b17f086bca0cf3e758284a92a9ced298584e6f92ac6a35f30231d59c916bb98d41a8939f9b1103996c9e09df32ec2 SHA512 dff559b1518bbf9c469a2f4624ba9e83d81df2f08223afc696fa7f3dc9fe1c0d4a17346db8946fb56806e12aa7cbddda8df05b032ffe29dafd8a66c630de0016
 DIST llvm-project-fb792ebaf2114ad11d673cf891ae560e2e604711.tar.gz 174312496 BLAKE2B dd7f30b911ef5049e9e2bff7b2768e31b48b1f4c7acaf159f535fe3deb5aa6630fdf7857c83fffcda1119a38a52101490d2b6cb41cb295bb7dd85cde0445b7ee SHA512 bef15e7d82a2faf8be24f784d3d34ff9b21c8f17256879587ea5471011a32a1eb885e1b020da55aa096f2e0b5fe4bcf9fe8f0f5b5d34f5f386c48899c68fb7d1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-libunwind-13.0.1-r1.ebuild 3772 BLAKE2B 8da1185d1b1c71fe4a84cf068847cdf86f210c181e5f745b3ed05635b8f2824ac7aab931a8066cf199c93553fe4a3a0915972f854af1e09b1a2411f66fee834d SHA512 736810a5a52be3271854a50b476874986618e79fb24022ae3188c68759b31b75071083db9a5c9ab8f9439edff3cf7df2e4a20a847ad330984796ed747eb1cd4f
@@ -14,6 +13,5 @@ EBUILD llvm-libunwind-15.0.5.ebuild 3032 BLAKE2B e9cdfc38c7a89f7ffb82c051e827f74
 EBUILD llvm-libunwind-15.0.6.9999.ebuild 2978 BLAKE2B e1fc6e470239200cea2bd9b84e9e084c204536e1bd2886780849f342452cf6b86a6d4d5baac91d562af632a9bcf298569ff459f24464fabc1e01accdc30e0db1 SHA512 b9e5e37262bd55c9aa776b78bcbab46be96de644ddc182fa6787200e4d6746babb09f42481d61723faec935542f869b10e7ce3af688f36a5086bcd6b235bbeec
 EBUILD llvm-libunwind-15.0.6.ebuild 3036 BLAKE2B f59cadffaf0f4e3daa329a5fbfe0a11d442bdd126347c6b6e3ffb8f18569d84fb464d9bb687c38e43cca39414cd95628be94e13982044393375660dc38ffb670 SHA512 286d83a0cc657015154abc57525e84ddc01f19a601136502fd6bf131869e77b32636191735fb83081659ede38243478518e0f168b27b4f2a1aef73adb0239aec
 EBUILD llvm-libunwind-16.0.0.9999.ebuild 2978 BLAKE2B e1fc6e470239200cea2bd9b84e9e084c204536e1bd2886780849f342452cf6b86a6d4d5baac91d562af632a9bcf298569ff459f24464fabc1e01accdc30e0db1 SHA512 b9e5e37262bd55c9aa776b78bcbab46be96de644ddc182fa6787200e4d6746babb09f42481d61723faec935542f869b10e7ce3af688f36a5086bcd6b235bbeec
-EBUILD llvm-libunwind-16.0.0_pre20221210.ebuild 2984 BLAKE2B 70388834a22670c4e426529ec11a167301c730533249543cdbe07d9ed6a52abb796aaf302b0e22715b2655b33261f36d6a67fc2a348c0159d92ff361dc204eb6 SHA512 693ecb366b56a282ce17bb820c0b4c04c4c3ca7c46e8514d8572bb1ee28356cfe5e717138ed8fd38303c378013a96de31ced2143afd6f9dde4298aa49af8746e
 EBUILD llvm-libunwind-16.0.0_pre20221217.ebuild 2984 BLAKE2B 70388834a22670c4e426529ec11a167301c730533249543cdbe07d9ed6a52abb796aaf302b0e22715b2655b33261f36d6a67fc2a348c0159d92ff361dc204eb6 SHA512 693ecb366b56a282ce17bb820c0b4c04c4c3ca7c46e8514d8572bb1ee28356cfe5e717138ed8fd38303c378013a96de31ced2143afd6f9dde4298aa49af8746e
 MISC metadata.xml 438 BLAKE2B 2a36fbbc59e137056029c62aef6d167d9c82531c2582d7bad5cb13cc36e5c4c9518ffe8c56d06bbcfd97ad22eda71a8b776f3984195f53d06cf45659b438dc00 SHA512 4f18b054072d00e5440faa31a59f9ef587d035b5f25e30913f0b1449debee967fa794fae2548e87db3fb2177ce853ab075e1f11f3cc763f5d7fdf06147108845
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0_pre20221210.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0_pre20221210.ebuild
deleted file mode 100644
index 7950708766b5..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0_pre20221210.ebuild
+++ /dev/null
@@ -1,123 +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 cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~loong"
-IUSE="+clang debug static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!sys-libs/libunwind
-"
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-
-	# https://github.com/llvm/llvm-project/issues/56825
-	# also separately bug #863917
-	filter-lto
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	# https://github.com/gentoo/gentoo/pull/21516
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libunwind"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
-		-DLIBUNWIND_INSTALL_HEADERS=ON
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-
-		# avoid dependency on libgcc_s if compiler-rt is used
-		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-
-			-DLIBCXXABI_LIBDIR_SUFFIX=
-			-DLIBCXXABI_ENABLE_SHARED=OFF
-			-DLIBCXXABI_ENABLE_STATIC=ON
-			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-			-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-			-DLIBCXX_LIBDIR_SUFFIX=
-			-DLIBCXX_ENABLE_SHARED=OFF
-			-DLIBCXX_ENABLE_STATIC=ON
-			-DLIBCXX_CXX_ABI=libcxxabi
-			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-			-DLIBCXX_HAS_GCC_S_LIB=OFF
-			-DLIBCXX_INCLUDE_TESTS=OFF
-			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-unwind
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-unwind
-}