gentoo auto-resync : 18:03:2023 - 18:31:42

615 files changed, 5284 insertions, 6928 deletions

diff --git a/Manifest b/Manifest
index bc40d54404d4..7c80592f4181 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29452 BLAKE2B 047d381f73f5cccfeb0739b41fc5f2781a8fcc2798854f021161e54e42ec9c2aac578bf0eb0b2aadc288e00d9b9cfad67699a8c12f2ce50965fc2340b6d0ab83 SHA512 1b7cee26a536d27c98ff8786cd9906165bb83ec34ce46aea40ae967cb3b2654924ea5c1dd729fafaf4abc1552b35fb08213e1961d386b8f4031209364af36ebe
-TIMESTAMP 2023-03-18T06:10:01Z
+MANIFEST Manifest.files.gz 29442 BLAKE2B 90feeda8b172b7bca45d4014fe0b42516d896e549c77104554fbb9a981be29c53fb01e09e5d5594f6f1ead61716109dc49dee4c6d78a9fb39d71e955d554ba84 SHA512 5c2f06e1541f9a8502eba9b8fe5b9c66913d87cd41eb307b53ec6c5dfe97a541a0317b517756a32a862fc459b4dab58cfb95524852ee6ff396cfd5ca8b77b8b2
+TIMESTAMP 2023-03-18T18:09:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQVVblfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQV/nRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCmEw//UgiV2qJ5ePiM4BSzSNICKTzvrc4XjbiJj1VVVQPAkro5GaN2TfgV8eCT
-HRHcZoDwR2Iy10Ty/QiuKpPCzgM1Wyt4ykQFACw+WqBeYMZZmoodU1Y8byiWEwnQ
-fp+GOnL7dKkoNbDq6KfPZKOM8Wt0CB6R9gPbEdpC8zIdu1kfn1je3FOnme1e/VHu
-mQWxDbkFqxQgvsJoJWo7Jc6x3qsR1KgfKSp6GWdGKYzsbyzFd/UeJQl4LdjfomZ1
-ObHUtOQEnaePgebuGLUO6xilXM+ziyew6VBJBuUrzWSkEOkMlzGK1uIEfD9mdgIc
-wLtkUtJN5+QtxgMLhcupgiqDgONW/t5lsQ9eUtaG2FW87uhsUqPXj7NXXtnLZi5U
-DGnelJuWzl7u8DkL12CZ5YdRuGxS0Ky5BSBIAB1CoRp3ebBvjL209nMiWjzwTfrc
-XNPIPNGdxO86I9D2ww2B8v1hkEUWNNm/qA2gGTftMzYLx7y01zCDoyNV/rSz4W0h
-tx49CVj4PSZI2dqD5rnpI8NFvu38STmsPUxFlnQavQ3+5mvJidcOUCMO2kgrvrP2
-Mj55GTtHMVnVffwDGUCPEX3AOudmd34mwIfk4YARBfq9xtVbKgf8Lop4Vt/9QRzU
-+5XbEDC1NroU5rWdPbqmCJGvxRN4vaxLPHm1BJ8+wuPqRa0gN1k=
-=6Luu
+klDc7g//YO3BO/m8BoQ9jUCmgSpze2UvY1/CdhIg3U3rrZTGlFcYL2pNAtbknVdG
+2jBD8FnHO2zOORxXO6UGHi+15spmqdjrO3yTTXwdWyqG+WtE2i23BHYr1vRglzVx
+UXt0gibqZvbF0c6HTJhQPFK5NiJGnDii4dsDpqMqEeOOvWBvEQDy/Y6mk34hEMAW
+cECb8XJscsGmOZYzVrJUz9tpk7s99rM+PUsGFaK+HVzKgbG+DELdFsWRz3ofJGIo
+mmIwWJUWOH/g6pef0YNAiVhD7Flqs9jUxOEnGZWwVVw+9ThAONEEZHr96U92NmU7
+WG7kQaBZG/s0Ervc2agTc1hXDkvn4Fnw1aKlb5WDJN3p5P+0zFg5yN7CMhIIJTz9
+FZwuR+z5VxFKqC0CCdPuRHaa8hryH0Xm7hgkwKZ4W8vChKf1KhvWD1Tyx3bVpQR0
+1+0+2dikWO/Nycv/JerA0Bqs3gLK/69oLC00D01NAR+eJw/bNTeHjhhZlYEuGs3B
+wTNs1cQSCWzvc6Eg8hfTBPn9oZDdzNCApaZnqE4H1uk6Qha6rp3j19XKTK5Ol7uj
+uMsVPGF771G5rRpk4myDZOLvNvWiKHMRdD1/W2+j60GwnjkEo/uIXt0HshZbxhbz
+Qd5kQT4U+pfVJQ3XKsB4M4hfNtA6eCe/wsJPYhUBeIeMua7XNL4=
+=fUIM
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d0aa9a1546fc..5ebb069396da 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d0012f8f8257..2ba1b59a148c 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/bastille/Manifest b/app-admin/bastille/Manifest
deleted file mode 100644
index bb3c108108e3..000000000000
--- a/app-admin/bastille/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX bastille-3.0.9-openrc.patch 650 BLAKE2B de676aa353116cfb2297b5d08dbb4bc38ab9706d696be53d42941c5f5c198d1ea197a3f9c0db7635819f588ec64b9fe24e2fbf55d77833b1229a5a5af0bd19e2 SHA512 fe880f40185d129fef192a5a4e98e891691087958382d7ac8fa05612fea7f24d8116f0787796b1a1a1dab31d54d1bef52a59cdcf3213feae384e7c838a9801cf
-AUX bastille-3.0.9-perl.patch 1049 BLAKE2B 2a82c1883bf795b83a86d34e29fc2b3495123035479ce7c30451e37e30b2890db7f14fa0451c5a7d68f88b49f97dc7945f886071bae16a9a20508aa886d6e99a SHA512 23446f6ca65fa4b164b6dd688eb31a957cf76ce5017c4b74b4bcf402091811e1b2b51a55957c6bf6de5b7f6b7f58a9f651c7f85b760b5d270ec9280eab405dfd
-AUX bastille-3.0.9-renamewidgets.patch 2015 BLAKE2B 12003ebd9d40296e5285b45b063050787fc71c8d0f1002e07407105eaa2678ed25e2dbee66bd9c057047b323076e19e258a5efd2156c043b3d1fba5a92f8ef70 SHA512 28cf0f8a5bf11c29127f128fee80bd0a169960996b4d97b3666d7cfb2485850ca040670deaaf9d0c728e08747adefeecf02c4647cbd4c0e3673cf327c9b46f92
-DIST Bastille-3.0.9.tar.bz2 319045 BLAKE2B 480288c6e9fc5462e8e6ca84665d5769aab4252813ff478ab0519d382e1f03994da008ac2818b1d4214a09607c7316711665bce154121b3029bace6f2822df09 SHA512 a97ab2c2bb64c655d43ddcfd4000cee8666787e5b5923390e3155b258c3a2cf7d131abd474f9b0dd415eb455b664ab26a875da6636268b2a715ea87dd4dae2f0
-DIST bastille-3.0.9-gentoo-0.2.patch.bz2 14117 BLAKE2B 9c4383eae9e27cc4e110553a21424cd2811172c32609b0d3bcc72ccc3f61ba7cd76bfdbee969de5a89c22d0c1dd91b9ba92ce27ea5ac2b7260e5c0e1ce424be5 SHA512 a4ecfc064d6cf8c12b6f53c81dea841931df270293b03c39266861121f3def28fcbc4127b3bc9374028983e584736fb85361443badaadec7441cfb1570bdea8f
-EBUILD bastille-3.0.9-r3.ebuild 1823 BLAKE2B dcaa67de675c582cffaf8a91c6d3cd66b8caa7aa71d342c4e5e46da344783ee0e7c8661074372ca10c268d0aff946b442d15e6d71941b846f9a23e2d11d5d84b SHA512 3f32d0018c7106d2d12ad1b96cac46dd385fd1d387c0478ea5b671cf0f9ebc561067c0463366e4538b6809d1ac8aed9074c0e125ce3a88cd7f6b8266d5095905
-MISC metadata.xml 336 BLAKE2B d1ca0961119d3468c05d2a6087507eb09a3996f6fbf3414ca7b1e120af8322f09e8694551a346c8a627d5c7f7c8c462bd5136cdbdab1c11931a05d7f318e2cf4 SHA512 92294b83690656c5f7bc78ce0ede62b757763614b6c6962d89b7ee5ff044858e55e6925befca3845d7948a37119617ad8e0e3d22d781cda888b2ca994f1677a1
diff --git a/app-admin/bastille/bastille-3.0.9-r3.ebuild b/app-admin/bastille/bastille-3.0.9-r3.ebuild
deleted file mode 100644
index 4a1ca299446d..000000000000
--- a/app-admin/bastille/bastille-3.0.9-r3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit perl-functions
-
-PATCHVER=0.2
-MY_PN=${PN/b/B}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Bastille-Linux is a security hardening tool"
-HOMEPAGE="https://bastille-linux.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
-S="${WORKDIR}"/${MY_PN}
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="X"
-
-RDEPEND="
-	app-admin/logrotate
-	dev-lang/perl
-	dev-perl/Curses
-	net-firewall/iptables
-	net-firewall/psad
-	virtual/logger
-	X? ( dev-perl/Tk )
-"
-
-PATCHES=(
-	"${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch
-	# make sure the Perl modules go into vendor dir
-	"${FILESDIR}/${P}-perl.patch"
-	# prevent file collision, bug 536292
-	"${FILESDIR}/${P}-renamewidgets.patch"
-	# openrc runscript rename
-	"${FILESDIR}/${P}-openrc.patch"
-)
-
-src_prepare() {
-	perl_set_version
-
-	default
-
-	cd "${S}" || die
-	chmod a+x Install.sh bastille-ipchains bastille-netfilter || die
-}
-
-src_install() {
-	perl_set_version
-	export VENDOR_LIB
-
-	cd "${S}" || die
-	DESTDIR="${D}" ./Install.sh || die
-
-	# Example configs
-	cd "${S}" || die
-	insinto /usr/share/Bastille
-	doins *.config
-
-	newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
-
-	# See bug #455542
-	keepdir /var/lock/subsys
-	keepdir /var/lock/bastille
-	keepdir /var/lock/subsys/bastille
-
-	# Documentation
-	cd "${S}" || die
-	dodoc *.txt BUGS Change* README*
-	cd "${S}"/docs || die
-	doman *.1m
-}
-
-pkg_postinst() {
-	elog "Please be aware that when using the Server Lax, Server Moderate, or"
-	elog "Server Paranoia configurations, you may need to use InteractiveBastille"
-	elog "to set any advanced network information, such as masquerading and"
-	elog "internal interfaces, if you plan to use them."
-}
diff --git a/app-admin/bastille/files/bastille-3.0.9-openrc.patch b/app-admin/bastille/files/bastille-3.0.9-openrc.patch
deleted file mode 100644
index 08d0a04fa480..000000000000
--- a/app-admin/bastille/files/bastille-3.0.9-openrc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN Bastille.orig/bastille-firewall.gentoo-init Bastille/bastille-firewall.gentoo-init
---- Bastille.orig/bastille-firewall.gentoo-init	2017-01-02 09:47:33.144433650 +0100
-+++ Bastille/bastille-firewall.gentoo-init	2017-01-02 09:49:05.396431757 +0100
-@@ -1,6 +1,6 @@
--#!/sbin/runscript
-+#!/sbin/openrc-run
- # Copyright 1999-2004 Gentoo Foundation
--# Distributed under the terms of the GNU General Public License v2         
-+# Distributed under the terms of the GNU General Public License v2
- # $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/files/bastille-3.0.2-firewall.init,v 1.1 2005/07/31 05:21:10 battousai Exp $
- 
- opts="start stop"
diff --git a/app-admin/bastille/files/bastille-3.0.9-perl.patch b/app-admin/bastille/files/bastille-3.0.9-perl.patch
deleted file mode 100644
index ab109093bc14..000000000000
--- a/app-admin/bastille/files/bastille-3.0.9-perl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ruN Bastille-gentoo-2/Install.sh Bastille/Install.sh
---- Bastille-gentoo-2/Install.sh	2014-12-09 23:05:55.674808824 +0100
-+++ Bastille/Install.sh	2014-12-09 23:17:25.907847419 +0100
-@@ -3,7 +3,7 @@
- umask 077
- 
- mkdir -p ${DESTDIR}/usr/sbin
--mkdir -p ${DESTDIR}/usr/lib/perl5/site_perl/Curses
-+mkdir -p ${DESTDIR}/${VENDOR_LIB}/Curses
- mkdir -p ${DESTDIR}/usr/lib/Bastille
- mkdir -p ${DESTDIR}/usr/share/Bastille
- mkdir -p ${DESTDIR}/usr/share/Bastille/OSMap
-@@ -13,9 +13,9 @@
-  
- cp AutomatedBastille ${DESTDIR}/usr/sbin/
- cp BastilleBackEnd ${DESTDIR}/usr/sbin
--cp Bastille_Curses.pm ${DESTDIR}/usr/lib/perl5/site_perl
--cp Bastille_Tk.pm ${DESTDIR}/usr/lib/perl5/site_perl
--cp Curses/Widgets.pm ${DESTDIR}/usr/lib/perl5/site_perl/Curses
-+cp Bastille_Curses.pm ${DESTDIR}/${VENDOR_LIB}
-+cp Bastille_Tk.pm ${DESTDIR}/${VENDOR_LIB}
-+cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses
- cp InteractiveBastille ${DESTDIR}/usr/sbin
- # Questions.txt has been replaced by Modules.txt and Questions/
- #cp Questions.txt ${DESTDIR}/usr/share/Bastille
diff --git a/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch b/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch
deleted file mode 100644
index 2cf303a548dc..000000000000
--- a/app-admin/bastille/files/bastille-3.0.9-renamewidgets.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ruN Bastille.orig/AutomatedBastille Bastille/AutomatedBastille
---- Bastille.orig/AutomatedBastille	2017-01-02 09:39:20.720443755 +0100
-+++ Bastille/AutomatedBastille	2017-01-02 09:40:54.293441835 +0100
-@@ -77,7 +77,7 @@
- 
- # Use the Curses interface
- use Curses;
--use Curses::Widgets;
-+use Curses::Widgets_Bastille;
- 
- # Hardcoded List of configurations -- to be replaced by list read from file
- @list = ("WorkstationLax","WorkstationModerate","WorkstationParanoia","ServerLax","ServerModerate","ServerParanoia","Quit");
-diff -ruN Bastille.orig/Bastille_Curses.pm Bastille/Bastille_Curses.pm
---- Bastille.orig/Bastille_Curses.pm	2005-04-18 14:32:10.000000000 +0200
-+++ Bastille/Bastille_Curses.pm	2017-01-02 09:41:24.470441216 +0100
-@@ -34,7 +34,7 @@
- sub do_Bastille {
- 
-     use Curses;
--    use Curses::Widgets;
-+    use Curses::Widgets_Bastille;
- 
-     # Number_Modules is the number of modules loaded in by Load_Questions
-     $Number_Modules=0;
-diff -ruN Bastille.orig/Curses/Widgets.pm Bastille/Curses/Widgets.pm
---- Bastille.orig/Curses/Widgets.pm	2005-04-06 01:18:11.000000000 +0200
-+++ Bastille/Curses/Widgets.pm	2017-01-02 09:42:31.145439848 +0100
-@@ -11,7 +11,7 @@
- #
- ########################################################################
- 
--package Curses::Widgets;
-+package Curses::Widgets_Bastille;
- 
- use strict;
- use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
-diff -ruN Bastille.orig/Install.sh Bastille/Install.sh
---- Bastille.orig/Install.sh	2017-01-02 09:39:20.767443754 +0100
-+++ Bastille/Install.sh	2017-01-02 09:41:05.537441604 +0100
-@@ -15,7 +15,7 @@
- cp BastilleBackEnd ${DESTDIR}/usr/sbin
- cp Bastille_Curses.pm ${DESTDIR}/${VENDOR_LIB}
- cp Bastille_Tk.pm ${DESTDIR}/${VENDOR_LIB}
--cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses
-+cp Curses/Widgets.pm ${DESTDIR}/${VENDOR_LIB}/Curses/Widgets_Bastille.pm
- cp InteractiveBastille ${DESTDIR}/usr/sbin
- # Questions.txt has been replaced by Modules.txt and Questions/
- #cp Questions.txt ${DESTDIR}/usr/share/Bastille
diff --git a/app-admin/bastille/metadata.xml b/app-admin/bastille/metadata.xml
deleted file mode 100644
index 9a5255cbfb46..000000000000
--- a/app-admin/bastille/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>hardened@gentoo.org</email>
-		<name>Gentoo Hardened</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">bastille-linux</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d5af896779cd..92397594b521 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/debian-archive-keyring/Manifest b/app-crypt/debian-archive-keyring/Manifest
index 900f78d85653..7fe2fbdf332a 100644
--- a/app-crypt/debian-archive-keyring/Manifest
+++ b/app-crypt/debian-archive-keyring/Manifest
@@ -2,8 +2,10 @@ DIST debian-archive-keyring_2019.1_all.deb 75088 BLAKE2B 54411c4bde02990670baba6
 DIST debian-archive-keyring_2021.1.1_all.deb 93592 BLAKE2B 8e17e16b2f0c670a1c486e8d139bf3da68ee7606052b219dd0b0bdc1334434686fe1920a33fcaf8e51e5b162c375e3528c3e565b99313f55e3dc9517eae5f4c5 SHA512 64575ab9f23b69ca98f13d535e18574b6d7805add0d56238e760b9e639c9990f3f3d865460fdaf86480c3905a3f3d7637b56e2998ae60f2f05e2d08e148ddcc7
 DIST debian-archive-keyring_2021.1_all.deb 93572 BLAKE2B 0566017cc02c9ddc03e6ba7a0fdb62856e8a8d5f31508b6fdba8c206288a8c4c0165f88bfaa3515897e8b88fa16ee459a5fca67e2f6364f1048c465b128e8d96 SHA512 20aeb3460bdfaa47aad0c069c5d39a2e385b0394d39db9ea76ad5a7e6fa6421c8603eb2241d2cf4ba82754291097ae416b1ec2a04c16a6065c5f0d04eb8d8946
 DIST debian-archive-keyring_2023.1_all.deb 143932 BLAKE2B 72adb14999d4ead23a79d610bde0dd50e0370a68da0be379556da56589f9f493a5e5cc5d77dd597fdb417fae6c3a0d1f882209086e9312816f63efd59408c001 SHA512 b9645b6ccc07c38b8187cd4169006f4231ab08c70305f28f40a3fba9a93e9f9f05e9e2ac3fde2423d28b99313d631afcdccadcd20d7237de49bc22709e646c39
+DIST debian-archive-keyring_2023.2_all.deb 160616 BLAKE2B 36b0dd0c518632eae0111fdc1adef069a3dc14d1d7904298665eec2bbd27044e04c600df9a635f82e986c4c401358d94d356fa75503b18b2b83253097101b063 SHA512 f1628233a9430762690db62b7329aefbdd24d4ebc5518ed6ab39c0155365ca2d82e4f5282f6f57990102770c8c97c4df05d9cbc3dedbb905a54fbb16f85e9ba4
 EBUILD debian-archive-keyring-2019.1-r1.ebuild 573 BLAKE2B f8a443e81c0345a37286f9b30d2293e2274c48c549b9005005e4db8dd513fec05962ea6ca9ae999ed953ae4ddc0ca89469fe825e78fbfd3fae860bed65407734 SHA512 23cc33336c33fa8275e97a9f235b40f23859c8c2406d9d461b5eb06f461093286ea6804742ce3299e3b3977a4402b7f2f1146093796c120036a3b982f2b5b66a
 EBUILD debian-archive-keyring-2021.1.1.ebuild 572 BLAKE2B aeefb72e33b8f736b11661640e2b2c304def4be822c5d201dc79c767e0aa32f65e8b9eef5c7f66716629b238f1db41ba57c87fa1db131c9590353d26f208d4f7 SHA512 09b621e427385f78be2409c9db22f5b3bef2aa25806b40fae9bd3a9a0c5385ba2d3204115fd6154ba28fbae3373c74d283bd16c8dd5db059de514a93a624c713
 EBUILD debian-archive-keyring-2021.1.ebuild 573 BLAKE2B 22fa551113dd20c5be3726464b9dbe9f0060136b16d35819e7c80e6a98b659743ab9a71d15acbed61eeef641f9234e26de1382294d4b229dc0fe0103831152e4 SHA512 47783fb36ce1e9a731e3ff3c0a9e0c9d1167943ea327d3f386f0779140380e2251395f69d0c394377dd585049fc4ce32d7250edab4ee594e61d041ea95a62285
 EBUILD debian-archive-keyring-2023.1.ebuild 573 BLAKE2B cc8e0df7f9e486f6c3c5b2502ea25cf77edac4d624859376468eaacd1f94b38b4458a6aefa43f49fe73a86996fa8d3043a0c727c56c262faf6849efe27d89edd SHA512 759ed573a1dc6acdd89e83df9f01c4a0ecc74be2c29d504fc7c1a8b6c4e720ff7fcb42926966d867f805747b01372753f5987a44acbdc3df43586a47a500c09a
+EBUILD debian-archive-keyring-2023.2.ebuild 573 BLAKE2B cc8e0df7f9e486f6c3c5b2502ea25cf77edac4d624859376468eaacd1f94b38b4458a6aefa43f49fe73a86996fa8d3043a0c727c56c262faf6849efe27d89edd SHA512 759ed573a1dc6acdd89e83df9f01c4a0ecc74be2c29d504fc7c1a8b6c4e720ff7fcb42926966d867f805747b01372753f5987a44acbdc3df43586a47a500c09a
 MISC metadata.xml 281 BLAKE2B 656a093cc4296d44da7aae8489bc5818873797765a02cd8e14e1b2baa9b5d22f3fe920c9c8c37420172c6dea5e7bc065ded9985e24d0c00804515a0fa50c5055 SHA512 c4944985c300a4917fa6fa449a6d84af84c353ecfa8f944c1cd8f37a9ab8b82c92fc6a66d2eff6a0a8e50b5d21ff8639406106d3188e06126c04ce49820ccb34
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2023.2.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2023.2.ebuild
new file mode 100644
index 000000000000..00b2e3a5b143
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2023.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="GnuPG archive keys of the Debian archive"
+HOMEPAGE="https://packages.debian.org/sid/debian-archive-keyring"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+	doins -r .
+
+	# https://bugs.gentoo.org/729142
+	gunzip "${D}"/usr/share/doc/${PN}/changelog.gz || die
+
+	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index e98eb75f44f7..287dec31c8c7 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 09e691741879..37dc1eb95375 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -18,6 +18,6 @@ DIST VirtualBox-6.1.42.tar.bz2 165554573 BLAKE2B 8419793d9e4c4d0804baba926443a27
 DIST VirtualBox-7.0.6.tar.bz2 199512172 BLAKE2B cfe4d7abd57dfdb0294177759e80aa9fda797b9b5433f214771a57764cb23404450169e8c7c30cda13de85b8e02a37024584c7b1f0b5a44b10b100aa66b8d5c5 SHA512 f9db7a154e392f550f50abe774fc6263eb0b6f86dccc069f2c5012fedbe2debbf5b8ba62cca44ea0d5d5475652188176bfb888266f69197677b22854f02b64a0
 DIST virtualbox-help-7.0.6.tar.xz 3939412 BLAKE2B ea1326bccb3c2edc33ab37e122a7bedf79475d335e632ee62f99e0dce4b80de7634cbfe121c8c7ccd6588ff3b81effe7b20efe123cc44bc7b1ff4f6a851302a6 SHA512 ffb59f0c99c91b165a0b83d29317e04eee9097b0d0ac92a0d3e71558e70ec8b2807491a4633562a5e820e5f5a8e1339883031fd03de93d09a188f19b8b4d3a93
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
-EBUILD virtualbox-6.1.42.ebuild 18584 BLAKE2B 82e17733d9388b093e9c39c418bc8f6c4a5a846cda8c8ae5fd112a795f1600a723be52077d612095827f41a80844577ad71e6e8faf126eb4ef5c26fb15265297 SHA512 dd94a3f1b07db5c2b815427b21f1fc6bfd4217f3db1a2a439cd20cbcbee57e3a7a182c7870c43941a737f770c8dac0362137247ac5127bcd309535ce464a381f
-EBUILD virtualbox-7.0.6-r2.ebuild 20385 BLAKE2B 033bd2d18bbb9551bb41b0a000ac5284548b4d5f97f3f32098fa1882c9a0d1675f379a326487d6aa6bfb4e7a071ed898b863fc5abd8d1869224a52f8592663ed SHA512 c55c6b577b21c9c8f813d784ed40cf466fed8c98b8e39069c702609e5010217013bcd09d3b7ca99ca8d0f3b07f9304a9234737b5161a6846371b2969a410be7e
+EBUILD virtualbox-6.1.42.ebuild 18594 BLAKE2B af0f0f4e3b3a68e4fa28b4027414bd285b0aa951dcddfeed2b5c039428e5eb027da2769a061f7f698d0bf05b8e3a23f6162b87223ac4fc9bfc543457a78f2078 SHA512 048c29029d870256b041fb57dad25a9455867c9490bc9707b02ccab89c08fe18204dbab7d27522089716c987f3054f5a8dc63e4c4af5f6976236bd48ea146c52
+EBUILD virtualbox-7.0.6-r2.ebuild 20395 BLAKE2B a51572013b0ffc561325368b5d3e3d6b755d58ae5d74a06aaf346650e31c8cc21d7b33a64fc7a01079a78cc3e7da4e82653ec4f60099e16bcc892033765ff4d0 SHA512 5f1b93f532236c3c1ddff26a45ac400870fccc9ddee2a98d06d9d94a1d204f191214b3a1153ded2d4a64d93f279a683b14bc2385de7f9807bc6eb735b6268bfe
 MISC metadata.xml 870 BLAKE2B 26f9370557a12c17465e7ca2d63902a2ce5b2d65fbdf40f3b890bd89aca28a1816424caf579f71b762876e8e91b292c5ecbcbad985e9da1e1472e66a2eaf6965 SHA512 eb2e9114dc343062e9afd3b933a5d355be790febb4a18f741347072d305b7d63ed40a6a3b9d11b91eb8602d5d2d4f5cf6c2ebde278fb0d0df48a5c5647374e33
diff --git a/app-emulation/virtualbox/virtualbox-6.1.42.ebuild b/app-emulation/virtualbox/virtualbox-6.1.42.ebuild
index 33589ebf0c18..2cdcfd9d0be2 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.42.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.42.ebuild
@@ -102,7 +102,7 @@ DEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
-	app-arch/tar
+	>=app-arch/tar-1.34-r2
 	>=dev-util/kbuild-0.1.9998.3127
 	>=dev-lang/yasm-0.6.2
 	dev-libs/libIDL
diff --git a/app-emulation/virtualbox/virtualbox-7.0.6-r2.ebuild b/app-emulation/virtualbox/virtualbox-7.0.6-r2.ebuild
index 3e3e49139878..02b13adc7290 100644
--- a/app-emulation/virtualbox/virtualbox-7.0.6-r2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-7.0.6-r2.ebuild
@@ -126,7 +126,7 @@ RDEPEND="
 "
 BDEPEND="
 	${PYTHON_DEPS}
-	app-arch/tar
+	>=app-arch/tar-1.34-r2
 	>=dev-lang/yasm-0.6.2
 	dev-libs/libIDL
 	dev-util/glslang
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 6780160d672d..d41be515651d 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/gcalcli/Manifest b/app-misc/gcalcli/Manifest
deleted file mode 100644
index d0f51db6a5aa..000000000000
--- a/app-misc/gcalcli/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gcalcli-4.2.0.tar.gz 1701050 BLAKE2B a0e310097cdb740ac873049d19d21dc8698afe61c919fd082258864e7170f5ca42a55b4eb211cfa9ecd9b2bef63f3e107839a4e3cad9ec2c278a8529f58ac33c SHA512 2dd39a62e3fd81753f30b77be196476ef366cb6914e62c5de82ab946b7159751a5cbf246aa54eaed1fb6adfef7dbba785d10e29571a454b627b7ff45b52375d6
-DIST gcalcli-4.3.0.gh.tar.gz 1702967 BLAKE2B 04623e2140769a56c28a03e315f8ef1e9fe51571f2e46d2529e1fca062c85de251c6adc631057df228494d449b93564e9fe71998f8702ed87dbc5ec5e7803bbd SHA512 ea8680be5351d7b18206ea7b010d49a8c87cbafc9d754cf7f47587a09228c45b29f76d29644770a881cb7c750a1e0e59262b7875eca77aee5bc2476e456b807e
-EBUILD gcalcli-4.2.0-r1.ebuild 875 BLAKE2B f1c501b5ff161695333cd9f06b3623cb83efc9f8daac2b587ee753b80403330f73f547c07ea41b7889672c50773bb3d412d37428567ff792a4a8fe1eea6d8b9b SHA512 7c8c49ffdf5679705fa4d0f920de9c9d42a8bd6d0fb456a50719385579320752b46fea8f3e48b4be78d8dd62a4952db842a4079a7f978f837afc3204435b488a
-EBUILD gcalcli-4.3.0.ebuild 828 BLAKE2B e1d8c13994a49c83a163c0da3a987bd7be1cbe35a2481730ff45bf4d0989ff208b03f948ee36c7bb5d535f5da973f51fd22db0cbb43363b625c7ca583d9aef61 SHA512 e38bef7d8f90c271771d8463f55a852c1317260418646f1ae5f0dd03894c0c8b711f59559fc81bb287fcf83f1185395c67744a3f91ee761ee7561d85f96bbd6d
-MISC metadata.xml 413 BLAKE2B 939af02f1077e01b65a014a06ca7b6f8244b0371a66048302f566eed042cf336ff1f6d2856674a4a69c3e9a22589b32539fa649433e59d30c6ec2d87d5ceb8a1 SHA512 8a6b6190e4cbe51677ff7ae4fe1838dcfd97ee8a7bfd9c39b03481795c0567baace4d50c4a090d2e2bbb9f28157e3778822da49e416334b8114d76a89a759b05
diff --git a/app-misc/gcalcli/gcalcli-4.2.0-r1.ebuild b/app-misc/gcalcli/gcalcli-4.2.0-r1.ebuild
deleted file mode 100644
index 78922029329c..000000000000
--- a/app-misc/gcalcli/gcalcli-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-MY_PV="4.2.0"
-DESCRIPTION="Google Calendar Command Line Interface"
-HOMEPAGE="https://github.com/insanum/gcalcli"
-SRC_URI="https://github.com/insanum/gcalcli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/gcalcli-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
-	dev-python/oauth2client[${PYTHON_USEDEP}]
-	dev-python/parsedatetime[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-gflags[${PYTHON_USEDEP}]
-	dev-python/vobject[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_install() {
-	dodoc -r ChangeLog README.md docs
-	distutils-r1_src_install
-}
diff --git a/app-misc/gcalcli/gcalcli-4.3.0.ebuild b/app-misc/gcalcli/gcalcli-4.3.0.ebuild
deleted file mode 100644
index 9011c82b338f..000000000000
--- a/app-misc/gcalcli/gcalcli-4.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1
-
-DESCRIPTION="Google Calendar Command Line Interface"
-HOMEPAGE="https://github.com/insanum/gcalcli"
-SRC_URI="https://github.com/insanum/gcalcli/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
-	dev-python/oauth2client[${PYTHON_USEDEP}]
-	dev-python/parsedatetime[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-gflags[${PYTHON_USEDEP}]
-	dev-python/vobject[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_install() {
-	dodoc -r ChangeLog README.md docs
-	distutils-r1_src_install
-}
diff --git a/app-misc/gcalcli/metadata.xml b/app-misc/gcalcli/metadata.xml
deleted file mode 100644
index 4b02113ea41b..000000000000
--- a/app-misc/gcalcli/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-    <name>Robin H. Johnson</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">insanum/gcalcli</remote-id>
-    <remote-id type="pypi">gcalcli</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-misc/goobook/Manifest b/app-misc/goobook/Manifest
deleted file mode 100644
index 62dd7d2f0bfb..000000000000
--- a/app-misc/goobook/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX goobook-3.5.1-pyxdg.patch 4669 BLAKE2B 9d1e86d9d2a54b4050378fa0e9799135db6d124b4546393d03981d17dee20d51d47a483075948cb7a9df75f7ab452c11b161db6aa5546bc27509e3b0ce6aad09 SHA512 0ffef1b4710b6b3e6c35d098380b6a3ff7b9b4d77c9b0c651ad5a46aa0491e7feb334bac2c472e11677cf8ae0fe47776abd5ece84efd053ef1fe202f51a37ae3
-DIST goobook-3.5.1.tar.gz 38176 BLAKE2B 99a068256ca83e800a2d2e82c88adba85797107dc72edde9fbb3c9790ef38fff627b4db64c21baff14aa8a4c69788c29aeb01dae60533c7f389352aee9401e9c SHA512 58d056d7d76843bc874e55424912bb00068541e674b780511b7753da31f2df9514baa188017dd0a7479b5527cd50c47e35f37afc493bdc973e0eb1624998a611
-EBUILD goobook-3.5.1-r3.ebuild 1202 BLAKE2B 1ec10eb3159d5dd246accec4e5dd8f9d7cc57057a25cfed31c3a9bfd9bddbc05f720721a9dec77429812681f54a1b965072843c75b33a4f3fdff6e5286d54903 SHA512 fa11761cba794d9cbaacb62f9cb34214330f64e1ce3b62b9e456439bf6860a7ae74925fce7112111d6eee5f529d3eed44662868ffcddb1c5d2eaf082a15e5a10
-MISC metadata.xml 509 BLAKE2B a8e461dfe042e8819f4cac60713d2792750a60d8c57b6f694bea9eb24ea8290cbbd5880fc6e3d7095f1ccb596a2c0335f3499b379b291b30cc62e3980b74f3ec SHA512 b52bc1eb9070cfc52be70b94704b214be745151ba00c986d9f4988d4f99fe9311a4283aff8cc2c4882f99404fd0257c8ad2d98142b03775b7018046b3fd5765f
diff --git a/app-misc/goobook/files/goobook-3.5.1-pyxdg.patch b/app-misc/goobook/files/goobook-3.5.1-pyxdg.patch
deleted file mode 100644
index e40bc051295f..000000000000
--- a/app-misc/goobook/files/goobook-3.5.1-pyxdg.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 391c081199f9cba5026460fbffba43c03602fa13 Mon Sep 17 00:00:00 2001
-From: Jan Baier <jbaier@suse.cz>
-Date: Mon, 22 Mar 2021 15:04:38 +0100
-Subject: [PATCH] Switch from xdg to pyxdg
-
-As both of them provides the xdg and cannot be installed at the same
-time, pyxdg should be used as it is older, has more features (xdg is a
-subset of pyxdg) and is more used. This change should resolve conflicts
-like https://github.com/srstevenson/xdg/issues/35
-
-Fixes #96
----
- CHANGES.rst       |  6 ++++++
- Pipfile           |  2 +-
- goobook/config.py | 16 ++++++++--------
- setup.py          |  4 ++--
- 4 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/goobook/config.py b/goobook/config.py
-index c948469..05589b1 100644
---- a/goobook/config.py
-+++ b/goobook/config.py
-@@ -10,7 +10,7 @@ import configparser
- import logging
- 
- import oauth2client.client
--import xdg
-+from xdg import BaseDirectory
- 
- from goobook.storage import Storage
- 
-@@ -61,8 +61,8 @@ def read_config(config_file=None):
-     if config_file:  # config file explicitly given on the commandline
-         config_file = os.path.expanduser(config_file)
-     else:  # search for goobookrc in XDG dirs and homedir
--        config_files = [dir_ / "goobookrc" for dir_ in [xdg.XDG_CONFIG_HOME] +
--                        xdg.XDG_CONFIG_DIRS] + [LEGACY_CONFIG_FILE]
-+        config_files = [dir_ / "goobookrc" for dir_ in [pathlib.Path(BaseDirectory.xdg_config_home)] +
-+                        [pathlib.Path(p) for p in BaseDirectory.xdg_config_dirs]] + [LEGACY_CONFIG_FILE]
-         log.debug("config file search path: %s", config_files)
-         for config_file_ in config_files:
-             if config_file_.exists():
-@@ -93,7 +93,7 @@ def read_config(config_file=None):
-     if config.cache_filename:  # If explicitly specified in config file
-         config.cache_filename = realpath(expanduser(config.cache_filename))
-     else:  # search for goobook_cache in XDG dirs and homedir
--        cache_files = [xdg.XDG_CACHE_HOME / "goobook_cache", LEGACY_CACHE_FILE]
-+        cache_files = [pathlib.Path(BaseDirectory.xdg_cache_home) / "goobook_cache", LEGACY_CACHE_FILE]
-         log.debug("cache file search path: %s", cache_files)
-         for cache_file in cache_files:
-             cache_file = cache_file.resolve()
-@@ -101,7 +101,7 @@ def read_config(config_file=None):
-                 log.debug("found cache file: %s", cache_file)
-                 break
-         else:  # If there is none, create in XDG_CACHE_HOME
--            cache_file = xdg.XDG_CACHE_HOME / "goobook_cache"
-+            cache_file = pathlib.Path(BaseDirectory.xdg_cache_home) / "goobook_cache"
-             log.debug("no cache file found, will use %s", cache_file)
-         config.cache_filename = str(cache_file)
- 
-@@ -110,8 +110,8 @@ def read_config(config_file=None):
-         config.oauth_db_filename = realpath(expanduser(config.oauth_db_filename))
-         auth_file = pathlib.Path(config.oauth_db_filename)
-     else:  # search for goobook_auth.json in XDG dirs and homedir
--        auth_files = [dir_ / "goobook_auth.json" for dir_ in [xdg.XDG_DATA_HOME] +
--                      xdg.XDG_DATA_DIRS] + [LEGACY_AUTH_FILE]
-+        auth_files = [dir_ / "goobook_auth.json" for dir_ in [pathlib.Path(BaseDirectory.xdg_data_home)] +
-+                      [pathlib.Path(p) for p in BaseDirectory.xdg_data_dirs]] + [LEGACY_AUTH_FILE]
-         log.debug("auth file search path: %s", auth_files)
-         for auth_file in auth_files:
-             auth_file = auth_file.resolve()
-@@ -119,7 +119,7 @@ def read_config(config_file=None):
-                 log.debug("found auth file: %s", auth_file)
-                 break
-         else:  # If there is none, create in XDG_DATA_HOME
--            auth_file = xdg.XDG_DATA_HOME / "goobook_auth.json"
-+            auth_file = pathlib.Path(BaseDirectory.xdg_data_home) / "goobook_auth.json"
-             log.debug("no auth file found, will use %s", auth_file)
-         config.oauth_db_filename = str(auth_file)
- 
-diff --git a/setup.py b/setup.py
-index e2bed5c..4a6c764 100755
---- a/setup.py
-+++ b/setup.py
-@@ -12,7 +12,7 @@ NEWS = open(os.path.join(HERE, 'CHANGES.rst')).read()
- 
- setuptools.setup(
-     name='goobook',
--    version='3.5.1',
-+    version='3.6',
-     description='Search your google contacts from the command-line or mutt.',
-     long_description=README + '\n\n' + NEWS,
-     long_description_content_type="text/x-rst",
-@@ -39,7 +39,7 @@ setuptools.setup(
-         'google-api-python-client>=1.7.12',
-         'simplejson>=3.16.0',
-         'oauth2client>=1.5.0,<5.0.0dev',
--        'xdg>=4.0.1'
-+        'pyxdg>=0.26'
-     ],
-     extras_require={
-     },
--- 
-GitLab
-
diff --git a/app-misc/goobook/goobook-3.5.1-r3.ebuild b/app-misc/goobook/goobook-3.5.1-r3.ebuild
deleted file mode 100644
index 1ddc2c09d924..000000000000
--- a/app-misc/goobook/goobook-3.5.1-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1 readme.gentoo-r1 pypi
-
-DESCRIPTION="Access your Google contacts from the command line"
-HOMEPAGE="https://gitlab.com/goobook/goobook"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/google-api-python-client-1.7.12[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oauth2client-5[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	# https://gitlab.com/goobook/goobook/-/merge_requests/13
-	"${FILESDIR}"/${P}-pyxdg.patch
-)
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-To setup initial authentication, execute:
-
-~ $ goobook authenticate
-
-If you want to use goobook from mutt, add this in your .muttrc file:
-	set query_command=\"goobook query '%s'\"
-to query address book.
-
-You may find more information and advanced configuration tips at
-https://pypi.org/project/${PN}/${PV} in \"Configure/Mutt\" section"
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-misc/goobook/metadata.xml b/app-misc/goobook/metadata.xml
deleted file mode 100644
index cc7896d7b32b..000000000000
--- a/app-misc/goobook/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <name>Kalin KOZHUHAROV</name>
-    <email>kalin@thinrope.net</email>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">goobook</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 19efa94b8165..437f7a2f91df 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,4 +1,6 @@
 AUX 3.4.2-functional-tests-Run-png-region-of-interest-only-if-.patch 935 BLAKE2B fda094d7e2b291a1efbcbc3a7219678d37e556891527e36480a877ac665d6cf094627f5b04a00f77d04978561ab818d3c255e29589fbc6107f587c269fc501f2 SHA512 db95fe5b6ea6a160ab9e31c41bd70198048ea183393fee44062c75d011254d8c6dc8c0a26c472a58e5f82543792e9a0f9c778cf08c768891a0760fab81bec65f
 DIST tracker-miners-3.4.3.tar.xz 7244744 BLAKE2B e018e8e80c5b87eda7ef50b00fe87b4d555806a1d630c147dd4c5a11bdf7140c28f68ef0724ec281f11acd5b63d9857eae8d23e51ed5607136c90d783c7a205b SHA512 b7287bd14be9c14be582109b660166b38c515199b809503a7b06e411f4cc1e0c1f59ce95ab70e1b404d7440b7f23312f1150a4e033e38cabfc0f396e3c1edc3c
+DIST tracker-miners-3.5.0.rc.tar.xz 7503452 BLAKE2B 769c7a28deeb1e8698bde22918b0b24c68c11aca2d690297ec55d891b6fcb978640fa50c5558b8f0a38e437ca9d5b893fb49f50d30c12acea207d2bdf6393ca6 SHA512 43285cdd0d43c19934995dcd1479dc7cd596eaa2e3e6be010c8789acac9f0bdec2930bec60d78ee551024f4cdb3789233e9e275eaec9157aa922f3f5d272db54
 EBUILD tracker-miners-3.4.3.ebuild 4776 BLAKE2B 8249d2d3a93380248098f073d96a150962022ac35809586324a49fd95edc6593f61d12e669b12dd6fa75268f4ea89583775411cb4c1a0127d91b99ead760b747 SHA512 859c86202d274bc91ae90c8448512dcf1ecb8a414dc36877d73327252e2d9486d9f55474db7093f3c071a788003e92a30284974b1a78951973e2c536db656862
+EBUILD tracker-miners-3.5.0_rc.ebuild 4896 BLAKE2B b80d23469716f02062d8980be775b6b8715d3330b9d48a38c54c0cbdfc4189f5a1c3b0eacaa50008c623ca73273f41d43cd8f4a4fbc9289862867e87b8272f94 SHA512 bd416e7216e3ae66df475ec9150c3a2b4f61e8a3f6faa3308397ece20a4f16c7accd65a49c1d5412d652d7381bd915647e815a296b804eeec98199d69f7cffba
 MISC metadata.xml 835 BLAKE2B a7f0c667be6eaaebcd62fd782c72831f8f95f778d2ff1ee36c278fc3a902761ca10d73fd7e6b15afa83d36a960d5f20dc765b62dc6f85022db01d9d0d356bcbd SHA512 9d348dbec07ab8e344dab0d6f3acdc48e91d80171e411353b233f8b49989f4152817c8ed522c234d5dd9a3849cdab3d46f41256702a5d50bbf1e591f112cddd5
diff --git a/app-misc/tracker-miners/tracker-miners-3.5.0_rc.ebuild b/app-misc/tracker-miners/tracker-miners-3.5.0_rc.ebuild
new file mode 100644
index 000000000000..0ae7be5286e0
--- /dev/null
+++ b/app-misc/tracker-miners/tracker-miners-3.5.0_rc.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
+SRC_URI="https://download.gnome.org/sources/${PN}/3.5/${PN}-3.5.0.rc.tar.xz"
+S="${WORKDIR}/${PN}-3.5.0.rc"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3"
+IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
+
+REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
+RDEPEND="
+	>=dev-libs/glib-2.70:2
+	>=app-misc/tracker-3.4.0:3
+
+	>=sys-apps/dbus-1.3.1
+	xmp? ( >=media-libs/exempi-2.1.0:= )
+	raw? ( media-libs/gexiv2 )
+	cue? ( media-libs/libcue:= )
+	exif? ( >=media-libs/libexif-0.6 )
+	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
+	xps? ( app-text/libgxps )
+	iptc? ( media-libs/libiptcdata )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	iso? ( >=sys-libs/libosinfo-1.10.0-r1 )
+	>=media-libs/libpng-1.2:0=
+	seccomp? ( >=sys-libs/libseccomp-2.0 )
+	tiff? ( media-libs/tiff:= )
+	xml? ( >=dev-libs/libxml2-2.6 )
+	pdf? ( >=app-text/poppler-0.16.0:=[cairo] )
+	playlist? ( >=dev-libs/totem-pl-parser-3:= )
+	sys-apps/util-linux
+
+	gif? ( media-libs/giflib:= )
+
+	networkmanager? ( net-misc/networkmanager )
+
+	rss? ( >=net-libs/libgrss-0.7:0 )
+	app-arch/gzip
+
+	upower? ( >=sys-power/upower-0.9.0:= )
+
+	>=dev-libs/icu-4.8.1.1:=
+
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0
+		>=media-plugins/gst-plugins-meta-1.20:1.0 )
+	!gstreamer? (
+		ffmpeg? ( media-video/ffmpeg:0= ) )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/asciidoc
+	dev-libs/libxslt
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
+		gstreamer? (
+			media-libs/gstreamer:1.0[introspection]
+			|| (
+				media-plugins/gst-plugins-libav:1.0
+				media-plugins/gst-plugins-openh264:1.0
+			)
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/3.4.2-functional-tests-Run-png-region-of-interest-only-if-.patch
+)
+
+python_check_deps() {
+	python_has_version -b \
+		"dev-python/pygobject[${PYTHON_USEDEP}]" \
+		"dev-python/tappy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
+	if use gstreamer; then
+		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
+	else
+		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
+	fi
+	gnome2_environment_reset # sets gstreamer safety variables
+}
+
+src_configure() {
+	append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
+
+	local media_extractor="none"
+	if use gstreamer ; then
+		media_extractor="gstreamer"
+	elif use ffmpeg ; then
+		media_extractor="libav"
+	fi
+
+	local emesonargs=(
+		-Dtracker_core=system
+
+		-Dman=true
+		-Dextract=true
+		$(meson_use test functional_tests)
+		$(meson_use test tests_tap_protocol)
+		-Dminer_fs=true
+		$(meson_use rss miner_rss)
+		-Dwriteback=true
+		-Dabiword=true
+		-Dicon=true
+		-Dmp3=true
+		-Dps=true
+		-Dtext=true
+		-Dunzip_ps_gz_files=true # spawns gunzip
+
+		$(meson_feature networkmanager network_manager)
+		$(meson_feature cue)
+		$(meson_feature exif)
+		$(meson_feature gif)
+		$(meson_feature gsf)
+		$(meson_feature iptc)
+		$(meson_feature iso)
+		$(meson_feature jpeg)
+		$(meson_feature pdf)
+		$(meson_feature playlist)
+		-Dpng=enabled
+		$(meson_feature raw)
+		$(meson_feature tiff)
+		$(meson_feature xml)
+		$(meson_feature xmp)
+		$(meson_feature xps)
+
+		-Dbattery_detection=$(usex upower upower none)
+		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
+		-Dgeneric_media_extractor=${media_extractor}
+		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
+		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index edc7c061cfeb..0718ed9beb10 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,3 +1,5 @@
 DIST tracker-3.4.2.tar.xz 1865236 BLAKE2B 31cdb33de38d9251fc60a71b31c539e3f045748fb5dc160656dd5187dce109da858bad5390864cda8b63466a5113e0a193e0799b662ec250a31cfdff79467e6e SHA512 2214bce7cdbaf1039b11986cf101f615337bbc450331ee703edcfd7ad62dee6e1db831c2c89bf341663cadcdaae6ee9e5a15f49a8087acaafd58b389292ef480
+DIST tracker-3.5.0.rc.tar.xz 1330772 BLAKE2B 27f6b942bb7a26266ede88466cbc1671779d49fa95278b2949d6338f6f976aa83aa15ef79c61f30a3c61b0304aee0ae125253185904794ba566b18397b868988 SHA512 cdbf903900a66ce0115e94193834d800a94d7dc7ff023125a8c1da9bf8d743829633bbe6af748bf0535071e492bd249b37e937527a3039143376511a320ddf44
 EBUILD tracker-3.4.2.ebuild 2719 BLAKE2B fa701f0dc1306fc893e0125bd8502c2724213f4084c902608cffc3f69de3ebb9ba474e8038213d1c847d013cf918bda4ddbc5049e62a21433e2e508308fc8d89 SHA512 0f917521e0e083765cba5ca5e64cad9a98e1b13735523217bee2f97e15a9c27899d675deefa9779e0664fa7ba573c31ed58967a753bb8b26c15a921b62d8cc95
+EBUILD tracker-3.5.0_rc.ebuild 2571 BLAKE2B ec79c514cfa58b64a51213abd77a14763ac4355daa644f866003acb0c78eb628d6ae231e33b0e6b615f8a1761c718f4dbbebc5a13d9d3b19c89e0e333df74a0c SHA512 a621978f3b78ce1c5099dcf6546f9cca1cde39b9a70aaf2b1271d58c3d3f7b53c668a8026886b2ab50091e073493aa8633acf234775719d0e79ce1f6c5ffa5ba
 MISC metadata.xml 586 BLAKE2B 8244e6f8d9491a0c224ed84f17ee6ad64b22e0c373243a319e7911739a7db6223ce47693ed5b31053b4465f35d20108db1469d74afcebb36b4516a53cbd7f98a SHA512 0a60b0e4b077bb03d02b7990511041695c5dff7a8a0972fa80abe9968b643ad5c2ba65182c079e8d5f3d1ef72a2c4dcc659d6ec283bf80813135c94cab2dddef
diff --git a/app-misc/tracker/tracker-3.5.0_rc.ebuild b/app-misc/tracker/tracker-3.5.0_rc.ebuild
new file mode 100644
index 000000000000..4fd068651f29
--- /dev/null
+++ b/app-misc/tracker/tracker-3.5.0_rc.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
+
+DESCRIPTION="A tagging metadata database, search tool and indexer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME/tracker"
+SRC_URI="https://download.gnome.org/sources/${PN}/3.5/${PN}-3.5.0.rc.tar.xz"
+S="${WORKDIR}/${PN}-3.5.0.rc"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3/0" # libtracker-sparql-3.0 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk-doc +miners stemmer test vala"
+RESTRICT="!test? ( test )"
+
+PV_SERIES=$(ver_cut 1-2)
+
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=sys-apps/dbus-1.3.2
+	>=dev-libs/gobject-introspection-1.54:=
+	>=dev-libs/icu-4.8.1.2:=
+	>=dev-libs/json-glib-1.4
+	>=net-libs/libsoup-2.99.2:3.0
+	>=dev-libs/libxml2-2.7
+	>=dev-db/sqlite-3.29.0:3
+	stemmer? ( dev-libs/snowball-stemmer:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-text/asciidoc
+	dev-libs/libxslt
+	$(vala_depend)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gi-docgen )
+	test? (
+		$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
+	)
+	${PYTHON_DEPS}
+"
+PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
+
+python_check_deps() {
+	python_has_version -b \
+		"dev-python/pygobject[${PYTHON_USEDEP}]" \
+		"dev-python/tappy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="INOTIFY_USER"
+	linux-info_pkg_setup
+
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
+
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dman=true
+		$(meson_feature stemmer)
+		-Dunicode_support=icu
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
+		$(meson_use test tests)
+		-Dintrospection=enabled
+		$(meson_feature vala vapi)
+		-Dsoup=soup3
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+src_install() {
+	meson_src_install
+
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/Tracker-3.0 "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 1d3cc5863a7d..45d689089202 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index ef54067e83ec..7c67db317aee 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,5 +1,7 @@
 DIST evince-43.1.tar.xz 2909512 BLAKE2B 1695320814aca28df17e5bbe6f4000b0191b9b600895c529d4ccd5628335fc4dd4fa788ddfe54c06fe37da12705add93f7df99a8c0dfb1060b8fd497aabae596 SHA512 c12d7b6e961a74c8e31b604f232483576289ba9e5a37faa766f4e5aaa95bdcbf37cf98c1d28de45ad1728452b0a2408fe4fe245dc76289a21e7664c96237d09f
+DIST evince-44.0.tar.xz 2918888 BLAKE2B 7994157ea2fdaadbb9e217441154af67f051f2d475a632cad0521179c7cd46e5b52f9818c2e7742d29f0d79d29dc8b735896877fe0aa8d4eecf3a2c787273e68 SHA512 1ff4e5a30e8b0c834dfa26294a6b6a4ec9fb2e3b5ecf040cc175423ebe4660a4c238bc21bf761e5dcda2b8c3888bddf6cae4cff3437ec20b9477f2106b5ba8da
 DIST evince-44.rc.tar.xz 2916416 BLAKE2B 75e2151100643aa786c3c37b77e0b9aebe0daa9942a7d9d220298cb5222e743b3d983deab01ca228a271bdf5b8665c7f4d3e6a7ac3a40e3c699aed6d26307b96 SHA512 a6e7efb79a9317604f1f5646af692693105d974b56dc23fe7248588215066b314bd464cbd454608610dd3514364e2a1c0ca4747b1e4804dc63746344857e1806
 EBUILD evince-43.1-r1.ebuild 3060 BLAKE2B d25fb961ca8a574a7361553b8fb77085ee7ebf074c9190ca749f52c71ba10f098f61d76c57538dd325f7a0365c9f75e2be7b7cf117820211a8240c83df5c7b32 SHA512 51bdae6754f0417817ec39166176b0d79811851e7d163f943441cbdcf6ab18250b8c2a3ca26be58a7db02d8caddbdbc7bafde6c3263ed4f7af9856cc1e040f22
+EBUILD evince-44.0.ebuild 3294 BLAKE2B d816297ebe1e44f07eb48e4254c858efa4ecc44c0ed97ff7d46c46d7b0669276030a680b9b957075501e7126d06813c36d426cfdee422583047dfc1bae154d8b SHA512 5d6d083addc7e7a12f97f1717c73c970aac0547ad86c7f28e48db83d73f63a9bf8f015cbddd80e4615dfe0a5c8f76f46da643f674b52832cf9c4632292daed6f
 EBUILD evince-44_rc.ebuild 3416 BLAKE2B 2c757eeded649ef68db6c63ba0e7fe4d8b2ad2e7920afd9108d7e4a3b9becb47e3ac421d78d80331b446b4ff1f402891746ec3b2910a85ed51955c7e49b4b0fa SHA512 ed744271738600e5dbf63ea867e8bb064c1ff4a1cded6dcc33b8301cb6ff9229306163821cba6f037954a69d953f2f7f14bd38b8150e9d37eaf8adb727aba1ab
 MISC metadata.xml 874 BLAKE2B be19d36175d5ca322e89689e69b18ae720b40450ce63fa3e5056c3b0af6f81be3481050b6a005db2d79f3c86b3de1eb7fabdde3d3ce9d84fffb13b13c5c04eac SHA512 d3128343855fd9c76ee8b68b19ec61a8ec479ee48c539bce17a09770f0f5661b8b1eb9d27ab0d52aaa450131b81f237fa54e8854ca0cbb3a2f487073b7107433
diff --git a/app-text/evince/evince-44.0.ebuild b/app-text/evince/evince-44.0.ebuild
new file mode 100644
index 000000000000..a5331cb9b677
--- /dev/null
+++ b/app-text/evince/evince-44.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps"
+REQUIRED_USE="gtk-doc? ( introspection )"
+
+# atk used in libview
+# bundles unarr
+DEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	>=dev-libs/glib-2.44.0:2
+	>=gui-libs/libhandy-1.5.0:1
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.40:2
+	>=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10
+	>=app-text/poppler-22.02.0:=[cairo]
+	>=app-arch/libarchive-3.6.0:=
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		>=app-text/libspectre-0.2:=
+		dev-libs/kpathsea:=
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 <gnome-base/nautilus-42.20 )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	spell? ( >=app-text/gspell-1.6.0:= )
+	tiff? ( >=media-libs/tiff-4.0:= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10
+	)
+"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gi-docgen-2021.1
+		app-text/docbook-xml-dtd:4.3
+	)
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddevelopment=false
+		-Dplatform=gnome
+
+		-Dviewer=true
+		-Dpreviewer=true
+		-Dthumbnailer=true
+		$(meson_use nautilus)
+
+		-Dcomics=enabled
+		$(meson_feature djvu)
+		$(meson_feature dvi)
+		-Dpdf=enabled
+		$(meson_feature postscript ps)
+		$(meson_feature tiff)
+		$(meson_feature xps)
+
+		$(meson_use gtk-doc gtk_doc)
+		-Duser_doc=true
+		$(meson_use introspection)
+		-Ddbus=true
+		$(meson_feature gnome-keyring keyring)
+		$(meson_feature cups gtk_unix_print)
+		$(meson_feature gnome thumbnail_cache)
+		$(meson_feature gstreamer multimedia)
+		$(meson_feature spell gspell)
+
+		-Dinternal_synctex=true
+
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use gtk-doc; then
+	   mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+	   mv "${ED}"/usr/share/doc/{libevdocument,libevview} "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index e7edc319b080..5a37f3b29c4b 100644
--- a/dev-erlang/Manifest.gz
+++ b/dev-erlang/Manifest.gz
diff --git a/dev-erlang/iconv/Manifest b/dev-erlang/iconv/Manifest
deleted file mode 100644
index acba6b135efd..000000000000
--- a/dev-erlang/iconv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iconv-1.0.10.tar.gz 121594 BLAKE2B 407a6cbe51aa50c561c577bf447dbc781c22bdc4ea20cacdcd2772e3cd7d262a1577381985ddafeb6fb48be94b35070de025b5d2301dbb4a3b9b9c0defd6a4be SHA512 c0537db617b83184111ce6f3be2e381c4a9f6a96d4887a2cf5bde3b275974411fb997f4a2f6a9c2b25c8e783e26af92b531788e9354be413d1837dd0482d41ef
-EBUILD iconv-1.0.10.ebuild 524 BLAKE2B fd1c4211a5bd72d5e6570add4f53bd01c7a5a518752def6eb55cb6b7ced7e678b2b02800133775217f735c8b28db79e750db9029e9aa5f5698513ea3a45281dc SHA512 501fd7682045321eb9f95fa385bbff0dea47c4386a2065767f2a9dc8d581e11679e6ae9e89006199dbcbfbad6f7b605be01a3c8f6b6173842ddb5a4f3c6fa568
-MISC metadata.xml 249 BLAKE2B 3ab0c05d13df98aa609628305b8a12b0b15e9d7b3ad20d12f1ffcf7c6e9e38ad6e7f8bdb135f265151feb0351689ace8d38136ab715de7cd670b8557853d56d2 SHA512 2caf8c911b640e81b54df56c3f6e063d0d1d3c9eb815dd58560e9069048d68a1df66a31cd7d47fa66d70c037b436724ae514936ec8f0a9b0b421b532d665a22a
diff --git a/dev-erlang/iconv/iconv-1.0.10.ebuild b/dev-erlang/iconv/iconv-1.0.10.ebuild
deleted file mode 100644
index c33648498890..000000000000
--- a/dev-erlang/iconv/iconv-1.0.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast encoding conversion library for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/iconv"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.13
-	>=dev-lang/erlang-17.1
-	virtual/libiconv"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/iconv/metadata.xml b/dev-erlang/iconv/metadata.xml
deleted file mode 100644
index 40280b057d50..000000000000
--- a/dev-erlang/iconv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">processone/iconv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-erlang/p1_xmlrpc/Manifest b/dev-erlang/p1_xmlrpc/Manifest
deleted file mode 100644
index b33d36baa9a7..000000000000
--- a/dev-erlang/p1_xmlrpc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST p1_xmlrpc-1.15.1.tar.gz 21132 BLAKE2B 95dee53a46c2584dec6356bbeed75af9700194b63b02ec4452dbec20e070f457db23d70cde8a2999cf76a83e0c25c7d5de62ddf6febe874ea836fffed2d4661e SHA512 42d4ad71899f1c460a97a8c24b96673fcd597c6cd3881acb69f703a832729d78217e1bd401f659eccc2a2b2d235e68d0b0ce2543923c8cc675a3793df0291c90
-EBUILD p1_xmlrpc-1.15.1.ebuild 498 BLAKE2B 75e734dbc41e59703f3e0175796455aae50fbe983bea74cffe0bf5cdb9011b4bd475a18ed60b3001f63b60fcd4fb21227496410c8b188c1225f0f8899df7e9c5 SHA512 bfed3ae713688ee0c1e551f7bd4e15e8de1d7d56cb11c5bee0118819c58a340a118aad846327433d891fda7b2253add1af772cacad4a8f18c84513f1b4a2c9f8
-MISC metadata.xml 253 BLAKE2B 5ed805454b27a286492bf9696d85b1188866e9f4a8d6fd923c4ea4854a3407d8d6c92d6e53a53f183f1b1f2bad570aa52421216d833c1ca38d57ae2a5d9d26b4 SHA512 a293154399a0a5a6ff29e336b03128f852665be888257476bd01b102b78838282ca875cbec56d6b092c55c8a0c6886e6534b614affd9656d9260911424222766
diff --git a/dev-erlang/p1_xmlrpc/metadata.xml b/dev-erlang/p1_xmlrpc/metadata.xml
deleted file mode 100644
index db65315ecd0b..000000000000
--- a/dev-erlang/p1_xmlrpc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">processone/p1_xmlrpc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-erlang/p1_xmlrpc/p1_xmlrpc-1.15.1.ebuild b/dev-erlang/p1_xmlrpc/p1_xmlrpc-1.15.1.ebuild
deleted file mode 100644
index 384587e9bcd9..000000000000
--- a/dev-erlang/p1_xmlrpc/p1_xmlrpc-1.15.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Erlang XMLRPC implementation with SSL, cookies, authentication"
-HOMEPAGE="https://github.com/processone/p1_xmlrpc"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/riak_pb/Manifest b/dev-erlang/riak_pb/Manifest
deleted file mode 100644
index 97de6f18ad80..000000000000
--- a/dev-erlang/riak_pb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST riak_pb-2.2.0.2.tar.gz 237485 BLAKE2B 5ca10bffcdf68562c9d61ffde0480be134a7b09f9040001bff2cdcf12e87c7256021829ab8c467a73cfd16c3e7e7c48229400d32b2e9f5442b05888de537c8be SHA512 f730d7bedc8152e5764c82df38a594e0113df7ab729008ecb9a231ea36d590e2240d7a5d0d3f57a6856b41748d5a525e0ab195887265d7cf5ab95563a6216992
-EBUILD riak_pb-2.2.0.2.ebuild 527 BLAKE2B 6c2819940ba2df5f7a3bb09531aa8f491248c9dce2f695ad21d8710e4a609a070989cb850a03df8b265a532bc904ea4307f891bd436e4732bd7c37fafb27f616 SHA512 b9d6417cb833754cdfbc71adf0f3cbd20d6b5ebe5fc9392eaa5bed5119df376d00c672ce68793d83221c2547c50fd0134fcd5420386fb956e26b1fc7455e548b
-MISC metadata.xml 246 BLAKE2B 878b7f21addf04d75d336394e2f834ce5d19522a84314af07ff64d68a0c89d480855b2bfd41d0fe879a6b367b6c880de67467cfbfe6656c7dc6b3298f6cc78af SHA512 b0b3d82c56561cd774cab14dd3f02d15a1f9f2fdd8d5b393cce86610b0b8697e344ef5174116acb880a74d21c1396fea5669d55474029665a02364ed82878d4c
diff --git a/dev-erlang/riak_pb/metadata.xml b/dev-erlang/riak_pb/metadata.xml
deleted file mode 100644
index 9efa3c8fe1ae..000000000000
--- a/dev-erlang/riak_pb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">basho/riak_pb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-erlang/riak_pb/riak_pb-2.2.0.2.ebuild b/dev-erlang/riak_pb/riak_pb-2.2.0.2.ebuild
deleted file mode 100644
index b164a87852cb..000000000000
--- a/dev-erlang/riak_pb/riak_pb-2.2.0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Riak Protocol Buffers messages"
-HOMEPAGE="https://github.com/basho/riak_pb"
-SRC_URI="https://github.com/basho/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/protobuffs-0.9.0
-	>=dev-erlang/hamcrest-0.1.0_p20160709
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md RELNOTES.md )
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 4d8dace16634..f2f33cc2dab2 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-text/Manifest b/dev-java/commons-text/Manifest
deleted file mode 100644
index 62add9d90a22..000000000000
--- a/dev-java/commons-text/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST commons-text-1.10.0-src.tar.gz 342224 BLAKE2B efed282c9fed7dae5766f7158136a4d7414ba0610e16a52fa2d12ee04e43960d47ec7c62f220c2ab881a13afa8a81cf85e453364e37c67550e15c314122ebf25 SHA512 6bf2dc7dda4429cb1b9ba3a4d383c1d9ffabd5ff35a0adc55216e7cf4c532e51b2b012c9b0f3ea859cd32aef75e05547d892301f34f304a0bfd27c39a28fe04f
-EBUILD commons-text-1.10.0.ebuild 1944 BLAKE2B 0ad39c8569085b4deadfd703b8d4c0996a5d8a249c2895b253092d5ce66f9292635f2d782582a941b4927622f296044c7c04ce5b2583ec1448a1db6288fceb2d SHA512 6229c7492d11147e33f4311d0497c9e5cc9da0fb9a69f62333c18f2e39d481a7695b0d912d80147aa6a35ee50e760335c61c2659e0f73317c8c95a3b24a76ccd
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/commons-text/commons-text-1.10.0.ebuild b/dev-java/commons-text/commons-text-1.10.0.ebuild
deleted file mode 100644
index 6241e756e3c3..000000000000
--- a/dev-java/commons-text/commons-text-1.10.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache//commons/text/source/commons-text-1.10.0-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-text-1.10.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-text:1.10.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Commons Text is a library focused on algorithms working on strings"
-HOMEPAGE="https://commons.apache.org/proper/commons-text/"
-SRC_URI="mirror://apache//commons/text/source/commons-text-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-
-CDEPEND="
-	dev-java/commons-lang:3.6
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
-# test? org.apache.commons:commons-rng-simple:1.4 -> !!!artifactId-not-found!!!
-# test? org.assertj:assertj-core:3.23.1 -> !!!suitable-mavenVersion-not-found!!!
-# test? org.graalvm.js:js:22.0.0.2 -> !!!groupId-not-found!!!
-# test? org.graalvm.js:js-scriptengine:22.0.0.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter:5.9.1 -> !!!groupId-not-found!!!
-# test? org.mockito:mockito-inline:4.8.0 -> !!!artifactId-not-found!!!
-# test? org.openjdk.jmh:jmh-core:1.35 -> >=dev-java/jmh-core-1.35:0
-# test? org.openjdk.jmh:jmh-generator-annprocess:1.35 -> !!!artifactId-not-found!!!
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-DOCS=( CONTRIBUTING.md NOTICE.txt README.md RELEASE-NOTES.txt )
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.text"
-JAVA_ENCODING="ISO-8859-1"
-
-JAVA_GENTOO_CLASSPATH="commons-lang-3.6"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-text/metadata.xml b/dev-java/commons-text/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/commons-text/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/core-specs-alpha/Manifest b/dev-java/core-specs-alpha/Manifest
deleted file mode 100644
index 6f4e2cad7306..000000000000
--- a/dev-java/core-specs-alpha/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX build.xml 1403 BLAKE2B ed4b7cb7f98192fb467df4353c17d5c61f84598f36cbab35b9310970c861505ba2b5fc1e1b3c717996b220c89feac22576e9df1cfac4b45336751564363cbc1c SHA512 c9973b2c0a24ce089b6f4be8c5e8d89664b5dba8d5810c54253b47e4efe7fef3bb2c8c10f3e4f8c988b33ddb538c6617a23fb55b41517ba8b06496d8f168bfba
-DIST core-specs-alpha-0.1.24.tar.gz 9896 BLAKE2B cb06053d2aa77b4bbd58b612fb0f80137833e156a5136e4f53f6123d158bdbe676e9bacdfe76728b1320986589e8242c52f49a4d8922bda5374e34fe52969ddc SHA512 6ddf20bf9be36f7493104f69f4e9402fc62f49005471a967843c7cfee898c67aaf5046886db73e6b54942538beed9556d83f4582e85fd02ef4cb755cb5a18d34
-DIST core-specs-alpha-0.2.44.tar.gz 10163 BLAKE2B c81ebb08779c3db137363ffb12bc7e26d29cd67323c98430a033f639714da83bf8c9d14146c12d925094e057d3735d100e33656e9571a0a4c107dc9fb56359e9 SHA512 1a59b947c580e45a280b25d5827a174565e066dde577685ca86aa1bbd9767716991cefb8a944c7ded0f84a71f9902f7fcdb5baacc7e19180096d599a51083048
-DIST core-specs-alpha-0.2.56.tar.gz 11780 BLAKE2B 088d0b32dea7ec49ddaf0f461703762a5a877ff4028b775eb35998e6a5a3436ad57b35d7d9431b6911ca2304403e95043d375bac80080ecaf6144a77b3ebcf4c SHA512 afbfc04b9708a21ae6c6b29b8653fc62b23efcb271b973534c4b8421a7d73df3ad24bd28d7115a2fe926954dc45571de86971637736f3a494799f6f1ba1765c8
-EBUILD core-specs-alpha-0.1.24.ebuild 883 BLAKE2B 6eb4577971e98dd87e2ee2a7c785030603690a9bd24a0fe9f27cc97df714634555b4a74eca5ffaa0cadd52427cd96c565b2a5aa4dd252fac135e03a862b5e827 SHA512 a504b493697d284a9a5ae833dc0f740f354bc24265280d30d2df54c35996952ad294f22a3b7a673a81dcaf11f6e7adcc7ce6ed22adfba12fd380b1c64a4de52c
-EBUILD core-specs-alpha-0.2.44.ebuild 883 BLAKE2B 0ba279bbe00dca4ae1bee997bd664f1aae06913f00c1ffc43a7e6371bd991e3fdbf91ff6712227d06be6bb81eb3ac10187d8bb76063e0c9b1ffcb7863b40f7e0 SHA512 0b4f633bf9fe85ceba3c904505560ce09d372dc9c0d268ac79a3e98e2b4566b3a286c88202da5a8504c0e2ed6b11ce90c593ee395a17d422416f202e73abac6d
-EBUILD core-specs-alpha-0.2.56.ebuild 977 BLAKE2B 583984b0c05b35f825de6a1d60a0f3753f2d820184d0b0031678665f8e134e4df5518ad9a34cc30928f28675cfe9484215d54a28c5be717d1a420e66da6b98a2 SHA512 bbe9210bfe14e19c4b3d4b4a7a9a5adf0634606e3b9f10925ae781ab668ca925ce71067224b9471e439d1a68399037fa3387c1ad2b60c4599d8e42d502af071f
-MISC metadata.xml 482 BLAKE2B d434904a31cda60ca3797aece58d7e1572bc1a1999cd452c720e102aae3c9ae73b2f331620113f7c4bebb3af0f51658d58a1784dc170abdcb724cffdc875596e SHA512 2cfd6d5157caf8fda83d3d2733dda0b737a49132ddeadfe23c173cd087af819831a11cbd563738ca1bd557c87825e2b4575aa075e0f364bfc6f0ffee18c93a06
diff --git a/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild b/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild
deleted file mode 100644
index a04c6e5dd6ac..000000000000
--- a/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-EGIT_REF="43815fc"
-
-MY_PN=${PN//-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions"
-HOMEPAGE="https://clojure.org/ https://github.com/clojure/core.specs.alpha"
-SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0.1"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE=""
-
-CDEPEND="dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-EANT_TASKS="jar"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${MY_P}"
-
-src_prepare() {
-	default
-	cp "${FILESDIR}/build.xml" . || die
-}
-
-src_install() {
-	java-pkg_newjar "target/${MY_P}.jar"
-	dodoc CONTRIBUTING.md README.md
-}
diff --git a/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild b/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild
deleted file mode 100644
index f54ad2867014..000000000000
--- a/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-EGIT_REF="d69f559"
-
-MY_PN=${PN//-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions"
-HOMEPAGE="https://clojure.org/ https://github.com/clojure/core.specs.alpha"
-SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0.2"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE=""
-
-CDEPEND="dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-EANT_TASKS="jar"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${MY_P}"
-
-src_prepare() {
-	default
-	cp "${FILESDIR}/build.xml" . || die
-}
-
-src_install() {
-	java-pkg_newjar "target/${MY_P}.jar"
-	dodoc CONTRIBUTING.md README.md
-}
diff --git a/dev-java/core-specs-alpha/core-specs-alpha-0.2.56.ebuild b/dev-java/core-specs-alpha/core-specs-alpha-0.2.56.ebuild
deleted file mode 100644
index 64ba20033302..000000000000
--- a/dev-java/core-specs-alpha/core-specs-alpha-0.2.56.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-EGIT_REF="053d789"
-
-MY_PN=core.specs.alpha
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions"
-HOMEPAGE="https://clojure.org/ https://github.com/clojure/core.specs.alpha"
-SRC_URI="https://github.com/clojure/core.specs.alpha/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0.2"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DEPEND="
-	dev-java/ant-core:0
-	>=virtual/jdk-1.8:*
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-DOCS=( CONTRIBUTING.md LICENSE README.md )
-
-EANT_TASKS="jar"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${MY_P}"
-
-src_prepare() {
-	default
-	rm -r CHANGES.md epl-v10.html || die # epl-10.html is the LICENSE in html format
-	cp "${FILESDIR}/build.xml" . || die
-}
-
-src_install() {
-	java-pkg_newjar "target/${MY_P}.jar"
-	einstalldocs
-}
diff --git a/dev-java/core-specs-alpha/files/build.xml b/dev-java/core-specs-alpha/files/build.xml
deleted file mode 100644
index 0499525e8817..000000000000
--- a/dev-java/core-specs-alpha/files/build.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<project name="spec.alpha" default="package" basedir=".">
-  <property name="maven.build.finalName" value="core.specs.alpha-SNAPSHOT"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/clojure"/>
-
-  <!-- clean -->
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- build -->
-  <target name="build" description="Copy the files">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.srcDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- package -->
-  <target name="package" depends="build" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
-         compress="true"
-         index="false"
-         basedir="${maven.build.outputDir}"
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- jar -->
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-</project>
diff --git a/dev-java/core-specs-alpha/metadata.xml b/dev-java/core-specs-alpha/metadata.xml
deleted file mode 100644
index 76ec8e09ecae..000000000000
--- a/dev-java/core-specs-alpha/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>tgbugs@gmail.com</email>
-		<name>Tom Gillespie</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">clojure/core.specs.alpha</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jcip-annotations/Manifest b/dev-java/jcip-annotations/Manifest
deleted file mode 100644
index b01bfaf0820c..000000000000
--- a/dev-java/jcip-annotations/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jcip-annotations-1.0-1.tar.gz 7524 BLAKE2B cd31ecf1fe1ef4d78a9624cd92b9837acaccc35b1edfe5fbfac517d94edada03b5f7ac065ba21b26b43e6a8a6aef70434f3dfb7a76bb866ef4e3e25467ff1c01 SHA512 22eb285a445b25a718846dad45581dbe7a324a2d670bd05f4b2aa5e850ae34af6bcedbf143e17a7cd6cf7e510e0dd447992ba1d5316432e8a8db5584a1e1973e
-EBUILD jcip-annotations-1.0.1-r1.ebuild 700 BLAKE2B 27e62dc63fb5842ce986bed53aaa87073786846656ffcc100a09c096d4bd6954f8cd97d9dafb7e13fc1f9ac992a51d8bcfd86daad31a0da011aa2eba00e62394 SHA512 93354d5eea5a0ecfbbc9528cfccc0d6ba1a0b8290b9917afec88e54b6ac329173d916375c7d3065b04a4d09b8e0454e093e46cbe4866d71b9f144fa2134b817c
-MISC metadata.xml 584 BLAKE2B 16e65f76dcc2436184e63d6ec63f22b9b548779ecbb6fcb9c64ff5923cd17ec966928fc26672beb17b740691ca4ca53e58d3c2f9de63117076e8334855bfe23a SHA512 d1232d01037a0e3e4f5301a1d65041027a02a84f4c464de16931102a8952235c88149efcfcf7150bda86b67f541fca891300ba3833e3cf2669960cfec451160b
diff --git a/dev-java/jcip-annotations/jcip-annotations-1.0.1-r1.ebuild b/dev-java/jcip-annotations/jcip-annotations-1.0.1-r1.ebuild
deleted file mode 100644
index 5ee98d998748..000000000000
--- a/dev-java/jcip-annotations/jcip-annotations-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.github.stephenc.jcip:jcip-annotations:1.0-1"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-$(ver_rs 2 -)"
-
-DESCRIPTION="Clean room implementation of the JCIP Annotations"
-HOMEPAGE="https://github.com/stephenc/jcip-annotations"
-SRC_URI="https://github.com/stephenc/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${PN}-${MY_P}/src"
-JAVA_SRC_DIR="main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc ../README.md
-}
diff --git a/dev-java/jcip-annotations/metadata.xml b/dev-java/jcip-annotations/metadata.xml
deleted file mode 100644
index d46506f39bf9..000000000000
--- a/dev-java/jcip-annotations/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <longdescription>The JCIP Annotations are really useful, however they are released under the Creative Commons Attribution License, which is not recommended for licensing software and may therefore cause issues for some people.</longdescription>
-  <upstream>
-    <remote-id type="github">stephenc/jcip-annotations</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-java/jformatstring/Manifest b/dev-java/jformatstring/Manifest
deleted file mode 100644
index 27f1294935e1..000000000000
--- a/dev-java/jformatstring/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST findbugs-3.0.1-source.zip 9625065 BLAKE2B 26c940ac0eaec16de89ffbbe26d16b0b5c2883a6131a8b3ce93b9a35014a42c221456f977e581d2f4f1b8d9333237c24ac6d5ad8fc2ba6bb018c333b6a09f4eb SHA512 d967769f2356f28b34d92c7451cf3e2ac004e667bfc3b049b5b10b1c19d7be2cfa0db132a77698d042300330f77a2bb5dd8c4baa0d67c37b7e5ae6da9e83a64f
-EBUILD jformatstring-2.0.3-r1.ebuild 743 BLAKE2B 53e5fec94122b0be2e112c5f721a9e1342763bde40ee96760fefe5cef3e87376df0f7acf4849a08ce4bda4bf0bb4ea1c01ace3d124afb2276efa8b056b09f450 SHA512 1927fdf32bdc13e4fa64414bc2d20165bc4ac2f4f4f4b860084ecb16fb7a353610a5a0fc6c9b10780b6c3921d58b54e6ac99a062ca0d8bd872faad8511497878
-MISC metadata.xml 566 BLAKE2B fca4101d7130ca6baef8c0f49ba3402cd1520c11f6e359b22ca8332b2985a2ac17e7023f8963c74bcc917b7deda72b35e8508a7be12ff073debf25323f180584 SHA512 5774bf427b38adf2396265047e9cbf070c93f43174ab337b379d07abcc1bf67db65d82d401825bbe0e915d0e19001d45ba7b84956e980a923c5aadd91b3abc2a
diff --git a/dev-java/jformatstring/jformatstring-2.0.3-r1.ebuild b/dev-java/jformatstring/jformatstring-2.0.3-r1.ebuild
deleted file mode 100644
index f0c536f80c94..000000000000
--- a/dev-java/jformatstring/jformatstring-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FINDBUGS_PV="3.0.1"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Compile time checking for Java format strings"
-SRC_URI="mirror://sourceforge/findbugs/findbugs-${FINDBUGS_PV}-source.zip"
-HOMEPAGE="https://code.google.com/p/j-format-string"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*
-	app-arch/unzip"
-
-src_unpack() {
-	unzip -qoj "${DISTDIR}/findbugs-${FINDBUGS_PV}-source.zip" "findbugs-${FINDBUGS_PV}/lib/jFormatString.jar" || die
-	unpack ./jFormatString.jar
-}
-
-src_prepare() {
-	default
-	find -name "*.class" -delete || die
-}
diff --git a/dev-java/jformatstring/metadata.xml b/dev-java/jformatstring/metadata.xml
deleted file mode 100644
index e9b6c157e052..000000000000
--- a/dev-java/jformatstring/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>This code is designed to allow for compile time checking of Java format strings. It can check that the format string is valid, that the proper number of arguments are supplied and that they are of the correct type.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">findbugs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jspeex/Manifest b/dev-java/jspeex/Manifest
deleted file mode 100644
index 001bab17884d..000000000000
--- a/dev-java/jspeex/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX jspeex-0.9.7-remove-junit-report.patch 530 BLAKE2B 2ebc0fcdd0713615bdcb1c829e0f26437af3829cdf4d01f453a6f8a4df9b0728f2f4d746214d44a8fa63f61ccda1c7812fe22ee6c67b8b141021adb61d6076e9 SHA512 8a38a6033ca138a131ee716712efd463c2fda87829d46eabd8fa561af0327fd8718a673075eaa0f6a08a931bfd142be23c65e16959a36e1a845dc002744010aa
-AUX jspeex-0.9.7-remove-proguard-taskdef.patch 1655 BLAKE2B 3ec50cada7bfd9b69a448f12fc1c07fc23003952e190ddafad4d58cb3cb1f13e746c02846cc17e2323d5c4ec7f76f049edb038e559c45f92854a23f72946b2e1 SHA512 d8c6358d01c659bf2e83d99d7831f1177383701ea34c76e8b39fa83a85477f8712b6911b6bea5da4e07b0e677816a1b7b4e90e51ee3c71fb7d0faffc9fc9b0d1
-DIST jspeex-0.9.7.zip 733580 BLAKE2B d5bfabb0857975ab8ca74d54401f6d4008c7386d8e2464c7386ecccfde8dcf3b92580d6168e4ff06cf8c1a27ca848abc7f630be7f19c6a0245beb8a9cb66c3f6 SHA512 9673bef155f1cccc45bc0a0d5596e79b48ba044309ba3446548b570bc7bad60b4b22cc7761749b0769114c7341b9fab6db8e8a155070f9de6fe2730c843199fe
-EBUILD jspeex-0.9.7-r2.ebuild 1098 BLAKE2B 2176c6e27a452c1b312f1e20475b341ea636fdbba4f9533f295ed821a4f1931cbf343de0beb4c7123ce21fe2735fe622391a116943b0a9135851290b1f44209d SHA512 72b0ea90ea7d78cf6eae25dbbde4ed3df96afbbf62d4d898771708a72a11ad0d7f9daecfb2603a1e5e898f89f5def94c01af92ff358829e55fe55a039f2afd0f
-MISC metadata.xml 313 BLAKE2B 2d1fa075e6e817588fa4d780397596e8cb07a2eab6431accb2595431311ddf2c4f7c421982fd9644caa9a6e64b5c980b04a1c5371217e6e3f4ec159cffc413c7 SHA512 3c4ed0d59b49cb568598c56b65d8683874ebbaa1b938a66cfd1c62cfc5d5a8e9b9346412fbc2948667e646bb7b8b10bcb7f4cbe046a03cd77657a69ecf6756f5
diff --git a/dev-java/jspeex/files/jspeex-0.9.7-remove-junit-report.patch b/dev-java/jspeex/files/jspeex-0.9.7-remove-junit-report.patch
deleted file mode 100644
index d3446420f720..000000000000
--- a/dev-java/jspeex/files/jspeex-0.9.7-remove-junit-report.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur a/build.xml b/build.xml
---- a/build.xml	2014-02-18 23:32:25.440819710 +0100
-+++ b/build.xml	2014-02-18 23:32:43.017053558 +0100
-@@ -218,12 +218,6 @@
-         </fileset>

-       </batchtest>

-     </junit>

--    <junitreport todir="${doc}/junit">

--      <fileset dir="${doc}/junit">

--        <include name="TEST-*.xml"/>

--      </fileset>

--      <report format="noframes" todir="${doc}/junit"/>

--    </junitreport>

-   </target>

- 

-   <!-- ******************************************************************** -->

diff --git a/dev-java/jspeex/files/jspeex-0.9.7-remove-proguard-taskdef.patch b/dev-java/jspeex/files/jspeex-0.9.7-remove-proguard-taskdef.patch
deleted file mode 100644
index eb9e6fc24af2..000000000000
--- a/dev-java/jspeex/files/jspeex-0.9.7-remove-proguard-taskdef.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Naur a/build.xml b/build.xml
---- a/build.xml	2014-02-18 23:32:25.440819710 +0100
-+++ b/build.xml	2014-02-18 23:33:26.308555686 +0100
-@@ -57,10 +57,6 @@
- 

-   <property name="version" value="0.9.7"/>

- 

--  <!-- Define additional tasks -->

--  <taskdef name="proguard" classname="proguard.ant.ProGuardTask"

--           classpath="${lib}/proguard3.2.jar" />

--

-   <target name="init" description="Initialise ant" depends="clean">

-     <tstamp>

-       <format property="NOW" pattern="dd/MM/yyyy HH:mm" locale="en"/>

-@@ -138,19 +134,6 @@
-   <target name="compress" depends="package"

-           description="Package obfuscated JSpeex library" >

-     <mkdir dir="${log}"/>

--    <proguard>

---libraryjars ${java.home}/lib/rt.jar

---injars      ${dist}/jspeex.jar

---outjar      ${dist}/jspeex-obf.jar

---renamesourcefileattribute SourceFile

---keepattributes InnerClasses,SourceFile

---printmapping ${log}/jspeex-obf.map

---overloadaggressively

--

---keep public class * {

--    public protected *;

--}

--    </proguard>

-   </target>

- 

-   <target name="compress-dec-nb" depends="compile-nb"

-@@ -161,18 +144,6 @@
-         <attribute name="Main-Class" value="JSpeexDec"/>

-       </manifest>

-     </jar>

--    <proguard>

---libraryjars ${java.home}/lib/rt.jar

---injars      ${dist}/jspeex-dec-nb.jar

---outjar      ${dist}/jspeex-dec-nb-obf.jar

---printmapping ${log}/jspeex-dec-nb-obf.map

---overloadaggressively

---defaultpackage ''

--

---keep public class JSpeexDec {

--    public static void main(java.lang.String[]);

--}

--    </proguard>

-   </target>

- 

-   <!-- ******************************************************************** -->

diff --git a/dev-java/jspeex/jspeex-0.9.7-r2.ebuild b/dev-java/jspeex/jspeex-0.9.7-r2.ebuild
deleted file mode 100644
index 404e7773e708..000000000000
--- a/dev-java/jspeex/jspeex-0.9.7-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Speex speech codec library for Java"
-HOMEPAGE="http://jspeex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-S="${WORKDIR}/${PN}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/ant-core:0"
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*
-"
-DEPEND="
-	${CDEPEND}
-	dev-java/junit:0
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/ant-junit:0
-	)
-"
-BDEPEND="app-arch/unzip"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="ant-core"
-EANT_BUILD_TARGET="package"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove-junit-report.patch
-	"${FILESDIR}"/${P}-remove-proguard-taskdef.patch
-)
-
-src_prepare() {
-	default
-
-	java-pkg_clean
-
-	cd lib || die
-	java-pkg_jar-from --build-only junit
-}
-
-src_test() {
-	ANT_TASKS="ant-junit ant-core" eant test
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	dodoc README TODO
-
-	use doc && java-pkg_dojavadoc doc/javadoc
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/jspeex/metadata.xml b/dev-java/jspeex/metadata.xml
deleted file mode 100644
index 590b0322bfe5..000000000000
--- a/dev-java/jspeex/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jspeex</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jta/Manifest b/dev-java/jta/Manifest
deleted file mode 100644
index 586adb21a5bb..000000000000
--- a/dev-java/jta/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jta-1_1-classes.zip 13236 BLAKE2B f2e1ffd531fce804d562c4cdcbe9b260d08eb2bcd79a879f94fbd3e23801849cbf311d8f7410a9776f9a8866027dcedcac479a64444321e8c6b2b23bd9a69054 SHA512 fb8b76223ccdec0ef97b00d7248d74b6316dd67c570667f3a644d03b05cd28af061a191cf71b6624fd4a4195f7bc107281eb847fc4c0ee4606c85c414da79a14
-EBUILD jta-1.1-r1.ebuild 1054 BLAKE2B 06aa582fb26604b4b30f787ac421bb060d5dec9d939448715d4a432217359a96c9a6449037834733caf18e413adacc6dfa6f08bea1fe380db3e8ce1bc4fbd449 SHA512 8ee977ec0de8662d03b0445edd3de42131f7089aab87a1d0318dcd63c772dd63f70bc3eaec20c2c06f4ba01488f4818db9dd284563edaa2b80983c8ba1143960
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jta/jta-1.1-r1.ebuild b/dev-java/jta/jta-1.1-r1.ebuild
deleted file mode 100644
index 4d3770f9bca4..000000000000
--- a/dev-java/jta/jta-1.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JTA_ZIP="jta-1_1-classes.zip"
-
-inherit java-pkg-2
-
-DESCRIPTION="The Java Transaction API"
-HOMEPAGE="https://www.oracle.com/java/technologies/jta.html"
-SRC_URI="${JTA_ZIP}"
-
-LICENSE="sun-bcla-jta"
-SLOT=0
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-RESTRICT="fetch"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo
-	einfo " Due to license restrictions, we cannot fetch the"
-	einfo " distributables automagically."
-	einfo
-	einfo " 1. Visit ${HOMEPAGE}"
-	einfo " 2. Select 'Java Transaction API Specification 1.1 Maintenance Release'"
-	einfo " 3. Download ${JTA_ZIP}"
-	einfo " 4. Move file to your DISTDIR directory"
-	einfo " 5. Restart the emerge process"
-	einfo
-}
-
-src_unpack() {
-	unzip -qq "${DISTDIR}"/${JTA_ZIP} || die "failed to unpack"
-}
-
-src_compile() {
-	jar cvf jta.jar javax/ || die "failed to create jar"
-}
-
-src_install() {
-	java-pkg_dojar jta.jar
-}
diff --git a/dev-java/jta/metadata.xml b/dev-java/jta/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/jta/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/osgi-annotation-versioning/Manifest b/dev-java/osgi-annotation-versioning/Manifest
deleted file mode 100644
index 751a04da4723..000000000000
--- a/dev-java/osgi-annotation-versioning/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST osgi-annotation-versioning-1.1.1-sources.jar 5301 BLAKE2B 3c45fc25bda97a3b98e8db1d725f64a4e237300251a3414daed8ddcb54c5d8a68aa4c603e57a3831a34761c4cbfa0d544b1ed345e26ca1a1a1b4d4fa5bf2f9dc SHA512 39b208b4f72a33cb9a8c2dff1a4c52e07b32a553bcf2d7cb014ae50935c6b8ff26b67961117019fb5222e99c59ab4ec6e73788124f309dac86defeeb212d407b
-EBUILD osgi-annotation-versioning-1.1.1.ebuild 1018 BLAKE2B a166ce64034891b8095e537a0be364adff90974bd982e6ecf387e74bdc5c93238244e3c78947a3d8f6e0205544b6c8112946b10ba921dd3001fa908faebb8cd5 SHA512 cdadc218ee24a350fd67dbdcd5b3c2599e5670a910dec136cd5c398e3e85600c405369a682e90b3fdd846034cda9a67da21dd2da89130fe969fdb9fa1bc8cba6
-MISC metadata.xml 291 BLAKE2B c85b76df77fc86b1590849e2ddbd23981924ae4172b592d72c45845212691f01cddcdd91ee9a079d977455ac6fdb1a7c4eafe6b507cef45cf28418e78092aafb SHA512 13c78a573ef594b87860d0c0a1b0f7eef9418fcaf5554995c5149cb42b434c6e81816e70ad8af6e35ecbd9fe12931700c9a2ade5a303e88b266922f4ffe0ff76
diff --git a/dev-java/osgi-annotation-versioning/metadata.xml b/dev-java/osgi-annotation-versioning/metadata.xml
deleted file mode 100644
index efee2e8082d7..000000000000
--- a/dev-java/osgi-annotation-versioning/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">osgi/osgi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild b/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild
deleted file mode 100644
index 80b9d802bee5..000000000000
--- a/dev-java/osgi-annotation-versioning/osgi-annotation-versioning-1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom org.osgi.annotation.versioning-1.1.1.pom.xml --download-uri https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.versioning/1.1.1/org.osgi.annotation.versioning-1.1.1-sources.jar --slot 0 --keywords "~amd64 ~x86" --ebuild osgi-annotation-versioning-1.1.1.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.osgi:org.osgi.annotation.versioning:1.1.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="OSGi Companion Code for org.osgi.annotation.versioning Version 1.1.1"
-HOMEPAGE="https://www.osgi.org/"
-SRC_URI="https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.versioning/${PV}/org.osgi.annotation.versioning-${PV}-sources.jar -> ${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
diff --git a/dev-java/pdf-renderer/Manifest b/dev-java/pdf-renderer/Manifest
deleted file mode 100644
index 8d14041c6c70..000000000000
--- a/dev-java/pdf-renderer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pdf-renderer-1.0.5-sources.jar 1736806 BLAKE2B b897d4f30ae0143a6eb7c3499c5d7c165cd4e81c950fbe3185066d5ab6dbe68d874a5ff7561d35a65e014a6d8b82f92de73574018f58dd3817a32488c5b09ed7 SHA512 086355441df0d59306839de3097d1e557870435dcb4ee878d4e7f3f46352a103ecfc1da4055f107c2c53a61f815f985f3e1e176dc9f99634afd58cf1faca940b
-EBUILD pdf-renderer-1.0.5-r1.ebuild 518 BLAKE2B 2849658e1e676f035531f8a3a878a5f98e58c7cfa7e22c89675f0abc3d263bea9f16269d869977392f50d735d083c520252b58021b0c724991a60255967897a3 SHA512 232d27d426cf02d6d7f7c9201aadefba1a0347b16673e0e0b16adf638835818bc3c87be96bcefa55487c5e1ddebf6bf0b8f6c0d8fdb62bcd46399c0ab101101d
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/pdf-renderer/metadata.xml b/dev-java/pdf-renderer/metadata.xml
deleted file mode 100644
index 4221e170cbc0..000000000000
--- a/dev-java/pdf-renderer/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/pdf-renderer/pdf-renderer-1.0.5-r1.ebuild b/dev-java/pdf-renderer/pdf-renderer-1.0.5-r1.ebuild
deleted file mode 100644
index 0c7ca8c0ea49..000000000000
--- a/dev-java/pdf-renderer/pdf-renderer-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="a 100% Java PDF renderer and viewer"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://repo1.maven.org/maven2/org/swinglabs/${PN}/${PV}/${P}-sources.jar"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
diff --git a/dev-java/spec-alpha/Manifest b/dev-java/spec-alpha/Manifest
deleted file mode 100644
index 8a1af59ec474..000000000000
--- a/dev-java/spec-alpha/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX build.xml 1397 BLAKE2B 12b251335c0b4303eced7a3263d20fb69da00d4856bc5068b8d91f0fcba6fcee9b5f1ae4374d8c4e804799079286c32886eca5a29e22c851186e2722704e44cd SHA512 d5e493a970774888aea8df15614068a533da6c30f76ef8628b8848782ba9b9bc5b6b54271e569458d7f6468af68ab454b7926266e9fa88389b7b3eff50e66e46
-DIST spec-alpha-0.1.143.tar.gz 35568 BLAKE2B f63fdd2b3c83dbd3936e36ff57b6ea399b7173fe805c60a6ecbd8e4aef5942f051a8551c259d89885a202c20045f67921b66c4dc9e361aacc8903c6542d7c7b5 SHA512 87887d72bc7343f96fad937b90feb4cc1be1eeaad8b7c01ae090ebe5cb17c30612e63797ea9eb39e6fe4c07870dcba9e153a98777d372923e95163f3219a976c
-DIST spec-alpha-0.2.176.tar.gz 37055 BLAKE2B 0588772e4a47a5b122984abefaf5ef2d0fffbacaf277b22737c94889e646c16a029017d405b72b829e88bcf03b12f689cb2053884b24b47193a26978ab54a318 SHA512 decf0dbff09bf8ee12503e6117ab635b98cd8dd2c389acf7aeebf00f32b5fd8250d66c2ec54cfe5da45e727e39480ae738a3ee7fcad71684d8c3acf464fe21e7
-DIST spec-alpha-0.2.194.tar.gz 39101 BLAKE2B 86de07fd83495b72d3b7d85b803ee9ecafba9a72d8541b5c62f22ad32d4e16b0c7be758ea8d30b743eba6fe994e09898e2f59b2b720913e7e1ab3732b496423f SHA512 3170883c1d62acf9af1435a5ca1ced34a318c53d1cd443d58a74afdcae4888553b9dba91fb81ccea8824c3a0c2396a0efbfaeb8ab408d8bbcf1aea0d3da9c82e
-EBUILD spec-alpha-0.1.143.ebuild 868 BLAKE2B eebb6f5c7121daa14a55ea40ea277f5f5d678f1725a0b44504bae6259a7d68690abba76013fa2d66a560c247f3662a1669ff6fcdbef74b6678b4d10c59b8a53e SHA512 9156aa6d7bd23426132884c999fe7d5b0199b2f8a84fef529cda16ca1e36482ccc1c73de1293a524f8aeaaccb38571094f2c88e32b295cc6c55ca30f353fdde3
-EBUILD spec-alpha-0.2.176.ebuild 868 BLAKE2B e3229858830b4302618a9b079287ef32a203d358fc673ad662348d189f8e26c3366d2c467fbb55264be2c1dcbdfefdcd44ceb9b0be672288029ef443496bbf4a SHA512 e939189e9652132ca06d027901fe8959b3a75a1452f15f8aa49c17b31c1ff1140e7a88d42b54e6b9f5d6a77cf8a32b94e5fae6bb15ae61e08c0e5b9dac07ae16
-EBUILD spec-alpha-0.2.194.ebuild 810 BLAKE2B d5924c9ba50ca29a1288b5eb288eb7e4253373768b428df7e780ec5cc42ba33c6df3f54f3792c018b8790cf80c7b6fcb1513850c3b1df9ba750b197f11baf6dc SHA512 c3ae5f4b207762968ae58db54d574f85f649909feb110532480679852f50c493c92ef4c31b1d10823b89c9b671e169f00067154084d066d53bb5267cc8a661a4
-MISC metadata.xml 476 BLAKE2B a4aba1942183ed5eea5e1af477007d1c652356e65ed97ee7fe4284a7df481eba6c6799d5b00ef78cc778a0a59fbffb3c8d7d73560f4bb7521aa6c7797decfa39 SHA512 78e9c9ccdf5af9f599b2c67c6ee0699007c3d6c90c330e0c937e0905324f9275ae2649db1ace2e0a59342968ce93f85782d5df81d2df6ef2104cd06376c1ee34
diff --git a/dev-java/spec-alpha/files/build.xml b/dev-java/spec-alpha/files/build.xml
deleted file mode 100644
index ea47d06b77d2..000000000000
--- a/dev-java/spec-alpha/files/build.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<project name="spec.alpha" default="package" basedir=".">
-  <property name="maven.build.finalName" value="spec.alpha-SNAPSHOT"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/clojure"/>
-
-  <!-- clean -->
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- build -->
-  <target name="build" description="Copy the files">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.srcDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- package -->
-  <target name="package" depends="build" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
-         compress="true"
-         index="false"
-         basedir="${maven.build.outputDir}"
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- jar -->
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-</project>
diff --git a/dev-java/spec-alpha/metadata.xml b/dev-java/spec-alpha/metadata.xml
deleted file mode 100644
index 896b0ee4a5c0..000000000000
--- a/dev-java/spec-alpha/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>tgbugs@gmail.com</email>
-		<name>Tom Gillespie</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">clojure/spec.alpha</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/spec-alpha/spec-alpha-0.1.143.ebuild b/dev-java/spec-alpha/spec-alpha-0.1.143.ebuild
deleted file mode 100644
index 73eff1ee42cf..000000000000
--- a/dev-java/spec-alpha/spec-alpha-0.1.143.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-EGIT_REF="51b64c0"
-
-MY_PN=${PN//-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A Clojure library to describe the structure of data and functions"
-HOMEPAGE="https://clojure.org/ https://github.com/clojure/spec.alpha"
-SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0.1"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE=""
-
-CDEPEND="dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-EANT_TASKS="jar"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${MY_P}"
-
-src_prepare() {
-	default
-	cp "${FILESDIR}/build.xml" . || die
-}
-
-src_install() {
-	java-pkg_newjar "target/${MY_P}.jar"
-	dodoc CONTRIBUTING.md README.md
-}
diff --git a/dev-java/spec-alpha/spec-alpha-0.2.176.ebuild b/dev-java/spec-alpha/spec-alpha-0.2.176.ebuild
deleted file mode 100644
index 42a9a4dd23fd..000000000000
--- a/dev-java/spec-alpha/spec-alpha-0.2.176.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-EGIT_REF="59af4cf"
-
-MY_PN=${PN//-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A Clojure library to describe the structure of data and functions"
-HOMEPAGE="https://clojure.org/ https://github.com/clojure/spec.alpha"
-SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0.2"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE=""
-
-CDEPEND="dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-EANT_TASKS="jar"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${MY_P}"
-
-src_prepare() {
-	default
-	cp "${FILESDIR}/build.xml" . || die
-}
-
-src_install() {
-	java-pkg_newjar "target/${MY_P}.jar"
-	dodoc CONTRIBUTING.md README.md
-}
diff --git a/dev-java/spec-alpha/spec-alpha-0.2.194.ebuild b/dev-java/spec-alpha/spec-alpha-0.2.194.ebuild
deleted file mode 100644
index cab6d8cad0c7..000000000000
--- a/dev-java/spec-alpha/spec-alpha-0.2.194.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-EGIT_REF="fb55378"
-
-MY_P=spec.alpha-${PV}
-
-DESCRIPTION="A Clojure library to describe the structure of data and functions"
-HOMEPAGE="https://clojure.org/ https://github.com/clojure/spec.alpha"
-SRC_URI="https://github.com/clojure/spec.alpha/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0.2"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND="
-	dev-java/ant-core:0
-	>=virtual/jdk-1.8:*
-"
-
-S="${WORKDIR}/spec.alpha-${MY_P}"
-
-EANT_TASKS="jar"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${MY_P}"
-
-src_prepare() {
-	default
-	cp "${FILESDIR}/build.xml" . || die
-}
-
-src_install() {
-	java-pkg_newjar "target/${MY_P}.jar"
-	einstalldocs
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 02342114d317..e1661458c4d5 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 41544a49a26e..e4322c441f21 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -5,8 +5,6 @@ AUX apr-util-1.6.1-libtool.patch 533 BLAKE2B d942a897aaeeb543e4dbb4fbaac7b54f4ac
 AUX apr-util-1.6.1-mariadb-support.patch 4929 BLAKE2B 9f8a06e657386f5f773642f36f0897bba5e55270e860f2f1edc86ebe44214395a64e70c3f984f324328a8f7a6276c86cb46caca16719ab3ad51aff995868818f SHA512 edd5e1cd7d31e7bfb1b166c162ad8c69c704c8e9a09e85770df3b625ed918ed52918a16728a9b4d69370ccc75ade32dd64ef73b31ce6e8dac7a360fe44ca34e7
 AUX apr-util-1.6.1-my_bool.patch 311 BLAKE2B c0fdf523983dc75ff977c8f602678cdd7d0b3e539fc266891e2266fa3b60e0971e93d77f2e28ed95959d8ca62bca4f9f566fefea525c845d49ce545ee6b5a99a SHA512 ed7d7857be8b5d29cc17a7216c1b06134798eb5129d50389bb0d5484a46e19e3169f8cea80cab7f845548e528a2cd9909b72016a7216b402092ae15879db792c
 AUX apr-util-1.6.3-fix-pkgconfig-libs.patch 982 BLAKE2B f18aa34a3fa0766020ead08b946847bbd8647c7be3485fe78cdff71f742b335969d1065c5ecc8f91f098fb705e616fe78b2c9581aab3770dd736f2d7a36ca732 SHA512 eb1e98d1db892656990ddfc6757e138264790ca37f981d580c0ff16a6e01288a0214898c014ff5c8fbe8ca2eb2df98b17bf3ae61046ae12d20f3ca84f91494a5
-DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
 DIST apr-util-1.6.3.tar.bz2 432692 BLAKE2B 5eb56c45ba9d87ff3e3769439a3a9a858a1947de68b34892c729f39736fc41117a41c630c3c4cfb07b444c4ee0d5853ec5be158e8fa0b0c0ab89f0cb51cc9c6d SHA512 8050a481eeda7532ef3751dbd8a5aa6c48354d52904a856ef9709484f4b0cc2e022661c49ddf55ec58253db22708ee0607dfa7705d9270e8fee117ae4f06a0fe
-EBUILD apr-util-1.6.1-r10.ebuild 3837 BLAKE2B 964390753d1270160680eb8eabbee019f40568a7b9c37eea72f9bec2968c81aa2eb0d1868589d636eeee96a2310420ee92fbe6d8eb0baa9f045c44e053ab6420 SHA512 ebd329003ea8bd14b879c442ce7b802f21c5835f34f79e9082a2575ec89452f7e979cd38347dc3a620f03e70efef84e44e1aeea07af09b4bd2a1fe6af0462329
 EBUILD apr-util-1.6.3.ebuild 3739 BLAKE2B da821a57a11ee7f48c571e640e91a80b45a7ca8ceb9e6e74e24f7aeefafba7ea8c81a4c1178bcff8c73c1260792fe78e3a4f9c11f9f91f42c3f35f2c158e6766 SHA512 79e8ae7758736412460bb288932de8038ab5c06a75d1ac7065af87e9e0192c67b18a4e6be369a59456a273bbfed317f91ee47a4a490c66f425b608f218c7263d
 MISC metadata.xml 469 BLAKE2B d4ef8b9223183a322e324290e26e78fd291bfd3e60b48a18d1345f0aaf467302cabb62ae330ee5282bf38fcdf84a020dcca1b32a8351e3494d9fecd723196031 SHA512 727443f6ab071b3c657287a698ccaccea336a3b861f199dd07c4472cd61e1252e2a25f24a86dcdd72cedcfb73fb6cb0ebe0cbdc93220223dab5501e9626ecb4e
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
deleted file mode 100644
index ff0412e3d5fc..000000000000
--- a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
-# APR_PV="${PV}"
-APR_PV="1.7.0-r6"
-
-inherit autotools db-use libtool multilib toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Utility Library"
-HOMEPAGE="https://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
-#RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/apr-${APR_PV}:1=
-	dev-libs/expat
-	virtual/libcrypt:=
-	berkdb? ( >=sys-libs/db-4:= )
-	gdbm? ( sys-libs/gdbm:= )
-	ldap? ( net-nds/openldap:= )
-	mysql? ( || (
-		dev-db/mariadb-connector-c
-		>=dev-db/mysql-connector-c-8
-	) )
-	nss? ( dev-libs/nss )
-	odbc? ( dev-db/unixODBC )
-	openssl? (
-		dev-libs/openssl:0=
-	)
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/libtool-2.4.2
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=(CHANGES NOTICE README)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
-	"${FILESDIR}"/${PN}-1.6.1-fix-gdbm-error-handling.patch
-	"${FILESDIR}"/${PN}-1.6.1-libtool.patch # 779487
-	"${FILESDIR}"/${PN}-1.6.1-mariadb-support.patch
-	"${FILESDIR}"/${PN}-1.6.1-my_bool.patch
-	"${FILESDIR}"/${PN}-1.6.1-drop-my_init.patch
-)
-
-src_prepare() {
-	default
-
-	# Fix usage of libmysqlclient (bug #620230)
-	grep -lrF "libmysqlclient_r" "${S}" \
-		| xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \
-		|| die
-
-	mv configure.{in,ac} || die
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=(
-		--datadir="${EPREFIX}"/usr/share/apr-util-1
-		--with-apr="${ESYSROOT}"/usr
-		--with-expat="${EPREFIX}"/usr
-		--without-sqlite2
-		$(use_with gdbm)
-		$(use_with ldap)
-		$(use_with mysql)
-		$(use_with nss)
-		$(use_with odbc)
-		$(use_with openssl)
-		$(use_with postgres pgsql)
-		$(use_with sqlite sqlite3)
-	)
-
-	tc-is-static-only && myconf+=( --disable-util-dso )
-
-	if use berkdb; then
-		local db_version
-		db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
-		db_version="$(db_ver_to_slot "${db_version}")"
-		db_version="${db_version/\./}"
-		myconf+=(
-			--with-dbm=db${db_version}
-			# We use $T for the libdir because otherwise it'd simply be the normal
-			# system libdir.  That's pointless as the compiler will search it for
-			# us already.  This makes cross-compiling and such easier.
-			--with-berkeley-db="$(db_includedir 2>/dev/null):${T}"
-		)
-	else
-		myconf+=( --without-berkeley-db )
-	fi
-
-	if use nss || use openssl ; then
-		myconf+=( --with-crypto ) # 518708
-	fi
-
-	econf "${myconf[@]}"
-	# Use the current env build settings rather than whatever apr was built with.
-	sed -i -r \
-		-e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
-		-e "/^CC=/s:=.*:=$(tc-getCC):" \
-		-e '/^(C|CPP|CXX|LD)FLAGS=/d' \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk || die
-}
-
-src_compile() {
-	emake
-	use doc && emake dox
-}
-
-src_test() {
-	# Building tests in parallel is broken
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-	if [[ -d "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
-		find "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
-	fi
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die
-	fi
-
-	if use doc ; then
-		docinto html
-		dodoc -r docs/dox/html/*
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	rm "${ED}/usr/$(get_libdir)/aprutil.exp" || die
-}
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 59eb3e7225de..e8c538cb1a97 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -12,8 +12,6 @@ AUX apr-1.7.2-libtool.patch 517 BLAKE2B da77ee1d94bc2bd46d4ef97f18f018fbcc67cceb
 AUX apr-1.7.2-respect-flags.patch 652 BLAKE2B e9cef7a8eff52a0d1799c261b377026849d8b65770a9e6b1d93f936d5d6533635827d6bdada9cbfdd8f274b191234d4b07ec7afa640383cac965562153c54164 SHA512 8305861c1196bbc5262bdc5d9fe87ef7d5d38d827d829455db2007036c70d749901bc3d2b63570528a70dfb3ff6171e78b54ceaea8c9646e4aa53c173440e70b
 AUX apr-1.7.2-sysroot.patch 1399 BLAKE2B 921694b66e2a0fe687ec9acb7458b1c860c12665e553aba4e043d56732bc0adc944c7bdd609dd001fcf2c9716b30989a47207506d3ad9c0141174848ce6ad70c SHA512 0dc3cb41fa8ab909c14e3650f755a061b5a0fab052b6b94c16678af58013841614ff9a407c82764cd3435db5b1d5d5a5ce41bb1b430dae0b272cffc438e49003
 AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4af9e65169c1c5862c3fa3532cc02df8e084b540e7a81091c3b16d50388c6234cba469b15fff896d0428fc SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf
-DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
 DIST apr-1.7.2.tar.bz2 890218 BLAKE2B a17ee4311a33acee0bdeb9e5225a198f9dec1b2e0267a742080c77d5342e5052392a5a2100a0ba85f5a192b8679838a7002d4c9a12aa5bdd7921eff025b75d15 SHA512 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e
-EBUILD apr-1.7.0-r6.ebuild 4667 BLAKE2B 0a48780503a9cadf9fa3463507881d314581d9270b5c28f9cc9754fe45038e6168d107f5c87993949e89593e436eb3f6e2c4c0045b29d02b9c74906b60e8b8a5 SHA512 71a1efb5b1c28b2a11a8751d82eceaf5cfe81fd95a142970d5bcb5da5a0e8b47cbf9c0d32c12c52eff269419547990426ea83eea7d96d59c48f80632fa05b889
 EBUILD apr-1.7.2.ebuild 4575 BLAKE2B a0bb685a7235819f77e0239120375fe335c86b9c99d258a4aefa999bbeae5ba41807bf6797267593ea5a19e1f7a3181df4328d04b87088fe4eb7f8533fc18f98 SHA512 189c3ac5aa060eb2d65013ae73a91498dd3a7a861d7434c007f24f31e2b895530b9f3d7a85f76da482b20870d0a505f454f2105d53f06159fb491cc8cc4227e1
-MISC metadata.xml 584 BLAKE2B 9146f73b20274c7dfa9887f9d97adfa3718a02ff65c694b8b9e56c865f68565f5f6148c7ecfe9b43add88b43d735a80be22b6a48aebf76e08cfc8193fa0d73c4 SHA512 05f1b7c01bd9a68eed38cc3e19f0fa7afe0b337874bc137ee265d4d505a98bbb069dfe61a4bd0faaa442472497f2b1ad48a14abb4312114b2af37d9e0e5a4441
+MISC metadata.xml 487 BLAKE2B 826e5b4b8b87d0077f1b2063ae1c808447987ddea524eeb4cdd17d60bea8b3919a2a714cdb0706cf758dfcf86109b702399c04dd054872d8465e1f6b3469c795 SHA512 9e8fbae61974080394151944ca7e2fec92a6c99b2c2fe75dc2486dced890933ac4694c8ac2984504bbfe42706bed6895b7d5fe9f9a9ced96c5c0ead8016f4366
diff --git a/dev-libs/apr/apr-1.7.0-r6.ebuild b/dev-libs/apr/apr-1.7.0-r6.ebuild
deleted file mode 100644
index 855fd6a0da42..000000000000
--- a/dev-libs/apr/apr-1.7.0-r6.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="https://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
-
-# See bug #815265 for libcrypt dependency
-CDEPEND="virtual/libcrypt:=
-	elibc_glibc? ( >=sys-apps/util-linux-2.16 )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-base-policy )"
-DEPEND="${CDEPEND}
-	>=sys-devel/libtool-2.4.2
-	doc? ( app-doc/doxygen )"
-
-DOCS=( CHANGES NOTICE README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-mint.patch
-	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
-	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
-	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
-	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
-	"${FILESDIR}"/${PN}-1.7.0-autoconf-2.70.patch #750353
-	"${FILESDIR}"/${PN}-1.7.0-CVE-2021-35940.patch #828545
-	"${FILESDIR}"/${PN}-1.7.0-clang-16.patch #870004
-	"${FILESDIR}"/${PN}-1.7.0-dev-zero.patch #830833
-)
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-	AT_M4DIR="build" eautoreconf
-	elibtoolize
-
-	eapply "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-	local myconf=(
-		--enable-layout=gentoo
-		--enable-nonportable-atomics
-		--enable-posix-shm
-		--enable-threads
-		$(use_enable static-libs static)
-		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
-	)
-
-	if use older-kernels-compatibility; then
-		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
-		export apr_cv_accept4="no"
-		export apr_cv_dup3="no"
-		export apr_cv_epoll_create1="no"
-		export apr_cv_sock_cloexec="no"
-	fi
-	if tc-is-cross-compiler; then
-		# The apache project relies heavily on AC_TRY_RUN and doesn't
-		# have any sane cross-compiling fallback logic.
-		export \
-			ac_cv_file__dev_zero="yes" \
-			ac_cv_func_sem_open="yes" \
-			ac_cv_negative_eai="yes" \
-			ac_cv_o_nonblock_inherited="no" \
-			ac_cv_struct_rlimit="yes" \
-			ap_cv_atomic_builtins="yes" \
-			apr_cv_accept4="yes" \
-			apr_cv_dup3="yes" \
-			apr_cv_epoll="yes" \
-			apr_cv_epoll_create1="yes" \
-			apr_cv_gai_addrconfig="yes" \
-			apr_cv_mutex_recursive="yes" \
-			apr_cv_mutex_robust_shared="yes" \
-			apr_cv_process_shared_works="yes" \
-			apr_cv_pthreads_lib="-pthread" \
-			apr_cv_sock_cloexec="yes" \
-			apr_cv_tcp_nodelay_with_cork="yes"
-	fi
-
-	if use urandom; then
-		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, ${PN} detects this.
-	else
-		myconf+=( --with-devrandom=/dev/random )
-	fi
-
-	tc-is-static-only && myconf+=( --disable-dso )
-
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
-
-	if [[ ${CHOST} == *-solaris2.10 ]]; then
-		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
-		*atomic_cas_ptr*) ;;
-		*)
-			elog "You do not have Solaris Patch ID "$(
-				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
-			)" (Problem 4954703) installed on your host ($(hostname)),"
-			elog "using generic atomic operations instead."
-			myconf+=( --disable-nonportable-atomics )
-			;;
-		esac
-	else
-		if use ppc || use sparc || use mips; then
-			# Avoid libapr containing undefined references (underlinked)
-			# undefined reference to `__sync_val_compare_and_swap_8'
-			# (May be possible to fix via libatomic linkage in future?)
-			# bug #740464
-			myconf+=( --disable-nonportable-atomics )
-		fi
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		emake tools/gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			tools/gen_test_char.c -o tools/gen_test_char || die
-	fi
-
-	emake
-
-	if use doc; then
-		emake dox
-	fi
-}
-
-src_test() {
-	# Building tests in parallel is broken
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/dox/html/*
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	# Even in Prefix, we don't need this on AIX.
-	rm "${ED}/usr/$(get_libdir)/apr.exp" || die
-}
diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml
index d898d5a8b907..b8d4a84e26af 100644
--- a/dev-libs/apr/metadata.xml
+++ b/dev-libs/apr/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="old-kernel">Enable compatibility with older kernels</flag>
-		<flag name="older-kernels-compatibility">Enable binary compatibility with older kernels</flag>
 		<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
 	</use>
 	<upstream>
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 9d8f54ce6cb4..74c6c8e9e10c 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -2,6 +2,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -11,6 +13,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B b355a93d63ee4beb5f3782cda8514aa02f16e71563f66bac6fc7a5e3beae40efa1bdbe098f3d83ce775d0458118f19fceb7225f2b5511823c8e56cabdae4f2d8 SHA512 488e5c278fe4b48ec8ce6ccd76d489cf08251ce6e8f8bd417048a80a10e4a5cf72f20462aa8115f72afe1a40dbee02d936680d516dd1c940fd52fe6f55402e69
 EBUILD libclc-15.0.7.ebuild 1667 BLAKE2B 496db7dddd88d6aba0a9bf96b9b874022da60073993b456316fd391b9c0ed76134fa4af3cae20df64af47884755aa68ea586fe4410d5a4eeea86b51a99566dd7 SHA512 155adf1cacc694b7a1c4d54b60ead79158796f56b5437109f7f6262c8d40d79181c2d78ec3a2028b5159973ae42da6ca85e159fb95818dfdfb6e384be7fdc25f
 EBUILD libclc-16.0.0.9999.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca
+EBUILD libclc-16.0.0.ebuild 1658 BLAKE2B 3aeec0820378ca3a425503c191138f4d938a624f503f13a73e8aa59ccb31e3e26b1d46092d04b150280f9c9711075bf8c58121421926a79d5a1b17de56ddee7c SHA512 fee4b9aa4b8652deb16bc2c2966caddf4233778c451b00ceac089f5fae2adb95c592b4323c8dcc796a3a28432e9f518343e06e9dd41b393272acecd7e1ebae52
 EBUILD libclc-16.0.0_rc3.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca
 EBUILD libclc-16.0.0_rc4.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca
 EBUILD libclc-17.0.0.9999.ebuild 1725 BLAKE2B 6af25c457993cd3f87b7fcb43a3824d43d7e57a3208270982dd7cddef72282c99d40d729041157be22b3a638613f1cdc8b43ddae8d19af05b44395cbd28404c8 SHA512 28079adbb36dbcf7beb4069afc4d10e505ae5ca74bbecda5b91c4641294d646a253dcce79149c31b90fa8c241f2155a01ff8f5b0f4d553caafa3412f2b9a20a3
diff --git a/dev-libs/libclc/libclc-16.0.0.ebuild b/dev-libs/libclc/libclc-16.0.0.ebuild
new file mode 100644
index 000000000000..6964547d373e
--- /dev/null
+++ b/dev-libs/libclc/libclc-16.0.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+
+LLVM_MAX_SLOT=16
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		(
+			sys-devel/clang:16
+			spirv? ( dev-util/spirv-llvm-translator:16 )
+		)
+		(
+			sys-devel/clang:15
+			spirv? ( dev-util/spirv-llvm-translator:15 )
+		)
+		(
+			sys-devel/clang:14
+			spirv? ( dev-util/spirv-llvm-translator:14 )
+		)
+		(
+			sys-devel/clang:13
+			spirv? ( dev-util/spirv-llvm-translator:13 )
+		)
+	)
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+	if use spirv; then
+		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
+			return 1
+	fi
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use spirv && libclc_targets+=(
+		"spirv-mesa3d-"
+		"spirv64-mesa3d-"
+	)
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+	)
+	cmake_src_configure
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 276cd9eb5d70..9d187c154988 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 e3167f9c72f1..8c7998030ab3 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,6 +2,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -11,6 +13,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 40fea3429bbf2e22f45598a679d9e5c6fa06343081a3a0a7c238bcbc8c3f270fea924ad57cab4f580adef66fe269eec188e6ed9f46772907063267805b7b51c7 SHA512 da649915c4804091ac68d9011a2370560f71e88952d13975a5f882e2c485d561fa0a5a43c61dd48f196534eae1e10aa6e46a9a9f6959d998ca850128c75a2615
 EBUILD llvm-ocaml-15.0.7.ebuild 2598 BLAKE2B 22f3c86bea3a17027f4513685ddb9077800918dbe8dc74dd17e7d8ccfb729c11baf6eb60915d6795170d4dd5ee66b5c19d16653044a0ad7bb34f18161db06848 SHA512 04de6e60fc31644b6e99af4277f5300cdcee1f8e35f9038b490ed7841fd0c92e71bdaa423cdedbc5cccbd219e32857c8d1d0e09dfdfe4919b165ee73670efbfe
 EBUILD llvm-ocaml-16.0.0.9999.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
+EBUILD llvm-ocaml-16.0.0.ebuild 2532 BLAKE2B 86820fc96e57f380dbddbe673423362925bbbd52f8fa98e3e8ce8f108c7999e520391db7a076c03351d83c80b662e1edb6a6e0f71a2d9b3aed8445d659eb8e16 SHA512 77e408a5f34d83abebef58df665767be4a059868f77a5e03f4edb29e20a317e4da057b7b6d473d55c9d398e24c389e911cd9153af9934f4b95d1a6b8bc6147ed
 EBUILD llvm-ocaml-16.0.0_rc3.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 EBUILD llvm-ocaml-16.0.0_rc4.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 EBUILD llvm-ocaml-17.0.0.9999.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0.ebuild
new file mode 100644
index 000000000000..d5f0179fb951
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/ppxfind/Manifest b/dev-ml/ppxfind/Manifest
deleted file mode 100644
index 717a087b5435..000000000000
--- a/dev-ml/ppxfind/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ppxfind-1.4.tbz 4083 BLAKE2B 3661827c897a74af21f0d10c9435b74845fc4832cb1b50a510fdf7c33cd877faee5ddcb8307c65903a4692fcb58ca264e0c0b44433a34a59a12f8eb2917e12e9 SHA512 f80b0ee09fb536aa9f154da80d06a1b68ba3b10605fb7338bd6449beb5c8d00e983bf66b4a63e12659ae1410fea56d0a2c4cfd43584616438504628035bcb981
-EBUILD ppxfind-1.4.ebuild 463 BLAKE2B 9f1b416fd01c6621dd0b56642f6ad9713e34a1697472e01769cbcd2c5bcc11b5040ae34c819a1231750e2398c8cd2f6a9e0f9526556414f58d9ae88fdd32c3fc SHA512 4f87f4d8cb90357d95492386a05e2fe710426fafe0abfb304d53969333c863dd59fe204cde6a700bcbdb165b5be0e4d63be19c289729946a3ecf0c77a33d6436
-MISC metadata.xml 415 BLAKE2B 22236aa2a77c6b76037d8dda103ac7ad700e7d45f9b2251ddbe79e94e0d78ebe94f88ed2ac50a452584675eb2e2a424cbe0a2a251199498689d11c9b4f70a837 SHA512 cbf1dc85338df76b4341172fcded00ff727fb08590dbb05e5d53cb529f22290d2a4d07c385a6a0f2aaa34efdec63c638e8f3ca60332f1f7b2a51d5570aac7d96
diff --git a/dev-ml/ppxfind/metadata.xml b/dev-ml/ppxfind/metadata.xml
deleted file mode 100644
index 8eb95a3e7a89..000000000000
--- a/dev-ml/ppxfind/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">diml/ppxfind</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ml/ppxfind/ppxfind-1.4.ebuild b/dev-ml/ppxfind/ppxfind-1.4.ebuild
deleted file mode 100644
index b964ae76cb11..000000000000
--- a/dev-ml/ppxfind/ppxfind-1.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="ocamlfind ppx tool"
-HOMEPAGE="https://github.com/diml/ppxfind"
-SRC_URI="https://github.com/diml/ppxfind/releases/download/${PV}/${P}.tbz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="
-	<=dev-ml/ocaml-migrate-parsetree-1.80:=
-	dev-ml/findlib:=
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/stdune/Manifest b/dev-ml/stdune/Manifest
index 2a220ad1fd6d..2bce79f426cd 100644
--- a/dev-ml/stdune/Manifest
+++ b/dev-ml/stdune/Manifest
@@ -3,9 +3,9 @@ DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7
 DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9
 DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be
 DIST dune-3.7.0.tar.gz 2010139 BLAKE2B 045fc6ee033325b074aac869c32b55f243bc561b796adfb83011f7ef95352bc0d8161fbb563744286ef145323b59a2854534c4e366532894a1ba5ff78a615f32 SHA512 f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239
-EBUILD stdune-3.0.3-r1.ebuild 845 BLAKE2B 4011992b54716bd47eb10da5a4e09bd9da930ea75be0f6b4073b7410c3aebcbd56d542e391337af936cec2b8e240f5f53cc5fbdf693fb072a78d0bec6685696f SHA512 30d5e3cfb21628f9fa2846302e8e69e18f1b0f72af47399fb9e1b16faabac03549f2ee550a052468512550acf59a729aa445a31773def2a2bc465f58735d5290
-EBUILD stdune-3.2.0.ebuild 763 BLAKE2B 4634b9d4888a26a8b29fe94b392151b01b74e4e00dc02c47a8a52326af7f358ec30c459441ad6ae2aff8a0572c8914c51c0726011a5c9ae349e92b1e14adc605 SHA512 6e0ae98827b3144cb6d922ee5aec046b1384fd4c49b5b8ab71a9f58585b1197652648380905a656c33accaceb99bd83b708ab7976996f853ceb1a1b3fcbec2a7
-EBUILD stdune-3.6.1.ebuild 765 BLAKE2B e5e85dee353dbf93d01520f2f202ee1aaadfc1f08cd347b5940950a0147be3f3a0d658ddcc329e4f67c39f2f43976ee07b234f697989d6d3812fa5b1dd538534 SHA512 e64fc40b0972527719ef420f7f33906c02f9a4c623cede9ac88c907675586202c14e7b54bd686440e8f702289e8a167cdfd10c2fc78bb9a523e1c1e2123979f0
-EBUILD stdune-3.6.2.ebuild 769 BLAKE2B 83c174cfe1e9e91d77d69b73e31a861119c6cce7f61331203eaa1e7a47973ac565c2416f56a9a2a90b23f9c67f04904d94d2926f7b9969a3ba2aecc5f6694ba5 SHA512 803597cd486931cf3dd716aa6d1fd796cce4ab0818435822d7316b12d75a477e4859a9cbf40f5970b3ccd0971927a18bd21d96ac98bdf951fc3fa35e721e08a7
-EBUILD stdune-3.7.0.ebuild 770 BLAKE2B b7ce0957db2dc97796e5d48bf286042d1bc7642b3704ea46e8e749efa567d54621ca72bae0d2937552dea290c96037ec32799b32ea8c0179e4ad0dee61f4211d SHA512 45c34d1eec5bd0a2976f4acab468826cb4ebfeae4ab856c08d8daeaa5a68a8c035edf828b940f203bd7a0461a66b4cf19028fe4a5e02791737171e37842a653e
+EBUILD stdune-3.0.3-r2.ebuild 880 BLAKE2B 2ead44e52c3f7a95b40f7cf1fb9ac4ce6e6ea1d0033b349db4fcec2a4d676c34449516fcb73101ced3f5e3e2abdc6d44a9901778dfd610fb65eb4d07f919195d SHA512 cbbb5c0cc62cd24f0ad4df2415cb33077527f2f6ba31af69d832d56733f2fa2c78b28c7ce30ce37668b74b02f4f1f4a6e418871a4a56b9422188ee74ec2a0546
+EBUILD stdune-3.2.0-r1.ebuild 798 BLAKE2B 34a506ce7f21df10539ddd5ce3459c62bc3141bec6a36f6d9a93077e3a8fa7ca10b58763fa6397538600c9e449661dc3acf9c761cad6bf0e156b4d0fff92663c SHA512 b70c6909e49e9e19cac20d9485f4dfee157fd5996d3142cee4d8e85e4a109b39cb5bb6e384ffacc7293da344e30d6b433c02238e6bf25710252e06a9167f50ee
+EBUILD stdune-3.6.1-r1.ebuild 800 BLAKE2B 91a0e8cb7157b6526b7833547d02822ad6a549d9046c246d6b45ef8157199e432f66d22d8c57e51347439c06527e5a0973243e5ec09208b4d09e4e5e356c0f1b SHA512 8923cea1f10501f78d9c508a3b8bb78edf6c852cb0750668f1ca0810c60d7f3099b29f48cfebe2512a4dda4f02b5d69e6106da7cfd54b53f9e31d6cb671ed652
+EBUILD stdune-3.6.2-r1.ebuild 799 BLAKE2B 15080bfc4ea1d21e5d478e469db27be133023573747fbd51e5d02d88ff4c0f77157fde8cc94a10c181facf0cf170774a0d9127ddea771fdbaffeba9aecc340ef SHA512 902fefbba7e7e552a76bfe93104a3d4afab63b087de5e22d55e65b0183045cfbf0cc85c70a141281ea6c8d82cfd467d1e47110934e301bf328f16ad79acaf5cc
+EBUILD stdune-3.7.0-r1.ebuild 800 BLAKE2B 91a0e8cb7157b6526b7833547d02822ad6a549d9046c246d6b45ef8157199e432f66d22d8c57e51347439c06527e5a0973243e5ec09208b4d09e4e5e356c0f1b SHA512 8923cea1f10501f78d9c508a3b8bb78edf6c852cb0750668f1ca0810c60d7f3099b29f48cfebe2512a4dda4f02b5d69e6106da7cfd54b53f9e31d6cb671ed652
 MISC metadata.xml 308 BLAKE2B 555692890c7fe4dee18d07e140384b70278e2a4a0230916a01ab9e5306776e0ed0d979e9a3487423fa1779a166da3038dca13273811e36593bb2b821b60cdfe0 SHA512 e50e28cb6f41fda295f12af1b94aba12dda8a7091322c0e7093d19ee60615d449bc1806354043e572d70aff1284e16b644b188911adbca60a2a5c8299fcee748
diff --git a/dev-ml/stdune/stdune-3.0.3-r1.ebuild b/dev-ml/stdune/stdune-3.0.3-r2.ebuild
index 57914cc6d34c..6899e81ace5c 100644
--- a/dev-ml/stdune/stdune-3.0.3-r1.ebuild
+++ b/dev-ml/stdune/stdune-3.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,6 +22,7 @@ DEPEND="
 	~dev-ml/dyn-${PV}:=[ocamlopt?]
 	~dev-ml/ordering-${PV}:=[ocamlopt?]
 	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/stdune/stdune-3.2.0.ebuild b/dev-ml/stdune/stdune-3.2.0-r1.ebuild
index 42c85b7e9d79..6eb7a8ea3f95 100644
--- a/dev-ml/stdune/stdune-3.2.0.ebuild
+++ b/dev-ml/stdune/stdune-3.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,6 +23,7 @@ DEPEND="
 	~dev-ml/dyn-${PV}:=[ocamlopt?]
 	~dev-ml/ordering-${PV}:=[ocamlopt?]
 	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/stdune/stdune-3.7.0.ebuild b/dev-ml/stdune/stdune-3.6.1-r1.ebuild
index 7ee771448037..8d82be573c81 100644
--- a/dev-ml/stdune/stdune-3.7.0.ebuild
+++ b/dev-ml/stdune/stdune-3.6.1-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="
 	~dev-ml/dyn-${PV}:=[ocamlopt?]
 	~dev-ml/ordering-${PV}:=[ocamlopt?]
 	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/stdune/stdune-3.6.2.ebuild b/dev-ml/stdune/stdune-3.6.2-r1.ebuild
index 9ab1a59d2ae2..c31152e785e8 100644
--- a/dev-ml/stdune/stdune-3.6.2.ebuild
+++ b/dev-ml/stdune/stdune-3.6.2-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="
 	~dev-ml/dyn-${PV}:=[ocamlopt?]
 	~dev-ml/ordering-${PV}:=[ocamlopt?]
 	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/stdune/stdune-3.6.1.ebuild b/dev-ml/stdune/stdune-3.7.0-r1.ebuild
index 8a902b92cec8..8d82be573c81 100644
--- a/dev-ml/stdune/stdune-3.6.1.ebuild
+++ b/dev-ml/stdune/stdune-3.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,6 +23,7 @@ DEPEND="
 	~dev-ml/dyn-${PV}:=[ocamlopt?]
 	~dev-ml/ordering-${PV}:=[ocamlopt?]
 	>=dev-ml/csexp-1.5:=[ocamlopt?]
+	!<dev-ml/dune-private-libs-3
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index cc3fcfa27a22..0997d66ab272 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp-jinja2/Manifest b/dev-python/aiohttp-jinja2/Manifest
deleted file mode 100644
index fc7ccf4b9da0..000000000000
--- a/dev-python/aiohttp-jinja2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aiohttp-jinja2-1.5.tar.gz 54608 BLAKE2B 3271e159f1022023b3d9f96b0f534b04898e0774d6ceefa19bf8958a835d499a1598fd12cabab8206448a0e89a107816577d596bff0c45a4947fcb7289c35e5b SHA512 230fec6e54fa55e22be3bc09ae1896cd12834eda5721c1d698c8482f9529b443ccf13a4db24bd9ccd179c36b9cdc90abbb848f287e7ed79e621d6a2976b1fa32
-EBUILD aiohttp-jinja2-1.5.ebuild 811 BLAKE2B db9859c84a2de76fb9ba647e0cda2ecb5182adbc6a2c2724226b4bb9fffff8629467fef0f8413f9ecf0d03ded9fc80e4ce7e6abac39e7dab858e284a2200fa55 SHA512 8e0a50e34dad54fd5ae30c2645343ddb7f680eb462ff53f694ac2bd7dc940d91d6e8431eaff6ea71738f6de88db61e069b720f2ba10869b6ed0612ab3b318b26
-MISC metadata.xml 510 BLAKE2B 457c273ba13d29037a79881015007652f8f9f3e5956dc997fcbc5e38294ae8ce7df81f0f8cd10a9bf97d371633d93cc59887067dbdaac5b9b6421b147ba332c6 SHA512 34398a5c6e57b87803ac705807c33b5080d87439288bd658a1191587662922e28755fe58fc39d42d4f4680fc890bfe6ddca6d17bf2472fe70446e1aa5e0c7456
diff --git a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.5.ebuild b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.5.ebuild
deleted file mode 100644
index c7c3f064c830..000000000000
--- a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-inherit distutils-r1 pypi
-
-DESCRIPTION="jinja2 template renderer for aiohttp.web"
-HOMEPAGE="https://github.com/aio-libs/aiohttp-jinja2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/aiohttp-2.3.9[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( >=dev-python/pytest-aiohttp-0.3.0[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/alabaster
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:--cov=aiohttp_jinja2 --cov-report xml --cov-report html --cov-report term::' \
-		setup.cfg || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/aiohttp-jinja2/metadata.xml b/dev-python/aiohttp-jinja2/metadata.xml
deleted file mode 100644
index 99353370c1be..000000000000
--- a/dev-python/aiohttp-jinja2/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">aiohttp-jinja2</remote-id>
-		<remote-id type="github">aio-libs/aiohttp-jinja2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/alagitpull/Manifest b/dev-python/alagitpull/Manifest
deleted file mode 100644
index 603ce0428265..000000000000
--- a/dev-python/alagitpull/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST alagitpull-0.0.23.gh.tar.gz 6692 BLAKE2B 63af3da6e98521487fad233dd648d9217d8e89c0d17e49dd771e934c0808a52c0659661ca8104c53c2d0fddf458650458e676e14b2e9c3820f353ab42044a490 SHA512 1620c0e25299f694f29f6e54105a2f336dee90535370a691a6e23a879a68626ef4aa19ae40ecc835553fe3b0272d48e4f5213c1ada054ad20d47034fc20dea3c
-EBUILD alagitpull-0.0.23-r2.ebuild 556 BLAKE2B 32247f7d209412a2d4500702d84c3568dfe23efeb6d3aa61ba5c1447da97c8ef543a588095e74b6f21783fe66f312a376e2144e6703ddc00b4b8a2f94d917878 SHA512 a7561a80d1bb10c2b155da21a77941a26e9966203fabb09edb76c8359f83b917ee81e22f37f1ebdb89fd856d4432280a67d797c26a3011c5b7ebe9d9a75646a6
-MISC metadata.xml 347 BLAKE2B 7f394b6b5262adc148a746a72308a74d8b7ae3d9c0896c775779415c3a4119026593957a58ea08bdf621309865759a4856a63221d3925258a34e026c1fd61044 SHA512 a5b91da9672da28f77f1ce059f00965de86de54b3f7b45a580b5d5509d42a38f256cf6525cc87a52cf0203713fd81f8cef06fd4dc8a1febf6c7690d6db57dcb8
diff --git a/dev-python/alagitpull/alagitpull-0.0.23-r2.ebuild b/dev-python/alagitpull/alagitpull-0.0.23-r2.ebuild
deleted file mode 100644
index e62d6fb5a7fc..000000000000
--- a/dev-python/alagitpull/alagitpull-0.0.23-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="alabaster sub-theme used on git-pull docs"
-HOMEPAGE="https://github.com/git-pull/alagitpull"
-SRC_URI="https://github.com/git-pull/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
-
-# no tests...
diff --git a/dev-python/alagitpull/metadata.xml b/dev-python/alagitpull/metadata.xml
deleted file mode 100644
index 3e917c0dee29..000000000000
--- a/dev-python/alagitpull/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>chutzpah@gentoo.org</email>
-		<name>Patrick McLean</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">alagitpull</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index ac5319db854f..28c73d05e19b 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -2,7 +2,9 @@ AUX argcomplete-2.0.5-test-install.patch 868 BLAKE2B 877ea4cb5f2793e0c641e306630
 DIST argcomplete-2.0.0.tar.gz 54164 BLAKE2B 77da149b07d4019f8d6f3dda8fd9bbe9953c25b8461ab0746e1c2eb4d1bb51a9007c1f046ad9dc41dc5f8f248fbdf18ad7d921cf644fbc7580661084fd1427a1 SHA512 ef2a551e1372ecf3739006fe2c020e9f7ec53c5809680dcd3d9d552290565d8d09ba22bcc989f40644120a129b101f8e2e8ed34723e947a7d8d7884e9b502c31
 DIST argcomplete-2.0.5.tar.gz 54665 BLAKE2B 33b3c1d6ba4b6fe6ac959db050d4944411a3ef6e737b9ae16f70d1e2cdd6cea0c2534ac4f4edce63df3606a18b9d8e16831a14db655cdd9cb4c2ad3afed60c72 SHA512 6354f2f67a5d0ff35539c2c4fa5ab5b78d3e57648ee2436da7b3916044d568d8558316a3e2b34581c97540c4a9f2191869fb215f0020ce09416d7b31377252e5
 DIST argcomplete-2.1.1.tar.gz 54042 BLAKE2B f4d1825306a17a873e3b3a9f23fea20ba29c4956ffc3228de4737b5be6280a3f29214a9e96bf5123220b2bd0b0fd88e77aa4d1487ef715af4e353fab0e2827a5 SHA512 3d37059713d953037421f2a3a2de1f3de7d2073423bce16187ffd47d24edbb72778ca2513ecb52c68ed6a3f89999da85770af36d07fded4ab1b41693a2ef2836
+DIST argcomplete-2.1.2.tar.gz 54114 BLAKE2B 19d29eb26c8d77998dcba51c263f49800ff98f22038964faf63d7b5963e8d62ca71ade9493937014f2e030add8a7d1032e2fdffce28765e12164906499cd2bcb SHA512 a91e3c0274c780da173659524f166b98f55342e54fbd38583757e65350b2288ea0e7f5acee7cb83b11478eda1b9b0f82ae6b0f559d7104c4ed67a6e1c9befa24
 EBUILD argcomplete-2.0.0-r1.ebuild 1089 BLAKE2B e66557e03dbc1a25ad16ea823cc43d35137ea0211519c7784bee1e4967c16c0c7afb16a09ac2e81b4ac4bfc2e5a7a7712aaf7ca6a8f524d8a63fb84e9d78ec57 SHA512 f631d7973f388954b0425ba824ba493d81c730a621b919a21ca89791b239d5ba6f2fde39cb3eb3f3584a0923b06260484e0a9b2b4ff54eb91a3e720222a5dff2
 EBUILD argcomplete-2.0.5.ebuild 944 BLAKE2B 735d5fe1ea7774901b13e38113c6485c0975296a3cbad400fc7091c24f6829174ac9f883955f4e75174723571c10d88427382130e755641fbe7e82f4f74f9ce6 SHA512 465b258daefedb95ad216dd5caae4ed37b788167b78db313ed147e397f85af5956a304f9bb0d46b1563b9b391185f12c70a21c2b1a42c6733a5578e1fa245cc7
 EBUILD argcomplete-2.1.1.ebuild 879 BLAKE2B d4137f761a2cd59f6adf0cf2342b15d081bfd70914f443e0ea5465018fb32761cb00c6709201b81dea15e46bd584900e1942795aa40a5e2cce2ba4ee03ce6f0d SHA512 339d99564a1b8b69a4080f102cb7484184f6389c1531cbd40838a119c10137d56ba403bd05eaa783341a44a8add84853c6d499c807c9fcbaf585250864b56d5b
+EBUILD argcomplete-2.1.2.ebuild 879 BLAKE2B d4137f761a2cd59f6adf0cf2342b15d081bfd70914f443e0ea5465018fb32761cb00c6709201b81dea15e46bd584900e1942795aa40a5e2cce2ba4ee03ce6f0d SHA512 339d99564a1b8b69a4080f102cb7484184f6389c1531cbd40838a119c10137d56ba403bd05eaa783341a44a8add84853c6d499c807c9fcbaf585250864b56d5b
 MISC metadata.xml 411 BLAKE2B 963cfdba9183fde9e97c534345164d26be569d841dcc6fd274601b18d5de2ae97fa837b0acfdc59616c5d19cc54ea368547ffd901f90239cdfb5ba08e8721607 SHA512 22db237979be34053ad7201f599d576a7756b71e6b75c40c2808d47f276cce6d3594ae46dcaec5aa5adab9e9e24e11d47bb9044a8b1a146163d66687965cf5b7
diff --git a/dev-python/argcomplete/argcomplete-2.1.2.ebuild b/dev-python/argcomplete/argcomplete-2.1.2.ebuild
new file mode 100644
index 000000000000..4c9150727c75
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-2.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="
+	https://github.com/kislyuk/argcomplete/
+	https://pypi.org/project/argcomplete/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pip is called as an external tool
+BDEPEND="
+	test? (
+		app-shells/fish
+		app-shells/tcsh
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pip-19
+	)
+"
+
+src_prepare() {
+	sed -i -e 's:timeout=5:timeout=30:' test/test.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" test/test.py -v || die
+}
diff --git a/dev-python/berkeleydb/Manifest b/dev-python/berkeleydb/Manifest
deleted file mode 100644
index e67cf03c3a62..000000000000
--- a/dev-python/berkeleydb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST berkeleydb-18.1.5.tar.xz 138488 BLAKE2B 1131509f30316469cfed30abdbd672ab73ef7dfc957e16935d04066b4a2efeb3c777ae4f70f821a29f4d8b8b51d649998735eb412639cc52997c9ee4a98c51db SHA512 c7a51e96cf32b74188b0cb4ed1d8b87436b30dc4929ba22180677ffb5eacd455a67eb5a231c814fc46ccc4c6a5da2f41876a343228969eab988bb0766d40a751
-EBUILD berkeleydb-18.1.5.ebuild 1864 BLAKE2B df8c54a4b4cc06f34d2f30156564206ce1548544ef23d9d541741f3346e3fc2b08f2779eb3622bdb490a98e5f9937aa913b9c5e58744e331173b1d41a1f00e9b SHA512 037ff698f5916d7e7b249420229bc6ac598e8d4a9986d3e37c217fa5744ea5d8e7dce4aadc166536ea5f1520db754689b0c23ce7b91d43adaee7bb53ae398994
-MISC metadata.xml 324 BLAKE2B 0741c4e1875fa2e306979097f6cc2fe13e9dda41f6aa49e54322289776387f97f399caa9ce79778dfeb8f4841a1b0cb3674e5748f556fbd5b116e97277a9a8ad SHA512 8eeeebb33f5cddbf7c841809d61f363f44757960ad5c71c84f1afa45c77d7e7c2ac5af226bfb0bd0348f4fb9167d2e9627b43b76951ca1abbdf514264feb9a56
diff --git a/dev-python/berkeleydb/berkeleydb-18.1.5.ebuild b/dev-python/berkeleydb/berkeleydb-18.1.5.ebuild
deleted file mode 100644
index fc5d886754b3..000000000000
--- a/dev-python/berkeleydb/berkeleydb-18.1.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit db-use flag-o-matic distutils-r1
-
-# Tests aren't included in PyPi tarballs, so just manually clone from upstream
-# at https://hg.jcea.es/pybsddb/ and prepare out tarball
-
-DESCRIPTION="Python bindings for Oracle Berkeley DB"
-HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/berkeleydb/"
-SRC_URI="https://dev.gentoo.org/~arthurzam/distfiles/dev-python/${PN}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	|| (
-		sys-libs/db:6.2
-		sys-libs/db:5.3
-		sys-libs/db:4.8
-	)"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	# This list should be kept in sync with setup3.py.
-	if [[ -z ${DB_VER} ]]; then
-		for DB_VER in 6.2 5.3 4.8; do
-			has_version "sys-libs/db:${DB_VER}" && break
-		done
-	fi
-
-	# Force version.
-	sed -e "s/db_ver = None/db_ver = (${DB_VER%.*}, ${DB_VER#*.})/" \
-		-e "s/dblib = 'db'/dblib = '$(db_libname ${DB_VER})'/" \
-		-i setup3.py || die
-
-	# rename to bypass name conflict with builtin test module
-	mv test.py test3.py || die
-
-	# Adjust test3.py to look in build/lib.
-	sed -e "s/'lib.%s' % PLAT_SPEC/'lib'/" -i test3.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# These are needed for both build and install.
-	export BERKELEYDB_DIR="${EPREFIX}/usr"
-	export BERKELEYDB_INCDIR="$(db_includedir ${DB_VER})"
-	export BERKELEYDB_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	export YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=1
-
-	if use ia64; then
-		# bug #814179
-		append-flags -fno-optimize-sibling-calls
-	fi
-}
-
-python_test() {
-	"${EPYTHON}" test3.py -vv || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/berkeleydb/metadata.xml b/dev-python/berkeleydb/metadata.xml
deleted file mode 100644
index 13dbb5909e0a..000000000000
--- a/dev-python/berkeleydb/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>arthurzam@gentoo.org</email>
-		<name>Arthur Zamarin</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">berkeleydb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
deleted file mode 100644
index 45aefbb2a13e..000000000000
--- a/dev-python/blockdiag/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST blockdiag-3.0.0.tar.gz 2694464 BLAKE2B 18887a48e0aa8293703e45746ee68c7c11accfaddf11d0d02af446c769404ce1666c2587b3e212cc48f4fb09bfa6169931c42a024adb739ce9223ccec862905a SHA512 e0e588941c5212a924068cc0b3953b670089e33c385ea8ce52fc54f5ca79414fb12217eba1052c5384c9f2fd81e79304639c9604cdc4a6464f7c221bb67ef267
-EBUILD blockdiag-3.0.0.ebuild 1604 BLAKE2B 84d592982a8a0c0373ab754ba99643bdcd9f8ea3c9ce0ace39286e6c3fd9df3790c346aa74df31642ac8cc57d4d95a7f233f443aa38c592242e3d2779c972ba3 SHA512 0cb62582e56ad825ee61a095abdf8c2e077279b0a6397f26a37fa4af21a098c3152a414bcf2924b2301d615dc764ae5e2d91121353790b9ab1d14945edc3828f
-MISC metadata.xml 796 BLAKE2B c6e8c55b3d8e32369c0b1ad002fdac48a1d656b878a64fcb036023b43fd96168b2307424d7672a74852b986d4cfcd06d631a3c3429b57e08afdea9fb7eb1ac61 SHA512 439109f06cfc5b9ea784cc062d97e5fe10799cd1756b84452e89c84715903f2ce2711fdb7599b4ad0e978f50b22921e9b110b4e47acc3d4fd9ad5f8243f7bf21
diff --git a/dev-python/blockdiag/blockdiag-3.0.0.ebuild b/dev-python/blockdiag/blockdiag-3.0.0.ebuild
deleted file mode 100644
index 4de7487d5084..000000000000
--- a/dev-python/blockdiag/blockdiag-3.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Generate block-diagram image from text"
-HOMEPAGE="http://blockdiag.com/ https://pypi.org/project/blockdiag/ https://github.com/blockdiag/blockdiag/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/funcparserlib-1.0.0_alpha0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.0.0[${PYTHON_USEDEP}]
-	dev-python/webcolors[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/reportlab[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		media-fonts/ja-ipafonts
-	)
-"
-
-distutils_enable_tests --install nose
-
-python_prepare_all() {
-	# disable tests requiring Internet access
-	sed -e 's:test_app_cleans_up_images:_&:' \
-		-i src/blockdiag/tests/test_command.py || die
-	sed -e 's:ghostscript_not_found_test:_&:' \
-		-i src/blockdiag/tests/test_generate_diagram.py || die
-	rm src/blockdiag/tests/diagrams/node_icon.diag || die
-
-	# By some reason it is needed - recheck on next bump
-	touch src/blockdiag/tests/diagrams/invalid.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	ALL_TESTS=1 distutils-r1_src_test
-}
-
-pkg_postinst() {
-	# TODO: Better descriptions!
-	optfeature "PDF format" dev-python/reportlab
-	optfeature "misc extra support" media-gfx/imagemagick
-	optfeature "Ctypes-based simple MagickWand API binding for Python" dev-python/wand
-}
diff --git a/dev-python/blockdiag/metadata.xml b/dev-python/blockdiag/metadata.xml
deleted file mode 100644
index 4162bc28780e..000000000000
--- a/dev-python/blockdiag/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<maintainer>
-			<email>i.tkomiya@gmail.com</email>
-			<name>Takeshi Komiya</name>
-		</maintainer>
-		<remote-id type="pypi">blockdiag</remote-id>
-		<remote-id type="github">blockdiag/blockdiag</remote-id>
-	</upstream>
-	<longdescription>blockdiag generate block-diagram image file from spec-text
-	file.  Additional functionality is available with <pkg>dev-python/reportlab</pkg>
-	(pdf's), <pkg>media-gfx/imagemagick</pkg> and an imagemagic python bindings package
-	named wand (available from pypi).
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 0c1b653e7f32..0b761d6681b2 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,4 +1,6 @@
 AUX cairocffi-0.8.0-tests.patch 827 BLAKE2B 81e1228f054ccb46b6c3170319fbd47aead8bdbb0b7af8e60cf85391c673d86e3eb1218a393c9b454d3d94b88968421ed9f3d798cc1d28ba7510bc75ad3ec261 SHA512 3fc7c2785586f88b17864931528e8c8e25792855107e5e8b76aa79a198303b68bd8cc822a2a5ff7a646c9f11982a3b5992a9eeb3bd651bbde1792d13a1410021
 DIST cairocffi-1.4.0.tar.gz 69851 BLAKE2B 8037d9bc619d2e96e655dc4682bb95a1e920d0b2188963088c1be21f2e157f7e791f3994f0ae7ecd338547baf2a65d03b175398bc1b3c92145ae6ea148420b5a SHA512 7ffdaf365c1251b202e2680a2f689ec6ea04c19eb75df38137624ffeb429ab61c6f54af450aec019b2570a4e91d2d701328109e4e0f5662a3b3b655ab53705ff
+DIST cairocffi-1.5.0.tar.gz 86811 BLAKE2B c8f6a39608f0db6d0b7730302437a8856a3dd7249ed275733a048b5c8f98b3484787ccecf70bae1053ee052b9a7c8c7d2da699dbbde0f34cea2ef8bbabe2fc6f SHA512 32ee1d1217a0300512b60c11fc3c9a0456e4a74a9c5364840e51e52a1320a2e26a3d2ed761615ce5fee247bcd2c713c099d3419b731c37fa812040d5f6f3096b
 EBUILD cairocffi-1.4.0.ebuild 927 BLAKE2B d8ee16540e8495e36c2ea53fc0a02ebec035d52e9e96ae7434aeef28827bd86b69253b989cda30980289c1412c214c436eb16f5ea6d69ab1762cf4cf6424d0fd SHA512 b57881771ca23d12bd5b8f6076991f07c9bd4898b7b7655f8f0ce629dfb9c9fb2afba0a0e4686a4566f7372b4d9b09a471d32d8618bb39a89aa88fd52d19857b
+EBUILD cairocffi-1.5.0.ebuild 1099 BLAKE2B 043b8fde20638038041ea9e9c6f6ddf31a13f015ee70c9ce3cc376daf4ebca0214f9550d373b5f590407a84ea7d2e02f7c1a22dd7eaf64fe373e0c489cfeb798 SHA512 d86293285e4bd8913bad4ed39bf7314578ae18dd6bd35c1add2c8a1a39dcd1de668de32a94b44ac7ed6005a3e602f009fd5c898b362d5adfbe9bf90f0d87e4f9
 MISC metadata.xml 380 BLAKE2B e489f8f463877335d35d1ccd7b04247ff92e5bddeffd36d42a4d8d45f3d48962d704c4a2701b8df91bb38182ada14e19ec6f97c58250f7a9881728cfa319ee15 SHA512 d64dde8aa97fa923c5b13f23539774ebcf02d5ea14b50e01e98c6a3e2f63316ab08a235613fe4bedfc496dd7ffacc2f6e41ea5a2fad310b341ad3ac254b2a522
diff --git a/dev-python/cairocffi/cairocffi-1.5.0.ebuild b/dev-python/cairocffi/cairocffi-1.5.0.ebuild
new file mode 100644
index 000000000000..cbd409e79100
--- /dev/null
+++ b/dev-python/cairocffi/cairocffi-1.5.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# custom wrapper
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
+HOMEPAGE="
+	https://github.com/Kozea/cairocffi/
+	https://pypi.org/project/cairocffi/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
+	x11-libs/cairo:0=[X,xcb(+)]
+	x11-libs/gdk-pixbuf[jpeg]
+"
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
+	' 'python*')
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
+	' 'python*')
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pikepdf[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.0-tests.patch
+)
+
+src_test() {
+	rm -r cairocffi || die
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/citeproc-py/Manifest b/dev-python/citeproc-py/Manifest
deleted file mode 100644
index 50c443c867d3..000000000000
--- a/dev-python/citeproc-py/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX stop_test_from_accessing_git-0.6.0.patch 432 BLAKE2B c4b4696acf4619eb30ec3423743a0d3db76f4932c67afecca121f289fe2d144f0bf51e1c62847f09d083e741b4a586ca02adea8bde321edfe5ea3156c673d60b SHA512 79308abf6392436ce528e0a9713ee3d7af7345585e68510a7f5ecd8427e8f6c9a7bcebc7787935ae838e089c94a3f8b7cc472af99c735fb5c0f3626501c35f0e
-DIST citeproc-py-0.6.0.tar.gz 140624 BLAKE2B 169129c6be29a5a5c4678ccc2e2dd0b9ef58248ae66339ac32c6fab887058c7bbd2884d2ce959ce52287a622be4abded7e1ab06cae9c0952be47352671f951c4 SHA512 901a62c59189a652b589e4aa12e489f72f5ea40db1349fcdc0e4ffd6f5be8d364dccdc23cfab1a9003fbc672d75c5bdf06c74b9b5e1fcfb2c12e84df39fe1fb1
-DIST citeproc-py-test-suite-c3db429ab7c6b9b9ccaaa6d3c6bb9e503f0d7b11.tar.gz 990340 BLAKE2B acf02bec956765d0bea794a96ce7b86104c98aa4c0f8620dbfaeb7f16f37fe07e5b45883c04a1c639fad9098e3733339c90deaf8cdd794fadb8db1456972d16b SHA512 8653ea8968fa108c0814f43744f6e569a0a32cf4e82addec667f75a28b9c1fd9c7714c0c75a85e0d6f7f579e554494925ba4ab05e21e4dcb6b727d00b6a16df7
-EBUILD citeproc-py-0.6.0.ebuild 1121 BLAKE2B 7a0647ede5ce76fd146147c843fe0d348b0a8c6fc53d0c9898274b1a8942150cbc297e92bcee58280783f217a93b716e7bc9e87fd2b6e9a2418e7d146bd7cf8f SHA512 2b6c315006c6be49d57b926bac4677c70f023d63516641840844d87c8f3c3d4c818d612cd0e8806676a9e4afc5bf7a53ea4f732f1644e4959c10e6aeaf7d4ef3
-MISC metadata.xml 382 BLAKE2B 2d84f4b9844043338b0eb9f737dfef0495445b91a66d4b4aed910e87d7742ff5889dcf55fb0beed2f09042ed44415f4587e34a011ce7e4ad424079da3a74fd4f SHA512 de145eb60b314cd6f502b9f9115b5b034f3b72f0d3209c8e368ffcff0f4105ce4a88511d6599d6472092761d6800508a911a0765937aeb9b8782b1621d9488e6
diff --git a/dev-python/citeproc-py/citeproc-py-0.6.0.ebuild b/dev-python/citeproc-py/citeproc-py-0.6.0.ebuild
deleted file mode 100644
index b3938812ea05..000000000000
--- a/dev-python/citeproc-py/citeproc-py-0.6.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..10} )
-
-# Keep synced with tests/citeproc-test.py
-TEST_SUITE_COMMIT="c3db429ab7c6b9b9ccaaa6d3c6bb9e503f0d7b11"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Yet another Python CSL Processor"
-HOMEPAGE="https://pypi.org/project/citeproc-py/"
-SRC_URI+="
-	test? (
-		https://github.com/citation-style-language/test-suite/archive/${TEST_SUITE_COMMIT}.tar.gz
-			-> ${PN}-test-suite-${TEST_SUITE_COMMIT}.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND=">=app-text/rnc2rng-2.6.3[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/stop_test_from_accessing_git-${PV}.patch" )
-
-distutils_enable_tests nose
-
-src_prepare() {
-	default
-
-	if use test ; then
-		mv "${WORKDIR}/test-suite-${TEST_SUITE_COMMIT}" "${S}/tests/test-suite" || die
-	fi
-}
-
-python_test() {
-	nosetests -v --ignore-files=citeproc-test.py || die "Tests failed with ${EPYTHON}"
-	${EPYTHON} tests/citeproc-test.py -vs || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/citeproc-py/files/stop_test_from_accessing_git-0.6.0.patch b/dev-python/citeproc-py/files/stop_test_from_accessing_git-0.6.0.patch
deleted file mode 100644
index e04ff1be1b87..000000000000
--- a/dev-python/citeproc-py/files/stop_test_from_accessing_git-0.6.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/citeproc-test.py b/tests/citeproc-test.py
-index 11bd47d..8934700 100644
---- a/tests/citeproc-test.py
-+++ b/tests/citeproc-test.py
-@@ -288,7 +288,7 @@ if __name__ == '__main__':
-         glob_pattern = '*'
-         run_all_tests = True
- 
--    test_repo_has_updates = clone_test_suite()
-+    test_repo_has_updates = False
- 
-     # import the text fixture parser included with citeproc-test
-     try:  # Python 3.3+
diff --git a/dev-python/citeproc-py/metadata.xml b/dev-python/citeproc-py/metadata.xml
deleted file mode 100644
index 38432292de71..000000000000
--- a/dev-python/citeproc-py/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">brechtm/citeproc-py</remote-id>
-		<remote-id type="pypi">citeproc-py</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 458746638e9b..06182e37dc51 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,6 +2,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -11,6 +13,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 0452806a0baf8641d44d86c91b95958fe3bdef74fe62c32e6cb90c90ee8718c61fe9649d2f9ac17b127d65c64cba9093adee742f455be720ca2bf558131cee05 SHA512 5179df9990802cfcedcd59b8a38a6198cdfddb511fb872872c2e4cfc95531f114acb6bb43395c74659c6b46a42da32213e8312e2ed71b6e317a7270a12cfa214
 EBUILD clang-python-15.0.7.ebuild 1202 BLAKE2B b655ab7b2fa3a5334666e42d36e1e7773be8910f5a47fe8792be04fafbc0c9889cf74d5ca4671863b5244b874133bb353feb4b1ac119e52486ac18d3ff7c6760 SHA512 eb99a86e826ff46d78e1f97a7db1c867e0fc4c9d0036de31407d83dc4de1b8cf80e36ba186d6d8a825209bbb4312d7120b96cbf59d6cb5cf598a3ffb754bf75d
 EBUILD clang-python-16.0.0.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
+EBUILD clang-python-16.0.0.ebuild 1204 BLAKE2B 7147fb79338449b0a955f7f5010e8fdba34848f9fb84b9df9ceefbcc9c1829def49d7157054ef2f707225d2bff673b67d37b82b2fb373b75355583a205db6b50 SHA512 e99332305557a698a231391bad9ba6c1677c7cf13ab64d9c79e6900029f373face1b89acc55321305b12ab6cd70b946609d6352318467c0c11ea1c5d2efff425
 EBUILD clang-python-16.0.0_rc3.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-16.0.0_rc4.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
diff --git a/dev-python/clang-python/clang-python-16.0.0.ebuild b/dev-python/clang-python/clang-python-16.0.0.ebuild
new file mode 100644
index 000000000000..83f4d804e310
--- /dev/null
+++ b/dev-python/clang-python/clang-python-16.0.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/duecredit/Manifest b/dev-python/duecredit/Manifest
deleted file mode 100644
index 1c88f76e9a41..000000000000
--- a/dev-python/duecredit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST duecredit-0.9.2.tar.gz 80998 BLAKE2B 5b8689122909828cac3fb0ba5566ea28de7083c8cec777f92bfae4590cf1f3ddfc8f759872f722f0e3a3fdaff5178d8aa77d7c7cf2ee14a9aebb71df3647a8b3 SHA512 bb40dba6e3b9b214f2ec45bb9ed3e9056c608ab1eec31aa9ca4e101aae4263b602da5fe92a988ea403348583e8fbb0aec0ebd0178567d36f157607e80066877c
-EBUILD duecredit-0.9.2.ebuild 648 BLAKE2B d3fa1a66677edd489c042c994ba38697a7039e83f3fddbca26c976e1785e6e38e85f7ddae0d56849d0c3d7f0b90cec3620bc815ef6e4a3e45f78bb39160ab321 SHA512 e486ada85d3fd93be8ef7f14ed463585ee98db28440450bb0f0992c5b66c7026a98ed3eb548a01e5b942c9172d821eb959fc3da3efc988a96c0abf212c2b8018
-MISC metadata.xml 505 BLAKE2B 3e87a19e4a9f7f819f7f570b5309487175ba4efb9620acbc3c4f60fa1447c62c591221447cf4d2f46304e2381c11b8e85d53b7c1a4b5e7049dbc767fc5656894 SHA512 0d26812e3fea48b007f9e5a2d8d14f6b393bef29e24405ff02575c494466d399c9cddded080023d276faa99af6157aa3586f2b886d1131f3dda0e838f9d02ccf
diff --git a/dev-python/duecredit/duecredit-0.9.2.ebuild b/dev-python/duecredit/duecredit-0.9.2.ebuild
deleted file mode 100644
index 6a1444cfd12b..000000000000
--- a/dev-python/duecredit/duecredit-0.9.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Publications (and donations) tracer"
-HOMEPAGE="https://github.com/duecredit/duecredit"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/citeproc-py-0.4[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# internet?
-	'duecredit/tests/test_api.py::test_noincorrect_import_if_no_lxml_numpy[kwargs1-env2]'
-)
diff --git a/dev-python/duecredit/metadata.xml b/dev-python/duecredit/metadata.xml
deleted file mode 100644
index a18004074da3..000000000000
--- a/dev-python/duecredit/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">duecredit/duecredit</remote-id>
-		<remote-id type="pypi">duecredit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 15da6aaabdaa..f2e9aa3f5c47 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-2.2.2.tar.gz 677389 BLAKE2B a7385c619dee7c25538a69bc514393c6efa2ee3cbd8394cde28c64a41d7252b4f12896728bf76a4b8bf5247cf19614bd9b8f94d7d82f22a6a8073011286758fc SHA512 d330398829cb0393e07a4dcf495a3939f0e8f7962c0a517fc866d333425dffe1ce8fd26e39a40445259028d46eff4566e97b3f5eba0d6bddf14b9d7bac138945
 DIST Flask-2.2.3.tar.gz 697599 BLAKE2B 619902202443567bc79111c15f19d0bea9e03b0fbd406e43c1f9d994975d9f529f8e58823d9f828bb8164bac6b6631ba1c00c3a1587b00afcb802082565248bc SHA512 de119d032b04eef80a99cee9658cac12f934e9a66d7dbb8304588d0c1320a8a19a8b0a78f69134a20ca26aa408db8686436c5c108ecc39e16b1eca1a3dea2d2c
-EBUILD flask-2.2.2.ebuild 1512 BLAKE2B 536a05f33b9a86e467645eab913f7f45e0c9c8556cafc555211ed43ac39cf773b381f24882265c326de391934cdb6dd0f3ea2f2362e7756428f9edd469e2f8a1 SHA512 e5697d4a2daa0f0c28c905810a71a7d7b116c1dd1f15f1dd6c74c20c8b9a1b219c9c482d3313c9bb7480766e0ecaf0109d97fd633370bc6e62b0639560538522
-EBUILD flask-2.2.3.ebuild 1520 BLAKE2B 6ea8d19e0969c03337b2a4575691e7c93e539d5a42c1a377a151ce17fed550438c8341fb683d738d9dc5ac6120d135c360333859a3d22b1508396a4e6b4179a6 SHA512 e1cb8c65d34e7af9b0779681832d7ccb1b9407eb6bc43630a89952fb866db51ac944d7346f8dc48e9637d20e7105ae9f9a87b7ddf9cdf09f3e23283d2e4cb468
+EBUILD flask-2.2.3.ebuild 1512 BLAKE2B 536a05f33b9a86e467645eab913f7f45e0c9c8556cafc555211ed43ac39cf773b381f24882265c326de391934cdb6dd0f3ea2f2362e7756428f9edd469e2f8a1 SHA512 e5697d4a2daa0f0c28c905810a71a7d7b116c1dd1f15f1dd6c74c20c8b9a1b219c9c482d3313c9bb7480766e0ecaf0109d97fd633370bc6e62b0639560538522
 MISC metadata.xml 386 BLAKE2B b449c54b966bc8943f7b7b12d6126867a89a2759eb749c08f7ad53a174e93ecad07f09b5e30c8562c63ab05df75a82e2f48f550ea8cf3a546f5afc2eef5a896d SHA512 123334db31948046e47f3cdbe0237cdec3dc2207485c8243d1e34e065436995423b6a89909563a6158741a8cc62a7fdad95923870a7114cf69e58ef715e7ec5c
diff --git a/dev-python/flask/flask-2.2.2.ebuild b/dev-python/flask/flask-2.2.2.ebuild
deleted file mode 100644
index 96e92c5f7195..000000000000
--- a/dev-python/flask/flask-2.2.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
-HOMEPAGE="
-	https://palletsprojects.com/p/flask/
-	https://github.com/pallets/flask/
-	https://pypi.org/project/Flask/
-"
-MY_PN="Flask"
-MY_P="${MY_PN}-${PV}"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-2.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6.0[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
-		!!dev-python/shiboken2
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-tabs \
-	dev-python/sphinxcontrib-log_cabinet
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:httpbin
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask/flask-2.2.3.ebuild b/dev-python/flask/flask-2.2.3.ebuild
index 486b6e0ce985..96e92c5f7195 100644
--- a/dev-python/flask/flask-2.2.3.ebuild
+++ b/dev-python/flask/flask-2.2.3.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/gcs-oauth2-boto-plugin/Manifest b/dev-python/gcs-oauth2-boto-plugin/Manifest
deleted file mode 100644
index 98487f24de8f..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gcs-oauth2-boto-plugin-3.0.tar.gz 20908 BLAKE2B 85c20d8b39dde8ed8a0bad887572040b8eb1eab91b41558c57ef7c190fff9cc5e0502579881a08ed514de87d5fe91a393779e2de071a53bb21e2371f8f13c047 SHA512 84cef64c2b0cc5e38685bb39b3939c54ceced2c0995a67787bf3541bf8a93b91ffec3da83094b7d6957d5afb60833c5ba4ffe7fb688ba8aa943c5f72c719e93b
-EBUILD gcs-oauth2-boto-plugin-3.0.ebuild 1180 BLAKE2B ea14a7d9e41ccf2135b2592898791114aa95323d6fed6f48d767e9e563eed3df6045f143a3d40278391bfae3ca10160f9fb3b1b174ae32f39c99e7d22f02f6fd SHA512 f6092dc89a64f9fade5d24d632bcc065c47c14e118dcc644d7801b62228698e27f2dcd33e435deb471a7b4bfd97888e7358fdfa5c69a586265991690c438383f
-MISC metadata.xml 456 BLAKE2B 5846fe15c17d14329e1f44eea25bd0528750cb92c5b0abb1c2413775f13e4a37470a0d03a8a96af4c05cee69d552e913746cef73c7379fb93511f9a1567e9294 SHA512 13c1f905b7e732be95f44268c176fe4e15c0a7b27d64f7581bafc4c0ce943f66d21f3d025b4001e7284404e354f61a6e08a1a2119295918981f7271cb6f04625
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild
deleted file mode 100644
index e320e64b3231..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_10 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Keep versions in sync with setup.py.
-BDEPEND="
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
-	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.18[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	# Make sure the unittests aren't installed.
-	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
-}
-
-python_test() {
-	"${EPYTHON}" "${S}"/test_oauth2_client.py -v \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/gcs-oauth2-boto-plugin/metadata.xml b/dev-python/gcs-oauth2-boto-plugin/metadata.xml
deleted file mode 100644
index 11c87c7e15d0..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>zmedico@gentoo.org</email>
-    <name>Zac Medico</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">gcs-oauth2-boto-plugin</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/glooey/Manifest b/dev-python/glooey/Manifest
deleted file mode 100644
index fbdfb721b3a3..000000000000
--- a/dev-python/glooey/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST glooey-0.3.6.tar.gz 19115984 BLAKE2B 79254f44caa94364a08d9c04394c6fd38ef84ddf539c881938bc05e65cdd0374deb0a10b835c21dd6d83a34118c29ff0876583a6c26f2e1f73cad8ceb4f40bdf SHA512 06e53d9d67e4be6cd800c4090e76d982a664be760fc77e2b5666d1b486665f8eea79f0f8ea58ff49b06b550e580cd2a5d4238f06f349613d323334b80de6b81c
-EBUILD glooey-0.3.6.ebuild 836 BLAKE2B 3fc1d2099dcf24341bbd5c6bbecd708ac98780bc726fa8c6a02cf633208d12cc26cdc368bb8a5e8797f5feae184af8f5b0c8005975878a890f5a33a43c56dd9e SHA512 b0acffe92827fbecefeabe9572f4b9a9ad93aba47281127f1919c0a2fc8f213bce140e9d5cb6c19c4d8642e8513c2f06a03f70e39a046fae55d416e06b35f5b8
-MISC metadata.xml 1125 BLAKE2B 3045cd6327a07210889b1b819922a6c79b851abaa8b8b0b0fba7898ecb3b227ad6c74297501dcb7027905b5ae7917d17e9cc3da3bc34a32ecbfaab91eb6d9547 SHA512 af00cc222f08d763097350a4e4d23ed97330a1edc231685592797e1a489a2e14c523729062b4f7db828705af9bcacec709dea10036d78c12eebed49a582c5f69
diff --git a/dev-python/glooey/glooey-0.3.6.ebuild b/dev-python/glooey/glooey-0.3.6.ebuild
deleted file mode 100644
index 223c7224d2e6..000000000000
--- a/dev-python/glooey/glooey-0.3.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_PEP517=flit
-
-inherit distutils-r1 virtualx pypi
-
-DESCRIPTION="An object-oriented GUI library for pyglet"
-HOMEPAGE="https://glooey.readthedocs.io/en/latest/"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	dev-python/autoprop[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/vecrec[${PYTHON_USEDEP}]
-"
-# Indirect dependency via pyglet
-BDEPEND="test? ( media-libs/freetype )"
-
-# Requires currently unpackaged Sphinx plug-in autoclasstoc
-#distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/glooey/metadata.xml b/dev-python/glooey/metadata.xml
deleted file mode 100644
index 87ff2cc0bf55..000000000000
--- a/dev-python/glooey/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <!-- maintainer-needed -->
-    <longdescription>
-        Every game needs a user interface that matches its look and feel. The purpose of glooey is to help you make
-        such an interface. Towards this end, glooey provides 7 powerful placement widgets, a label widget, an image
-        widget, 3 different button widgets, a text entry widget, a variety of scroll boxes and bars, 4 different dialog
-        box widgets, and a variety of other miscellaneous widgets. The appearance of any widget can be trivially
-        customized, and glooey comes with built-in fantasy, puzzle, and 8-bit themes to prove it (and to help you hit
-        the ground running if your game fits one of those genres).
-    </longdescription>
-    <upstream>
-        <bugs-to>https://github.com/kxgames/glooey/issues</bugs-to>
-        <doc>https://glooey.readthedocs.io/</doc>
-        <remote-id type="github">kxgames/glooey</remote-id>
-        <remote-id type="pypi">glooey</remote-id>
-    </upstream>
-</pkgmetadata>
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
deleted file mode 100644
index f41597e4faa2..000000000000
--- a/dev-python/google-apitools/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX google-apitools-0.5.30-py37.patch 5938 BLAKE2B efc0962d612017903092b7ed37561a09eb78f8b2c189d7c8bf902fd11b711676a230fed57f2671ac0d0c9fdddfbe66ac911d84ce1cfab64ed6b3a865d3ba1aaa SHA512 0cbeaf85568a23224c32647c1e3f6ce3a173093df1d40e36a8f2dd9155f19b3211fc926c054add955934104a069787d7cac03aa86efad526556f3255cdff98f0
-DIST google-apitools-0.5.32.gh.tar.gz 365913 BLAKE2B e43b21e6ce8491c89955bd6c194a1f4076988be2f67280c1bfb8184e1b83a01c307077080d182877d1306814bc38aa0541d9d417cfb93afdd766ddb3c83e0ef5 SHA512 5996d80cb08fd7de3b2df5fbdbe56c885af5d85276a44f174762ac71407227e454d338007035ba2b3deef09384e7bd389f121ea5e19e5e302a054f1033c19b6f
-EBUILD google-apitools-0.5.32-r1.ebuild 930 BLAKE2B 50fb4662169fc896bbf3ff59c36b11085f3d81543b74ffe58e6377072c4324ce4b95582bf43ee72d2a20e460c0f2d422e29e756a259d30edea3557ba5892dbd1 SHA512 f212ed89f659e58e76b30263f37f8755f32a745c2f4438382e5827c13279db35d4752c42364210ba14692f8474eb9bc491922f04e68edb7e2bea60ee1534257c
-MISC metadata.xml 374 BLAKE2B 7c5958972937c0faee293cb016f911f7b9514a0849251bdff06946061e5dfcc308c4016e4dc82ec84162127cdb69c6fb41136b19cac13b6c38c4e12a27728bd5 SHA512 df98a533627f967ecc240dcd839d9ef74445b07eafe15e1931481fd5b6a1521553f5b377c324cd1d8bf87db3d996b9cd5ddba362bc91450923a92b90c5be6fa8
diff --git a/dev-python/google-apitools/files/google-apitools-0.5.30-py37.patch b/dev-python/google-apitools/files/google-apitools-0.5.30-py37.patch
deleted file mode 100644
index 77f2c59b8296..000000000000
--- a/dev-python/google-apitools/files/google-apitools-0.5.30-py37.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff --git a/apitools/base/protorpclite/messages.py b/apitools/base/protorpclite/messages.py
-index 0d564e9..5b2346a 100644
---- a/apitools/base/protorpclite/messages.py
-+++ b/apitools/base/protorpclite/messages.py
-@@ -757,6 +757,7 @@ class Message(six.with_metaclass(_MessageClass, object)):
-       order.check_initialized()
- 
-     """
-+    __hash__ = None
- 
-     def __init__(self, **kwargs):
-         """Initialize internal messages state.
-@@ -1079,9 +1080,9 @@ class FieldList(list):
-         if not field_instance.repeated:
-             raise FieldDefinitionError(
-                 'FieldList may only accept repeated fields')
--        self.__field = field_instance
--        self.__field.validate(sequence)
--        list.__init__(self, sequence)
-+        self._field = field_instance
-+        self._field.validate(sequence)
-+        super().__init__(sequence)
- 
-     def __getstate__(self):
-         """Enable pickling.
-@@ -1098,10 +1099,10 @@ class FieldList(list):
-                 None.
- 
-         """
--        message_class = self.__field.message_definition()
-+        message_class = self._field.message_definition()
-         if message_class is None:
--            return self.__field, None, None
--        return None, message_class, self.__field.number
-+            return self._field, None, None
-+        return None, message_class, self._field.number
- 
-     def __setstate__(self, state):
-         """Enable unpickling.
-@@ -1115,41 +1116,43 @@ class FieldList(list):
-         """
-         field_instance, message_class, number = state
-         if field_instance is None:
--            self.__field = message_class.field_by_number(number)
-+            self._field = message_class.field_by_number(number)
-         else:
--            self.__field = field_instance
-+            self._field = field_instance
- 
-     @property
-     def field(self):
-         """Field that validates list."""
--        return self.__field
-+        return self._field
- 
-     def __setslice__(self, i, j, sequence):
-         """Validate slice assignment to list."""
--        self.__field.validate(sequence)
-+        self._field.validate(sequence)
-         list.__setslice__(self, i, j, sequence)
- 
-     def __setitem__(self, index, value):
-         """Validate item assignment to list."""
-         if isinstance(index, slice):
--            self.__field.validate(value)
-+            self._field.validate(value)
-         else:
--            self.__field.validate_element(value)
-+            self._field.validate_element(value)
-         list.__setitem__(self, index, value)
- 
-     def append(self, value):
-         """Validate item appending to list."""
--        self.__field.validate_element(value)
-+        if hasattr(self, '_field'):
-+            self._field.validate_element(value)
-         return list.append(self, value)
- 
-     def extend(self, sequence):
-         """Validate extension of list."""
--        self.__field.validate(sequence)
-+        if hasattr(self, '_field'):
-+            self._field.validate(sequence)
-         return list.extend(self, sequence)
- 
-     def insert(self, index, value):
-         """Validate item insertion to list."""
--        self.__field.validate_element(value)
-+        self._field.validate_element(value)
-         return list.insert(self, index, value)
- 
- 
-diff --git a/apitools/base/protorpclite/messages_test.py b/apitools/base/protorpclite/messages_test.py
-index 3ad75e4..1acdab3 100644
---- a/apitools/base/protorpclite/messages_test.py
-+++ b/apitools/base/protorpclite/messages_test.py
-@@ -508,7 +508,8 @@ class FieldListTest(test_util.TestCase):
-     def testPickle(self):
-         """Testing pickling and unpickling of FieldList instances."""
-         field_list = messages.FieldList(self.integer_field, [1, 2, 3, 4, 5])
--        unpickled = pickle.loads(pickle.dumps(field_list))
-+        pickled = pickle.dumps(field_list)
-+        unpickled = pickle.loads(pickled)
-         self.assertEquals(field_list, unpickled)
-         self.assertIsInstance(unpickled.field, messages.IntegerField)
-         self.assertEquals(1, unpickled.field.number)
-diff --git a/apitools/base/protorpclite/protojson_test.py b/apitools/base/protorpclite/protojson_test.py
-index 7a8f875..69804f5 100644
---- a/apitools/base/protorpclite/protojson_test.py
-+++ b/apitools/base/protorpclite/protojson_test.py
-@@ -440,7 +440,7 @@ class ProtojsonTest(test_util.TestCase,
-         """Test decoding improperly encoded base64 bytes value."""
-         self.assertRaisesWithRegexpMatch(
-             messages.DecodeError,
--            'Base64 decoding error: Incorrect padding',
-+            'Base64 decoding error: (?:Incorrect padding|Invalid base64-encoded string: .*)',
-             protojson.decode_message,
-             test_util.OptionalMessage,
-             '{"bytes_value": "abcdefghijklmnopq"}')
-diff --git a/apitools/base/py/batch_test.py b/apitools/base/py/batch_test.py
-index 90cf4fb..e1384c5 100644
---- a/apitools/base/py/batch_test.py
-+++ b/apitools/base/py/batch_test.py
-@@ -357,7 +357,7 @@ class BatchTest(unittest.TestCase):
-         self._DoTestConvertIdToHeader('blah', '<%s+blah>')
- 
-     def testConvertIdThatNeedsEscaping(self):
--        self._DoTestConvertIdToHeader('~tilde1', '<%s+%%7Etilde1>')
-+        self._DoTestConvertIdToHeader('#hash1', r'<%s+%%23hash1>')
- 
-     def _DoTestConvertHeaderToId(self, header, expected_id):
-         batch_request = batch.BatchHttpRequest('https://www.example.com')
-diff --git a/apitools/gen/client_generation_test.py b/apitools/gen/client_generation_test.py
-index 4e382dd..c26db39 100644
---- a/apitools/gen/client_generation_test.py
-+++ b/apitools/gen/client_generation_test.py
-@@ -42,6 +42,7 @@ class ClientGenerationTest(unittest.TestCase):
-         self.gen_client_binary = 'gen_client'
- 
-     @test_utils.SkipOnWindows
-+    @unittest.skip('needs network access')
-     def testGeneration(self):
-         for api in _API_LIST:
-             with test_utils.TempDir(change_to=True):
diff --git a/dev-python/google-apitools/google-apitools-0.5.32-r1.ebuild b/dev-python/google-apitools/google-apitools-0.5.32-r1.ebuild
deleted file mode 100644
index 8e201b95b35c..000000000000
--- a/dev-python/google-apitools/google-apitools-0.5.32-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-COMMIT_HASH="7975c0cdbae1b9fc106553ce46e4a59cf0bea1e1"
-DESCRIPTION="Python library to manipulate Google APIs"
-HOMEPAGE="https://github.com/google/apitools"
-SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${P#google-}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-3.1.2[${PYTHON_USEDEP}]"
-BDEPEND="test? ( >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/google-apitools-0.5.30-py37.patch"
-)
-
-distutils_enable_tests nose
diff --git a/dev-python/google-apitools/metadata.xml b/dev-python/google-apitools/metadata.xml
deleted file mode 100644
index 837b1fee7452..000000000000
--- a/dev-python/google-apitools/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">google/apitools</remote-id>
-		<remote-id type="pypi">google-apitools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/google-reauth-python/Manifest b/dev-python/google-reauth-python/Manifest
deleted file mode 100644
index 467d654bd7c2..000000000000
--- a/dev-python/google-reauth-python/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST google-reauth-python-0.1.1.tar.gz 18302 BLAKE2B a21e174f7dffe48810679910bf8d6712fb4176e5608f2a068d575df3643c4db15a74dae92c15f4ffdc344d287c31a8eb58f94b0384e2d9fc808c072dc8f89043 SHA512 81705d4080b3d7fb0a73741f9f498f8014ec94aa165a5b112c8af8fddc8f040dc43809aff6df39354c8d975db0ee8d62d003c11b173bd56fcf9add1b01644930
-EBUILD google-reauth-python-0.1.1.ebuild 1084 BLAKE2B b4322599b02df4a09fa0a9d7382cbf077ceb3cbf59aa35e5c32ad4e2e14de6c6e5d07cf3ddeb7c2edba785e382bbe9bdae71077ca94ea10b0669cb5a4a5132bc SHA512 5b156f334f3b8bd6825811425828a32b5b19a0b811b43d5f8dc07bd390cfcbd8d6daf9dffe91ca8d912c73bfba1bdb4574b5a051e831305a539ec65061e50564
-MISC metadata.xml 388 BLAKE2B a75115224020407fcc3bed17a0148f5aac88944f0a575ca0b0889522d7548e1e7d0bc15c6cdb545ba931c46a7268662df5577096368366178577ed16f0445c4d SHA512 fb16d4f7b91aeb0598881749f529ca3ea289e5dd63d219fbe99942f557e262b2e3f2fc3a78b0fbe408c29eac2ad64e8024f44609c546c45deb0f1b567c1f6287
diff --git a/dev-python/google-reauth-python/google-reauth-python-0.1.1.ebuild b/dev-python/google-reauth-python/google-reauth-python-0.1.1.ebuild
deleted file mode 100644
index 8a3e25c1016b..000000000000
--- a/dev-python/google-reauth-python/google-reauth-python-0.1.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python based U2F host library"
-HOMEPAGE="https://github.com/google/google-reauth-python"
-SRC_URI="https://github.com/google/google-reauth-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/oauth2client-2.0.0[${PYTHON_USEDEP}]
-	dev-python/pyu2f[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGELOG.rst CONTRIBUTING.rst README.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s:'some_origin'.encode('ascii'):'some_origin':" \
-		-e "s:SignResponse('key_handle', 'resp',:SignResponse('key_handle'.encode(), 'resp'.encode(),:" \
-		-i tests/test_reauth.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/google-reauth-python/metadata.xml b/dev-python/google-reauth-python/metadata.xml
deleted file mode 100644
index a6806f4f27ec..000000000000
--- a/dev-python/google-reauth-python/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">google-reauth</remote-id>
-		<remote-id type="github">google/google-reauth-python</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/ini2toml/Manifest b/dev-python/ini2toml/Manifest
index 44fff4c42e09..ba6723995d25 100644
--- a/dev-python/ini2toml/Manifest
+++ b/dev-python/ini2toml/Manifest
@@ -1,3 +1,5 @@
 DIST ini2toml-0.11.3.gh.tar.gz 94011 BLAKE2B c827b4030f7c80fa749cdccc170dfced7c869836c90e3350e486be94a30541983c79161e6fb4b007258a692abd62e8b724ac758f6c952b0c7b820e9b5679706d SHA512 f1331bc47a2d4593788de9d8b1fdbc2231ac22524aaf3a83695c810e0dcbdce4bb46c48363ea150a583e4b24264d7a25f85ece737b31fa0ec0b8a6a2e098a9d5
+DIST ini2toml-0.12.tar.gz 101098 BLAKE2B 8e44600718318ce9c2ebaa5205864c1ca6ce87852a59496801578f32e223b9283d2f724acf004136743f87c8a081e58fd1176abe85288f8c463fc2520f708633 SHA512 c324a65fa20af880f2731b740dbf041ef7673d7ab817a9ee1947bf781d39bc000fcd8a725a546fc6af0dbecd0ec0534b2f9b83f3d8ab4afc0239d94acca06df5
 EBUILD ini2toml-0.11.3.ebuild 1224 BLAKE2B 002768777b3f62cf4963122f7735126542f7221bde505757eacdb1051439c605d36239f7b91ec2942481bde6dccea7b46058cbe8b841218c1c3988bd98d60737 SHA512 2757bec71bff12f231d89af0db011aef75ccc3732107eca23d32691fb863a8abcee58cc3543d7184231df46fed49f32bcde68b58ed525a61c7b23e0cc2e185a6
+EBUILD ini2toml-0.12.ebuild 1097 BLAKE2B f0b7a85372442ca67da690664ed79e88eec85447e6bc82e3e6124f1f93bf427340d58b1bd4f7954ba33359abf3ce15904e61ff80264bf04fac08c480cc29890b SHA512 f9e36d73f1790ae2f4bdbb69d0e057de2a4f840849ebfae58832dd2c869fa5ab115530b68041a8ee0b84bcdc2e58b39a358ff564efa18724e0d4bd0d01390b8e
 MISC metadata.xml 374 BLAKE2B d1d096c2db4d1975e07553486be8e1ef66a63338b6a6617f71131565b80f612b9d50ca7c039d0b37b02eec56421231f52833390eb8536de44d4edd7c90d307f2 SHA512 21a272e9c3a7eb3e0950358f8ffb90b961ff0e39073519ed0b36660dfae91b24f8e09e3b89a20dbeadba45d995eea4bb89d484acc04a7251dfb9f33603bef998
diff --git a/dev-python/ini2toml/ini2toml-0.12.ebuild b/dev-python/ini2toml/ini2toml-0.12.ebuild
new file mode 100644
index 000000000000..b796d712c588
--- /dev/null
+++ b/dev-python/ini2toml/ini2toml-0.12.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Automatically conversion of .ini/.cfg files to TOML equivalents"
+HOMEPAGE="
+	https://pypi.org/project/ini2toml/
+	https://github.com/abravalheri/ini2toml/
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
+	>=dev-python/tomli-w-0.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/configupdater[${PYTHON_USEDEP}]
+		>=dev-python/pyproject-fmt-0.4.0[${PYTHON_USEDEP}]
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/tomlkit[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# validate_pyproject is not packaged
+	tests/test_examples.py
+)
+
+src_prepare() {
+	sed -i -e 's:--cov ini2toml --cov-report term-missing::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index cd0e3c61dbec..91fa39912e2c 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,6 +2,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -11,6 +13,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B ff939004df0d10a698e942c99ecf3bb11fe8e0c035e3dfb0ac495f2368d83bb89cccb11de0878b3555c4047b8d0e4b969e5cec8aef8891aabf2d16a550696870 SHA512 7be9e5f983bffabf30c954e45ede8fb6b30013b84cbd50f66fa3a2185b0223b4ede7466d40376453283e9ca806da1ae80afe6e6fee001ede95b78226bcc7267d
 EBUILD lit-15.0.7.ebuild 913 BLAKE2B 38afb1ee0c64d7480ccf1c84c6c1ae0e1ff5f75a0b52272b68d50717a338f143214329245bd650e107d8091ffe1bef6b29293a4b47d147122ea6cea64b448b92 SHA512 fc58e9f0ba65f388830a4e935f448126eb61f2dcf6fa40750e6feaf8a5943fb259bd3c1db3877767e4ba9ade75f6204de8a33c14630176a34fa097e522a0a051
 EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
+EBUILD lit-16.0.0.ebuild 927 BLAKE2B 2fcc513071d5701cddfeeca945e109b6ea676c4cb8f8c6aa18ed6d1d196c44a118b2c78248ced457dbdd9301c8455247f2eef8df2675fe910fd342a6755354fd SHA512 eebce40ed9c187f89439dca4216a681c8d4bfc6c1f36abcbb73dca3c1a61033ae7967b68e4d2c36ae5c8f37bd352654401eca9b47135200f090bc9d7617c6b2f
 EBUILD lit-16.0.0_rc3.ebuild 877 BLAKE2B e0fb3eb26a481420f154c6c7306824e929cbea060ec0e28c28991c39f86f756ee5d004abf6c76775975e053a588df73b2fd121a55617621c8a179899adecb41d SHA512 9799e40aa5ad07879a049777666963e225ffc97618fdae22869e8c8a648b0e33554859c525fad2307e23b96616bf24847c1ad7aa3e69353927c03f975b3bcbb8
 EBUILD lit-16.0.0_rc4.ebuild 877 BLAKE2B e0fb3eb26a481420f154c6c7306824e929cbea060ec0e28c28991c39f86f756ee5d004abf6c76775975e053a588df73b2fd121a55617621c8a179899adecb41d SHA512 9799e40aa5ad07879a049777666963e225ffc97618fdae22869e8c8a648b0e33554859c525fad2307e23b96616bf24847c1ad7aa3e69353927c03f975b3bcbb8
 EBUILD lit-17.0.0.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
diff --git a/dev-python/lit/lit-16.0.0.ebuild b/dev-python/lit/lit-16.0.0.ebuild
new file mode 100644
index 000000000000..4275151b428c
--- /dev/null
+++ b/dev-python/lit/lit-16.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
deleted file mode 100644
index 76d3db0a2a2e..000000000000
--- a/dev-python/oauth2client/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX oauth2client-4.1.3-py38.patch 1782 BLAKE2B 751b62649cd7222230f809c7e957636e351cddb3588c1da112443b09067c73cc6ada588697dd36f9b6ed2115238f8f811bc5502b17c75b2f65be655b4199dc9f SHA512 3e03d7105e76206e63858a32a25dfd5bbf997ced6abafd75d0f4973528ee91cb28200854ccfa519945573992f454c18d2acad5784693acffc7509ddcb13908a8
-DIST oauth2client-4.1.3-fixes-20230207.patch 21827 BLAKE2B c04886be0efad92fff75f0d78c5597bbc386939001f1fc5d094f96899bcc25bbd80c4e620cdf401a45c7ed48a8c83515adc98a190cecbbd345f55b78ca4a0257 SHA512 4d648aff20e56628c6fa916627851d7bb50f927c1cb1a056e115130e0aec128e7e2a5571b4a35a167bbcf01762669c22008cffd5530e0006846250d32b3f8093
-DIST oauth2client-4.1.3.tar.gz 185589 BLAKE2B 6cd61448e0d55cef7f2ba640c8cbb50ac83e76d0993391eb0acb3e156f937fcdee80576c9d45d505235a9f266495069664ccbfafd649a4e2d7a0990517ee8cb6 SHA512 80f49e09a6dd6767307a2c278544926fbf20b4f55e4cf83563ac7a7c1043622bd3c8c7fcf6de62896b623ca8c7947b309a5e6bf2b7cb0fccff3ff7634386b287
-EBUILD oauth2client-4.1.3-r2.ebuild 1425 BLAKE2B 6571481cceff9f6fd60b99752ffdcf8fd3d2155017b13ef180ed3803c1ea3783b9ceb5b060c6aef1816bf688c2965d2cdb7cc7cd0c3032de1cb2a65460fd1fa6 SHA512 e7bed040d05f4797f5058b064a698357fecb821259fc1a851232026ada9e5964f464051689a7d0e25a8a2c873ebe31921f52aa9d37238955aaa971a10ac80a23
-EBUILD oauth2client-4.1.3-r3.ebuild 2344 BLAKE2B acc20be847650feda07a3ad875f5a2258a17206d758be2a9af891ce1536ce658592b2d610b82ad130ff6b404f98b04daed1deaad3754515f1fb96fa1d92b6450 SHA512 3a09c679a548f994c083c50483d675a738fd36273dce282fec784f39f83f6e78659bce66b54c63b8a1888eceb1c5f526dd49cc95bf47720bc578951b324a681c
-MISC metadata.xml 403 BLAKE2B 53ea3fd7507fa9760d7af00c61e4598779e775fd3ab7e498908aa39f3472dff0cdd8246d7c2e7b62ebbfbf01c7ed9c1725dbb276e8685cb46ea77bcc2c02f9d2 SHA512 1cdf21510872f686912e699627a0252119ca25a3198183d74608a12e07bf14538398794e235ccdfdec06e1aafc52cbb693748bfde50855c083a59e3f1ada3870
diff --git a/dev-python/oauth2client/files/oauth2client-4.1.3-py38.patch b/dev-python/oauth2client/files/oauth2client-4.1.3-py38.patch
deleted file mode 100644
index d0898c02036a..000000000000
--- a/dev-python/oauth2client/files/oauth2client-4.1.3-py38.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/oauth2client/contrib/xsrfutil.py b/oauth2client/contrib/xsrfutil.py
-index 7c3ec03..20f35c9 100644
---- a/oauth2client/contrib/xsrfutil.py
-+++ b/oauth2client/contrib/xsrfutil.py
-@@ -44,7 +44,7 @@ def generate_token(key, user_id, action_id='', when=None):
-     Returns:
-         A string XSRF protection token.
-     """
--    digester = hmac.new(_helpers._to_bytes(key, encoding='utf-8'))
-+    digester = hmac.new(_helpers._to_bytes(key, encoding='utf-8'), digestmod='MD5')
-     digester.update(_helpers._to_bytes(str(user_id), encoding='utf-8'))
-     digester.update(DELIMITER)
-     digester.update(_helpers._to_bytes(action_id, encoding='utf-8'))
-diff --git a/tests/contrib/test_xsrfutil.py b/tests/contrib/test_xsrfutil.py
-index 3115827..deae568 100644
---- a/tests/contrib/test_xsrfutil.py
-+++ b/tests/contrib/test_xsrfutil.py
-@@ -54,7 +54,7 @@ class Test_generate_token(unittest.TestCase):
-                                             TEST_USER_ID_1,
-                                             action_id=TEST_ACTION_ID_1,
-                                             when=TEST_TIME)
--            hmac.new.assert_called_once_with(TEST_KEY)
-+            hmac.new.assert_called_once_with(TEST_KEY, digestmod='MD5')
-             digester.digest.assert_called_once_with()
- 
-             expected_digest_calls = [
-@@ -87,7 +87,7 @@ class Test_generate_token(unittest.TestCase):
-                                                 TEST_USER_ID_1,
-                                                 action_id=TEST_ACTION_ID_1)
- 
--                hmac.new.assert_called_once_with(TEST_KEY)
-+                hmac.new.assert_called_once_with(TEST_KEY, digestmod='MD5')
-                 time.time.assert_called_once_with()
-                 digester.digest.assert_called_once_with()
- 
diff --git a/dev-python/oauth2client/metadata.xml b/dev-python/oauth2client/metadata.xml
deleted file mode 100644
index 465b9dc1a08f..000000000000
--- a/dev-python/oauth2client/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">googleapis/oauth2client</remote-id>
-		<remote-id type="pypi">oauth2client</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild b/dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild
deleted file mode 100644
index f17e9279839b..000000000000
--- a/dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
-HOMEPAGE="https://github.com/googleapis/oauth2client"
-SRC_URI="https://github.com/googleapis/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P/_p/-post}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
-
-PATCHES=(
-	"${FILESDIR}/oauth2client-4.1.3-py38.patch"
-)
-
-python_test() {
-	nosetests -v \
-		-e appengine \
-		-e django_util \
-		-e test_multiprocess_file_storage \
-		-e test_bad_positional || die "tests fail with ${EPYTHON}"
-	# appengine - requires appengine
-	# django_util - requires django
-	# test_multiprocess_file_storage - requires fasteners
-	# test_bad_positional - expects TypeError, gets ValueError
-}
diff --git a/dev-python/oauth2client/oauth2client-4.1.3-r3.ebuild b/dev-python/oauth2client/oauth2client-4.1.3-r3.ebuild
deleted file mode 100644
index fd404d1b6b8e..000000000000
--- a/dev-python/oauth2client/oauth2client-4.1.3-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
-HOMEPAGE="https://github.com/googleapis/oauth2client"
-SRC_URI="
-	https://github.com/googleapis/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~robbat2/distfiles/oauth2client-4.1.3-fixes-20230207.patch
-	"
-S="${WORKDIR}"/${P/_p/-post}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-# This package supports 3 different crypto options, but tests ALL of them
-CRYPTO_A=">=dev-python/pycryptodome-2.6[${PYTHON_USEDEP}]"
-CRYPTO_B="dev-python/pyopenssl[${PYTHON_USEDEP}]"
-CRYPTO_C="(
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	|| ( ${CRYPTO_A} ${CRYPTO_B} ${CRYPTO_C} )
-	dev-python/keyring[${PYTHON_USEDEP}]
-	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
-"
-
-# Not well-tested upstream, and broken:
-# django dev-python/django[${PYTHON_USEDEP}]
-# flask dev-python/flask[${PYTHON_USEDEP}]
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/fasteners[${PYTHON_USEDEP}]
-		${CRYPTO_A}
-		${CRYPTO_B}
-		${CRYPTO_C}
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${DISTDIR}/oauth2client-4.1.3-fixes-20230207.patch"
-)
-
-src_prepare() {
-	default
-	# These contrib modules are broken upstream:
-	REMOVE=(
-		# django
-		"${S}"/oauth2client/contrib/django_util/
-		"${S}"/samples/django/
-		"${S}"/tests/contrib/django_util/
-		"${S}"/docs/source/oauth2client.contrib.django*
-		# flask
-		"${S}"/docs/source/oauth2client.contrib.flask_util.rst
-		"${S}"/oauth2client/contrib/flask_util.py
-		"${S}"/tests/contrib/test_flask_util.py
-	)
-	rm -rf "${REMOVE[@]}"
-}
-
-python_test() {
-	TEST_ARGS=(
-		# appengine - requires appengine
-		# django_util - requires django, contrib module broken upstream
-		# flash - requires flask, contrib module broken upstream
-		--ignore-glob='*appengine*'
-	)
-	epytest "${TEST_ARGS[@]}" || die "tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index bf2e51868e11..4a4f51f50387 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,3 +1,5 @@
 DIST pyphen-0.13.2.gh.tar.gz 1998017 BLAKE2B 7290cf7902a3dcfc9355d39de40a13b7aea20252636bdcdcd70436f59ca493dd287f96f365323c3e2d45dfc989e5418db4e3fb676602d123182c33b715ac7d26 SHA512 63bd3411c3120e73cd484eef3c3a280e9f8fee40f9aaf3fdca46c3ddf545aeb462eb4214fb239bd6a1fb6c065d5a34290f39763985e85447f413fc0af0afdae8
+DIST pyphen-0.14.0.tar.gz 1986988 BLAKE2B 3513ad1c9fbcc05318764f862a01bc4bbd6ad6a86f120ad93f8ff1d2a979984c35554db85943b5b7423f97e44ea933c64a3bf9c90aeb18629d215292466581b6 SHA512 5e242de2ecd5e951b2e1925df724013c14cea14729e8e0c132ab233c82406b37cc8d1d21cbd1edd748811fa6826a79da7a5ff9dfa859315840560cacae523e13
 EBUILD pyphen-0.13.2.ebuild 596 BLAKE2B d087919ee1591d6b91917d28fa556c12f2abd10bcb06e3d0e6f72e1689cf95cfa58fb19a2754772e95d8aefc4218d5501f06760cae3b99783426ef552429531f SHA512 a28bf7d4bd113045123aeec3342843d2cb83491abea927e1483c126c180e2b97168ce9536f90222cbfa5d482519e8db65a039d4532a858623f046f556a77bc26
+EBUILD pyphen-0.14.0.ebuild 498 BLAKE2B 75500374272c0012f9b465e4ac8a2cc8a9bb03c77d2c300f32b694edec3e83a078b541863519a4cb46d98fa22cf3a342a22392eba3b55ecbf253370223084a21 SHA512 cbaea15b54b4e28dc06f0e27e44db858194837f2250345eb5b65445020f413a18b85357126ce94513a7b54991e705f5aa8390b9305d03076069993c0652cc97f
 MISC metadata.xml 386 BLAKE2B 884bd76d980e70fcec706674b5363dfebc74931eac7a2e06cd77e5ca2cd7a72ec0673e44dd05a17dd16f91b7d43b7f97c996bb3994045adb008d97b64ef40c0f SHA512 20752bbbc3c47d4a6f1330a552a5c02bb5fc036f3656c067cb6ebcb4ac2fe2e766c343ec90542aa3ff7465d0726fcf705118ac03d743508ab135261fb115f8f8
diff --git a/dev-python/pyphen/pyphen-0.14.0.ebuild b/dev-python/pyphen/pyphen-0.14.0.ebuild
new file mode 100644
index 000000000000..0aa510692c18
--- /dev/null
+++ b/dev-python/pyphen/pyphen-0.14.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python module for hyphenation using hunspell dictionaries"
+HOMEPAGE="
+	https://github.com/Kozea/Pyphen/
+	https://pypi.org/project/pyphen/
+"
+
+LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -o addopts=
+}
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
deleted file mode 100644
index 46e6631ca399..000000000000
--- a/dev-python/scandir/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX scandir-1.10.0-python3.9.patch 2703 BLAKE2B bc37fbbf3cfb9c77db15a932b047f82af10b19890ef8e29979502a0d0d0bd3f71300a871a8a76d08ad606143c47ed3389e7a2f1c2f6376e3b86d32227ef0dfe8 SHA512 edd491cd68aee1a405b51113833a2cbde77f2146c0b3b1c807f2efff2cdbb307fe18d6a40f39b5b4567320dc52346feabf342472de308982bc46d03be28b5777
-DIST scandir-1.10.0.tar.gz 33311 BLAKE2B 47576618c41a477ff7bab9daecf2e4719ed0c497a25fd68b4bacae073fc418f9fc51503812af726d1d124f07cccfb418ae09c196cf7ce283abf5d3bbc36b7e09 SHA512 42a570320018ffff2172ada67002334446c73c53813b36d63558d3854ded2fac0b266fcaf399cf9a735ceba110636b6901683fb26cde1e286ff476bc37e3d335
-EBUILD scandir-1.10.0-r3.ebuild 719 BLAKE2B e85e55dce4eae207db65af45278bc174c8c74b978459fdd59bede47653a38fdedea5ca85ed292508f3a8576e35027b5c84c26dde4f544937088e608a2ce8aeec SHA512 a8768759175cc7e967e06bb120dafc32218ca32abf04b1802bc1a5f1e9b5c5e7b5eb5de7deb8b377b8deece3db6ae5bde185ae7eea19571f0a352f06064514c2
-MISC metadata.xml 496 BLAKE2B a5e4d74cf0526a99d2c968bd225f6b5d284a7f532e18ab5d1ec8f2da6b43d25c323d194982ccdc29d216c42fde989f1515c07fd8d65ff2d464191fc428125140 SHA512 66ead6b25749d156a0b702f558ee93005653de6c2039e3d76c7567606154e5720ea4da69944f725eb1598254cc251f091a46fddd03df695a1aa88058c64d4df7
diff --git a/dev-python/scandir/files/scandir-1.10.0-python3.9.patch b/dev-python/scandir/files/scandir-1.10.0-python3.9.patch
deleted file mode 100644
index c8683c1c6b9b..000000000000
--- a/dev-python/scandir/files/scandir-1.10.0-python3.9.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://github.com/benhoyt/scandir/commit/3396aa4155ffde8600a0e9ca50d5872569169b5d
-
-From 3396aa4155ffde8600a0e9ca50d5872569169b5d Mon Sep 17 00:00:00 2001
-From: Ben Hoyt <benhoyt@gmail.com>
-Date: Mon, 24 Jan 2022 08:44:07 +1300
-Subject: [PATCH] Add Python 3.10 to tests (#137)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix PyStructSequence_UnnamedField build issues on Python 3.9/3.10
-
-_scandir.c:663:7: error: conflicting type qualifiers for ‘PyStructSequence_UnnamedField’
-  663 | char *PyStructSequence_UnnamedField = "unnamed field";
-      |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-In file included from /usr/local/include/python3.10/Python.h:127,
-                 from _scandir.c:14:
-/usr/local/include/python3.10/structseq.h:22:27: note: previous declaration of ‘PyStructSequence_UnnamedField’ was here
-   22 | extern const char * const PyStructSequence_UnnamedField;
-      |                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Fixes https://github.com/benhoyt/scandir/pull/137
----
- _scandir.c                  | 10 +++++-----
- scandir.py                  |  2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/_scandir.c b/_scandir.c
-index 6cc28c8..433483f 100644
---- a/_scandir.c
-+++ b/_scandir.c
-@@ -660,7 +660,7 @@ _pystat_fromstructstat(STRUCT_STAT *st)
-     return v;
- }
- 
--char *PyStructSequence_UnnamedField = "unnamed field";
-+static char *scandir_unnamed_field = "unnamed field";
- 
- PyDoc_STRVAR(stat_result__doc__,
- "stat_result: Result from stat, fstat, or lstat.\n\n\
-@@ -681,7 +681,7 @@ static PyStructSequence_Field stat_result_fields[] = {
-     {"st_uid",     "user ID of owner"},
-     {"st_gid",     "group ID of owner"},
-     {"st_size",    "total size, in bytes"},
--    /* The NULL is replaced with PyStructSequence_UnnamedField later. */
-+    /* The NULL is replaced with scandir_unnamed_field later. */
-     {NULL,         "integer time of last access"},
-     {NULL,         "integer time of last modification"},
-     {NULL,         "integer time of last change"},
-@@ -1817,9 +1817,9 @@ init_scandir(void)
-     if (!billion)
-         INIT_ERROR;
- 
--    stat_result_desc.fields[7].name = PyStructSequence_UnnamedField;
--    stat_result_desc.fields[8].name = PyStructSequence_UnnamedField;
--    stat_result_desc.fields[9].name = PyStructSequence_UnnamedField;
-+    stat_result_desc.fields[7].name = scandir_unnamed_field;
-+    stat_result_desc.fields[8].name = scandir_unnamed_field;
-+    stat_result_desc.fields[9].name = scandir_unnamed_field;
-     PyStructSequence_InitType(&StatResultType, &stat_result_desc);
-     structseq_new = StatResultType.tp_new;
-     StatResultType.tp_new = statresult_new;
diff --git a/dev-python/scandir/metadata.xml b/dev-python/scandir/metadata.xml
deleted file mode 100644
index 525e3bfdcccb..000000000000
--- a/dev-python/scandir/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>monsieurp@gentoo.org</email>
-    <name>Patrice Clement</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">scandir</remote-id>
-    <remote-id type="github">benhoyt/scandir</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/scandir/scandir-1.10.0-r3.ebuild b/dev-python/scandir/scandir-1.10.0-r3.ebuild
deleted file mode 100644
index 3110d3be206b..000000000000
--- a/dev-python/scandir/scandir-1.10.0-r3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-# Do NOT add Python 3.11 without verifying the C extension is actually built
-# and installed for it!
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A better directory iterator and faster os.walk()"
-HOMEPAGE="https://github.com/benhoyt/scandir"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python3.9.patch
-)
-
-python_test() {
-	"${EPYTHON}" test/run_tests.py -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/setuptools_trial/Manifest b/dev-python/setuptools_trial/Manifest
deleted file mode 100644
index 45cb68de24bc..000000000000
--- a/dev-python/setuptools_trial/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST setuptools_trial-0.6.0.tar.gz 6227 BLAKE2B 2df7276197a5630b8140dce17528b75045ea86e15495146aceafc4428f6ab6493fbe8e2edfded30ae644523455df02f3cb85e8bf8879bd4fafc9a332d9f6bc40 SHA512 9104b98627f57ed53c90d22042346875c5324d7b30e1ec9ba1718b5c59a786915a8fe0a53789a5dbd9318a12b27122661234f5be403365261db6a8728ce39827
-EBUILD setuptools_trial-0.6.0-r1.ebuild 1347 BLAKE2B 7e40687456afd0e624c5dfc9977a407700632924bd15c914add201810553380592b34b2e0c6451ee922d78af3753b0662a6c08e72ac086094d882a751a6dccc2 SHA512 40d3285b76f8ef3b6fe7f8f3b2bf4b54eca2609b30253fac615f3f8f97692c53d76886eef62f2a0d9a99df5eed59ce83657b43f9beaca045a448f23c33c68d33
-MISC metadata.xml 845 BLAKE2B bbaa43f3cbca032a132f5ed18ce3be5dd28a1f79c91db2dcbd78fb09f172c8e1d1e14c0f03ec51736af03b11acf1f7d6bf3e2945447de3fb57e02b9612523bf8 SHA512 663163e31c8283ffc345c1542992b230c7a0dd00b9ae88499c1b6d1c1ba6bf49e510cbc8822e7af95e1c04fc5ce20bd2d5369fb4b88d66ecd6b080e8d94dfbab
diff --git a/dev-python/setuptools_trial/metadata.xml b/dev-python/setuptools_trial/metadata.xml
deleted file mode 100644
index 3718ce297d89..000000000000
--- a/dev-python/setuptools_trial/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
-	<upstream>
-		<maintainer>
-			<email>vladimir@rutsky.org</email>
-			<name>Vladimir Rutsky</name>
-		</maintainer>
-		<remote-id type="pypi">setuptools_trial</remote-id>
-		<remote-id type="github">rutsky/setuptools-trial</remote-id>
-	</upstream>
-	<longdescription>
-		This is a plugin for setuptools that integrates Twisted trial. Once
-		installed, “python ./setup.py trial” will run the package’s unit tests
-		using Twisted trial. The package can also optionally be configured so
-		that “python ./setup.py test” will use Twisted trial instead of pyunit
-		a.k.a. unittest.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild b/dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild
deleted file mode 100644
index e62868fc93b0..000000000000
--- a/dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Setuptools plugin that makes unit tests execute with trial instead of pyunit"
-HOMEPAGE="https://github.com/rutsky/setuptools-trial https://pypi.org/project/setuptools_trial/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? ( ${RDEPEND} )"
-
-src_prepare() {
-	# don't install docs into wrong location
-	sed -e '/data_files=/d' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	# The pkg test suite creates a virtualenv to install to for testing
-	# The distutils-r1 eclass already does the equivalent for us.
-	# So just run the same commands they do directly...
-	pushd "${S}"/tests/dummy_project > /dev/null || die
-	"${EPYTHON}" -m setup.py trial || \
-			die "trial tests failed with ${EPYTHON}"
-	"${EPYTHON}" -m setup.py trial --reporter=text || \
-			die "trial --reporter tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-	pushd "${S}"/tests/alias_project > /dev/null || die
-	"${EPYTHON}" -m setup.py test || \
-			die "alias_project tests failed with ${EPYTHON}"
-	popd > /dev/null || die
-}
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
deleted file mode 100644
index 4c2268b38eee..000000000000
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sphinxcontrib-blockdiag-3.0.0.gh.tar.gz 12300 BLAKE2B 4bb6e83625095aab209b3f8eff3f96dd0c0ff37c542bedd03d7b56be282bdb6929bba7ef9cbbc458492b17bfbcf80d705cb17b3f194213c1416bf1ab090fcc6a SHA512 1d03296007b0b6455fa25b1c0d3f09fb76dfaeba43ac7155033ec6fda0aaae40b757f6b77b63725489f2360eb5a80ce8e9e55eb6460b73c3b3bca363afe8aeac
-EBUILD sphinxcontrib-blockdiag-3.0.0.ebuild 1179 BLAKE2B d983e8b3dea39865d33f8fc52721537d6c85343b69bc1025646b6a2e2991f8c88176a74f63be66e6d44b256302d93fdd3f7436b0b313bd4084ed065ad1c912ee SHA512 767c3ad7b0692c474ad8923acb20ab94c569544f5f36fc4020eb3406b0213951e18ceaddfd452ff58925befec27432740e3fb4dcc9fc607390ad1f6b9456c91b
-MISC metadata.xml 502 BLAKE2B a9910c9ee4029937c23f98b7cab1b6d9b2ca72db3272fab0c11d8e3e851e249229a2749d74250c8717e83d90eab0613cab892e7218b70ab26b761a77c23bd4a8 SHA512 993ab6e8cd639af61f08bffe017bd6d12539d20f827b1992a8d99e9cbcc6cfb18b254b2b7a86ce16a2b87125254d801333f68469bc6bc6b576a70d27c605c6a4
diff --git a/dev-python/sphinxcontrib-blockdiag/metadata.xml b/dev-python/sphinxcontrib-blockdiag/metadata.xml
deleted file mode 100644
index b212d7d00f0f..000000000000
--- a/dev-python/sphinxcontrib-blockdiag/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<maintainer>
-			<email>i.tkomiya@gmail.com</email>
-			<name>Takeshi KOMIYA</name>
-		</maintainer>
-		<remote-id type="github">blockdiag/sphinxcontrib-blockdiag</remote-id>
-		<remote-id type="pypi">sphinxcontrib-blockdiag</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-3.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-3.0.0.ebuild
deleted file mode 100644
index caa17bdd1940..000000000000
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-3.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
-HOMEPAGE="
-	https://github.com/blockdiag/sphinxcontrib-blockdiag/
-	https://pypi.org/project/sphinxcontrib-blockdiag/
-"
-SRC_URI="
-	https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
-	>=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/reportlab[${PYTHON_USEDEP}]
-		dev-python/sphinx-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	sed -i -e "/build-base/d" setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	rm -rf sphinxcontrib || die
-	distutils_write_namespace sphinxcontrib
-	eunittest
-}
diff --git a/dev-python/urlgrabber/Manifest b/dev-python/urlgrabber/Manifest
deleted file mode 100644
index cd81067c16a2..000000000000
--- a/dev-python/urlgrabber/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX urlgrabber-4.1.0-skip-test_range.patch 466 BLAKE2B d7035794c6beb47e7ae13e7914f5eb067e71d592b14100c04a67102c98351d020cb3949fcba79521245189c139b3eca36403ad23c2692043c20db3b4e2bad66d SHA512 f952eb16eb93b4a61826c36c8265b01d3084144dcb90aa274c3fd22ce837ef58c84a5cf7b2aae7fbbbab4048ac405b6320ba917cd6f181ccf3875bdf81f3c6be
-AUX urlgrabber-4.1.0-test-mirror-set-thread-daemon.patch 406 BLAKE2B 0b37cfa8eccf790fe0dce89f8c6cc5f9241f9c6fbf11d339cee72056387aa5444f811b3ce62e83311499effd93d954dc350b3951030b5636372b4c7b41b280f7 SHA512 208812678cc58651294b858071d3b89630f3f539036b1a4f97c5fb99314fb2889240ec9550dcf3d062bca8620049e388c47c9e57ba4beccc3c843a2f69787f77
-DIST urlgrabber-4.1.0.tar.gz 277537 BLAKE2B 3697cb1d08fe0fa8bc83118e1466d76d1b8aa0375fd895d12f5135850bb5100d1d52b1691b2135a80a4937158c5d362e88777ae9ba58790ad88355f13e679b34 SHA512 43e54656d0ca92f616d49cd90dd6282408d64909848e4bf1c74b3b1eede55ba0c9526d6ea5fa9ae18545b806ef9965130ecf1cb1f5f05d4611db974d3f2aa200
-EBUILD urlgrabber-4.1.0.ebuild 1108 BLAKE2B 07e31d757217f9dcbe9d5fca33b0ed3e23d2f8ea47b25a66d77a378afc667fc456f6d5b145860a0abb5cc48b06627191e6c7d9626e073ba7c7fccb835deb2116 SHA512 ff237cf4925a16538bd7d13af1f90fe5a341eeb7c052742ea58d7f5789f7dd26193eb702b98c22b7dc8173966ec7975559fb65fe29e69bfe4a442d8893ef2f2e
-MISC metadata.xml 1599 BLAKE2B f70763aa6df97491b69b72db96f51ed691bb39b2d2a88ed761a345e87d25ec4f77c1802018e277692a41aa823cc2ab31ecd9c49b08949b2d7865200dbcab8ed2 SHA512 93c6ab097564a6ab393bb0c3033016af801a9e91e8fd72622bd8c6ee67415f3ab78dc83cfc25fac0ae627ce4984716d72ede278f88448333d1b22b496d85d6d9
diff --git a/dev-python/urlgrabber/files/urlgrabber-4.1.0-skip-test_range.patch b/dev-python/urlgrabber/files/urlgrabber-4.1.0-skip-test_range.patch
deleted file mode 100644
index 548242fc1894..000000000000
--- a/dev-python/urlgrabber/files/urlgrabber-4.1.0-skip-test_range.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- urlgrabber-urlgrabber-4-1-0/test/test_mirror.py.orig	2020-11-16 06:23:15.874354961 +0100
-+++ urlgrabber-urlgrabber-4-1-0/test/test_mirror.py	2020-11-16 06:23:59.674354944 +0100
-@@ -329,6 +329,8 @@
-         self.assertEqual(self.code, 503); del self.code
- 
-     def test_range(self):
-+        # skip failing test
-+        self.skip()
-         'test client-side processing of HTTP ranges'
-         # server does not process ranges
-         self.reply = 200, b'OK'
diff --git a/dev-python/urlgrabber/files/urlgrabber-4.1.0-test-mirror-set-thread-daemon.patch b/dev-python/urlgrabber/files/urlgrabber-4.1.0-test-mirror-set-thread-daemon.patch
deleted file mode 100644
index 6d6e8afa6462..000000000000
--- a/dev-python/urlgrabber/files/urlgrabber-4.1.0-test-mirror-set-thread-daemon.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- urlgrabber-urlgrabber-4-1-0/test/test_mirror.py.orig	2020-11-16 18:47:43.724337579 +0100
-+++ urlgrabber-urlgrabber-4-1-0/test/test_mirror.py	2020-11-16 18:47:57.724337574 +0100
-@@ -290,6 +290,7 @@
-             self.exit = False
- 
-         self.thread = threading.Thread(target=server)
-+        self.thread.daemon = True
-         self.thread.start()
- 
-         # create grabber and mirror group objects
diff --git a/dev-python/urlgrabber/metadata.xml b/dev-python/urlgrabber/metadata.xml
deleted file mode 100644
index 812dc00b5e88..000000000000
--- a/dev-python/urlgrabber/metadata.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription>
-		A high-level cross-protocol url-grabber.
-
-		Using urlgrabber, data can be fetched in three basic ways:
-
-		urlgrab(url) copy the file to the local filesystem
-		urlopen(url) open the remote file and return a file object (like urllib2.urlopen)
-		urlread(url) return the contents of the file as a string
-
-
-		When using these functions (or methods), urlgrabber supports the following
-		features:
-
-		* identical behavior for http://, ftp://, and file:// urls
-		* http keepalive - faster downloads of many files by using only a single
-		connection
-		* byte ranges - fetch only a portion of the file
-		* reget - for a urlgrab, resume a partial download
-		* progress meters - the ability to report download progress automatically,
-		even when using urlopen!
-		* throttling - restrict bandwidth usage
-		* retries - automatically retry a download if it fails. The number of retries
-		and failure types are configurable.
-		* authenticated server access for http and ftp
-		* proxy support - support for authenticated http and ftp proxies
-		* mirror groups - treat a list of mirrors as a single source, automatically
-		switching mirrors if there is a failure.
-	</longdescription>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">urlgrabber</remote-id>
-		<remote-id type="github">rpm-software-management/urlgrabber</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/urlgrabber/urlgrabber-4.1.0.ebuild b/dev-python/urlgrabber/urlgrabber-4.1.0.ebuild
deleted file mode 100644
index 08457ee90633..000000000000
--- a/dev-python/urlgrabber/urlgrabber-4.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Python module for downloading files"
-HOMEPAGE="http://urlgrabber.baseurl.org https://github.com/rpm-software-management/urlgrabber"
-SRC_URI="https://github.com/rpm-software-management/${PN}/archive/${PN}-${PV//./-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-${PV//./-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86"
-
-# Entire testsuite relies on connecting to the i'net
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${P}-skip-test_range.patch"
-	"${FILESDIR}/${P}-test-mirror-set-thread-daemon.patch"
-)
-
-python_test() {
-	URLGRABBER_EXT_DOWN="${S}/scripts/urlgrabber-ext-down" \
-	PYTHON_PATH="${S}" \
-	"${EPYTHON}" test/runtests.py -v 2 || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 2d2c9d91c9b0..0f91432d86a0 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,3 +1,3 @@
 DIST waitress-2.1.2.tar.gz 179823 BLAKE2B 0cbd172050f1da845c47b3a084cd5d7558c736c416372f22af4d4b6870ef6cd9050f4779fabaa5069b6b4783d748df98e2484eaed09da4d2cfc2d239ce15a05a SHA512 4ef487e116b34eede0f04a02ca7a78116a91664814067a8562d1cd15a4ab702e5faf4be7c122478324d017b6bb1f5315633b74405d00e900b34cc8f1a068da59
-EBUILD waitress-2.1.2.ebuild 642 BLAKE2B a3675373292c4f11f2395caef8af70f253c582694deaaa16514ea60aa9bea3f83b493b4905c1bc4fc5a8022cec37af483c6135dfc1c1cbb45eb55537d4f8aacb SHA512 a360fb98dc7d3f42a109528be6f7df526bf5915a5bf0373aa4f744d82a6de980d73a53d204e046956ab014bbf2092d1109f5495dfff60e02ad93acc8b804e04b
+EBUILD waitress-2.1.2.ebuild 782 BLAKE2B 44b2a582e39cf37f0ae4f8131ff124683b3ea9f18ff96eefc0fe45b96b64b938c381bb01fe9d231bd615a8378e2b1d7d74758c7fdf872bb8c34e25d2e93ee1c2 SHA512 6f7caa4fba21986dab86aa22d887efb96efe5f3c08e545f731bc4d28bc4986f6b3a84d5fabb207c7eb6376977bc9ad556e5cff90caa855a5e0c1ee94edb45ef8
 MISC metadata.xml 404 BLAKE2B 384598e80742dbc76ff25fab9b93b3e5ad1f730c9c55782257a6e7ce2724f631213301d4a213bd1a20ffc0bc97bfbb2ae4759cf9ac6e31d9728f645fbb69cb9d SHA512 5315d60706055e2def0e41f4d8ed99bcb54f99524fc6d23ffbe36a28faa315801dbbfba02042ae217e3a9db2dbac430085500603d88cfb0fab25d0a587ccee0e
diff --git a/dev-python/waitress/waitress-2.1.2.ebuild b/dev-python/waitress/waitress-2.1.2.ebuild
index 53fa9f25cb82..9c4d35f09719 100644
--- a/dev-python/waitress/waitress-2.1.2.ebuild
+++ b/dev-python/waitress/waitress-2.1.2.ebuild
@@ -21,6 +21,11 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390
 
 distutils_enable_tests pytest
 
+EPYTEST_DESELECT=(
+	# fails on some systems, https://bugs.gentoo.org/782031
+	tests/test_wasyncore.py::DispatcherWithSendTests::test_send
+)
+
 src_prepare() {
 	sed -i -e 's:--cov::' setup.cfg || die
 	distutils-r1_src_prepare
diff --git a/dev-python/zstd/Manifest b/dev-python/zstd/Manifest
index 0b3bffb774f4..22df6ebed89f 100644
--- a/dev-python/zstd/Manifest
+++ b/dev-python/zstd/Manifest
@@ -1,5 +1,3 @@
-DIST zstd-1.5.2.6.tar.gz 606528 BLAKE2B 0d9b0937346e69a25eb834d2894ab74efdd3f35390afebc98a6cb255f18cdbe540433139d51f43bf0a9fb5d85bee588c7df8543842248e700652af3e3e721df2 SHA512 a692d87ffad4d148d56487fa740876653ccbd151ac8a897a35946a3899d4d3b3aaf6e9954a2050b4cee8137d5161481f3460a0e64ce339c624349bf030c9f975
 DIST zstd-1.5.4.0.tar.gz 620235 BLAKE2B 490415a1be76e4957f14e2e5137eca5a80290e4b492d551cd230826b500a36a8574d0c20eabd4d0bf6bf34d8c61f60f8e6aef5220bf3b0a2e5ba95eef1aa428f SHA512 f9a9301cb0f5f3f7fbf67dd44d9b748673894b89002f5666f394c093545a779370f79ab5a4fbe853be40d8701a5c9203a26da3ef6a243650f2c81a2c0d029b2d
-EBUILD zstd-1.5.2.6.ebuild 665 BLAKE2B 59064546edc141501184d245d6b16099933bfd225503e6f3dea9d0c4054e74fe90d37be96a333aa7e00a227b667b2a9dc045f1cfc1ef880ef07201bf39446c59 SHA512 e077daa3ab6ce13d266ca83fedd7880a963524f89ef125639e6d6e0733394ad02899f29f8160cae0787e3d2516fa70f469c39d6fd04db439ea1d9d9570350473
-EBUILD zstd-1.5.4.0.ebuild 568 BLAKE2B 2d204e8b0c709f1652d82d7e73e657d2fda69801f1e7562c71073bef11fbdee55b8a532a60abba67a21da5098a17e417eaa4d691f74e0eed31012e693e8e7aa2 SHA512 dee23d0b504e08acca9705701267cf9412720cba85e83aa2e6fb4481a5827d5bdf13e3e3695ff81f0efff759ab92d5d502842a51d6a0d4ceb5c9a0d9b3a78fe5
+EBUILD zstd-1.5.4.0.ebuild 566 BLAKE2B b18b055cb1df6c81a9fad5fa9431aa578dd14fbd4ea295750a3bd7a19e83857f495f74686551ffbc1fbec94af09f6b36888b5394bde1d66f20aaae4aabbe5ae0 SHA512 07997a563d33cc090c91b7382995747ef8ae6e91f92e8631be01f7bd6fe0b8092ebe9f0b39c0a4341b25aa4cdeeaf4db691976f41b5d822155731eeea55d3324
 MISC metadata.xml 472 BLAKE2B a4d69b294f26714e9f5211408f01222174c8dd9b0e990840c4603f70a7080fd41a6f3ec74987e40b330a19967f0b90447446b6d5fdb1179ec3be0406592f6b3e SHA512 0cb6b445a84c48dc909eca438bf3908bdc08309f27314692fc2a3fa5a21b3cd1af92e06a593fb2a2cb32c3f0f70db56b7177abcc1fa4348c664e779f0e277cda
diff --git a/dev-python/zstd/zstd-1.5.2.6.ebuild b/dev-python/zstd/zstd-1.5.2.6.ebuild
deleted file mode 100644
index 0f00177eaaa4..000000000000
--- a/dev-python/zstd/zstd-1.5.2.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple python bindings to Yann Collet ZSTD compression library"
-HOMEPAGE="
-	https://github.com/sergey-dryabzhinsky/python-zstd/
-	https://pypi.org/project/zstd/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-	!<dev-python/zstandard-0.15.2-r1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	export ZSTD_EXTERNAL=1
-}
diff --git a/dev-python/zstd/zstd-1.5.4.0.ebuild b/dev-python/zstd/zstd-1.5.4.0.ebuild
index 0c805254d3dc..20017d80fc05 100644
--- a/dev-python/zstd/zstd-1.5.4.0.ebuild
+++ b/dev-python/zstd/zstd-1.5.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	app-arch/zstd:=
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index bdf68014d54e..e86d8cd79d01 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/benchmark-ips/Manifest b/dev-ruby/benchmark-ips/Manifest
index 67160a257572..4a29b151d408 100644
--- a/dev-ruby/benchmark-ips/Manifest
+++ b/dev-ruby/benchmark-ips/Manifest
@@ -1,5 +1,7 @@
 DIST benchmark-ips-2.10.0.tar.gz 19840 BLAKE2B 53c219921144632dc91971fa3558bcaf106887d7deafbd7145c1ad12d09d37ecbe17dd07a3da7f8a2c5bedea4a228d76d72bd8e54b14c94c4b21f2e9823cb8f6 SHA512 aeb86bfd80c6ac6a16df8dced2681e81bcb6a0a31848524956b348cd699addebdda4b1a32c6eab85884b89bfb9c26e01f40af7da5a58e187af3a737ad582b8dc
+DIST benchmark-ips-2.12.0.tar.gz 20676 BLAKE2B 1473fb8cc42d62cf6b7206d91c9d959707109e3ade9d712d82ab5ccfdcc48bb4874bae4c37370561aa60fe8c99078564a22a5a216daa6b870015329db1094af1 SHA512 ad4a7133b73d3ead583513704cbf00ef858b7fc5477686d3841614f05a83f3b4551b1fcab78e9a8affe7c8487112d9fde5012bf8a8e13621d289d792ff27c061
 DIST benchmark-ips-2.9.2.gem 21504 BLAKE2B e1ff44841c42a2ac919bc33be517aab8c09ede32fcf2d72d143a21bbaf8c67a99ea8abcfc10a473afc456be735836fa44135ff3c295380bf21d09cc43337977e SHA512 b20d80e42a6175a2c2b75be7a1d423b0ecd1aa201be9cb443f838bcdbfba08d54cdd5e43a203834d451b9ce37219b6e1c8227a5196ee84a132c7ed9fd9431270
 EBUILD benchmark-ips-2.10.0.ebuild 877 BLAKE2B caba97bb502a1041717acf0fc66f8e17aa630d46785affb45cc161cc0fdb293500ecaef49e2596c3e4cff2cb1c8a6c70942cff9bacc3f8267a19d2783faeb1cc SHA512 00d808a5d9cec943330a82d5f4e4d3d3f9dc34d2ffcd76075768978a162bc1d8b59aed047c96ec0120c274a2ab6dee05f7986349b0f0d79fceb2f0b5c46ba091
+EBUILD benchmark-ips-2.12.0.ebuild 877 BLAKE2B 5954792e235ddcede89bdf60adbee714491c69df429ddd368387e81afb05f2544594b568c9be8a1c074844413efdd5acb85d8d8b67dd789c7e1a5879bb358c7d SHA512 27a111fc995c2b2e90afcc71157083ff6cbeae82a4c6d3ff95a4d10193cf999e137eb4a18b48975bf67cf1b4ca427d6eef81a1a4233963367f1ed1086c3ff0f5
 EBUILD benchmark-ips-2.9.2.ebuild 658 BLAKE2B 3e8539092424211dbc91e1e3068f6ce55f096826e2ac9dbc773424d8951674dee4511928a0ab662d5ff64a674108637933a774e83709313505b13b96f1735f76 SHA512 6670821a585ceeb3650aea0de461fdb171bdf03af76605eb8b9a5dcf7daffdd4adb04fd92be94fc76731675f9cdb2b68799791cce4c65dd2f106827cd4231ff2
 MISC metadata.xml 348 BLAKE2B 2c14d35b0157af73ef1085f5a1997ea79d342463d29afa1556b14cdc7edf9d305dfc90bab8020707b3974adce83adb7c56bb04ef372388da329ffddb8ccf3712 SHA512 7e2cad94bf587518835350f2abcb06f7096b3283ebc1f9b22eb1b7d8ea8b21edd5fd9aaf963a9461d57eca7290dcb98c5f6c9a4d0a0cbae4308a6b7448479063
diff --git a/dev-ruby/benchmark-ips/benchmark-ips-2.12.0.ebuild b/dev-ruby/benchmark-ips/benchmark-ips-2.12.0.ebuild
new file mode 100644
index 000000000000..43c906350edd
--- /dev/null
+++ b/dev-ruby/benchmark-ips/benchmark-ips-2.12.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+RUBY_FAKEGEM_GEMSPEC="benchmark-ips.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A iterations per second enhancement to Benchmark"
+HOMEPAGE="https://github.com/evanphx/benchmark-ips"
+SRC_URI="https://github.com/evanphx/benchmark-ips/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.6:5 )"
+
+all_ruby_prepare() {
+	sed -i -e '1i require "tempfile"' test/test_benchmark_ips.rb || die
+	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/bindata/Manifest b/dev-ruby/bindata/Manifest
index 6faf459aba46..0de5ca85b679 100644
--- a/dev-ruby/bindata/Manifest
+++ b/dev-ruby/bindata/Manifest
@@ -1,5 +1,7 @@
 DIST bindata-2.4.10.gem 80384 BLAKE2B a95f607771cbee45e65748ff8f09a87f2fa5b1462f311a0630b4202ec99d2c20815e0ea2e451c52583e5964f29189a56a63e1a03a6193d23125d1720beccbb4f SHA512 4f3fee967fd27e5f69bcf0126582191579ff36786f9841e31253de6d5de9de21c81b71e4efbdf5a9c5d8585a8404e2064bd378feae0a9a5cc9bd3664846ea423
 DIST bindata-2.4.14.gem 80896 BLAKE2B f01cdd12a66ddb9c94a583d0629d4e9ad7fef8dda36ad0267d9a0eddf505f0c68127a8c1add0bc3450e66185eeb58fd8cad8aea57d06f147f81ace5a22d77ae5 SHA512 5aa18d10c9a05c6b41845e258925fbd5bcbdd1cbcbf2c581dde2212f226437c032c4158835dca9881aaeff94a52b803c6294fda35a7afadadc76829875c3e9b0
+DIST bindata-2.4.15.gem 80384 BLAKE2B e874f396d1ac7902db0fadca4b2d75da3af6ef553d84cea07a7fefa2fcba46d383c4c4b1ec0db8e744675253fd86dc5e9a287b3834616286a08f1e5605711443 SHA512 366b9de24ce6276832f0ea9c76cad70b433aa1f7f29839a1317b0fe2582f9c91d16ea90d74da7364d94f088b53ada2597b0e25cee859487657af4db20efed930
 EBUILD bindata-2.4.10.ebuild 490 BLAKE2B 28ac678cef4db8d8812769d5988c1d383deccfc89433509d932ad3d533c710ca685894e994f6b11fc1e0441adc2ab5b63821dc9921a2a2bfcf9fa7e6433272c0 SHA512 f5d4a9e5005c4a03cc8f9a0c492efd29584055bada9b99f41274b8ceeef3a4cc8ef779f5c15cfb50a03b43ea76b1b2581a75f9e7e8f59d3df8b8c1ee49be7b1d
 EBUILD bindata-2.4.14.ebuild 490 BLAKE2B 3cf1b44d7ca77fd8c280508f6ddc666e59247dac3d70147ee6a469a24afdddba937bb205b917052eeced1a5e298d624dcd9edf9164eaa6b0da8b4fb0140de4ad SHA512 67e1fe1d39f3cb7186fa768e5ee33cb373929d6b98547dc49e7eefbfd66aa16d3679f1396a1d36a0ca81d0375efc5c5c971db9ea7457d1f12e2edad890bcc465
+EBUILD bindata-2.4.15.ebuild 497 BLAKE2B 3d372e170d85b7507fc90369cc10b9e6aba99d6ddad3ffaacf20eebbd4d60482ce816a7f0061ee0c5e53b9e943c74e53e573e1549c07d24542c46d866fcefa6f SHA512 828a1706cf7b3690f5935709d102a4d17218ea5f849edeb01a42c02700051bc9126aa5c1f484d2f353c152630f844f8f71c0bfa7e354e5b864c2978a103a0100
 MISC metadata.xml 328 BLAKE2B 299726a22f84a94b8e3d3553fdc543194137d10020fc67fb8145f50c7f10ddfe825ba9b22f20ab09f815646cd152de7c3027e9090f902356a75ba11f12033fa5 SHA512 f8257e5b1e928c6801226e7be3e0fa6ea015e447f9b0bd10ea88830e6c98222f3d1fad55d92b7eec622886d2eff4d566e0f5f0e3d2d677d1f1dfb989a6846603
diff --git a/dev-ruby/bindata/bindata-2.4.15.ebuild b/dev-ruby/bindata/bindata-2.4.15.ebuild
new file mode 100644
index 000000000000..46b8412da889
--- /dev/null
+++ b/dev-ruby/bindata/bindata-2.4.15.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parsing Binary Data in Ruby"
+HOMEPAGE="https://github.com/dmendel/bindata"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/[Cc]overalls/d' test/test_helper.rb || die
+}
diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index 070356a8bf3a..125d1c802fd8 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,7 +1,3 @@
-DIST gruff-0.14.0.tar.gz 20193671 BLAKE2B b8cdaaca71c5b034206c4f88b1e50e09f8d9c5a3227eaa59a5c66718468ffa643509acfe8bd6919fd012a50daa27709569c210b030e25207c17a0ce13b60616f SHA512 e3c3acbce0888698e2aa92b8e86d2ada5499f394d100209b94ac4284f05a6a4f64c2bdcce91f76be7cec860d0546ebf5fa24aab73b51c0ca9763dc07855c8a68
-DIST gruff-0.18.0.tar.gz 25884658 BLAKE2B 2943d7de2ea6d024d46b2cb389ab46dcf6dc5cb00cc6e0cf089a401552424dbc1978f98f454bedfd74cc1d3caf079857d4df2da4067d8ddadd8e28d47314430a SHA512 fcfa0c5062d3b71188ae4b3aa39b391866f69a35037a6e82a40071ac59cc0837804ef642d00f9c73bbe4a9ec3e46a3de7b14c8e61a341497f7f362130a467cf8
 DIST gruff-0.19.0.tar.gz 25770103 BLAKE2B 6f1d45e03a4ca0a022c1f7313114bb87a06dc2265f1500fea703b2bb4dbbdba21336a63e4a10b166696baa37eb034977c7606817284f8abc06f8ce5bb4a4d6c2 SHA512 5028429c6b2d3551964190956cc5ce7e234b14aef94f8687fc9ac52aa810d98c9018ce5f1dfc04756936dfa47665d3566d53ec300523ca5786693ac99740d81f
-EBUILD gruff-0.14.0.ebuild 1599 BLAKE2B 5e5439740be12d01d3e86691bfc1c359e9fdc3fe13e412d3d27fbcfc6e73b31f81696d0a2da597cdc484dd42779d4ceabd74cd5d6681b8fe486cfa0d36bf3765 SHA512 2fd1fb7b239fe48ddaa6d990531a18cae93e01b365d445c6bd9d8815a98b229ac18586af797585a7e4f1d57aa5bda37c193f866bbd6117d0cf78ade274f36fc2
-EBUILD gruff-0.18.0.ebuild 1621 BLAKE2B 491e1aefe2b0ceadfaf0906bdadf927b7f64c041987d0d8738d8868f5f19b27bd39c475078ffaa51077001b195e83f6f8198907a0232e6a80fd4a2d38f6b5379 SHA512 6c14f00ba50d7154a212b33710812a75499283161028e0f9c6e391edf2768ef3b946c1d4a8a9b51d901468c7a2b90e42c0a9ccaabdc6adde326ca4f4fe583808
 EBUILD gruff-0.19.0.ebuild 1612 BLAKE2B 074b29d5f7e3b2c66a28d41136f214f7ea2d62e48e03576196d9dc4dd522465c776503087c222eec6f38b3884f9f922dca6fbee156da6bc8a78963c964c4ae8a SHA512 e9b4b60d96c17beadbec8587d52685d3a8f89056faea9a3d632de7cfdc0699548b2e04b51e98731da9a9a34e08a929c378f30c1921a2301354720e458d5dbb73
 MISC metadata.xml 341 BLAKE2B d27e2cd08a5540fee57b4633b95cfe34569da56bca5e4638fa799aacfdfa8ccd4f3f195ebbca6782da97734bea84ba4adb8f49f08c8ec5b6757a3867ca70dd80 SHA512 ebf3fc986abccac99d46c2d66a1480ec3d9748660c314615b180e390bc5a55d7780c28ff85280390ef0e0f219aee626cae775d44f2c2ec1cfe047157055f20f9
diff --git a/dev-ruby/gruff/gruff-0.14.0.ebuild b/dev-ruby/gruff/gruff-0.14.0.ebuild
deleted file mode 100644
index 07e87c0e3d04..000000000000
--- a/dev-ruby/gruff/gruff-0.14.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
-
-RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Beautiful graphs for one or multiple datasets"
-HOMEPAGE="https://github.com/topfunky/gruff"
-SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# imagemagick is an indirect dependency through rmagick. However, for
-# gruff to work properly imagemagick needs to be compiled with truetype
-# support and this cannot be expressed in the rmagick dependency. Tests
-# also require imagemagick to have jpeg and png support.
-DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
-RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
-
-ruby_add_rdepend "dev-ruby/histogram dev-ruby/rmagick:*"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/\(reporters\|simplecov\)/I s:^:#:' test/gruff_test_case.rb || die
-	sed -i -e '2irequire "date"' test/test_scatter.rb || die
-
-	sed -e 's/git ls-files/find . -print/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	# Skip the image comparison checks since the images are not
-	# pixel-perfect identical, most likely due to the use of a slightly
-	# different font.
-	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/gruff/gruff-0.18.0.ebuild b/dev-ruby/gruff/gruff-0.18.0.ebuild
deleted file mode 100644
index f39dc996da03..000000000000
--- a/dev-ruby/gruff/gruff-0.18.0.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
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
-
-RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Beautiful graphs for one or multiple datasets"
-HOMEPAGE="https://github.com/topfunky/gruff"
-SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# imagemagick is an indirect dependency through rmagick. However, for
-# gruff to work properly imagemagick needs to be compiled with truetype
-# support and this cannot be expressed in the rmagick dependency. Tests
-# also require imagemagick to have jpeg and png support.
-DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
-RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
-
-ruby_add_rdepend "dev-ruby/histogram >=dev-ruby/rmagick-4.2:*"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/\(reporters\|simplecov\)/I s:^:#:' test/gruff_test_case.rb || die
-	sed -i -e '2irequire "date"' test/test_scatter.rb || die
-
-	sed -e 's/git ls-files/find . -print/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	# Skip the image comparison checks since the images are not
-	# pixel-perfect identical, most likely due to the use of a slightly
-	# different font.
-	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/libusb/Manifest b/dev-ruby/libusb/Manifest
index 182e6741788e..e36fb87aa732 100644
--- a/dev-ruby/libusb/Manifest
+++ b/dev-ruby/libusb/Manifest
@@ -1,3 +1,4 @@
 DIST libusb-0.6.4.gem 762368 BLAKE2B daca8049b82cb56fb8cac350f6953ce292c74370bf468497773b34b6017eef9c0252daf2a0213e660db99120a53193ea67943bb1d851ae1ee723ea84dbe289e0 SHA512 433425f9cc2600615a3e4baec962ff0901e9c0eae7a77c410d099f22742995b23bf9c143797b393843b3de26b8336263cd5b3d3d1cdcd8f91266d90201a6a6de
 EBUILD libusb-0.6.4-r1.ebuild 909 BLAKE2B c5d56a8cb13d2543e838d5e0094f1986325ea5a70fcf089c83340ded0eda91f1cd90f8216bd7ce277d6439a506c5dc476f932455ecd62cb2ecd960f6904ff63e SHA512 51e5d763c819f9212695f0b00f373daf5165ba54f3563cd3b3396307f3c69c3aa8ce639de8c28e943f3d9d1284f0255a286758b3657cab1fa199b773579b2999
+EBUILD libusb-0.6.4-r2.ebuild 1165 BLAKE2B 8dab0da0246bd9994847210459742a14fbe8cce3fae98557388fb7c7ee5766e772c0f1a1b568441bdb0d91ec702d31346216060cda749df5b34cc3457d90f6d1 SHA512 7ad6e30f5fe526be73e6d3acc56d8718c0c1dcaeccb32b10565b313fdb1fd4f88e6457964f34b9bb1ff5927fcc1614e595d7e5f138fab62095efce1e711accbe
 MISC metadata.xml 339 BLAKE2B 6dba590360812d06f4831a0e38b5431b2761a583bdf35446c3cdbb0c60821a6bf6b5526ea7eee8b0a9aa6bb536177edf25717bbc0d90a47e4a48a2b6c05f70a4 SHA512 35eea6d20d5bd664cb885f7daf2c88927784c55e1da8f5800dcf704464cb1793ab04a1fd8feaa177e9e304bcdbdcc009eca087c7c4047198f45be470927f5a31
diff --git a/dev-ruby/libusb/libusb-0.6.4-r2.ebuild b/dev-ruby/libusb/libusb-0.6.4-r2.ebuild
new file mode 100644
index 000000000000..335703d18ed0
--- /dev/null
+++ b/dev-ruby/libusb/libusb-0.6.4-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="binding that gives Ruby programmers access to arbitrary USB devices"
+HOMEPAGE="https://github.com/larskanis/libusb"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND+="virtual/libusb:1"
+RDEPEND+="${DEPEND}"
+
+ruby_add_rdepend "dev-ruby/ffi:0"
+ruby_add_bdepend "test? ( dev-ruby/eventmachine )"
+
+all_ruby_prepare() {
+	sed -e '/mini_portile2/d' \
+		-e 's/git ls-files --/find/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests that try to open devices or depend on specific hardware
+	rm -f test/test_libusb_{bos,descriptors}.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I.:lib -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	# This gem includes an extension that does not actually do anything
+	# when using the system libusb, but newer rubygems versions still
+	# require the marker to be present.
+	ruby_fakegem_extensions_installed
+}
diff --git a/dev-ruby/ruby-atk/Manifest b/dev-ruby/ruby-atk/Manifest
index 0b84452d0fbf..7a3c36a653dc 100644
--- a/dev-ruby/ruby-atk/Manifest
+++ b/dev-ruby/ruby-atk/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-3.5.1.tar.gz 2613400 BLAKE2B ab9b7e3b6322b5b89a6bf4d529d5b5abdfbe50b1e099cfba67f089bab3abd39c2a96b57305b13311e9c34957c57107e31708cc76ffa4c20d84af2294f7bf7bb4 SHA512 9423c18587c11b6c317a58ec817e886c99ab37b29271b1684d7c793655a121c8b20c9630347d5f248e687843fd888e2137dca5d3d232121d87565ee2707f2f21
 EBUILD ruby-atk-3.4.3.ebuild 420 BLAKE2B 50a1cd1e2f373b9cbc2007003b76f7e281506b054b8d858aa568df80fffdd5188374dd07b776d709c51940cb7c00c527948464ed4a8a5d18b51bbfd63bea2bad SHA512 46cec748e2b0e3c429515b8931adaa9f20e1b42747b94cc264d22ba869635e33a51b2c8a0c313cc67ae8914ff79b0ae9428d560a54a433caf3475e7dd5dce173
+EBUILD ruby-atk-3.5.1.ebuild 414 BLAKE2B 5a46e7d8a01eb5818947e52c8ff682793553d26ccd22c72675d2a7b8d95eb0f1984fd68e9030ee56d9fb4bd42b1f15d4cda91bc06b9c9b6bc6de1fd2763663ce SHA512 8a7f9f61f69a08c1afc54468b4380aa52080d2c0d08dcbddb0ae8f33ee19a9134f766f6452a824a3b3265c73641ad6f263929fda541058e46df1b77ebb7b4e4b
 MISC metadata.xml 338 BLAKE2B 28afb4e4601ddbd918344e8ea4668d18b43122fd5db29849d806919be9da2889d21fa047bfc43cbad6c95ff0e0f1bcdba2c2ba0c5e0b8b27ac7a235f534cd163 SHA512 72c7dbc3d22142137d4017e7514cafc7c900b673a571b44b7c649dc8776550d504052cce7f48164594939f1cd01e0fa5034a1e8c3b9c4a5f7176f7760ba692da
diff --git a/dev-ruby/ruby-atk/ruby-atk-3.5.1.ebuild b/dev-ruby/ruby-atk/ruby-atk-3.5.1.ebuild
new file mode 100644
index 000000000000..3882ef4588e0
--- /dev/null
+++ b/dev-ruby/ruby-atk/ruby-atk-3.5.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Atk bindings"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE=""
+DEPEND+=" dev-libs/atk[introspection]"
+RDEPEND+=" dev-libs/atk[introspection]"
+
+ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}
+	~dev-ruby/ruby-gobject-introspection-${PV}"
diff --git a/dev-ruby/ruby-gdkpixbuf2/Manifest b/dev-ruby/ruby-gdkpixbuf2/Manifest
index 3dbe0f5a243e..400880ab627d 100644
--- a/dev-ruby/ruby-gdkpixbuf2/Manifest
+++ b/dev-ruby/ruby-gdkpixbuf2/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-3.5.1.tar.gz 2613400 BLAKE2B ab9b7e3b6322b5b89a6bf4d529d5b5abdfbe50b1e099cfba67f089bab3abd39c2a96b57305b13311e9c34957c57107e31708cc76ffa4c20d84af2294f7bf7bb4 SHA512 9423c18587c11b6c317a58ec817e886c99ab37b29271b1684d7c793655a121c8b20c9630347d5f248e687843fd888e2137dca5d3d232121d87565ee2707f2f21
 EBUILD ruby-gdkpixbuf2-3.4.3.ebuild 468 BLAKE2B 096cedb4bb350fbf55858380c3819adab1f2d8db5e62b0cd5c8f69f74be42d16ccdc231f4aba479b05c9db34532e152630f4e1989405efcd15e4952a0bf271e3 SHA512 74b724c10933789336e06a2766e29a7e224cc9bb83ab765c6cb16d92cc391fc88f3e72bfe19da418362abd7b487795267ad38140421fb92192bc608ffbe0c2ab
+EBUILD ruby-gdkpixbuf2-3.5.1.ebuild 462 BLAKE2B 8fc38f4865e56484b4744240a0d0b0fa02354c31726993e473633298071cc0ef666ce05ae619b2a97f677d4e7087e9ae8ff41d3ca35aba2de7b4fcb315562ca7 SHA512 6d73dd7a2bdd3db6314431cdc71b7712db755c82dd3bf5f14edf4baf41681454f6c3b71e9c1304c425929ff8326863d99bb27831dc8123e33a996c50ccc51b95
 MISC metadata.xml 338 BLAKE2B 28afb4e4601ddbd918344e8ea4668d18b43122fd5db29849d806919be9da2889d21fa047bfc43cbad6c95ff0e0f1bcdba2c2ba0c5e0b8b27ac7a235f534cd163 SHA512 72c7dbc3d22142137d4017e7514cafc7c900b673a571b44b7c649dc8776550d504052cce7f48164594939f1cd01e0fa5034a1e8c3b9c4a5f7176f7760ba692da
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.5.1.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.5.1.ebuild
new file mode 100644
index 000000000000..2b414c0e5c6c
--- /dev/null
+++ b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.5.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_NAME="gdk_pixbuf2"
+
+inherit ruby-ng-gnome2
+
+RUBY_S=ruby-gnome-${PV}/gdk_pixbuf2
+
+DESCRIPTION="Ruby GdkPixbuf2 bindings"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE=""
+
+DEPEND+=" test? ( x11-libs/gdk-pixbuf[jpeg] )"
+RDEPEND+=" x11-libs/gdk-pixbuf[introspection]"
+
+ruby_add_rdepend "~dev-ruby/ruby-gio2-${PV}"
diff --git a/dev-ruby/ruby-pango/Manifest b/dev-ruby/ruby-pango/Manifest
index 42c1c8174b93..1b447c5b4145 100644
--- a/dev-ruby/ruby-pango/Manifest
+++ b/dev-ruby/ruby-pango/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-3.5.1.tar.gz 2613400 BLAKE2B ab9b7e3b6322b5b89a6bf4d529d5b5abdfbe50b1e099cfba67f089bab3abd39c2a96b57305b13311e9c34957c57107e31708cc76ffa4c20d84af2294f7bf7bb4 SHA512 9423c18587c11b6c317a58ec817e886c99ab37b29271b1684d7c793655a121c8b20c9630347d5f248e687843fd888e2137dca5d3d232121d87565ee2707f2f21
 EBUILD ruby-pango-3.4.3.ebuild 785 BLAKE2B de8cde028111ba3bb0341a1fe3803b5578ea767921fb8ac73f049fe7bfc1af189871ef6dd13b333a73ac9cf110fa82179c8cfcf421b7ac6edae705d19d4ede48 SHA512 7e51887d5d9b80b2615968c9ab43cf2647c5f0f964b1749fae89470f828e2a2109f6d6df18ae59164fa409a33ba5f0e86dc06ea50c1ccd10f582ec5edc533cf7
+EBUILD ruby-pango-3.5.1.ebuild 779 BLAKE2B 3192a4f2135f7c3c4fe48e09180dc9cfa71dc5c1d257f2d973e1f87ee7880d9b7aa07b8a548525ed568b907e2115d4aeb16944a39b90f12b36f6bc7b8b1df30a SHA512 0947d02ffbcfc647f16cb137ff5ee086a87e7242e79b109cc2a455e8e290d3aab88029d7a27cc2075304e363443a0d40a43dcc370c79e24b182ff78167685441
 MISC metadata.xml 338 BLAKE2B 28afb4e4601ddbd918344e8ea4668d18b43122fd5db29849d806919be9da2889d21fa047bfc43cbad6c95ff0e0f1bcdba2c2ba0c5e0b8b27ac7a235f534cd163 SHA512 72c7dbc3d22142137d4017e7514cafc7c900b673a571b44b7c649dc8776550d504052cce7f48164594939f1cd01e0fa5034a1e8c3b9c4a5f7176f7760ba692da
diff --git a/dev-ruby/ruby-pango/ruby-pango-3.5.1.ebuild b/dev-ruby/ruby-pango/ruby-pango-3.5.1.ebuild
new file mode 100644
index 000000000000..53e1e0b9a62c
--- /dev/null
+++ b/dev-ruby/ruby-pango/ruby-pango-3.5.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Pango bindings"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE=""
+DEPEND+=" dev-libs/glib
+	>=x11-libs/pango-1.2.1[introspection]"
+RDEPEND+=" dev-libs/glib
+	>=x11-libs/pango-1.2.1[introspection]"
+
+ruby_add_rdepend "
+	dev-ruby/rcairo
+	~dev-ruby/ruby-cairo-gobject-${PV}
+	~dev-ruby/ruby-gobject-introspection-${PV}
+"
+
+all_ruby_prepare() {
+	ruby-ng-gnome2_all_ruby_prepare
+
+	# Remove test depending on specific locales to be set up: bug 526248
+	rm -f test/test-language.rb || die
+}
+
+each_ruby_test() {
+	# Include pango path since run-test does not list it
+	${RUBY} -Iext/pango test/run-test.rb || die
+}
diff --git a/dev-ruby/slop/Manifest b/dev-ruby/slop/Manifest
index 92101d333b86..36040b4d3d9e 100644
--- a/dev-ruby/slop/Manifest
+++ b/dev-ruby/slop/Manifest
@@ -1,7 +1,9 @@
 DIST slop-4.10.0.tgz 17595 BLAKE2B ef542c9062dfd3381c7cbc5d1cb004a0d7e1f9d9ea78ee835704aa744309e6c4ac003d91328da89d3fdb734e5495e9f7cb05b2498e0f2126edecec8a83c97283 SHA512 22c586ef1e5ecebc3311496ae6285219b41627e5d15032a15964b682bc98eda7dca8d69017eaae0fbce31e7787a0e974ee58e340c6acd475f0f60001f7e9c85b
+DIST slop-4.10.1.tgz 17752 BLAKE2B d7be110a9fa012af3df26aa4a7dc055fe9443ca131ee078adb05fb4ef87c6976520ee96aca23893abb651bd6fa22ea350be5851ca6f142b301551447c0b12c34 SHA512 0ffca1dcb550a4b21188647bbc433345c62c61dcb5c6e647727ab21d0816a13b6e6cb17180eb86a870eb50ed67b2f44f72f38490f907ba21acaa81c2a2febc53
 DIST slop-4.9.2.tgz 16633 BLAKE2B 8907314016066569279dbab6b52f50cee58044b46c1a88c7cfab3a31e1bd7e702f63da170a42f113c5611080d5d212b970dddd1e3aeb2bc8e86d5ea577b9f163 SHA512 dbecbc5edaf257131edf54fb5577531a962a6ed64f9414342b5060bee479cf7e4c9cfb891af3553644fbe7817a2067de3c83b379651a62da5983f0c42cd68fd6
 DIST slop-4.9.3.tgz 16887 BLAKE2B 10ce02eec161fa12a1f6078047c5461476a45e02ea6e27f4e9c888611cc24a8f74e7cf90607a93a9510b41577e70e344caeb7d865eaf0bc9f980cc34d73899d4 SHA512 fbbf9aa5e12ee6b5d3c1e2bbe55c160e196fb201ff50c266f035e7150b9ec3bc223c89e354e16b9cd4cecabaa71935334722e53b0363d5a2a59f6c0e50c2dc97
 EBUILD slop-4.10.0.ebuild 671 BLAKE2B 9afa169034a84d6c1a25c14a326611ce9176d65902d9fc925e6ef4688c2b392d0829905cf70b95ede2f76bf587e45791628e95b8af487a1639b8ccde4c0deb18 SHA512 fb3c267de47acb7ebdf74ec6c3fb4a3a0eb625630ddbdc93a132b189354c11aaeaebfce3f8519c05c60d918dab9889623c6b4ed07d404f2b0ad1afe307747147
+EBUILD slop-4.10.1.ebuild 678 BLAKE2B 200d57baa884d311fe344f57d55d6710e8c3d5efb0f9d77dda60487f6111af60fcec0ca57c073b9a19e1407dfc29f7d35c28d29df173789377a8d5f381b21695 SHA512 10994778507fb4e1298a35053932d22b580c9adcec5ae5293479b0c68e17e9c261d5df7fe95bd8e83650117ae65b6271973e0b41b1d21ee2288f4df9b23af773
 EBUILD slop-4.9.2.ebuild 672 BLAKE2B 305f22607207147d54e9b0693f04508c8df6b56fa85f8b40dcc2f11fb4cac1c66fc88f536225e0c2a4a6b64e7d764659a8645ca3c0e039559bac67fcfd35fdc4 SHA512 6a53ac5e70f2249ee6a9a0d447fbc7006ed8ee1b74e89574e222ee52b6ac50efeae3f40e58bee6ced6944d0b97a309b66256d320aff72ffa636e60ef13674eee
 EBUILD slop-4.9.3.ebuild 665 BLAKE2B bcd3c94ad73e722eea62648b8687725aa622c776ddf07d285eb7f860de41889a6e69f526dc2d41d5ff92c07147cd64693f84fe304460733af3f397835d509c38 SHA512 b030247ab324abe4cf0222164d84efd417cd57afc7e86fe8020e409198081bd29ac831ce401344b8d37287e3e6ea971d5f3d271f782985c01c243e8809fa36ee
 MISC metadata.xml 389 BLAKE2B 3007f76ec3ad2c1ce734a5ea209b6708c78a10825986190254b7728087a7b04c19cf847d8f940476d3a796fe9a0272fb4b82db92a664d4edd90eb3377adf31e1 SHA512 777d72f0ab69f3523aed8a4487f4f4c391ac94af4eae7aa7efc3375c6c2539a1e1a85cd88d893a32c879692f1862251489642a6757a46401f3d7e5182d3ef5e1
diff --git a/dev-ruby/slop/slop-4.10.1.ebuild b/dev-ruby/slop/slop-4.10.1.ebuild
new file mode 100644
index 000000000000..003a4bf68a9e
--- /dev/null
+++ b/dev-ruby/slop/slop-4.10.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="slop.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API"
+HOMEPAGE="https://github.com/leejarvis/slop"
+SRC_URI="https://github.com/leejarvis/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' slop.gemspec || die
+}
diff --git a/dev-ruby/spring/Manifest b/dev-ruby/spring/Manifest
index 43f0126e3dfe..f706f4dec47f 100644
--- a/dev-ruby/spring/Manifest
+++ b/dev-ruby/spring/Manifest
@@ -1,5 +1,7 @@
 DIST spring-4.0.0.tar.gz 46258 BLAKE2B 9e02594dff1882f3f7f47af682afddafc3f4be97f9c3dcc0ee3289be9fb1bc252260e24bec44d024ce808a26a2ac571840357df8fcc719e60ca9ca159460b998 SHA512 c5ed7e389c97dea3b183d6cd373823c3230a84f21427cabacd72ea2bc97f00bcbf9855d36808a1bf3257ccaea21ee35f2070716dc4f0b64205a674202eac6b94
 DIST spring-4.1.0.tar.gz 46775 BLAKE2B 5ae0b1b74438e0e8c41ef7e3bd2a5041c6277b91c8befef7a235f42d3a876f2a125c8ddf1dcca86216c4a740a7c07b49077f64baa8cd078ef695e109d2aaaa5d SHA512 f91d9ad8c87acdc9b8af593f788dd7c255da3c2b407c43d9c20d16c3e21d731f8e923c5e00e4e1ee59596ea04c7f26a2a1eb3a2251edc8cb94dd16c346654285
+DIST spring-4.1.1.tar.gz 46849 BLAKE2B 08e66e8e8869ae900bd134ceb82e55d08ba005291b8a7c83a61225c04373b8b89488f0636c4bcf0a8fdc6407ae2b1da26ac7092a3cdd5b1209d2ae2c4a6abd06 SHA512 caf85cf8588825b62cc8284bea79ad3b1faa5b61cf773db78c4f62b24df1e0fd5d6ba148d993045ab8dc768dde5a3401aa228ba51b4985b98f5ce4080f695e43
 EBUILD spring-4.0.0.ebuild 818 BLAKE2B 66128f0799bd88522540bc0714b76d0859a7e1b916a81674c582110e0094b6bc0f8303004bb2c3fbda84a81bae77e52dc03593b0ab0bccb94542cc403686e220 SHA512 e1f38bfa014d9d5fb897e0c4040dc375a7b338c36e0a2272016871f0559909b4e805d58fa36f42de8438482dacf7530cd3dbe5f06fe644595c919a5d9e6c62b6
 EBUILD spring-4.1.0.ebuild 825 BLAKE2B 320854e18ab9c850d9816e6846637dc792d207a48391e26b0a4cb620570e34b5d9d539a3cb418cb2dad83ad1b5d6332f6fc6585ffb4edb752f22797890c065ee SHA512 8d688bdf44ff127046775f3f9786c8b070a599495fe37334c5296eb90399d5359b44dd5caa9c8137ad0e6bc101ae0d90a90e2b9a0ebe62fd7718bb83cd70ea9e
+EBUILD spring-4.1.1.ebuild 825 BLAKE2B 9b23620493ebac8f5520e4f9a04345bd2e55f1e9254affb0e9722241af640c945e5a561738ef02138010d81cda18c35e223aefa25ade9bddf8ea7d37ee170bf7 SHA512 054e5fe4610285b3fd7859899b56d7175a37b1fe7f7ce2a5b2b215ed95592c48c1cc751b3dfb226797380d17a5fe4959289e158af93f4593fa3fafe08b3ea4ef
 MISC metadata.xml 339 BLAKE2B 17c685849cee6c0fb62bc96a54cccb38c1fb12bc90518094639ba3f9e1c97f286b8beeea52556986337673361c510c4c14298e1694cfafbd955b5c6277a6dbbc SHA512 46a6a32dd12d206b3b91a2e7e0fa8ac56a4b9dc4f09ac92277c634d428ad519dc361dd94fefd9a8b19257921eba68f418e635279c6ea07dd083252ab6b3f8879
diff --git a/dev-ruby/spring/spring-4.1.1.ebuild b/dev-ruby/spring/spring-4.1.1.ebuild
new file mode 100644
index 000000000000..e881ec944281
--- /dev/null
+++ b/dev-ruby/spring/spring-4.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+
+RUBY_FAKEGEM_GEMSPEC="spring.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rails application preloader"
+HOMEPAGE="https://github.com/rails/spring"
+SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
+
+all_ruby_prepare() {
+	sed -i -e '/files/d' \
+		-e '/bump/d' ${PN}.gemspec || die
+	sed -i -e '/bump/d' Rakefile || die
+}
diff --git a/dev-ruby/sus/Manifest b/dev-ruby/sus/Manifest
index 665dd43ba7b7..22ba3597ebf7 100644
--- a/dev-ruby/sus/Manifest
+++ b/dev-ruby/sus/Manifest
@@ -1,7 +1,9 @@
 DIST sus-0.15.2.tar.gz 25676 BLAKE2B 3cc99d849674b87c8ac919dc176d48cfc184de9ed302f33a40a3f171430e9cc0ad9624c29f95053e7a8bd0ab7b2741bd6a09c7a77707a9ef83a265b09a095b4d SHA512 0f2e0f3640cce798564c53ffb2cc93996eda28af3b49d4f0d89327be960ef68e8aee5b0e906cfbadca0582bf5b363633314fd7d2eabf7ebf4782fe2aed095394
 DIST sus-0.16.0.tar.gz 26123 BLAKE2B 829e2ec74e60eb41809d85e9f74e1c8697d7803c6f26dd5da18f705fb0b35f85d8efb976eb858e07647db2137a1e864181346b69d2dd054d81289a6bd43cca2c SHA512 cd787e63b202df8b501c5d71198b9cfa23085b7e6ad7d9d9a4d023e4fab3a6c103d89390293f9940d14c023ea224b33b5ec728b67988aee8279cf248e20547cf
 DIST sus-0.18.0.tar.gz 27299 BLAKE2B 235ee4b9229d27966eabddd9400b734bd98c9f175eb639830b45269977b75770c72357be7cc631076df90f35cec38cfa6137277394dc1af0053cf81de59a84bf SHA512 3aea3aeac304efeafd0dd27f523196965731521cebb123d781cbb3a59bbaf79a5db460f2bf8461d750865616ec1dd4cf4acc0c29d3be0a0d7f33e21c43e0844c
+DIST sus-0.20.3.tar.gz 28845 BLAKE2B d10b142dd9d7ef44a453746f859a7d4a66eacd09ea157aef1887a95b01a88e7f749f9ca881518500eef48917b5cb1e67ac008327af0ae9df0200875bbe1de3b1 SHA512 1158f6ae53c5aae22454a15eaf7e613a00b1af730bf07af6662bd7e9d7f30365cea9dbebcddb5b6234931cf9414b8c3af0889d73194632cbaad439872cc89059
 EBUILD sus-0.15.2.ebuild 830 BLAKE2B 639e9073fb91743afdafccdd6a19d5af17401bbedf50dcb7aa04be4726399b939eb3ba937d0fea18dd7275a7bbffa8008b29f775d35c1f9880a136b86aa8ebff SHA512 c25fad76b81b85f1c763316e9a7b98b22214e60c89f44f7ded4c6a7347c70ec41b24fba99ac2fe80c8fb6ac3ea686a5a1b85713287d8dc0d59a69639c42344d3
 EBUILD sus-0.16.0.ebuild 835 BLAKE2B 2662afb4c07112b2782efad38e34e82fec9692db383b0d054d188ada82dfe57df1f3f110d6c0ef5a72f186bc24453e30d4b03e089b43e135ab623f191b1f5c59 SHA512 d925b9384705f276d88607117da89d7fe9f149a68478c18ff4d68d771f21e9b4ff10b6e8cb451e485dcc128c97ffc72cf64bb384366c415c9e06480e74be0c26
 EBUILD sus-0.18.0.ebuild 835 BLAKE2B 2662afb4c07112b2782efad38e34e82fec9692db383b0d054d188ada82dfe57df1f3f110d6c0ef5a72f186bc24453e30d4b03e089b43e135ab623f191b1f5c59 SHA512 d925b9384705f276d88607117da89d7fe9f149a68478c18ff4d68d771f21e9b4ff10b6e8cb451e485dcc128c97ffc72cf64bb384366c415c9e06480e74be0c26
+EBUILD sus-0.20.3.ebuild 842 BLAKE2B 0fb723bf51380768841455238e1bc1893ed49090a8105e31b40148f89c09f82a53e942c6a5b1af28d499bb273a58e017733c34e0fd5fdf0964f3f56ecb4e4e00 SHA512 170c79168d13518dd8ad4ff86c268ed54f3b688ca8c40db6eeeb7f5d4123ddb411ee6f596392f48b0e067667526274f12edf4423125b84398b2afdcdbb4a9bb6
 MISC metadata.xml 339 BLAKE2B a89a738b1bc39d01b68a8ff2f6ea0b7edbb35c6c9cad01b7762e2ee4e99b00bd72b87752832fb2a09017836a648334aefaf3009d6912917e490c13557427f963 SHA512 bcc9d407a5fb5159fc2910fa0eab40d3654d78907a0b1812351adf85cf577d3cef53550ebcd86aa40ddc6c03714df97469615dccab9ec4388728ab1106cf6cd0
diff --git a/dev-ruby/sus/sus-0.20.3.ebuild b/dev-ruby/sus/sus-0.20.3.ebuild
new file mode 100644
index 000000000000..ee07579ec948
--- /dev/null
+++ b/dev-ruby/sus/sus-0.20.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast and scalable test runner"
+HOMEPAGE="https://github.com/ioquatix/sus"
+SRC_URI="https://github.com/ioquatix/sus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Remove the sus configuration which enabled coverage checks.
+	# Its dependency is not packaged.
+	rm -f config/sus.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} bin/sus-parallel || die
+}
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 489fc063c6bd..0b46abd2a1d9 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tcl3d/Manifest b/dev-tcltk/tcl3d/Manifest
index 4eed621a6387..587a699a65cf 100644
--- a/dev-tcltk/tcl3d/Manifest
+++ b/dev-tcltk/tcl3d/Manifest
@@ -1,5 +1,5 @@
 AUX tcl3d-0.5.0-implicit.patch 225 BLAKE2B 1a2a484e3d390e92f9889772e926b0529fa5adaf00e817c3d20a02cba33f00ea3f5f6f4a5c8a8ebe958a799fc1e78ad5d31d831f82ecaa31420c4dfec29abe91 SHA512 fc5fabaee860b0e89af47c6070f0394fe247a86f484292d657b96d3d762b451036b56983d6352719e141d4e0c17bdcec97ddee898adc55de36e712789736e581
 AUX tcl3d-0.5.0-include-tk-dir-and-permissive.patch 2544 BLAKE2B c982924cffd60db538428d225a23023bcedbd3a9bf5e1087815d3a8fbe49d4f2be3f4dd3aadee3274a85f11a9c2d0e442bd739a0da3a415c15ac32eb8a116abe SHA512 ff5bb6df033cfa1ce9d01305cf3346653cc9ff6c144e19609b8cacc659993f0df0a8e0db741e0733e7c3f44aff6ed7f02596e382bd2b813980a8fbbfbbb376e6
 DIST tcl3d-src-0.5.0.zip 3936271 BLAKE2B 97bd3815c05254162d8af4b2029dd2ac4218ed4bfb94e19a6454f41c12953b48f616444e466dda5359433f84a9284a2e20316b6c97b0e3a20deada47f583510c SHA512 24f799d5cc0ad9daf060b6b723d1197be678c0716b2099287e004221889c56da03f7368d6cd4c47dbbbbfe936b0bf65366cd452d3d9c2335cdfbae6ff3860a29
-EBUILD tcl3d-0.5.0.ebuild 2186 BLAKE2B d469868e7b152c402933287f2a052341ecb661e673293b2a6054f7258db0b87bf82efd0554d5bf3fc3271c6e05bfac62e0ae9b4b33ff9a017654ec3b46b5f0b0 SHA512 441f75cf5679905b363ecf5877243d84064484a6a7575e10cefe8ccb6eb11f060506abbd66a986428b9a7708a5e34f838dfddea1b5cbb6ab71877908363d62ae
+EBUILD tcl3d-0.5.0-r1.ebuild 2218 BLAKE2B f54db5a1ba21bf40a377307c323bfd0aa23b121466939434b24589cddfcaf12d9f2a9b42c4549f523cb4692b5fcb1de165ca189791b6cb542a171a55c75149b8 SHA512 0a0168633431580a4ea75ed3a2273a55ee6b79c9a93db12b55e3e722dc321d284f3453be9f3decc577d75f71cdc13f1fd59a915014dcbfb33f823421e472e58c
 MISC metadata.xml 1312 BLAKE2B 4201d0bb5484fa80df0439ea9e4b8a91823c7c47690bf10d525331edeb43f8799c33eb71d2e1305d84e1b916fa10ea3906104bd13f6c169f3c02279555491e9a SHA512 8269b94e36e04835c1deb69ece8ba04801a8e9daf08fd8f18fbc2a42687b9ceedf8f8fa5e525f10699a32c98de07a6944c70a3bbc9d5f673f8868bf5b090e3e2
diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild b/dev-tcltk/tcl3d/tcl3d-0.5.0-r1.ebuild
index 870f791b448b..b295909cdc56 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.5.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
@@ -51,6 +51,7 @@ src_configure() {
 	sed -i \
 		-e 's:^\(TCLMAJOR\) *=\(.*\)$:\1 = '${_TCL_V[0]}':' \
 		-e 's:^\(TCLMINOR\) *=\(.*\)$:\1 = '${_TCL_V[1]}':' \
+		-e "s:lib64:$(get_libdir):" \
 		config_Linux* || die
 
 	# Fix libSDL link
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2c7b3f95079a..0a03067a0fe5 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index e6998cb3f54c..27c927e44315 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,6 +2,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -11,6 +13,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 57d0c4810421eff9d3fab976f16d8ad92e67764aaa9c72154a793c7783d98e835789df2cdd2c64f44c035f85e29652e5e50b72ceb161d4dc0dc803983234c08f SHA512 54120a86d7655cc53bb0ee858561959e112f415e9f23e4d56cd0d7716147b2563bdcb3800005eebd8311c237659319f735176072547a7f2162fc9b4f641dfdf0
 EBUILD lldb-15.0.7.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
 EBUILD lldb-16.0.0.9999.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2dcc4f24d06552459384b240a352b7be168338d738657f9c0d5a2123ec6c4fb6a6454e6fe6c71489f0d036985dedb SHA512 133ebff79c2452ed3b198c9ece259de10d4267b039d076a210d7a2ee627d12c8a05f7a37b692cbf732fe78e488daac6c37c9542a92dd765ecba292ca12310e10
+EBUILD lldb-16.0.0.ebuild 2668 BLAKE2B 9c511f2ec5e6c0636d3de8c9c306dcc444efa8bc3e35c278763b3123ec6a400467ef68921ff41f1c731362f58bb6dc72dbd536bfe52758de6ea7f7e0b85c0a07 SHA512 fc19cffc5826458d7981dfbaa5e687d39d7c66ee40857bdca9e0ece371198f9537eef7f3f885d1357f7e995d73d1586d3c8b58ccce486d3264859166e1786dbf
 EBUILD lldb-16.0.0_rc3.ebuild 2670 BLAKE2B ee1ab32dec6e5df020c0bffbaee0bad69ded3a57d6a26c61fdece3b9741b91c97a1fd9018fe36db452515852ada6388d539d93f0fa718601e7f1b590704af011 SHA512 93ee5b4a0f8d34cdd270e152d5c4a7e7fdd0df30eddc43ecaee3bf84734a0442d012eb3f2c619682465646d9789b8cc1961dddc7018cd17f47b88ccfdf764206
 EBUILD lldb-16.0.0_rc4.ebuild 2644 BLAKE2B 477cfcccd1f17eaab5578e67f545517fb6ef0d29df12dcaedc4a27e55da68554ad7cbdb4da4e1f8a49b91101676a571ca764a71b816e9b133e105d8ba0f3406d SHA512 534e9bef0f96bd135cedc1d69069fd961e366063b72ff9ff3a89c33d5c2f6fcba9c80bd3ae78b7643a0b272263d49ec6ebf63ff1373890446dfdf67c794cf3d6
 EBUILD lldb-17.0.0.9999.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2dcc4f24d06552459384b240a352b7be168338d738657f9c0d5a2123ec6c4fb6a6454e6fe6c71489f0d036985dedb SHA512 133ebff79c2452ed3b198c9ece259de10d4267b039d076a210d7a2ee627d12c8a05f7a37b692cbf732fe78e488daac6c37c9542a92dd765ecba292ca12310e10
diff --git a/dev-util/lldb/lldb-16.0.0.ebuild b/dev-util/lldb/lldb-16.0.0.ebuild
new file mode 100644
index 000000000000..e4e43bb0ef2f
--- /dev/null
+++ b/dev-util/lldb/lldb-16.0.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
+IUSE="debug +libedit lzma ncurses +python test +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	xml? ( dev-libs/libxml2:= )
+	~sys-devel/clang-${PV}
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	python? (
+		>=dev-lang/swig-3.0.11
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+"
+
+LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LUA=OFF
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 88f8ebee00e1..70b68e400b73 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index b182f08c5468..c07dda299f3f 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -63,7 +63,7 @@ _LLVM_MASTER_MAJOR=17
 # @INTERNAL
 # @DESCRIPTION:
 # The newest release of LLVM for which manpages were generated.
-_LLVM_NEWEST_MANPAGE_RELEASE=15.0.7
+_LLVM_NEWEST_MANPAGE_RELEASE=16.0.0
 
 # @ECLASS_VARIABLE: _LLVM_SOURCE_TYPE
 # @INTERNAL
@@ -444,7 +444,7 @@ get_lit_flags() {
 # Return true (0) if this LLVM version features prebuilt manpage
 # tarball, false (1) otherwise.
 llvm_manpage_dist_available() {
-	[[ ${_LLVM_SOURCE_TYPE} == tar ]] &&
+	[[ ${_LLVM_SOURCE_TYPE} == tar && ${PV} != *_rc* ]] &&
 		ver_test "${PV}" -le "${_LLVM_NEWEST_MANPAGE_RELEASE}"
 }
 
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 27a91d0dce23..ec17ae0f694c 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index aaa6230d5999..14f5e0b210c8 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,7 +1,9 @@
 DIST gnome-contacts-43.0.tar.xz 380348 BLAKE2B be226024dd8369a3c3df9766d6860912fee5a698ee4e0754d773afe16d7f787f3d8a73485c9a31b091514b7de3a835e3f4e37b6c11fc746e1a5f681e07af58fc SHA512 ee2cfc4ad2318f27b0e6597eae501a6e2240b4de8ceb7982c4942a6ff50ce6cd56d06f5d324ac04f82dd8e7086dc82426fb3aab9c194cbfa490b5bab98ba0469
 DIST gnome-contacts-43.1.tar.xz 384560 BLAKE2B 43f3c0e815e358dc4952f9b389028c8b6ad0590ed3db0e31ce08bf2f76dd75ec5a11afb0660344eee79fd42e7aa9bd4199981bb823505e295e40d3d2a17d4e90 SHA512 4a4513937d0ca2ba35584795fd186ae01e2b2dcab6482ecd73bff24cd4f7abf0a84a7e3305b69aef8de611ee737bc2e572d6be60cea3121850a6e3cf15db0755
+DIST gnome-contacts-44.0.tar.xz 395540 BLAKE2B 479353667217d0f78d61cbc1dff5ec67c13cf14254fbd258cf34d5b084d65c515426b2ce418bf74350f727a2b1cb6b9a0e4ade150eeabd01b06cecf7792f7a7e SHA512 f25a368317923c46f5700359e3fed86f85a155c58adb275ba7d884975debe78594e1da58a95633a33a281cbc78f41824f4ab38b50ae01f4f9f8e38f3f1906849
 DIST gnome-contacts-44.rc.tar.xz 395224 BLAKE2B cb674f25c6b9b658f581f88f7a285675e79c5e436af65de92a2c77580d2ddfe32aa1d1d34de2894de09b59689ff2880c176fb78e1cdce2eabfc2ce109089988a SHA512 0d01974447689291d69a83cf593938507d813a4c1f3d37b76e56e9d6bee57db12e638a1c37059c0ce26e83fb5362c1881c30da14cd2b2252e3653432bf6b62cf
 EBUILD gnome-contacts-43.0.ebuild 1427 BLAKE2B c7842623780e7ffca5ba9e193d00ee056cdcf8bf852ab3ef5d90f1c4141d5cb71851ae40512973d11ec8194035276e225eeacdf9148d95e6e4e0c9992dfe99dd SHA512 273ee115cffa1e0ef5e47934038df40435cfbd9ebaf071714d7d5efa191215ee9239fbc8a5b70dcaf3400ed2126ed6bfd1f04454c6f6248cb445b483fe0308d0
 EBUILD gnome-contacts-43.1.ebuild 1430 BLAKE2B 7ebdea824d2d6dcc88bdaacb35a831e1fad9d68f2cc7508e66c8334f34834b125b521ce43eddc32ae8a0216fed8a539bb43ad3f15f0fb10e699b97e927bcdc30 SHA512 a554556186f773e4244733b2ba71377718b867821e157765806f3ef8e887caedcd5a5effc474c7338d8d26f6cdb7a70077603e6378d1389a2f644b6d6e701f6a
+EBUILD gnome-contacts-44.0.ebuild 1586 BLAKE2B 49d295f30ff76e7fc9c7875e9c844d547680cb5e427c5c28dcc69aa3cf5cf72a4364bdc3919b19864aa9abbeefb6f709de2099049798ea33182f42ab657bd969 SHA512 2277730e0d8c742d2890df4d048e0b273c67636865db5d2887857289afabc40a75be546adce15b1b9f3310f3b54c35e2e59214ba6c4036dd7a41c62d4ed6c9eb
 EBUILD gnome-contacts-44_rc.ebuild 1684 BLAKE2B f59093e07bf52e73ed83d4ad576a013363603cf4d175d0792362c820e53b4d20686960997b1e57820612fb8f84db01b3a563326adfa4ef657b9851a91a530249 SHA512 266223dc5b42b432795618cabe51dd5ec9572d66c9673f5b685db2b487d89a5cc2012d77622ebc0c9eb57eed2b9b1c38c78cbe8d7b3bbb60859e6c44383907d0
 MISC metadata.xml 504 BLAKE2B 876846abc81450936c89143571a1b26cd48f095c22aa76632e3aa8d860fc77fd8cf5f9aa6f39ecc37f02d53964aa2cbc35f74acc1ecf7a947cef4568b8b5a1dd SHA512 2241ed2d7e0c42276ac709c76085ec62c743cafde605494a5ffd5314a7c1d555d2463104c6487bb3ae4a0360d3f68220b910dfd0c40ea4f52c748a727b1aa0f5
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-44.0.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-44.0.ebuild
new file mode 100644
index 000000000000..303bb2b982e3
--- /dev/null
+++ b/gnome-extra/gnome-contacts/gnome-contacts-44.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="GNOME contact management application"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+gnome-online-accounts"
+
+VALA_DEPEND="
+	$(vala_depend)
+	>=dev-libs/gobject-introspection-1.54
+	dev-libs/folks[vala(+)]
+	gnome-online-accounts? ( net-libs/gnome-online-accounts[vala] )
+	gnome-extra/evolution-data-server[gtk,vala]
+	>=dev-libs/libportal-0.6:=[vala]
+"
+RDEPEND="
+	>=dev-libs/folks-0.14.0:=[eds]
+	>=dev-libs/libgee-0.10:0.8=
+	>=dev-libs/glib-2.64:2
+	>=gui-libs/gtk-4.6:4
+	>=gui-libs/libadwaita-1.2:1
+	>=gnome-extra/evolution-data-server-3.42:=[gnome-online-accounts?]
+	>=dev-libs/libportal-0.6:=
+	>=media-gfx/qrencode-4.1.1:=
+	gnome-online-accounts? ( net-libs/gnome-online-accounts:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	${VALA_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcamera=true # Ignored
+		-Dmanpage=true
+		-Ddocs=false
+		$(meson_use gnome-online-accounts goa)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 06c3b1c10555..70dce49e4ef4 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 6ddb2c0ad328..21e909ad1acb 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -6,4 +6,4 @@ DIST postfix-3.7.4.tar.gz 4833834 BLAKE2B edb716ef4576d339189f11b535a62f3c6f8f28
 DIST postfix-3.8-20230314.tar.gz 4822429 BLAKE2B b4c15da78c5691a39878bc96f8432b411f29089a20cd86bbc6e3ebdee0c8df7699320b642a4cbc315e8a5275acf439b00f6fc4b1cece048ef3326a9ce1717232 SHA512 bc5ee2e88d2485068a40c3724e07729c90282b87f4f1dc8ca87dc39fb589b8983a2186c45f5d0bdbad8085851f29c478a3c0cd9a3246987304125878a4c2f90f
 EBUILD postfix-3.7.4.ebuild 8023 BLAKE2B f1ed37c430536e96591beceb346144d28bf5eee3a1f93d7d41d4db3f3ed36b9fea7847cbf0c3b278a8ee99ec93ad91797a8fccfad5104717deec5bf4ef18396e SHA512 0676646a5d0bc5187779b707593b8c6ac438c2f13524c4105bc4955feb57ed40aa86df78b740bec4cfa651ce22e44075d8fe6bbecbe44ad591842634856403cf
 EBUILD postfix-3.8_pre20230314.ebuild 8198 BLAKE2B 3a4bad841ef4154c8ac20c78ebe4e2bcae9023f92d52bf2d94945aae20bda2ca214942e58c598b7646f755bb0aebcf0966ac1dad334d4996b454d78f062c974a SHA512 c7d29ef876d85afcfc8c3e6d9e888e0f266cd30c0552c6f1e8ac3b462ec3c76b7244a202bf379053728264322b559f60aff0f5484fc7abdf9576e82af0155406
-MISC metadata.xml 867 BLAKE2B 1839d35c91007bb07e1a722b6b4751e9f7754e00109859efe5850df16486bafbaeb019326d006438471678553aca9474462fa32eaba445362113ced6927bf4ab SHA512 ff898bdce2b60bc52a0d326f8f8221bd474cc4fa31def2ccc5526ba59ad396b0b26f22cc98ca4e1181e3c38e5476615e53bde2db1e643ae5b9209ac581ecc1fd
+MISC metadata.xml 853 BLAKE2B 96b2b5c531692f1eba1bc4c543ba4df77754d11802e9754ac102907d00dc1284fe449384d3c8c4e53c343e3424f79cf654b7a0c6a112d0ec973f8da585045ff7 SHA512 15c4521a70f25d8d5261c1c981d7ab41cdf542a1630c6857037e0b3e3ab0a51f6dbb4edee9ee9857d0b7a130c5da6f475e1be6a02728edecb23defa004be48eb
diff --git a/mail-mta/postfix/metadata.xml b/mail-mta/postfix/metadata.xml
index c08e86d06fea..bfcda1f76455 100644
--- a/mail-mta/postfix/metadata.xml
+++ b/mail-mta/postfix/metadata.xml
@@ -3,15 +3,11 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>eras@gentoo.org</email>
-		<name>
-			Eray Aslan
-		</name>
+		<name>Eray Aslan</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
-		<name>
-			William Hubbs
-		</name>
+		<name>William Hubbs</name>
 	</maintainer>
 	<use>
 		<flag name="dovecot-sasl">Enable <pkg>net-mail/dovecot</pkg> protocol
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c4507486839c..7ef8a6d1c8a2 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
deleted file mode 100644
index 787378b84a30..000000000000
--- a/media-libs/libextractor/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX libextractor-1.8-exiv2-0.27.patch 3364 BLAKE2B da55735ccab9a3cf868f274b82951cf548a2f1340ee24c180244f8ba2bbd85c7002c963d06257aac0b0457c2afeda755d0aaacb501280b995001f7bbd49d6de9 SHA512 6411df1498fd3594088b3488e490b25009e9243684b777d35fa26189c20f410b42496b5fb42f762c468df746a9bdcd6a310f645db5ab0bbe3bd121e82aa9d48c
-AUX libextractor-1.9-CVE-2019-15531.patch 518 BLAKE2B 2310c4863dcce5324706a96fb86cff7b72473d0027027bf8f40453cc863296a5c1880577af8a95f0875522da4d5251690c77cd8571e87d5c048f18240b8aee03 SHA512 5b50c20ce0e77f664578e1383e481694388e6200f01e3eef0029296deb3cc35cc76b2277d4a1f879f3f1d1b4d24235d2e17f26eacf0a5b963f1c1433a615eaa2
-DIST libextractor-1.9.tar.gz 8323852 BLAKE2B 71e81e57ce7857b7b7f0180a7b130b0808573d71384c61a1a079b0ce9c02bc4f1386d3b27c68d668b555a692e523a7998d6fbc675d15f8ee26b487b0b5b31927 SHA512 c2539b144d026fb0e871c5776aee4deaad4a987a730350744a7e5e74fbe98a4abb635dbe206b93c3aa9cd676b8797ea0b97271de0c903dfb035e245ab42ea149
-EBUILD libextractor-1.9-r5.ebuild 2849 BLAKE2B 63fac488179bd49f981cdff2ed733bd03286300a29ab267733bba59e30d23d91c73e7c96b2cdba245d16c27ad6417ac1ec87a78d4527d4fe61b9a19813c6c8cc SHA512 7924424b7a6e518049345bc53a2586ad3a4262512d80be3293df1c0046662346d5231c10f0c0e71bad1180a061494765ab0c57f243f9d9b8738c471e70726bb8
-MISC metadata.xml 549 BLAKE2B f25ce221cf80c66d32c5989cd0b6a2e61ef5a665152d95fc20f2a7959cf185a33c50c223b81428feb77ebb1550ae2aa448d105db5c9b3b21f35751d1d9bb3954 SHA512 7405ef5efde10dfe76f12c0936371c9f504d1ccc3922b868cab680fabb2bd6bb8ea8a5d57f452237fc2697b63fe1225582a0d8418b3b0ca7a89b4d9e80403643
diff --git a/media-libs/libextractor/files/libextractor-1.8-exiv2-0.27.patch b/media-libs/libextractor/files/libextractor-1.8-exiv2-0.27.patch
deleted file mode 100644
index cfdb6426408d..000000000000
--- a/media-libs/libextractor/files/libextractor-1.8-exiv2-0.27.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From bbe21db4bf8face03adf0efd2eb18540582cb5ba Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 30 Dec 2018 00:46:57 +0100
-Subject: [PATCH] Fix build with exiv2-0.27
-
----
- src/plugins/exiv2_extractor.cc | 35 +++++++++++++++++++++++++++-------
- 1 file changed, 28 insertions(+), 7 deletions(-)
-
-diff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extractor.cc
-index 8741d40..ef402a8 100644
---- a/src/plugins/exiv2_extractor.cc
-+++ b/src/plugins/exiv2_extractor.cc
-@@ -27,10 +27,7 @@
- #include <cassert>
- #include <cstring>
- #include <math.h>
--#include <exiv2/exif.hpp>
--#include <exiv2/error.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/futils.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- /**
-  * Enable debugging to get error messages.
-@@ -180,7 +177,7 @@ public:
-    *
-    * @return -1 on error
-    */
--#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+#if EXIV2_TEST_VERSION(0,26,0)
-   virtual size_t size (void) const;
- #else
-   virtual long int size (void) const;
-@@ -316,7 +313,11 @@ ExtractorIO::getb ()
-   const unsigned char *r;
- 
-   if (1 != ec->read (ec->cls, &data, 1))
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-     throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
-   r = (const unsigned char *) data;
-   return *r;
- }
-@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data)
- void
- ExtractorIO::transfer (Exiv2::BasicIo& src)
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-   throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- 
- 
-@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset,
- Exiv2::byte *
- ExtractorIO::mmap (bool isWritable)
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-   throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- 
- 
-@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const
-  *
-  * @return -1 on error
-  */
--#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+#if EXIV2_TEST_VERSION(0,26,0)
- size_t
- #else
- long int
-@@ -504,7 +513,11 @@ ExtractorIO::eof () const
- std::string
- ExtractorIO::path () const
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-   throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- 
- 
-@@ -517,7 +530,11 @@ ExtractorIO::path () const
- std::wstring
- ExtractorIO::wpath () const
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-   throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- #endif
- 
-@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr
- ExtractorIO::temporary () const
- {
-   fprintf (stderr, "throwing temporary error\n");
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-   throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- 
- 
-@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec)
- {
-   try
-     {
--#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION
-+#if !EXIV2_TEST_VERSION(0,24,0)
-       Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute);
- #endif
-       std::auto_ptr<Exiv2::BasicIo> eio(new ExtractorIO (ec));
--- 
-2.20.1
-
diff --git a/media-libs/libextractor/files/libextractor-1.9-CVE-2019-15531.patch b/media-libs/libextractor/files/libextractor-1.9-CVE-2019-15531.patch
deleted file mode 100644
index 11344d3946af..000000000000
--- a/media-libs/libextractor/files/libextractor-1.9-CVE-2019-15531.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: fix heap-based buffer over-read.
-Origin: upstream, commit: d2b032452241708bee68d02aa02092cfbfba951a
-Author: Christian Grothoff <christian@grothoff.org>
-
---- a/src/plugins/dvi_extractor.c
-+++ b/src/plugins/dvi_extractor.c
-@@ -182,6 +182,8 @@
-   size = ec->get_size (ec->cls);
-   if (size > 16 * 1024 * 1024)
-     return; /* too large */
-+  if (klen + 15 > size)
-+    return; /* malformed klen */
-   if (NULL == (data = malloc ((size_t) size)))
-     return; /* out of memory */
-   memcpy (data, buf, iret);
diff --git a/media-libs/libextractor/libextractor-1.9-r5.ebuild b/media-libs/libextractor/libextractor-1.9-r5.ebuild
deleted file mode 100644
index 6645ffc5cc52..000000000000
--- a/media-libs/libextractor/libextractor-1.9-r5.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library to extract metadata from files of arbitrary type"
-HOMEPAGE="https://www.gnu.org/software/libextractor/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
-
-RESTRICT="test"
-
-DEPEND="
-	app-text/iso-codes
-	dev-libs/glib:2
-	media-gfx/exiv2:=
-	sys-devel/libtool
-	virtual/libiconv
-	virtual/libintl
-	apparmor? ( sys-libs/libapparmor )
-	archive? ( app-arch/libarchive:= )
-	bzip2? ( app-arch/bzip2 )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? (
-		media-libs/flac:=
-		media-libs/libogg
-	)
-	gif? ( media-libs/giflib:= )
-	gsf? ( gnome-extra/libgsf:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? ( x11-libs/gtk+:3 )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	magic? ( sys-apps/file )
-	midi? ( media-libs/libsmf )
-	mp4? ( media-libs/libmp4v2 )
-	mpeg? ( media-libs/libmpeg2 )
-	tidy? ( >=app-text/htmltidy-5.0.0 )
-	tiff? ( media-libs/tiff:= )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	zlib? ( sys-libs/zlib )
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# test? ( app-forensics/zzuf )
-RDEPEND="${DEPEND}
-	!sci-biology/glimmer
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8-exiv2-0.27.patch # bug #674046
-	"${FILESDIR}"/${P}-CVE-2019-15531.patch
-)
-
-src_prepare() {
-	default
-
-	# m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
-	sed -i \
-		-e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \
-		configure src/plugins/html_extractor.c || die
-
-	if ! use tidy; then
-		sed -i -e 's:tidy.h:dIsAbLe&:' configure || die
-	fi
-}
-
-src_configure() {
-	e_ac_cv() {
-		export ac_cv_"$@"
-	}
-
-	e_ac_cv {lib_rpm_rpmReadPackageFile,prog_HAVE_ZZUF}=no
-
-	e_ac_cv header_FLAC_all_h=$(usex flac)
-	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=$(usex flac)
-	e_ac_cv lib_FLAC_FLAC__stream_decoder_init_ogg_stream=$(usex flac)
-
-	e_ac_cv header_sys_apparmor_h=$(usex apparmor)
-	e_ac_cv header_archive_h=$(usex archive)
-	e_ac_cv header_bzlib_h=$(usex bzip2)
-	e_ac_cv header_gif_lib_h=$(usex gif)
-	e_ac_cv header_jpeglib_h=$(usex jpeg)
-	e_ac_cv header_magic_h=$(usex magic)
-	e_ac_cv header_mpeg2dec_mpeg2_h=$(usex mpeg)
-	e_ac_cv header_tiffio_h=$(usex tiff)
-	e_ac_cv header_vorbis_vorbisfile_h=$(usex vorbis)
-	e_ac_cv header_zlib_h=$(usex zlib)
-	e_ac_cv lib_mp4v2_MP4ReadProvider=$(usex mp4)
-	e_ac_cv lib_smf_smf_load_from_memory=$(usex midi)
-
-	local myeconfargs=(
-		--disable-static
-		--enable-experimental
-		--enable-glib
-		--disable-gsf-gnome
-		$(use_enable ffmpeg)
-		$(use_enable gsf)
-		$(use_with gstreamer)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libextractor/metadata.xml b/media-libs/libextractor/metadata.xml
deleted file mode 100644
index 88d3c6282813..000000000000
--- a/media-libs/libextractor/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!--maintainer-needed-->
-  <use>
-    <flag name="archive">Enable archive support using <pkg>app-arch/libarchive</pkg></flag>
-    <flag name="gsf">Enable OLE2 (MS Office) plug-in support using <pkg>gnome-extra/libgsf</pkg></flag>
-    <flag name="midi">Enable MIDI support through <pkg>media-libs/libsmf</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="savannah">libextractor</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest
deleted file mode 100644
index ca6b157e59ba..000000000000
--- a/media-libs/qtav/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX qtav-1.12.0-ffmpeg4-1.patch 1225 BLAKE2B 392c7290067aef2132e7024e268af250221b4138942c882b3c6955616f66561a067520f389731b53cc689e96cbbd43d1294a25efcdb4bdd61275f5d067a92014 SHA512 a46d37f00f92860d0b4e9d7c0bb2ec2aabf9517b39876b0ade58081955005eb8be7b4c18d16abcdaf98441c6179924b0bd1974041ede04467e7b7f5953a4fe8b
-AUX qtav-1.12.0-ffmpeg4-2.patch 5467 BLAKE2B b638548b1b66aeef0d10f381a2484528c93be1b14e6eb1099c36b77d9667ae4c20dd69279ba7e182da95be1e76048edac3e221f7a545563b2fe860d58814e0a0 SHA512 cc1c57444cae170498e2eff713c68106e3b829db3334f40a63530466a7a8c92532b41ee47a58e10676b8515929e6d3b5b1865c7842e3eaa676d7f89d820137c8
-AUX qtav-1.12.0-installpaths.patch 894 BLAKE2B d5e964a15566c5df08e35ad3dc6a666ce88a71bb260b0a0b56e2f6dfc1cc421a893e8104c740d911f805746ed4fd00f716453e58bd14ad80349a3b4c459f2006 SHA512 0eb3b37c86e29467db10263c94ea2efcd2fed014e49b1dc280c40c4ba0f63a7537260572aa786817df8e6bd503012b7e193ab0c9e66883f2eaf04c23976fa527
-AUX qtav-1.12.0-qt5.14.patch 443 BLAKE2B 80f2e2da6ef67cdd300257aba988dcdcb0a6a5215b806c862cf0a7d2fba7652aae27f5aa568f0bfbb1067b768be4c4d1a1458dab3e468cb7f55a1938e1c63b81 SHA512 1976e312bad83d0493be3af8652d537cca8905a1559d6dd021e4a3c234ac3e65e5743db6f2ac28bfd69ef8c2e0021b7d2144c8a4efea72dcc718bfc53e6d2370
-AUX qtav-1.12.0-qt5.15.patch 650 BLAKE2B cf5d5d5b4a30a1eb32ee38cd3f87c9df3a813eca19d342ba720521da8cc2c32eaabeb8a93bd56a25e456ef8fa9523bbbc4c832dbf22fd3831324bc96523a084e SHA512 156d6feb8bf0d9a3660f0341ceb3d2728d7b044ef4e3a9c7f81adbc262e3d30c4e8769a6059ef90601006d17f50f2259dcc533f223d0bcdc7467376b11f10899
-DIST qtav-1.12.0-capi.h-b43aa93.xz 6120 BLAKE2B b2aca6c4ae70e227728bf908a7b5b9ad9fcb4ba52a254362eaaefaa9480c6a1c551bf47f02f8a44273952bf2816d2dbc7dc92142264892547d4fe602184b5fba SHA512 f5e458b157a5f343bc5d4133cfe45ffefb5c6cbb902b41ae6b9d9349e31ca7ac5a2746addc4fef89fb74856f5db7691cf174d82e88b51cc0b7a356c4fdab5aa7
-DIST qtav-1.12.0.tar.gz 998117 BLAKE2B 85f8a470333e683353c305b06cec10f65b553c26b05fad4824d8f05f6aeb1fc2622ab8b60ba42a35260402a950bf41458e90342be6c53cbdb8400642c2d09741 SHA512 f273d10a4fe9126cd7d7b1293c087527bf898513e8add7958d905b6039b0c9c3891ea751c40e4c13ba683febff73912322953b151a131726ef8b44db199e0f32
-EBUILD qtav-1.12.0-r3.ebuild 1560 BLAKE2B 855361a6efc04b0819ad199fa7e1bc7d1a343eefeb4e6609c97e6a72944dc341bdf5047094f05f8c7034cc858fabb5bd58ea947a38cbfed942a879097bb78103 SHA512 722a498d686f1ef798259cb0b6f00484823f05bca80ef39d4449355a486c9a95a5031018df44896f01dfb45c7b5a3d446909550b93e5432fe921f746d64fb8f2
-MISC metadata.xml 312 BLAKE2B b8171e7b2ecbd6acb0c2ce006102d16454867f0ef84ecd8134ffa6fec93088a3eae6d79512fb78c6ab30bdc7a12d132e9266671f044b589fc4f48902e08b89c0 SHA512 10270381e10f7595d4ad8f6ef573cef8c0fbadfc2c659de60502c796acce3a4dc9476896ddfe711a0d552f2353de5d0372575f3e65c2db51eed8fbb8f3375945
diff --git a/media-libs/qtav/files/qtav-1.12.0-ffmpeg4-1.patch b/media-libs/qtav/files/qtav-1.12.0-ffmpeg4-1.patch
deleted file mode 100644
index cb77e9adebb2..000000000000
--- a/media-libs/qtav/files/qtav-1.12.0-ffmpeg4-1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1633f2962e195eb2a013072e694a2e1c701613a8 Mon Sep 17 00:00:00 2001
-From: 0xFelix <evostar@gmx.de>
-Date: Tue, 12 Dec 2017 13:24:34 +0100
-Subject: [PATCH] Remove usage of deprecated avfiltergraph.h header
-
-avfiltergraph.h was replaced by avfilter.h in libavfilter version
-3.8.0+ so only include it when the used libavfilter version
-is older than 3.8.0
----
- src/QtAV/private/AVCompat.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/QtAV/private/AVCompat.h b/src/QtAV/private/AVCompat.h
-index 6c38596d1..944cfd7de 100644
---- a/src/QtAV/private/AVCompat.h
-+++ b/src/QtAV/private/AVCompat.h
-@@ -59,6 +59,7 @@ extern "C"
- #include <libavutil/parseutils.h>
- #include <libavutil/pixdesc.h>
- #include <libavutil/avstring.h>
-+#include <libavfilter/version.h>
- 
- #if !FFMPEG_MODULE_CHECK(LIBAVUTIL, 51, 73, 101)
- #include <libavutil/channel_layout.h>
-@@ -79,8 +80,11 @@ extern "C"
- #endif //QTAV_HAVE(AVRESAMPLE)
- 
- #if QTAV_HAVE(AVFILTER)
-+#if LIBAVFILTER_VERSION_INT < AV_VERSION_INT(3,8,0)
- #include <libavfilter/avfiltergraph.h> /*code is here for old version*/
-+#else
- #include <libavfilter/avfilter.h>
-+#endif
- #include <libavfilter/buffersink.h>
- #include <libavfilter/buffersrc.h>
- #endif //QTAV_HAVE(AVFILTER)
diff --git a/media-libs/qtav/files/qtav-1.12.0-ffmpeg4-2.patch b/media-libs/qtav/files/qtav-1.12.0-ffmpeg4-2.patch
deleted file mode 100644
index 1f78acfde491..000000000000
--- a/media-libs/qtav/files/qtav-1.12.0-ffmpeg4-2.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 7f6929b49c25ca475a08f87e8b52aa1642d109dd Mon Sep 17 00:00:00 2001
-From: Felix Matouschek <felix@matouschek.org>
-Date: Sat, 11 Nov 2017 10:13:06 +0100
-Subject: [PATCH] Make QtAV build with newer versions of FFmpeg
-
-Some defines changed their name in newer versions of FFmpeg, this
-patch uses preprocessor instructions in AVCompat.h to use the
-correct define names. Also filter names retrieved by
-'avfilter_get_by_name' should be used as const variables in
-libavfilter versions starting at 7.0.0.
----
- src/AVMuxer.cpp                          |  2 +-
- src/QtAV/private/AVCompat.h              | 12 ++++++++++++
- src/codec/audio/AudioEncoderFFmpeg.cpp   |  4 ++--
- src/codec/video/VideoEncoderFFmpeg.cpp   |  2 +-
- src/filter/LibAVFilter.cpp               |  8 +++++++-
- src/subtitle/SubtitleProcessorFFmpeg.cpp |  2 +-
- 6 files changed, 24 insertions(+), 6 deletions(-)
-
-diff --git a/src/AVMuxer.cpp b/src/AVMuxer.cpp
-index 2f0b40d05..d2eb3dde8 100644
---- a/src/AVMuxer.cpp
-+++ b/src/AVMuxer.cpp
-@@ -124,7 +124,7 @@ AVStream *AVMuxer::Private::addStream(AVFormatContext* ctx, const QString &codec
-     c->time_base = s->time_base;
-     /* Some formats want stream headers to be separate. */
-     if (ctx->oformat->flags & AVFMT_GLOBALHEADER)
--        c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+        c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-     // expose avctx to encoder and set properties in encoder?
-     // list codecs for a given format in ui
-     return s;
-diff --git a/src/QtAV/private/AVCompat.h b/src/QtAV/private/AVCompat.h
-index e387868a8..6c38596d1 100644
---- a/src/QtAV/private/AVCompat.h
-+++ b/src/QtAV/private/AVCompat.h
-@@ -456,3 +456,15 @@ const char *get_codec_long_name(AVCodecID id);
-      } } while(0)
- 
- #endif //QTAV_COMPAT_H
-+
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56,33,0)
-+#define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
-+#endif
-+
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56,56,100)
-+#define AV_INPUT_BUFFER_MIN_SIZE FF_MIN_BUFFER_SIZE
-+#endif
-+
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56,56,100)
-+#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE
-+#endif
-diff --git a/src/codec/audio/AudioEncoderFFmpeg.cpp b/src/codec/audio/AudioEncoderFFmpeg.cpp
-index a74f4f31d..3811e11a6 100644
---- a/src/codec/audio/AudioEncoderFFmpeg.cpp
-+++ b/src/codec/audio/AudioEncoderFFmpeg.cpp
-@@ -151,8 +151,8 @@ bool AudioEncoderFFmpegPrivate::open()
-     } else {
-         buffer_size = frame_size*format_used.bytesPerSample()*format_used.channels()*2+200;
-     }
--    if (buffer_size < FF_MIN_BUFFER_SIZE)
--        buffer_size = FF_MIN_BUFFER_SIZE;
-+    if (buffer_size < AV_INPUT_BUFFER_MIN_SIZE)
-+        buffer_size = AV_INPUT_BUFFER_MIN_SIZE;
-     buffer.resize(buffer_size);
-     return true;
- }
-diff --git a/src/codec/video/VideoEncoderFFmpeg.cpp b/src/codec/video/VideoEncoderFFmpeg.cpp
-index 7c5ed42d0..671efa7d3 100644
---- a/src/codec/video/VideoEncoderFFmpeg.cpp
-+++ b/src/codec/video/VideoEncoderFFmpeg.cpp
-@@ -245,7 +245,7 @@ bool VideoEncoderFFmpegPrivate::open()
-     applyOptionsForContext();
-     AV_ENSURE_OK(avcodec_open2(avctx, codec, &dict), false);
-     // from mpv ao_lavc
--    const int buffer_size = qMax<int>(qMax<int>(width*height*6+200, FF_MIN_BUFFER_SIZE), sizeof(AVPicture));//??
-+    const int buffer_size = qMax<int>(qMax<int>(width*height*6+200, AV_INPUT_BUFFER_MIN_SIZE), sizeof(AVPicture));//??
-     buffer.resize(buffer_size);
-     return true;
- }
-diff --git a/src/filter/LibAVFilter.cpp b/src/filter/LibAVFilter.cpp
-index 191512040..8993a91f7 100644
---- a/src/filter/LibAVFilter.cpp
-+++ b/src/filter/LibAVFilter.cpp
-@@ -120,7 +120,10 @@ class LibAVFilter::Private
-         // pixel_aspect==sar, pixel_aspect is more compatible
-         QString buffersrc_args = args;
-         qDebug("buffersrc_args=%s", buffersrc_args.toUtf8().constData());
--        AVFilter *buffersrc  = avfilter_get_by_name(video ? "buffer" : "abuffer");
-+#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(7,0,0)
-+        const
-+#endif
-+        AVFilter *buffersrc = avfilter_get_by_name(video ? "buffer" : "abuffer");
-         Q_ASSERT(buffersrc);
-         AV_ENSURE_OK(avfilter_graph_create_filter(&in_filter_ctx,
-                                                buffersrc,
-@@ -128,6 +131,9 @@ class LibAVFilter::Private
-                                                filter_graph)
-                      , false);
-         /* buffer video sink: to terminate the filter chain. */
-+#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(7,0,0)
-+        const
-+#endif
-         AVFilter *buffersink = avfilter_get_by_name(video ? "buffersink" : "abuffersink");
-         Q_ASSERT(buffersink);
-         AV_ENSURE_OK(avfilter_graph_create_filter(&out_filter_ctx, buffersink, "out",
-diff --git a/src/subtitle/SubtitleProcessorFFmpeg.cpp b/src/subtitle/SubtitleProcessorFFmpeg.cpp
-index 30ee9367c..1755c3816 100644
---- a/src/subtitle/SubtitleProcessorFFmpeg.cpp
-+++ b/src/subtitle/SubtitleProcessorFFmpeg.cpp
-@@ -249,7 +249,7 @@ bool SubtitleProcessorFFmpeg::processHeader(const QByteArray &codec, const QByte
-     codec_ctx->time_base.den = 1000;
-     if (!data.isEmpty()) {
-         av_free(codec_ctx->extradata);
--        codec_ctx->extradata = (uint8_t*)av_mallocz(data.size() + FF_INPUT_BUFFER_PADDING_SIZE);
-+        codec_ctx->extradata = (uint8_t*)av_mallocz(data.size() + AV_INPUT_BUFFER_PADDING_SIZE);
-         if (!codec_ctx->extradata)
-             return false;
-         codec_ctx->extradata_size = data.size();
\ No newline at end of file
diff --git a/media-libs/qtav/files/qtav-1.12.0-installpaths.patch b/media-libs/qtav/files/qtav-1.12.0-installpaths.patch
deleted file mode 100644
index 7d491931d05e..000000000000
--- a/media-libs/qtav/files/qtav-1.12.0-installpaths.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ub -purN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2017-06-21 03:47:15.000000000 +0200
-+++ b/CMakeLists.txt	2020-01-12 02:51:41.692331365 +0100
-@@ -65,10 +65,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # for
- # Instruct CMake to run moc automatically when needed.
- set(CMAKE_AUTOMOC ON)
- if(NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
--  set(QTAV_INSTALL_HEADERS ${CMAKE_INSTALL_PREFIX}/include)
--  set(QTAV_INSTALL_LIBS ${CMAKE_INSTALL_PREFIX}/lib)
-+  set(QTAV_INSTALL_HEADERS ${QT_INSTALL_HEADERS})
-+  set(QTAV_INSTALL_LIBS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-   set(QTAV_INSTALL_BINS ${CMAKE_INSTALL_PREFIX}/bin)
--  set(QTAV_INSTALL_QML ${CMAKE_INSTALL_PREFIX}/qml)
-+  set(QTAV_INSTALL_QML ${QT_INSTALL_QML})
- else()
-   set(CMAKE_INSTALL_PREFIX ${QT_INSTALL_PREFIX} CACHE PATH "default install path" FORCE)
-   set(QTAV_INSTALL_HEADERS ${QT_INSTALL_HEADERS})
diff --git a/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch b/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch
deleted file mode 100644
index bf546c9e068d..000000000000
--- a/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ub -purN -x '*~' a/qml/SGVideoNode.cpp b/qml/SGVideoNode.cpp
---- a/qml/SGVideoNode.cpp	2017-06-21 03:47:15.000000000 +0200
-+++ b/qml/SGVideoNode.cpp	2020-01-07 05:37:05.304897727 +0100
-@@ -25,6 +25,8 @@
- #include "QtAV/VideoFrame.h"
- #include <QtCore/QScopedPointer>
- #include <QtGui/QOpenGLFunctions>
-+#include <QtQuick/QSGMaterialType>
-+#include <QtQuick/QSGMaterial>
- #include <QtQuick/QSGMaterialShader>
- 
- // all in QSGRenderThread
diff --git a/media-libs/qtav/files/qtav-1.12.0-qt5.15.patch b/media-libs/qtav/files/qtav-1.12.0-qt5.15.patch
deleted file mode 100644
index a992f59fac31..000000000000
--- a/media-libs/qtav/files/qtav-1.12.0-qt5.15.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5263d9d9ee29303a919d33d52b15acda554226c5 Mon Sep 17 00:00:00 2001
-From: rezso <rezso@rezso.net>
-Date: Mon, 1 Jun 2020 13:30:21 +0200
-Subject: [PATCH] Fix build with Qt 5.15
-
-Solves https://github.com/wang-bin/QtAV/issues/1309
----
- src/QtAV/FilterContext.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/QtAV/FilterContext.h b/src/QtAV/FilterContext.h
-index 6d2f9a041..7cc2fc1c5 100644
---- a/src/QtAV/FilterContext.h
-+++ b/src/QtAV/FilterContext.h
-@@ -26,6 +26,7 @@
- #include <QtCore/QByteArray>
- #include <QtCore/QRect>
- #include <QtGui/QPainter>
-+#include <QtGui/QPainterPath>
- /*
-  * QPainterFilterContext, D2DFilterContext, ...
-  */
diff --git a/media-libs/qtav/metadata.xml b/media-libs/qtav/metadata.xml
deleted file mode 100644
index e35c6288e69e..000000000000
--- a/media-libs/qtav/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="gui">Build a video player gui</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">wang-bin/QtAV</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/qtav/qtav-1.12.0-r3.ebuild b/media-libs/qtav/qtav-1.12.0-r3.ebuild
deleted file mode 100644
index 38c5d150a590..000000000000
--- a/media-libs/qtav/qtav-1.12.0-r3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="QtAV"
-CAPI_HASH="b43aa93"
-inherit cmake qmake-utils
-
-DESCRIPTION="Multimedia playback framework based on Qt + FFmpeg"
-HOMEPAGE="https://www.qtav.org"
-SRC_URI="https://github.com/wang-bin/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm64"
-IUSE="gui portaudio pulseaudio vaapi"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	media-video/ffmpeg:=
-	gui? ( dev-qt/qtsql:5 )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-installpaths.patch
-	"${FILESDIR}"/${P}-ffmpeg4-{1,2}.patch # bugs 660852, 670765
-	"${FILESDIR}"/${P}-qt5.14.patch
-	"${FILESDIR}"/${P}-qt5.15.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	cp "${WORKDIR}/${P}-capi.h-${CAPI_HASH}" contrib/capi/capi.h \
-		|| die "Failed to add missing header"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=OFF
-		-DBUILD_EXAMPLES=OFF
-		-DBUILD_QT5OPENGL=ON # bug 740172
-		-DBUILD_PLAYERS=$(usex gui)
-		-DHAVE_PORTAUDIO=$(usex portaudio)
-		-DHAVE_PULSE=$(usex pulseaudio)
-		-DHAVE_VAAPI=$(usex vaapi)
-	)
-
-	cmake_src_configure
-	pushd tools/install_sdk >/dev/null
-	eqmake5
-	popd >/dev/null
-}
-
-src_install() {
-	cmake_src_install
-	emake -C tools/install_sdk INSTALL_ROOT="${ED}" install
-}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index ee314eb482a6..0be4177512a9 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/vdr-vaapidevice/Manifest b/media-plugins/vdr-vaapidevice/Manifest
deleted file mode 100644
index 4c7bd89fd420..000000000000
--- a/media-plugins/vdr-vaapidevice/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX confd 1427 BLAKE2B 04cab6d1c6f63a0c4aa0b25ed0f9e36af763a0520170025d956b344b37c979a5ffc6dc42a18e2a1ef25027cdfed86ce801fbb5ab3db256e43d4e7cf5df468363 SHA512 a12d06e2a3fde12de81ea65ddad1113b0e11bbea5bd236cddede17f40da7f234b2fa429a48238f39828bd72ae36e7f9e07319e45994c76a624c098f284411161
-DIST vdr-vaapidevice-1.0.0_p20190526.tar.gz 122374 BLAKE2B 740bf6244205eacc89cb9517fc25f7a947f67f14eda990688f86f6c6ebb3da9d648ee3cb6798d4c27bd8bde04c4354b35fb4d4a5d0ed30dcdd1e04293d0744a5 SHA512 f67caa3f052479ac8339700766471f0f36369b152c84c84ed7479ddb67235fa527465dffae6f3b0d57f6cae12ed3d4c290a7cd65ad32af1421943b8adcad8e5b
-EBUILD vdr-vaapidevice-1.0.0_p20190526.ebuild 1156 BLAKE2B 286141b61ac9cc7f849078a1de0a296af27c8c9820936b60a207973117e24162cd18c5b7b70cee301475843976464cea0b52f3f9d1405c0c085d9972292646ec SHA512 7694e1eee7dfa57947d56d57a338d0f905b3658f7cea5def6978f06939f28e3db4a88c978ca9c82d265c2bc181c84974dc2c63e51dd79628af3febdffe07b032
-MISC metadata.xml 508 BLAKE2B 0e1fd077065c9e960657a6a6b2648f77a96cf106c57732b31c65050d3e85cdb35f3f735944bfc423f79be8382f5f210dcc7acfe04cdc10b294400f579cda251d SHA512 9409dce6ee81e8d7a7541528880eca2b38ba500cfc38a8c2d0eb0636c54ab5b5cb2987befa9f420fbb28b391b0516299ccc02b25b60137bef024cf2e70ee15a3
diff --git a/media-plugins/vdr-vaapidevice/files/confd b/media-plugins/vdr-vaapidevice/files/confd
deleted file mode 100644
index 4d25501b1493..000000000000
--- a/media-plugins/vdr-vaapidevice/files/confd
+++ /dev/null
@@ -1,30 +0,0 @@
-# vaapidevice - VA-API Output Device
-#
-#  -a device     audio device (fe. alsa: hw:0,0 oss: /dev/dsp)
-#  -p device     audio device for pass-through (hw:0,1 or /dev/dsp1)
-#  -c channel    audio mixer channel name (fe. PCM)
-#  -d display    display of x11 server (fe. :0.0)
-#  -f            start with fullscreen window (only with window manager)
-#  -g geometry   x11 window geometry wxh+x+y
-#  -t tracemode  set the trace mode for debugging
-#  -v device     video driver device (vaapi, noop)
-#  -s            start in suspended mode
-#  -x            start x11 server, with -xx try to connect, if this fails
-#  -X args       X11 server arguments (f.e. -nocursor)
-#  -D            start in detached mode
-#
-#  -w workaround enable/disable workarounds
-#        no-hw-decoder           disable hw decoder, use software decoder only
-#        no-mpeg-hw-decoder      disable hw decoder for mpeg only
-#        still-hw-decoder        enable hardware decoder for still-pictures
-#        still-h264-hw-decoder   enable h264 hw decoder for still-pictures
-#        alsa-driver-broken      disable broken alsa driver message
-#        alsa-no-close-open      disable close open to fix alsa no sound bug
-#        alsa-close-open-delay   enable close open delay to fix no sound bug
-#        ignore-repeat-pict      disable repeat pict message
-#
-# no default parameters
-# uncomment the next line and add your personal settings
-
-#_EXTRAOPTS=""
-
diff --git a/media-plugins/vdr-vaapidevice/metadata.xml b/media-plugins/vdr-vaapidevice/metadata.xml
deleted file mode 100644
index b4dbb6eb43d2..000000000000
--- a/media-plugins/vdr-vaapidevice/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>martin.dummer@gmx.net</email>
-		<name>Martin Dummer</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>vdr@gentoo.org</email>
-		<name>Gentoo VDR Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-plugins/vdr-vaapidevice/vdr-vaapidevice-1.0.0_p20190526.ebuild b/media-plugins/vdr-vaapidevice/vdr-vaapidevice-1.0.0_p20190526.ebuild
deleted file mode 100644
index 9e9241741f76..000000000000
--- a/media-plugins/vdr-vaapidevice/vdr-vaapidevice-1.0.0_p20190526.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-GIT_COMMIT="d19657bae399e79df107e316ca40922d21393f80"
-
-DESCRIPTION="VDR Plugin: A VA-API output device plugin for VDR"
-HOMEPAGE="https://github.com/pesintta/vdr-plugin-vaapidevice"
-SRC_URI="https://github.com/pesintta/vdr-plugin-vaapidevice/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="AGPL-3"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
-	media-video/vdr
-	media-video/ffmpeg[vaapi,X]
-	media-libs/libva[X]
-	media-libs/libva-intel-driver[X]
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-keysyms
-	media-libs/alsa-lib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-QA_FLAGS_IGNORED="
-	usr/lib/vdr/plugins/libvdr-vaapidevice.*
-	usr/lib64/vdr/plugins/libvdr-vaapidevice.*
-"
-S="${WORKDIR}/vdr-plugin-vaapidevice-${GIT_COMMIT}"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	use debug && append-cppflags -DDEBUG
-
-	local GIT_COMMIT_SHORT=${GIT_COMMIT:0:7}
-	sed -i -e "s:GIT_REV =.*:GIT_REV=-${GIT_COMMIT_SHORT}:" Makefile || die "Failed to modify Makefile"
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index abc35ea5d272..2691891cf39e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest
deleted file mode 100644
index acff6451c139..000000000000
--- a/media-sound/potamus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST potamus-17.tar.gz 146822 BLAKE2B 9fa7beabcd4e0ce8a3a6adda4fa425d0a6789c85cc1852bcf528c709574097f5fc34127cb8404d2d8b01c0f961026439786f58a0afd3bd022ed9efe22790bcf9 SHA512 655ac7c99e252c200bb012b1076850ae8c4307ac57dd8d6cb86fc0da0a0ea3b3193c617a365889485a4cab87cb113e40f1d828585e5bdf20c5f2b1b0a2c51099
-EBUILD potamus-17-r1.ebuild 1112 BLAKE2B 15e56bd1235f28aa4a802e776367182e263ad53ee358b0218a11b1363ea3b2f53e1f4050116aeb4c6ca58fc0a00d8d67e9a3eef76a19d43aba15e7321bccd8d6 SHA512 01f22a917a674fbfb006f216769d43cb099afd6c02c0676fe1eac4b92919be989829cfd05ea4808ee3df3e34f89a46012a66742b17c43252d41692cd6e301360
-MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/potamus/metadata.xml b/media-sound/potamus/metadata.xml
deleted file mode 100644
index b69a849fd57e..000000000000
--- a/media-sound/potamus/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/potamus/potamus-17-r1.ebuild b/media-sound/potamus/potamus-17-r1.ebuild
deleted file mode 100644
index c9c4a18fe9bf..000000000000
--- a/media-sound/potamus/potamus-17-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg
-
-DESCRIPTION="A lightweight audio player with an emphasis on high audio quality"
-HOMEPAGE="http://offog.org/code/potamus/"
-SRC_URI="http://offog.org/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+ao audiofile flac jack mad modplug opus vorbis"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	x11-libs/gtk+:2
-	gnome-base/libglade
-	media-libs/libsamplerate
-	media-video/ffmpeg:0=
-	ao? ( media-libs/libao )
-	audiofile? ( media-libs/audiofile )
-	flac? ( media-libs/flac:= )
-	jack? ( virtual/jack )
-	mad? ( media-libs/libmad )
-	modplug? ( media-libs/libmodplug )
-	opus? ( media-libs/opusfile )
-	vorbis? ( media-libs/libvorbis )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable audiofile input-audiofile) \
-		$(use_enable flac input-flac) \
-		$(use_enable mad input-mad) \
-		$(use_enable modplug input-modplug) \
-		$(use_enable opus input-opus) \
-		$(use_enable vorbis input-vorbis) \
-		$(use_enable ao output-ao) \
-		$(use_enable jack output-jack)
-
-}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index eda00bc07151..9009a949302f 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest
deleted file mode 100644
index aad62b2babdc..000000000000
--- a/media-video/ffmpeg2theora/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX ffmpeg2theora-0.29-swr.patch 778 BLAKE2B e0b57be8a1941abc1c3c2c01939dc339a705c9cc7ce1a0de81a868023dc6d9bb7593ae3b7c10cae9ad9e3418819637a2f9e20c42409047f5b9d5686864eacf15 SHA512 38ab469efff0f7607cbc8d8b9c57e1b4e92ce02ff2d4380aa2a04e1e3092e8b5fb2b95eb1c761df4809333d6979cb66fcd8892d245777d375adacfdd82d07c73
-AUX ffmpeg2theora-0.29-underlinking.patch 507 BLAKE2B 337a94a9a948d375a4930686951d1b0db4c8e8bf97c63c2e46729b721e9c0b11e7c5dae648826b5afda0b35e22f8cc4e876513a74831d61c436bcb3937719d51 SHA512 44be5be61ab9786446d49498cf0496b9600b65ecba9b1199f98ee9030f5224887f6a1de73eaab1ee04cefa391ffcfd8629eb4cb9d3e28216569b570cc1e96e48
-DIST ffmpeg2theora-0.30.tar.bz2 91269 BLAKE2B e5a57679cb874e7052db184e8e24b60da640ed818affa228cf5353216c64d2805aee375f67cfa2653112beafa36d492a274ced745846e53f81101e0f97418c41 SHA512 2c77d2c5e705751928e2bfd86c4fe4c2b7df2ca2ce70f3dfeb0014a3269eef067587eaa045c11b0db86c69176d8f01a43b3ad75544d181c016a89aa50b6518c1
-EBUILD ffmpeg2theora-0.30-r1.ebuild 1140 BLAKE2B 3f13c233f5ec677ddb625cc685add2c12afc4a506ac2aeef7d2a98fba9b8ae948949400a8defbe44f102c738af42fcde1b448dc3130e81c77f6aad603c168c15 SHA512 3935b9373bec5f09c785a6ddc0da53c3f6d6023bb56d3f2fbc2b2a4842423e2d3ca00017c5220bdcc9cb726493de33f8d40fb2d2f4e1f33141dfd8b38ad53b4e
-MISC metadata.xml 315 BLAKE2B da08396535f51aab2d889ad283829418c8673cdd7b3f3d87558723798b399f8e15279c63f47c1f111b3b41f0c39c5c1dfb5ed8e89b0d1cbe5c8ff21dc3624c44 SHA512 875203b4b87e7592ac84105f23b5c103c68ebf22fb4a3f225b75bb77f9fc18d99c08a7b23b9245d042ca6ece974e27edac89bd437c6e4c6666063ebc0666550d
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
deleted file mode 100644
index 89102c0a4714..000000000000
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit python-any-r1 scons-utils
-
-DESCRIPTION="A simple converter to create Ogg Theora files"
-HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
-SRC_URI="http://www.v2v.cc/~j/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="kate"
-
-RDEPEND="
-	media-video/ffmpeg:0=[postproc]
-	>=media-libs/libvorbis-1.1
-	>=media-libs/libogg-1.1
-	>=media-libs/libtheora-1.1[encode]
-	kate? ( >=media-libs/libkate-0.3.7 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.29-swr.patch
-	"${FILESDIR}"/${PN}-0.29-underlinking.patch
-)
-
-src_prepare() {
-	default
-
-	2to3 -n -w --no-diffs SConstruct || die
-}
-
-src_configure() {
-	SCONSARGS=(
-		APPEND_CCFLAGS="${CFLAGS}"
-		APPEND_LINKFLAGS="${LDFLAGS}"
-		prefix=/usr
-		mandir=PREFIX/share/man
-		libkate=$(usex kate 1 0)
-	)
-}
-
-src_compile() {
-	escons "${SCONSARGS[@]}"
-}
-
-src_install() {
-	escons "${SCONSARGS[@]}" destdir="${D}" install
-	dodoc AUTHORS ChangeLog README subtitles.txt TODO
-}
diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch
deleted file mode 100644
index b1117a87ea6f..000000000000
--- a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit a72baecd4dc7b01c0785b481460dde0fbab9a90a
-Author: Jan Gerber <j@xiph.org>
-Date:   Fri Nov 23 20:21:54 2012 +0100
-
-    only depend on libswresample for local branch
-    
-    libav does not have libswresample so its not in ubuntu.
-
-diff --git a/SConstruct b/SConstruct
-index 90520c3..01d234a 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -152,10 +152,10 @@ if not env.GetOption('clean'):
-       "libavcodec >= 52.30.0",
-       "libpostproc",
-       "libswscale",
--      "libswresample",
-       "libavutil",
-   ]
-   if os.path.exists("./ffmpeg"):
-+    FFMPEG_LIBS.append('libswresample')
-     pkg_path = list(set(map(os.path.dirname, glob('./ffmpeg/*/*.pc'))))
-     pkg_path.append(os.environ.get('PKG_CONFIG_PATH', ''))
-     os.environ['PKG_CONFIG_PATH'] = ':'.join(pkg_path)
diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
deleted file mode 100644
index 791e39d87744..000000000000
--- a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-For example, pow() from mathlib is used directly in src/ffmpeg2theora.c:
-
-<snip>
-v = pow(v, g) * 255.0;    // mplayer's vf_eq2.c multiplies with 256 here, strange...
-</snip>
-
-For build failure and log, see Gentoo bug #504698
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -206,9 +206,8 @@
-   if env['crossmingw']:
-       env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
-       env.Append(LIBS=['m'])
--  elif env['static']:
--      env.Append(LIBS=['m', 'dl'])
- 
-+  env.Append(LIBS=['m', 'dl'])
- 
- env = conf.Finish()
- 
diff --git a/media-video/ffmpeg2theora/metadata.xml b/media-video/ffmpeg2theora/metadata.xml
deleted file mode 100644
index dc686e6e5ae1..000000000000
--- a/media-video/ffmpeg2theora/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="kate">Adds support for Ogg Kate subtitles via libkate.</flag>
-	</use>
-</pkgmetadata>
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ff4f7ea4c33d..61043087c265 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4c0a29e7157f..fb7ea8584a32 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 18 Mar 2023 06:09:57 +0000
+Sat, 18 Mar 2023 18:09:52 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 28d05a5260c8..b78da175b57f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-03-18T06:10:01Z
+TIMESTAMP 2023-03-18T18:09:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQVVblfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQV/nNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB1kA/8CmGaakp7gfPmXu6fAuYNDdLWiY8xR0t9x3gggF5gObs/Ha7fzINWldKr
-CQq/UyiCshdPAzvBvMDUsdt1HrfXV9z4dSvF4m9LKwLW9g9pR9MuP7lhUfJmTE5e
-OjV0i4V1jyAEi2tw60H4Y2T1fhhA4HJ8gdlQnUD5OsXLjmIAZESDpi4ZWdxtz7UQ
-cJjN9/ZKXWw4XYDptNw9X9pg5K5CqZ/sTmhC+UlkYeKJylJQ8NAy8OVHGaiGT0Ef
-IJTs5TXWpzcV0lF0Za6JQThxPOFnhQX+YmXjo+9szZ1yCzYnXIlWK85r9/6ZiEmA
-azvTMX23J/wUXTnA39FQkrBz0Wu7+bYr4eItXYszwVM74eTFYxE6aIraHwRYfBYu
-qbRIBz7FXx5bDFncqPyhTnlojeduxEe3gfvcCb3nRt/4qsOa1wXlt9YPFee768G8
-PjeiP6U6xWU6EV0rDBLa9LYcVA1m+0VB/IineF6xPGqMYQiNH96KzmLHNrZyTchn
-jfWrv+ZHbcGsyi6Adh9oRd1fNWOX0mm9Ygng979DCFeypmu3JiTzpIneWMY0hl4I
-y96aJ15GWo3qPxLo0ZG69X/arErsSdXWEgw+FAQDDdnLebj/GYprWhjeFvMIoLEb
-Kqj1JDNenvqFZL+V/xyU2wC+Lnby0nCW+tu9uD4xG1PKxUjbOkU=
-=DT0V
+klAOwBAAmgx/uTEnUMzlgk4zE+Z5zbqk4ev7KC6OpSPo/wKwnSBj6HUyNYivdsbj
+/7bYFPUtR21lPytwjc8MKAzzqd9c4BOAFGWZfnbpeAYJvlpAUCwi4AKxeRDjX1OM
+HEYF1J274m6so5TS0dd59G1MkgRDCVNNM4a/DPsLFDYvU5EUEid4b/sfNf2bArd/
+SobSwcNkOPizPdlO1wHHvryKYKjirSU7oWY6RdepQe8q5fiJRLp5zqBfAPv3Tmry
+JnmQSF9zuPXIB2S1NRgUN2IRtP5nHSvKXHiCCUUtIr3rNc9r6OpEuNsp8jq0Rh5B
+oe0OHiTE4DVxJBV4WW1Glk4jY8GDCaRVQNAvsuPkACo/siUq07/HP2Z7yt72p8D3
+8ch8nWF2tFBeHYtGN5+6fwL90dA4sJhvZuZjouprP/pI8ELAlYniUOoYDJGZKtvE
+b90mmvwByIgklLymiJYXFCWU5929K0a74r7YambeTdUX4zNZeuM0YzecR2wjSMSu
+j3EJhkaK6PSDy2hZZHpCCDRBLsydh5vFzt6c6Wiu+sY6g8kF7QjetTGvhk04BxKq
+iW0gP29jIHA8K+utptHZsQpj0b9FSU448FrHjnzeu6+NDKdcre89KAlbZHB5fis8
+Mo3+DpiNgjT9vL4ly+RVGREwFSuuR7gFAbLDzaPAps+rBkgN9rk=
+=mE1Q
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4c0a29e7157f..fb7ea8584a32 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 18 Mar 2023 06:09:57 +0000
+Sat, 18 Mar 2023 18:09:52 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 8b0e379a37f5..d98b3656f3d0 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 bc8d59cb4391..ca82c4cc1817 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/bastille-3.0.9-r3 b/metadata/md5-cache/app-admin/bastille-3.0.9-r3
deleted file mode 100644
index 460a3824ffd1..000000000000
--- a/metadata/md5-cache/app-admin/bastille-3.0.9-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Bastille-Linux is a security hardening tool
-EAPI=8
-HOMEPAGE=https://bastille-linux.sourceforge.net/
-INHERIT=perl-functions
-IUSE=X
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=app-admin/logrotate dev-lang/perl dev-perl/Curses net-firewall/iptables net-firewall/psad virtual/logger X? ( dev-perl/Tk )
-SLOT=0
-SRC_URI=mirror://sourceforge/bastille-linux/Bastille-3.0.9.tar.bz2 mirror://gentoo/bastille-3.0.9-gentoo-0.2.patch.bz2
-_eclasses_=perl-functions	c3fca037246e877693badea0df3b0ef8
-_md5_=ec23fbbd472e13256a12abf4caf5d966
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 6e9353799830..3e52f502e8f8 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/debian-archive-keyring-2023.2 b/metadata/md5-cache/app-crypt/debian-archive-keyring-2023.2
new file mode 100644
index 000000000000..b0333af7acd5
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/debian-archive-keyring-2023.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=GnuPG archive keys of the Debian archive
+EAPI=8
+HOMEPAGE=https://packages.debian.org/sid/debian-archive-keyring
+INHERIT=unpacker
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2023.2_all.deb
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	65735fed9c1c30cb461c90db600ac990
+_md5_=0a854f85d75f8b89a0cb423c36b8f3bc
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index f9183cd45b0b..9a302b50201a 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.42 b/metadata/md5-cache/app-emulation/virtualbox-6.1.42
index fa74c678c8d9..b040bbfa838c 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.42
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.42
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-arch/tar >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 dev-libs/libIDL sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( virtual/jdk:1.8 ) qt5? ( dev-qt/linguist-tools:5 ) virtual/pkgconfig
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=app-arch/tar-1.34-r2 >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 dev-libs/libIDL sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( virtual/jdk:1.8 ) qt5? ( dev-qt/linguist-tools:5 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
 DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.42 >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( sdl? ( media-libs/libsdl:0[X,video] ) x11-base/xorg-proto x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] virtual/glu ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= virtual/libcrypt:= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama x11-libs/libXrandr opengl? ( virtual/opengl ) ) java? ( virtual/jdk:1.8 ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
@@ -14,4 +14,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_sing
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.42/VirtualBox-6.1.42.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	linux-info	ecb03306c95c6ccc55852c98abcfcc64	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8999c342c72981a2ad453c57dcb64ce9
+_md5_=cd0bcc39ef4be8c7bb0860688d78d2c3
diff --git a/metadata/md5-cache/app-emulation/virtualbox-7.0.6-r2 b/metadata/md5-cache/app-emulation/virtualbox-7.0.6-r2
index af5c25026ee8..1d94813845db 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-7.0.6-r2
+++ b/metadata/md5-cache/app-emulation/virtualbox-7.0.6-r2
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-arch/tar >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-util/glslang >=dev-util/kbuild-0.1.9998.3127 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 app-text/docbook-xsl-ns-stylesheets dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra dev-qt/qthelp:5 ) gui? ( dev-qt/linguist-tools:5 ) nls? ( dev-qt/linguist-tools:5 ) java? ( virtual/jdk:1.8 ) virtual/pkgconfig
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=app-arch/tar-1.34-r2 >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-util/glslang >=dev-util/kbuild-0.1.9998.3127 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 app-text/docbook-xsl-ns-stylesheets dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra dev-qt/qthelp:5 ) gui? ( dev-qt/linguist-tools:5 ) nls? ( dev-qt/linguist-tools:5 ) java? ( virtual/jdk:1.8 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
 DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.6 dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-libs/libxslt-1.1.19 virtual/libcrypt:= alsa? ( >=media-libs/alsa-lib-1.0.13 ) gui? ( x11-base/xorg-proto x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr ) java? ( virtual/jdk:1.8 ) opengl? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr virtual/glu ) sdl? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) udev? ( >=virtual/udev-171 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
@@ -14,4 +14,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_sing
 SLOT=0/7.0
 SRC_URI=https://download.virtualbox.org/virtualbox/7.0.6/VirtualBox-7.0.6.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.6.tar.xz ) )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	linux-info	ecb03306c95c6ccc55852c98abcfcc64	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4d8f6aa8f6acd806c9a726bb849399b6
+_md5_=0cb35bcbd1e59063fbb6c63f2aa1d87f
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 03a926847e30..30451e9b852a 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/gcalcli-4.2.0-r1 b/metadata/md5-cache/app-misc/gcalcli-4.2.0-r1
deleted file mode 100644
index 3db77d95a5e6..000000000000
--- a/metadata/md5-cache/app-misc/gcalcli-4.2.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/google-api-python-client-1.5.3[python_targets_python3_10(-)?] dev-python/oauth2client[python_targets_python3_10(-)?] dev-python/parsedatetime[python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?] dev-python/python-gflags[python_targets_python3_10(-)?] dev-python/vobject[python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Calendar Command Line Interface
-EAPI=7
-HOMEPAGE=https://github.com/insanum/gcalcli
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/google-api-python-client-1.5.3[python_targets_python3_10(-)?] dev-python/oauth2client[python_targets_python3_10(-)?] dev-python/parsedatetime[python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?] dev-python/python-gflags[python_targets_python3_10(-)?] dev-python/vobject[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/insanum/gcalcli/archive/v4.2.0.tar.gz -> gcalcli-4.2.0.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=eb648802f3645ac68e6bc6a41b29219d
diff --git a/metadata/md5-cache/app-misc/gcalcli-4.3.0 b/metadata/md5-cache/app-misc/gcalcli-4.3.0
deleted file mode 100644
index 110fa87be87a..000000000000
--- a/metadata/md5-cache/app-misc/gcalcli-4.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/google-api-python-client-1.5.3[python_targets_python3_10(-)?] dev-python/oauth2client[python_targets_python3_10(-)?] dev-python/parsedatetime[python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?] dev-python/python-gflags[python_targets_python3_10(-)?] dev-python/vobject[python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Calendar Command Line Interface
-EAPI=8
-HOMEPAGE=https://github.com/insanum/gcalcli
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/google-api-python-client-1.5.3[python_targets_python3_10(-)?] dev-python/oauth2client[python_targets_python3_10(-)?] dev-python/parsedatetime[python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?] dev-python/python-gflags[python_targets_python3_10(-)?] dev-python/vobject[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/insanum/gcalcli/archive/v4.3.0.tar.gz -> gcalcli-4.3.0.gh.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4d8df9ab91549f84e3c7c05b1dce2a62
diff --git a/metadata/md5-cache/app-misc/goobook-3.5.1-r3 b/metadata/md5-cache/app-misc/goobook-3.5.1-r3
deleted file mode 100644
index 9be3ae2b85fe..000000000000
--- a/metadata/md5-cache/app-misc/goobook-3.5.1-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Access your Google contacts from the command line
-EAPI=8
-HOMEPAGE=https://gitlab.com/goobook/goobook
-INHERIT=distutils-r1 readme.gentoo-r1 pypi
-IUSE=python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-python/google-api-python-client-1.7.12[python_targets_python3_10(-)?] >=dev-python/simplejson-3.16.0[python_targets_python3_10(-)?] >=dev-python/oauth2client-1.5.0[python_targets_python3_10(-)?] <dev-python/oauth2client-5[python_targets_python3_10(-)?] dev-python/pyxdg[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/g/goobook/goobook-3.5.1.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=32edaa6ff71c5f09d9bc8a3588de8ab9
diff --git a/metadata/md5-cache/app-misc/tracker-3.5.0_rc b/metadata/md5-cache/app-misc/tracker-3.5.0_rc
new file mode 100644
index 000000000000..71a5a98de368
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tracker-3.5.0_rc
@@ -0,0 +1,18 @@
+BDEPEND=dev-util/glib-utils app-text/asciidoc dev-libs/libxslt || ( dev-lang/vala:0.56 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gi-docgen ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pygobject[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pygobject[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pygobject[python_targets_python3_9(-)] ) ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/tappy[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/tappy[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/tappy[python_targets_python3_9(-)] ) ) ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.4 >=net-libs/libsoup-2.99.2:3.0 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.29.0:3 stemmer? ( dev-libs/snowball-stemmer:= )
+DESCRIPTION=A tagging metadata database, search tool and indexer
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME/tracker
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
+IUSE=gtk-doc +miners stemmer test vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+PDEPEND=miners? ( >=app-misc/tracker-miners-3.5 )
+RDEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.4 >=net-libs/libsoup-2.99.2:3.0 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.29.0:3 stemmer? ( dev-libs/snowball-stemmer:= )
+RESTRICT=!test? ( test )
+SLOT=3/0
+SRC_URI=https://download.gnome.org/sources/tracker/3.5/tracker-3.5.0.rc.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	linux-info	ecb03306c95c6ccc55852c98abcfcc64	meson	cd2865332c8d99e1da0655523ff4a28f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=1dd2cc81434654f368e2f4b723163bd2
diff --git a/metadata/md5-cache/app-misc/tracker-miners-3.5.0_rc b/metadata/md5-cache/app-misc/tracker-miners-3.5.0_rc
new file mode 100644
index 000000000000..e4b4e4213d91
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tracker-miners-3.5.0_rc
@@ -0,0 +1,18 @@
+BDEPEND=app-text/asciidoc dev-libs/libxslt dev-util/glib-utils dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pygobject[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pygobject[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pygobject[python_targets_python3_9(-)] ) ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/tappy[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/tappy[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/tappy[python_targets_python3_9(-)] ) ) gstreamer? ( media-libs/gstreamer:1.0[introspection] || ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-openh264:1.0 ) ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.70:2 >=app-misc/tracker-3.4.0:3 >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( media-libs/libjpeg-turbo:0= ) iso? ( >=sys-libs/libosinfo-1.10.0-r1 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:= ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0:=[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) sys-apps/util-linux gif? ( media-libs/giflib:= ) networkmanager? ( net-misc/networkmanager ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip upower? ( >=sys-power/upower-0.9.0:= ) >=dev-libs/icu-4.8.1.1:= gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=media-plugins/gst-plugins-meta-1.20:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) )
+DESCRIPTION=Collection of data extractors for Tracker/Nepomuk
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
+IUSE=cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.70:2 >=app-misc/tracker-3.4.0:3 >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( media-libs/libjpeg-turbo:0= ) iso? ( >=sys-libs/libosinfo-1.10.0-r1 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:= ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0:=[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) sys-apps/util-linux gif? ( media-libs/giflib:= ) networkmanager? ( net-misc/networkmanager ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip upower? ( >=sys-power/upower-0.9.0:= ) >=dev-libs/icu-4.8.1.1:= gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=media-plugins/gst-plugins-meta-1.20:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) )
+REQUIRED_USE=cue? ( gstreamer )
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=https://download.gnome.org/sources/tracker-miners/3.5/tracker-miners-3.5.0.rc.tar.xz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	cd2865332c8d99e1da0655523ff4a28f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=9204ac8c9b9b44face2328c50643e3ef
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 628ff396195a..2e16172c336a 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/evince-44.0 b/metadata/md5-cache/app-text/evince-44.0
new file mode 100644
index 000000000000..340a7780932b
--- /dev/null
+++ b/metadata/md5-cache/app-text/evince-44.0
@@ -0,0 +1,17 @@
+BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 app-text/docbook-xml-dtd:4.3 ) dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.5.0:1 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.40:2 >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10 >=app-text/poppler-22.02.0:=[cairo] >=app-arch/libarchive-3.6.0:= djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 <gnome-base/nautilus-42.20 ) postscript? ( >=app-text/libspectre-0.2:= ) spell? ( >=app-text/gspell-1.6.0:= ) tiff? ( >=media-libs/tiff-4.0:= ) xps? ( >=app-text/libgxps-0.2.1:= )
+DESCRIPTION=Simple document viewer for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Evince
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson systemd xdg
+IUSE=cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.5.0:1 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.40:2 >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10 >=app-text/poppler-22.02.0:=[cairo] >=app-arch/libarchive-3.6.0:= djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 <gnome-base/nautilus-42.20 ) postscript? ( >=app-text/libspectre-0.2:= ) spell? ( >=app-text/gspell-1.6.0:= ) tiff? ( >=media-libs/tiff-4.0:= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
+REQUIRED_USE=gtk-doc? ( introspection )
+SLOT=0/evd3.4-evv3.3
+SRC_URI=mirror://gnome/sources/evince/44/evince-44.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	cd2865332c8d99e1da0655523ff4a28f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=d3135da801c1b078509f5622edd93701
diff --git a/metadata/md5-cache/dev-erlang/Manifest.gz b/metadata/md5-cache/dev-erlang/Manifest.gz
index 094c924c28f5..e9ec29aad9a4 100644
--- a/metadata/md5-cache/dev-erlang/Manifest.gz
+++ b/metadata/md5-cache/dev-erlang/Manifest.gz
diff --git a/metadata/md5-cache/dev-erlang/iconv-1.0.10 b/metadata/md5-cache/dev-erlang/iconv-1.0.10
deleted file mode 100644
index 76974eb07eed..000000000000
--- a/metadata/md5-cache/dev-erlang/iconv-1.0.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang:= dev-util/rebar:0 >=sys-apps/gawk-4.1
-DESCRIPTION=Fast encoding conversion library for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/iconv
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/iconv/archive/1.0.10.tar.gz -> iconv-1.0.10.tar.gz
-_eclasses_=rebar	2914a5b863e914d99ddc9a6b6222a76f
-_md5_=74cb4028de2813cd01b08e0a3b09987d
diff --git a/metadata/md5-cache/dev-erlang/p1_xmlrpc-1.15.1 b/metadata/md5-cache/dev-erlang/p1_xmlrpc-1.15.1
deleted file mode 100644
index 303cc60ed209..000000000000
--- a/metadata/md5-cache/dev-erlang/p1_xmlrpc-1.15.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar:0 >=sys-apps/gawk-4.1
-DESCRIPTION=Erlang XMLRPC implementation with SSL, cookies, authentication
-EAPI=6
-HOMEPAGE=https://github.com/processone/p1_xmlrpc
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=BSD-2
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/p1_xmlrpc/archive/1.15.1.tar.gz -> p1_xmlrpc-1.15.1.tar.gz
-_eclasses_=rebar	2914a5b863e914d99ddc9a6b6222a76f
-_md5_=87980355c9db95db9e97c489fab68ff5
diff --git a/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.2 b/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.2
deleted file mode 100644
index ccdb11b24e87..000000000000
--- a/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar:0 >=sys-apps/gawk-4.1
-DESCRIPTION=Riak Protocol Buffers messages
-EAPI=6
-HOMEPAGE=https://github.com/basho/riak_pb
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev-lang/erlang-17.1 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/basho/riak_pb/archive/2.2.0.2.tar.gz -> riak_pb-2.2.0.2.tar.gz
-_eclasses_=rebar	2914a5b863e914d99ddc9a6b6222a76f
-_md5_=abd185e08735ea360db4262f56ec8613
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 7918ededefb3..5000b3a05050 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/commons-text-1.10.0 b/metadata/md5-cache/dev-java/commons-text-1.10.0
deleted file mode 100644
index 2016c3da82fe..000000000000
--- a/metadata/md5-cache/dev-java/commons-text-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Apache Commons Text is a library focused on algorithms working on strings
-EAPI=8
-HOMEPAGE=https://commons.apache.org/proper/commons-text/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache//commons/text/source/commons-text-1.10.0-src.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=172fcf75d090f02f6c1633d2d3ab5e05
diff --git a/metadata/md5-cache/dev-java/core-specs-alpha-0.1.24 b/metadata/md5-cache/dev-java/core-specs-alpha-0.1.24
deleted file mode 100644
index 29540ddd7207..000000000000
--- a/metadata/md5-cache/dev-java/core-specs-alpha-0.1.24
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=A Clojure library with specs to describe Clojure core macros and functions
-EAPI=7
-HOMEPAGE=https://clojure.org/ https://github.com/clojure/core.specs.alpha
-INHERIT=java-pkg-2 java-ant-2
-KEYWORDS=~amd64 ~x86 ~x86-linux
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-SLOT=0.1
-SRC_URI=https://github.com/clojure/core.specs.alpha/archive/core.specs.alpha-0.1.24.tar.gz -> core-specs-alpha-0.1.24.tar.gz
-_eclasses_=java-ant-2	f9b70c3474c0b326c8102814719dc554	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=caaacacbbf986bb968c3b93a81de48f0
diff --git a/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44 b/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44
deleted file mode 100644
index 8b3efb919c34..000000000000
--- a/metadata/md5-cache/dev-java/core-specs-alpha-0.2.44
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=A Clojure library with specs to describe Clojure core macros and functions
-EAPI=7
-HOMEPAGE=https://clojure.org/ https://github.com/clojure/core.specs.alpha
-INHERIT=java-pkg-2 java-ant-2
-KEYWORDS=~amd64 ~x86 ~x86-linux
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-SLOT=0.2
-SRC_URI=https://github.com/clojure/core.specs.alpha/archive/core.specs.alpha-0.2.44.tar.gz -> core-specs-alpha-0.2.44.tar.gz
-_eclasses_=java-ant-2	f9b70c3474c0b326c8102814719dc554	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=02d6dbc3aef805e1178e36211fd03409
diff --git a/metadata/md5-cache/dev-java/core-specs-alpha-0.2.56 b/metadata/md5-cache/dev-java/core-specs-alpha-0.2.56
deleted file mode 100644
index a1f5361259b8..000000000000
--- a/metadata/md5-cache/dev-java/core-specs-alpha-0.2.56
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=A Clojure library with specs to describe Clojure core macros and functions
-EAPI=7
-HOMEPAGE=https://clojure.org/ https://github.com/clojure/core.specs.alpha
-INHERIT=java-pkg-2 java-ant-2
-KEYWORDS=~amd64 ~x86 ~x86-linux
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-SLOT=0.2
-SRC_URI=https://github.com/clojure/core.specs.alpha/archive/core.specs.alpha-0.2.56.tar.gz -> core-specs-alpha-0.2.56.tar.gz
-_eclasses_=java-ant-2	f9b70c3474c0b326c8102814719dc554	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=faa81bdb522e13991a71394907889ff5
diff --git a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1 b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
deleted file mode 100644
index 86cce4933320..000000000000
--- a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Clean room implementation of the JCIP Annotations
-EAPI=7
-HOMEPAGE=https://github.com/stephenc/jcip-annotations
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/stephenc/jcip-annotations/archive/jcip-annotations-1.0-1.tar.gz
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=2102558eeb9f6633f492229e3b75c6f1
diff --git a/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1 b/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
deleted file mode 100644
index 5aa50c7dbf13..000000000000
--- a/metadata/md5-cache/dev-java/jformatstring-2.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8:* app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Compile time checking for Java format strings
-EAPI=7
-HOMEPAGE=https://code.google.com/p/j-format-string
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=b8ac9859bde44b536280eca8b7171498
diff --git a/metadata/md5-cache/dev-java/jspeex-0.9.7-r2 b/metadata/md5-cache/dev-java/jspeex-0.9.7-r2
deleted file mode 100644
index fbb3547cd799..000000000000
--- a/metadata/md5-cache/dev-java/jspeex-0.9.7-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/ant-core:0 dev-java/junit:0 >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Speex speech codec library for Java
-EAPI=7
-HOMEPAGE=http://jspeex.sourceforge.net/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc source test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/jspeex/jspeex-0.9.7.zip
-_eclasses_=java-ant-2	f9b70c3474c0b326c8102814719dc554	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=aa48b8f15f3f68c7ed90b29836daf6af
diff --git a/metadata/md5-cache/dev-java/jta-1.1-r1 b/metadata/md5-cache/dev-java/jta-1.1-r1
deleted file mode 100644
index 02cd5ef68e13..000000000000
--- a/metadata/md5-cache/dev-java/jta-1.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install nofetch preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=The Java Transaction API
-EAPI=7
-HOMEPAGE=https://www.oracle.com/java/technologies/jta.html
-INHERIT=java-pkg-2
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=sun-bcla-jta
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=fetch
-SLOT=0
-SRC_URI=jta-1_1-classes.zip
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=bc8f4489d0fe3fa1dcfe2d5228c8393c
diff --git a/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1 b/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1
deleted file mode 100644
index a51853939dae..000000000000
--- a/metadata/md5-cache/dev-java/osgi-annotation-versioning-1.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=OSGi Companion Code for org.osgi.annotation.versioning Version 1.1.1
-EAPI=7
-HOMEPAGE=https://www.osgi.org/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/org/osgi/org.osgi.annotation.versioning/1.1.1/org.osgi.annotation.versioning-1.1.1-sources.jar -> osgi-annotation-versioning-1.1.1-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=a9d6c762ca136920c7f039fc17bcc66c
diff --git a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1 b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1
deleted file mode 100644
index 8c1676ac4440..000000000000
--- a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=a 100% Java PDF renderer and viewer
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=LGPL-3
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://repo1.maven.org/maven2/org/swinglabs/pdf-renderer/1.0.5/pdf-renderer-1.0.5-sources.jar
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=2c78499f210b111fd94d81bd4618a5cc
diff --git a/metadata/md5-cache/dev-java/spec-alpha-0.1.143 b/metadata/md5-cache/dev-java/spec-alpha-0.1.143
deleted file mode 100644
index 6b46c4ba9886..000000000000
--- a/metadata/md5-cache/dev-java/spec-alpha-0.1.143
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=A Clojure library to describe the structure of data and functions
-EAPI=7
-HOMEPAGE=https://clojure.org/ https://github.com/clojure/spec.alpha
-INHERIT=java-pkg-2 java-ant-2
-KEYWORDS=~amd64 ~x86 ~x86-linux
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-SLOT=0.1
-SRC_URI=https://github.com/clojure/spec.alpha/archive/spec.alpha-0.1.143.tar.gz -> spec-alpha-0.1.143.tar.gz
-_eclasses_=java-ant-2	f9b70c3474c0b326c8102814719dc554	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bba66ecd87479c84051f091f7a333b9d
diff --git a/metadata/md5-cache/dev-java/spec-alpha-0.2.176 b/metadata/md5-cache/dev-java/spec-alpha-0.2.176
deleted file mode 100644
index 39ea487671b2..000000000000
--- a/metadata/md5-cache/dev-java/spec-alpha-0.2.176
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=A Clojure library to describe the structure of data and functions
-EAPI=7
-HOMEPAGE=https://clojure.org/ https://github.com/clojure/spec.alpha
-INHERIT=java-pkg-2 java-ant-2
-KEYWORDS=~amd64 ~x86 ~x86-linux
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-SLOT=0.2
-SRC_URI=https://github.com/clojure/spec.alpha/archive/spec.alpha-0.2.176.tar.gz -> spec-alpha-0.2.176.tar.gz
-_eclasses_=java-ant-2	f9b70c3474c0b326c8102814719dc554	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1b7aef6dad85d62a04e7c6e251d3c238
diff --git a/metadata/md5-cache/dev-java/spec-alpha-0.2.194 b/metadata/md5-cache/dev-java/spec-alpha-0.2.194
deleted file mode 100644
index 0431868bab88..000000000000
--- a/metadata/md5-cache/dev-java/spec-alpha-0.2.194
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/ant-core:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=A Clojure library to describe the structure of data and functions
-EAPI=7
-HOMEPAGE=https://clojure.org/ https://github.com/clojure/spec.alpha
-INHERIT=java-pkg-2 java-ant-2
-KEYWORDS=~amd64 ~x86 ~x86-linux
-LICENSE=EPL-1.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-SLOT=0.2
-SRC_URI=https://github.com/clojure/spec.alpha/archive/spec.alpha-0.2.194.tar.gz -> spec-alpha-0.2.194.tar.gz
-_eclasses_=java-ant-2	f9b70c3474c0b326c8102814719dc554	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e5d86d5dd44cbc84e39df89aeaf70d07
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 13342195b244..5bdce2b538b3 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/apr-1.7.0-r6 b/metadata/md5-cache/dev-libs/apr-1.7.0-r6
deleted file mode 100644
index b712ecef73d1..000000000000
--- a/metadata/md5-cache/dev-libs/apr-1.7.0-r6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen )
-DESCRIPTION=Apache Portable Runtime Library
-EAPI=7
-HOMEPAGE=https://apr.apache.org/
-INHERIT=autotools libtool toolchain-funcs
-IUSE=doc older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) selinux? ( sec-policy/selinux-base-policy )
-SLOT=1/1.7
-SRC_URI=mirror://apache/apr/apr-1.7.0.tar.bz2
-_eclasses_=autotools	b5529dc611971a61a30153916014f616	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0a605b41c82d50ba09b7e7fa0617f058
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r10 b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r10
deleted file mode 100644
index ed8d0ce9145e..000000000000
--- a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/apr-1.7.0-r6:1= dev-libs/expat virtual/libcrypt:= berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm:= ) ldap? ( net-nds/openldap:= ) mysql? ( || ( dev-db/mariadb-connector-c >=dev-db/mysql-connector-c-8 ) ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen )
-DESCRIPTION=Apache Portable Runtime Utility Library
-EAPI=7
-HOMEPAGE=https://apr.apache.org/
-INHERIT=autotools db-use libtool multilib toolchain-funcs
-IUSE=berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/apr-1.7.0-r6:1= dev-libs/expat virtual/libcrypt:= berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm:= ) ldap? ( net-nds/openldap:= ) mysql? ( || ( dev-db/mariadb-connector-c >=dev-db/mysql-connector-c-8 ) ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
-SLOT=1
-SRC_URI=mirror://apache/apr/apr-util-1.6.1.tar.bz2
-_eclasses_=autotools	b5529dc611971a61a30153916014f616	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=78b0ef29303510d073ad8d2cfb6a0ce0
diff --git a/metadata/md5-cache/dev-libs/libclc-14.0.6 b/metadata/md5-cache/dev-libs/libclc-14.0.6
index 83d8f3ba79cd..4b1c2aa347b4 100644
--- a/metadata/md5-cache/dev-libs/libclc-14.0.6
+++ b/metadata/md5-cache/dev-libs/libclc-14.0.6
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=1146abd4294efeffbee6b66090a04a69
diff --git a/metadata/md5-cache/dev-libs/libclc-15.0.7 b/metadata/md5-cache/dev-libs/libclc-15.0.7
index a885bdc9435d..cafc0dca712a 100644
--- a/metadata/md5-cache/dev-libs/libclc-15.0.7
+++ b/metadata/md5-cache/dev-libs/libclc-15.0.7
@@ -10,5 +10,5 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=1d1c104375d7a3406edd39028898ffef
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0 b/metadata/md5-cache/dev-libs/libclc-16.0.0
new file mode 100644
index 000000000000..92b5e6a46b25
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) || ( ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!!sys-devel/llvm:0
+DESCRIPTION=OpenCL C library
+EAPI=8
+HOMEPAGE=https://libclc.llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
+IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig )
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=75e107841b2809e5c6a7f568c1861581
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0.9999 b/metadata/md5-cache/dev-libs/libclc-16.0.0.9999
index 3a019309c1c8..fb3e2216585b 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.0.9999
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.0.9999
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a58fe7488220b532b0ac71a5315cdb8b
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0_rc3 b/metadata/md5-cache/dev-libs/libclc-16.0.0_rc3
index 85406ae5e875..c869ecf7fd30 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.0_rc3
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.0_rc3
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a58fe7488220b532b0ac71a5315cdb8b
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0_rc4 b/metadata/md5-cache/dev-libs/libclc-16.0.0_rc4
index 41697182f57a..f4315fee8d9b 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.0_rc4
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.0_rc4
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a58fe7488220b532b0ac71a5315cdb8b
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0.9999 b/metadata/md5-cache/dev-libs/libclc-17.0.0.9999
index 7c46706628b3..449f29c5f145 100644
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0.9999
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.0.9999
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0fae6b12ce0d1ece79a21405ece2b4f9
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230304 b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230304
index 428ffa778e1c..aaeb0c1d0160 100644
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230304
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230304
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0fae6b12ce0d1ece79a21405ece2b4f9
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230314 b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230314
index a76099526df9..00a2f818fcf9 100644
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230314
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230314
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0fae6b12ce0d1ece79a21405ece2b4f9
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index b85494a87c3c..d97c64f670d5 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-14.0.6 b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
index 3f79cb28ddec..1684153b2fba 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=81a9f3aae36c4d277e7deb51da8e2119
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7 b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
index 37a9e2f4425f..a48b56e7f98f 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=47ac9fc5ccf47d31fdeabf577e9b531c
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0
new file mode 100644
index 000000000000..25d673406d29
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.0:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.0[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.0[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa verify-sig
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.0:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.0[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.0[llvm_targets_Xtensa] )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
+RESTRICT=!test? ( test )
+SLOT=0/16.0.0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig )
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=bb054ccbb72b406130928bc4c24b2faa
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999
index 60492d3e7720..e5a00a2bf69b 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.0.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test )
 SLOT=0/16.0.0.9999
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc3 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc3
index b032d5145faf..833ac24cd72c 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc3
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/16.0.0_rc3
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc4 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc4
index 95d5078f3029..1f63b44c57ce 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc4
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/16.0.0_rc4
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
index 0ee12139595f..419b94af4552 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.0.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0.9999
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230304 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230304
index 6a189b3f84f6..0859c58edfa3 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230304
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230304
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0_pre20230304
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230314 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230314
index fcb49808a1a7..22450e5d74e6 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230314
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230314
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0_pre20230314
 SRC_URI=https://github.com/llvm/llvm-project/archive/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/ppxfind-1.4 b/metadata/md5-cache/dev-ml/ppxfind-1.4
deleted file mode 100644
index 4979300c08d7..000000000000
--- a/metadata/md5-cache/dev-ml/ppxfind-1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/ocaml dev-ml/dune
-DEFINED_PHASES=compile install test
-DEPEND=<=dev-ml/ocaml-migrate-parsetree-1.80:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=ocamlfind ppx tool
-EAPI=7
-HOMEPAGE=https://github.com/diml/ppxfind
-INHERIT=dune
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=<=dev-ml/ocaml-migrate-parsetree-1.80:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-SLOT=0/1.4
-SRC_URI=https://github.com/diml/ppxfind/releases/download/1.4/ppxfind-1.4.tbz
-_eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=4dc59cefd26db134a8cf705c9b6ab11e
diff --git a/metadata/md5-cache/dev-ml/stdune-3.0.3-r1 b/metadata/md5-cache/dev-ml/stdune-3.0.3-r2
index 2392ede72aba..26d4d0f1ebda 100644
--- a/metadata/md5-cache/dev-ml/stdune-3.0.3-r1
+++ b/metadata/md5-cache/dev-ml/stdune-3.0.3-r2
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-ml/dune-3 dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile configure install test
-DEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.0.3:=[ocamlopt?] ~dev-ml/ordering-3.0.3:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.0.3:=[ocamlopt?] ~dev-ml/ordering-3.0.3:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] !<dev-ml/dune-private-libs-3 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Dune's unstable standard library
 EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
@@ -8,9 +8,9 @@ INHERIT=dune multiprocessing
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.0.3:=[ocamlopt?] ~dev-ml/ordering-3.0.3:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.0.3:=[ocamlopt?] ~dev-ml/ordering-3.0.3:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] !<dev-ml/dune-private-libs-3 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/3.0.3
 SRC_URI=https://github.com/ocaml/dune/archive/3.0.3.tar.gz -> dune-3.0.3.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=7cf2713a342219613a51507cb3c13c79
+_md5_=620b194e4e197653e9ca219ea099368a
diff --git a/metadata/md5-cache/dev-ml/stdune-3.2.0 b/metadata/md5-cache/dev-ml/stdune-3.2.0-r1
index 93dd9c2214cd..506cd09d3776 100644
--- a/metadata/md5-cache/dev-ml/stdune-3.2.0
+++ b/metadata/md5-cache/dev-ml/stdune-3.2.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-ml/dune-3 dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile configure install test
-DEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.2.0:=[ocamlopt?] ~dev-ml/ordering-3.2.0:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.2.0:=[ocamlopt?] ~dev-ml/ordering-3.2.0:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] !<dev-ml/dune-private-libs-3 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Dune's unstable standard library
 EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
@@ -8,9 +8,9 @@ INHERIT=dune multiprocessing
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.2.0:=[ocamlopt?] ~dev-ml/ordering-3.2.0:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.2.0:=[ocamlopt?] ~dev-ml/ordering-3.2.0:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] !<dev-ml/dune-private-libs-3 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/3.2.0
 SRC_URI=https://github.com/ocaml/dune/archive/3.2.0.tar.gz -> dune-3.2.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=290c53f2bebcddcd795825930b6778e0
+_md5_=473e441f7a184998031ed485f9f32c57
diff --git a/metadata/md5-cache/dev-ml/stdune-3.6.1 b/metadata/md5-cache/dev-ml/stdune-3.6.1-r1
index 8f6798301576..d670439d818a 100644
--- a/metadata/md5-cache/dev-ml/stdune-3.6.1
+++ b/metadata/md5-cache/dev-ml/stdune-3.6.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile configure install test
-DEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.6.1:=[ocamlopt?] ~dev-ml/ordering-3.6.1:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.6.1:=[ocamlopt?] ~dev-ml/ordering-3.6.1:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] !<dev-ml/dune-private-libs-3 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Dune's unstable standard library
 EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
@@ -8,9 +8,9 @@ INHERIT=dune multiprocessing
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.6.1:=[ocamlopt?] ~dev-ml/ordering-3.6.1:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.6.1:=[ocamlopt?] ~dev-ml/ordering-3.6.1:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] !<dev-ml/dune-private-libs-3 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/3.6.1
 SRC_URI=https://github.com/ocaml/dune/archive/3.6.1.tar.gz -> dune-3.6.1.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=b59d0ba4c6e416b1875ac10cb9943728
+_md5_=c7c0debae68bed48faef4a88e6c550e9
diff --git a/metadata/md5-cache/dev-ml/stdune-3.6.2 b/metadata/md5-cache/dev-ml/stdune-3.6.2-r1
index bb1fb9b7950e..93b5075cc939 100644
--- a/metadata/md5-cache/dev-ml/stdune-3.6.2
+++ b/metadata/md5-cache/dev-ml/stdune-3.6.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile configure install test
-DEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.6.2:=[ocamlopt?] ~dev-ml/ordering-3.6.2:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.6.2:=[ocamlopt?] ~dev-ml/ordering-3.6.2:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] !<dev-ml/dune-private-libs-3 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Dune's unstable standard library
 EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
@@ -8,9 +8,9 @@ INHERIT=dune multiprocessing
 IUSE=+ocamlopt
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.6.2:=[ocamlopt?] ~dev-ml/ordering-3.6.2:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.6.2:=[ocamlopt?] ~dev-ml/ordering-3.6.2:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] !<dev-ml/dune-private-libs-3 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/3.6.2
 SRC_URI=https://github.com/ocaml/dune/archive/3.6.2.tar.gz -> dune-3.6.2.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=6201784e9c76916e1957c8277878db74
+_md5_=521dd45634d2db919205c6fc6d45d2f0
diff --git a/metadata/md5-cache/dev-ml/stdune-3.7.0 b/metadata/md5-cache/dev-ml/stdune-3.7.0-r1
index 7cc43b5fbdef..922fb0693866 100644
--- a/metadata/md5-cache/dev-ml/stdune-3.7.0
+++ b/metadata/md5-cache/dev-ml/stdune-3.7.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-ml/dune-3.5 dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile configure install test
-DEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.7.0:=[ocamlopt?] ~dev-ml/ordering-3.7.0:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.7.0:=[ocamlopt?] ~dev-ml/ordering-3.7.0:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] !<dev-ml/dune-private-libs-3 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Dune's unstable standard library
 EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
@@ -8,9 +8,9 @@ INHERIT=dune multiprocessing
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.7.0:=[ocamlopt?] ~dev-ml/ordering-3.7.0:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/pp:=[ocamlopt?] ~dev-ml/dyn-3.7.0:=[ocamlopt?] ~dev-ml/ordering-3.7.0:=[ocamlopt?] >=dev-ml/csexp-1.5:=[ocamlopt?] !<dev-ml/dune-private-libs-3 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/3.7.0
 SRC_URI=https://github.com/ocaml/dune/archive/3.7.0.tar.gz -> dune-3.7.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=ac184dd2e82e179df579740fbda7a375
+_md5_=c7c0debae68bed48faef4a88e6c550e9
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index bf2b688e3d56..c08455b5f50c 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/aiohttp-jinja2-1.5 b/metadata/md5-cache/dev-python/aiohttp-jinja2-1.5
deleted file mode 100644
index f187141464d1..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-jinja2-1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-aiohttp-0.3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aiohttp-2.3.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.11-r1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=jinja2 template renderer for aiohttp.web
-EAPI=8
-HOMEPAGE=https://github.com/aio-libs/aiohttp-jinja2
-INHERIT=distutils-r1 pypi
-IUSE=test doc python_targets_pypy3 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aiohttp-2.3.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/a/aiohttp-jinja2/aiohttp-jinja2-1.5.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b72f24f02df4ead1304a1a71cad51f54
diff --git a/metadata/md5-cache/dev-python/alagitpull-0.0.23-r2 b/metadata/md5-cache/dev-python/alagitpull-0.0.23-r2
deleted file mode 100644
index 55d826550a2e..000000000000
--- a/metadata/md5-cache/dev-python/alagitpull-0.0.23-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=alabaster sub-theme used on git-pull docs
-EAPI=8
-HOMEPAGE=https://github.com/git-pull/alagitpull
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=MIT
-RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/git-pull/alagitpull/archive/v0.0.23.tar.gz -> alagitpull-0.0.23.gh.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c89e2efe5306b475ac9a4bc71b8cdd0e
diff --git a/metadata/md5-cache/dev-python/argcomplete-2.1.2 b/metadata/md5-cache/dev-python/argcomplete-2.1.2
new file mode 100644
index 000000000000..6e711d639526
--- /dev/null
+++ b/metadata/md5-cache/dev-python/argcomplete-2.1.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-shells/fish app-shells/tcsh dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pip-19 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Bash tab completion for argparse
+EAPI=8
+HOMEPAGE=https://github.com/kislyuk/argcomplete/ https://pypi.org/project/argcomplete/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/a/argcomplete/argcomplete-2.1.2.tar.gz
+_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=717a0f0a7c9ae1b516bd8d0d35070216
diff --git a/metadata/md5-cache/dev-python/berkeleydb-18.1.5 b/metadata/md5-cache/dev-python/berkeleydb-18.1.5
deleted file mode 100644
index 28338ca26e0d..000000000000
--- a/metadata/md5-cache/dev-python/berkeleydb-18.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 )
-DESCRIPTION=Python bindings for Oracle Berkeley DB
-EAPI=7
-HOMEPAGE=https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/berkeleydb/
-INHERIT=db-use flag-o-matic distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=BSD
-RDEPEND=|| ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~arthurzam/distfiles/dev-python/berkeleydb/berkeleydb-18.1.5.tar.xz
-_eclasses_=db-use	3807d3e43e20aaa6e4decedd2bb2db4c	distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d2d1d1e71233ef027211569e8018bf2d
diff --git a/metadata/md5-cache/dev-python/blockdiag-3.0.0 b/metadata/md5-cache/dev-python/blockdiag-3.0.0
deleted file mode 100644
index 43b3362c097d..000000000000
--- a/metadata/md5-cache/dev-python/blockdiag-3.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/reportlab[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/ja-ipafonts ) test? ( >=dev-python/funcparserlib-1.0.0_alpha0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/webcolors[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7_p20221026[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Generate block-diagram image from text
-EAPI=8
-HOMEPAGE=http://blockdiag.com/ https://pypi.org/project/blockdiag/ https://github.com/blockdiag/blockdiag/
-INHERIT=distutils-r1 optfeature pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/funcparserlib-1.0.0_alpha0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/webcolors[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/b/blockdiag/blockdiag-3.0.0.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=db00c55b7e83ab570cbbd2261d10d70d
diff --git a/metadata/md5-cache/dev-python/cairocffi-1.5.0 b/metadata/md5-cache/dev-python/cairocffi-1.5.0
new file mode 100644
index 000000000000..661f855b29d2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cairocffi-1.5.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/numpy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pikepdf[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/xcffib-0.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] python_targets_python3_9? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/xcffib-0.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg]
+DESCRIPTION=CFFI-based drop-in replacement for Pycairo
+EAPI=8
+HOMEPAGE=https://github.com/Kozea/cairocffi/ https://pypi.org/project/cairocffi/
+INHERIT=distutils-r1 pypi virtualx
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/xcffib-0.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] python_targets_python3_9? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cairocffi/cairocffi-1.5.0.tar.gz
+_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	ab0d5fcb35ad650a57b516e6f4c467e7
+_md5_=f292eee0f9b52c6c47c28192548ee7e7
diff --git a/metadata/md5-cache/dev-python/citeproc-py-0.6.0 b/metadata/md5-cache/dev-python/citeproc-py-0.6.0
deleted file mode 100644
index 369ed772d21a..000000000000
--- a/metadata/md5-cache/dev-python/citeproc-py-0.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-text/rnc2rng-2.6.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7_p20221026[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Yet another Python CSL Processor
-EAPI=8
-HOMEPAGE=https://pypi.org/project/citeproc-py/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/c/citeproc-py/citeproc-py-0.6.0.tar.gz test? ( https://github.com/citation-style-language/test-suite/archive/c3db429ab7c6b9b9ccaaa6d3c6bb9e503f0d7b11.tar.gz -> citeproc-py-test-suite-c3db429ab7c6b9b9ccaaa6d3c6bb9e503f0d7b11.tar.gz )
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=88d1c49160a8a78e88a1e2633517c565
diff --git a/metadata/md5-cache/dev-python/clang-python-14.0.6 b/metadata/md5-cache/dev-python/clang-python-14.0.6
index 628d8d347b47..227cab416a05 100644
--- a/metadata/md5-cache/dev-python/clang-python-14.0.6
+++ b/metadata/md5-cache/dev-python/clang-python-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=df1bc02b22483edeca144370d496a934
diff --git a/metadata/md5-cache/dev-python/clang-python-15.0.7 b/metadata/md5-cache/dev-python/clang-python-15.0.7
index 86ee0409db82..30cdef9c67a1 100644
--- a/metadata/md5-cache/dev-python/clang-python-15.0.7
+++ b/metadata/md5-cache/dev-python/clang-python-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=af6077f776aa5a8c36aee6ad4acd5183
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.0 b/metadata/md5-cache/dev-python/clang-python-16.0.0
new file mode 100644
index 000000000000..343dacdb0584
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.0
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) test? ( sys-devel/clang:16 ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=install prepare test unpack
+DEPEND=>=sys-devel/clang-16.0.0:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
+DESCRIPTION=Python bindings for sys-devel/clang
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=llvm.org python-r1
+IUSE=test verify-sig python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=sys-devel/clang-16.0.0:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig )
+_eclasses_=llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_md5_=54870a9d47888a4dcba05e8fffb23186
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.0.9999 b/metadata/md5-cache/dev-python/clang-python-16.0.0.9999
index 96ba6c63a433..e3480ba2ed86 100644
--- a/metadata/md5-cache/dev-python/clang-python-16.0.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-devel/clang-16.0.0.9999:* !sys-devel/llvm:0[clang(-),python(-)] !s
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.0_rc3 b/metadata/md5-cache/dev-python/clang-python-16.0.0_rc3
index 605567c74ce7..a146a1a6cb91 100644
--- a/metadata/md5-cache/dev-python/clang-python-16.0.0_rc3
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.0_rc3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.0_rc4 b/metadata/md5-cache/dev-python/clang-python-16.0.0_rc4
index c1360851592a..406a06721f62 100644
--- a/metadata/md5-cache/dev-python/clang-python-16.0.0_rc4
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.0_rc4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0.9999 b/metadata/md5-cache/dev-python/clang-python-17.0.0.9999
index 3ad7dfb574a1..950b4cf3f885 100644
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-devel/clang-17.0.0.9999:* !sys-devel/llvm:0[clang(-),python(-)] !s
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230304 b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230304
index 29027f675c21..0ac32d8f8e09 100644
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230304
+++ b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230304
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230314 b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230314
index 11fe06974e77..39155b0d3bea 100644
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230314
+++ b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230314
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/duecredit-0.9.2 b/metadata/md5-cache/dev-python/duecredit-0.9.2
deleted file mode 100644
index f6f6a01d5c1e..000000000000
--- a/metadata/md5-cache/dev-python/duecredit-0.9.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/citeproc-py-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Publications (and donations) tracer
-EAPI=8
-HOMEPAGE=https://github.com/duecredit/duecredit
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/citeproc-py-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/d/duecredit/duecredit-0.9.2.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ef8a898add4500d399b83b8ee472d00f
diff --git a/metadata/md5-cache/dev-python/flask-2.2.2 b/metadata/md5-cache/dev-python/flask-2.2.2
deleted file mode 100644
index f7181d86c42a..000000000000
--- a/metadata/md5-cache/dev-python/flask-2.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/asgiref-3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!dev-python/shiboken2 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/pallets-sphinx-themes[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] dev-python/sphinx-tabs[python_targets_python3_11(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/pallets-sphinx-themes[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] dev-python/sphinx-tabs[python_targets_python3_10(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] dev-python/sphinx-tabs[python_targets_python3_9(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.11-r1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-)] dev-python/sphinx-tabs[python_targets_pypy3(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/itsdangerous-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A microframework based on Werkzeug, Jinja2 and good intentions
-EAPI=8
-HOMEPAGE=https://palletsprojects.com/p/flask/ https://github.com/pallets/flask/ https://pypi.org/project/Flask/
-INHERIT=distutils-r1
-IUSE=examples doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/itsdangerous-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/F/Flask/Flask-2.2.2.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e3e80ce9ae43824715724e12945d278e
diff --git a/metadata/md5-cache/dev-python/flask-2.2.3 b/metadata/md5-cache/dev-python/flask-2.2.3
index c329b0c81ef1..6c5f085ae7cb 100644
--- a/metadata/md5-cache/dev-python/flask-2.2.3
+++ b/metadata/md5-cache/dev-python/flask-2.2.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://palletsprojects.com/p/flask/ https://github.com/pallets/flask/ https://pypi.org/project/Flask/
 INHERIT=distutils-r1
 IUSE=examples doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/itsdangerous-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask/Flask-2.2.3.tar.gz
 _eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3d124c3d27a627442de68f92afc0de13
+_md5_=e3e80ce9ae43824715724e12945d278e
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-3.0 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-3.0
deleted file mode 100644
index ac6667f524e4..000000000000
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/gcs-oauth2-boto-plugin/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/boto-2.29.1[python_targets_python3_10(-)?] >=dev-python/google-reauth-python-0.1.0[python_targets_python3_10(-)?] >=dev-python/httplib2-0.18[python_targets_python3_10(-)?] >=dev-python/oauth2client-2.2.0[python_targets_python3_10(-)?] >=dev-python/pyopenssl-0.13[python_targets_python3_10(-)?] >=dev-python/retry-decorator-1.0.0[python_targets_python3_10(-)?] >=dev-python/six-1.12.0[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f6b797b06eda2a83bfdb72d1369329b5
diff --git a/metadata/md5-cache/dev-python/glooey-0.3.6 b/metadata/md5-cache/dev-python/glooey-0.3.6
deleted file mode 100644
index aab719de974c..000000000000
--- a/metadata/md5-cache/dev-python/glooey-0.3.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( media-libs/freetype ) test? ( dev-python/autoprop[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/vecrec[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An object-oriented GUI library for pyglet
-EAPI=8
-HOMEPAGE=https://glooey.readthedocs.io/en/latest/
-INHERIT=distutils-r1 virtualx pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/autoprop[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/vecrec[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/g/glooey/glooey-0.3.6.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	ab0d5fcb35ad650a57b516e6f4c467e7
-_md5_=472aa3530657e34d5313b6f5450df393
diff --git a/metadata/md5-cache/dev-python/google-apitools-0.5.32-r1 b/metadata/md5-cache/dev-python/google-apitools-0.5.32-r1
deleted file mode 100644
index ed634b5a0d85..000000000000
--- a/metadata/md5-cache/dev-python/google-apitools-0.5.32-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/mock-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/httplib2-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fasteners-0.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oauth2client-1.5.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-gflags-3.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7_p20221026[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library to manipulate Google APIs
-EAPI=8
-HOMEPAGE=https://github.com/google/apitools
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fasteners-0.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oauth2client-1.5.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-gflags-3.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/apitools/archive/v0.5.32.tar.gz -> google-apitools-0.5.32.gh.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c1da953e6c9c4a4e7ecc077cea844810
diff --git a/metadata/md5-cache/dev-python/google-reauth-python-0.1.1 b/metadata/md5-cache/dev-python/google-reauth-python-0.1.1
deleted file mode 100644
index cbc7dd88828e..000000000000
--- a/metadata/md5-cache/dev-python/google-reauth-python-0.1.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/oauth2client-2.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyu2f[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/oauth2client-2.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyu2f[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DESCRIPTION=Python based U2F host library
-EAPI=7
-HOMEPAGE=https://github.com/google/google-reauth-python
-INHERIT=distutils-r1
-IUSE=test test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/oauth2client-2.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyu2f[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/google-reauth-python/archive/0.1.1.tar.gz -> google-reauth-python-0.1.1.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=120edc2033f2bc8dbfd2a368fceebc13
diff --git a/metadata/md5-cache/dev-python/ini2toml-0.12 b/metadata/md5-cache/dev-python/ini2toml-0.12
new file mode 100644
index 000000000000..750a1ec9a0ad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ini2toml-0.12
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/configupdater[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-fmt-0.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomlkit[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-20.7[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-0.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Automatically conversion of .ini/.cfg files to TOML equivalents
+EAPI=8
+HOMEPAGE=https://pypi.org/project/ini2toml/ https://github.com/abravalheri/ini2toml/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/packaging-20.7[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-0.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/i/ini2toml/ini2toml-0.12.tar.gz
+_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=fc80b3ed7492e71048f4830103d6243f
diff --git a/metadata/md5-cache/dev-python/lit-14.0.6 b/metadata/md5-cache/dev-python/lit-14.0.6
index 8e676edc71ca..699b1a08f160 100644
--- a/metadata/md5-cache/dev-python/lit-14.0.6
+++ b/metadata/md5-cache/dev-python/lit-14.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=67d902868be793a5cb25a3d9aae6cdef
diff --git a/metadata/md5-cache/dev-python/lit-15.0.7 b/metadata/md5-cache/dev-python/lit-15.0.7
index e657176e17ab..464233afdab3 100644
--- a/metadata/md5-cache/dev-python/lit-15.0.7
+++ b/metadata/md5-cache/dev-python/lit-15.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=05fe9b9d4b376809fb1d6ef6ed35e15b
diff --git a/metadata/md5-cache/dev-python/lit-16.0.0 b/metadata/md5-cache/dev-python/lit-16.0.0
new file mode 100644
index 000000000000..7eedc17c467b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-16.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/llvm ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A stand-alone install of the LLVM suite testing tool
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=distutils-r1 llvm.org
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig )
+_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_md5_=997bc0ae1ca46b80dad712ff6f6827ba
diff --git a/metadata/md5-cache/dev-python/lit-16.0.0.9999 b/metadata/md5-cache/dev-python/lit-16.0.0.9999
index 705e975bef87..1b95986faf60 100644
--- a/metadata/md5-cache/dev-python/lit-16.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-16.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/lit-16.0.0_rc3 b/metadata/md5-cache/dev-python/lit-16.0.0_rc3
index db673f705750..551eebe1068a 100644
--- a/metadata/md5-cache/dev-python/lit-16.0.0_rc3
+++ b/metadata/md5-cache/dev-python/lit-16.0.0_rc3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=76aafe2b1c14b670a7497cda70885ee2
diff --git a/metadata/md5-cache/dev-python/lit-16.0.0_rc4 b/metadata/md5-cache/dev-python/lit-16.0.0_rc4
index cf6db91b9cac..7b82e7145ac9 100644
--- a/metadata/md5-cache/dev-python/lit-16.0.0_rc4
+++ b/metadata/md5-cache/dev-python/lit-16.0.0_rc4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=76aafe2b1c14b670a7497cda70885ee2
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0.9999 b/metadata/md5-cache/dev-python/lit-17.0.0.9999
index 705e975bef87..1b95986faf60 100644
--- a/metadata/md5-cache/dev-python/lit-17.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-17.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230304 b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230304
index 49d259f4795b..fe407d2044ec 100644
--- a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230304
+++ b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230304
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230314 b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230314
index 96bf78e3bc74..99e564b3f947 100644
--- a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230314
+++ b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230314
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/oauth2client-4.1.3-r2 b/metadata/md5-cache/dev-python/oauth2client-4.1.3-r2
deleted file mode 100644
index e4ad7a87d3c4..000000000000
--- a/metadata/md5-cache/dev-python/oauth2client-4.1.3-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/flask[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sqlalchemy[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/httplib2-0.9.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/keyring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<=dev-python/google-api-python-client-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7_p20221026[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for accessing resources protected by OAuth 2.0
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/oauth2client
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/keyring[python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<=dev-python/google-api-python-client-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/oauth2client/archive/v4.1.3.tar.gz -> oauth2client-4.1.3.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=44f37ce3e0900cab2bbb004dcfe471b9
diff --git a/metadata/md5-cache/dev-python/oauth2client-4.1.3-r3 b/metadata/md5-cache/dev-python/oauth2client-4.1.3-r3
deleted file mode 100644
index cd5715d64816..000000000000
--- a/metadata/md5-cache/dev-python/oauth2client-4.1.3-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sqlalchemy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fasteners[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycryptodome-2.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyopenssl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ( >=dev-python/pyasn1-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/httplib2-0.9.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/pycryptodome-2.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyopenssl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ( >=dev-python/pyasn1-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) dev-python/keyring[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<=dev-python/google-api-python-client-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for accessing resources protected by OAuth 2.0
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/oauth2client
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/pycryptodome-2.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyopenssl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ( >=dev-python/pyasn1-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.0.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) dev-python/keyring[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<=dev-python/google-api-python-client-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/googleapis/oauth2client/archive/v4.1.3.tar.gz -> oauth2client-4.1.3.tar.gz https://dev.gentoo.org/~robbat2/distfiles/oauth2client-4.1.3-fixes-20230207.patch
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=46b5a706124ef281e57ed4af1ae3d62e
diff --git a/metadata/md5-cache/dev-python/pyphen-0.14.0 b/metadata/md5-cache/dev-python/pyphen-0.14.0
new file mode 100644
index 000000000000..43b199be614a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyphen-0.14.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python module for hyphenation using hunspell dictionaries
+EAPI=8
+HOMEPAGE=https://github.com/Kozea/Pyphen/ https://pypi.org/project/pyphen/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-2+ LGPL-2+ MPL-1.1
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyphen/pyphen-0.14.0.tar.gz
+_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=110b2ac606fa0e0631d13473d7e01533
diff --git a/metadata/md5-cache/dev-python/scandir-1.10.0-r3 b/metadata/md5-cache/dev-python/scandir-1.10.0-r3
deleted file mode 100644
index 254125d440a0..000000000000
--- a/metadata/md5-cache/dev-python/scandir-1.10.0-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A better directory iterator and faster os.walk()
-EAPI=8
-HOMEPAGE=https://github.com/benhoyt/scandir
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/scandir/scandir-1.10.0.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=48dceb97fc440bce2ccba866f2267a42
diff --git a/metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1 b/metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1
deleted file mode 100644
index da422c9696b5..000000000000
--- a/metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/twisted-16.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Setuptools plugin that makes unit tests execute with trial instead of pyunit
-EAPI=8
-HOMEPAGE=https://github.com/rutsky/setuptools-trial https://pypi.org/project/setuptools_trial/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/twisted-16.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/setuptools_trial/setuptools_trial-0.6.0.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=cab1c7af18bd2f946b47638a57932ca1
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-3.0.0 b/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-3.0.0
deleted file mode 100644
index c2f04429cd42..000000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-3.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/reportlab[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx-testing[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/sphinx-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blockdiag-1.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A sphinx extension for embedding block diagrams using blockdiag
-EAPI=8
-HOMEPAGE=https://github.com/blockdiag/sphinxcontrib-blockdiag/ https://pypi.org/project/sphinxcontrib-blockdiag/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/sphinx-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blockdiag-1.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/blockdiag/sphinxcontrib-blockdiag/archive/3.0.0.tar.gz -> sphinxcontrib-blockdiag-3.0.0.gh.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c9a7b9fdda98627acc5cca4137283763
diff --git a/metadata/md5-cache/dev-python/urlgrabber-4.1.0 b/metadata/md5-cache/dev-python/urlgrabber-4.1.0
deleted file mode 100644
index 21165987549b..000000000000
--- a/metadata/md5-cache/dev-python/urlgrabber-4.1.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module for downloading files
-EAPI=7
-HOMEPAGE=http://urlgrabber.baseurl.org https://github.com/rpm-software-management/urlgrabber
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 x86
-LICENSE=LGPL-2.1
-PROPERTIES=test_network
-RDEPEND=dev-python/pycurl[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rpm-software-management/urlgrabber/archive/urlgrabber-4-1-0.tar.gz -> urlgrabber-4.1.0.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b1c12978768436d019e2ae0d67af078b
diff --git a/metadata/md5-cache/dev-python/waitress-2.1.2 b/metadata/md5-cache/dev-python/waitress-2.1.2
index 1da85676f3bd..f495a4b8d41c 100644
--- a/metadata/md5-cache/dev-python/waitress-2.1.2
+++ b/metadata/md5-cache/dev-python/waitress-2.1.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/w/waitress/waitress-2.1.2.tar.gz
 _eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=78d4aefccfbf171ba080bfeec8b1bf8a
+_md5_=e03d16d4e232e5a29e279a264c8bf680
diff --git a/metadata/md5-cache/dev-python/zstd-1.5.2.6 b/metadata/md5-cache/dev-python/zstd-1.5.2.6
deleted file mode 100644
index 981bbe75700b..000000000000
--- a/metadata/md5-cache/dev-python/zstd-1.5.2.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( app-arch/zstd:= !<dev-python/zstandard-0.15.2-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/zstd:=
-DESCRIPTION=Simple python bindings to Yann Collet ZSTD compression library
-EAPI=8
-HOMEPAGE=https://github.com/sergey-dryabzhinsky/python-zstd/ https://pypi.org/project/zstd/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD-2
-RDEPEND=app-arch/zstd:= !<dev-python/zstandard-0.15.2-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/z/zstd/zstd-1.5.2.6.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c5590bc66139a897f634a99c80df6e58
diff --git a/metadata/md5-cache/dev-python/zstd-1.5.4.0 b/metadata/md5-cache/dev-python/zstd-1.5.4.0
index e79024530270..20cd16ef4834 100644
--- a/metadata/md5-cache/dev-python/zstd-1.5.4.0
+++ b/metadata/md5-cache/dev-python/zstd-1.5.4.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sergey-dryabzhinsky/python-zstd/ https://pypi.org/project/zstd/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD-2
 RDEPEND=app-arch/zstd:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/z/zstd/zstd-1.5.4.0.tar.gz
 _eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6ad3aa61aafe0c1934e12f8a2b80a55c
+_md5_=ffa28671878f3fd52efbe1a4b0378916
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index ab32a211b5c0..3fc39b6d04e7 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/benchmark-ips-2.12.0 b/metadata/md5-cache/dev-ruby/benchmark-ips-2.12.0
new file mode 100644
index 000000000000..698566bc0c78
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/benchmark-ips-2.12.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.6:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5.6:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/minitest-5.6:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/minitest-5.6:5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=A iterations per second enhancement to Benchmark
+EAPI=8
+HOMEPAGE=https://github.com/evanphx/benchmark-ips
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/evanphx/benchmark-ips/archive/v2.12.0.tar.gz -> benchmark-ips-2.12.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	69b6ab182fab608b42dee39cae3d730c	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c0b14cc54360634c2b52f8b4599f50d6
diff --git a/metadata/md5-cache/dev-ruby/bindata-2.4.15 b/metadata/md5-cache/dev-ruby/bindata-2.4.15
new file mode 100644
index 000000000000..17c1e27a606c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bindata-2.4.15
@@ -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_ruby32? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Parsing Binary Data in Ruby
+EAPI=8
+HOMEPAGE=https://github.com/dmendel/bindata
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+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_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://rubygems.org/gems/bindata-2.4.15.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	69b6ab182fab608b42dee39cae3d730c	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=934da2324f89a07aa6e0acb183d88889
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.14.0 b/metadata/md5-cache/dev-ruby/gruff-0.14.0
deleted file mode 100644
index 71170ac82aee..000000000000
--- a/metadata/md5-cache/dev-ruby/gruff-0.14.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/histogram[ruby_targets_ruby27(-)] dev-ruby/rmagick:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Beautiful graphs for one or multiple datasets
-EAPI=8
-HOMEPAGE=https://github.com/topfunky/gruff
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=media-gfx/imagemagick[truetype] ruby_targets_ruby27? ( dev-ruby/histogram[ruby_targets_ruby27(-)] dev-ruby/rmagick:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/topfunky/gruff/archive/v0.14.0.tar.gz -> gruff-0.14.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	69b6ab182fab608b42dee39cae3d730c	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=05fda139f6ce51876d62390649023847
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.18.0 b/metadata/md5-cache/dev-ruby/gruff-0.18.0
deleted file mode 100644
index ccfc7b919e02..000000000000
--- a/metadata/md5-cache/dev-ruby/gruff-0.18.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/histogram[ruby_targets_ruby27(-)] >=dev-ruby/rmagick-4.2:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/histogram[ruby_targets_ruby30(-)] >=dev-ruby/rmagick-4.2:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/histogram[ruby_targets_ruby31(-)] >=dev-ruby/rmagick-4.2:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/test-unit[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/test-unit[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=test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] ) 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=Beautiful graphs for one or multiple datasets
-EAPI=8
-HOMEPAGE=https://github.com/topfunky/gruff
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-gfx/imagemagick[truetype] ruby_targets_ruby27? ( dev-ruby/histogram[ruby_targets_ruby27(-)] >=dev-ruby/rmagick-4.2:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/histogram[ruby_targets_ruby30(-)] >=dev-ruby/rmagick-4.2:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/histogram[ruby_targets_ruby31(-)] >=dev-ruby/rmagick-4.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=0
-SRC_URI=https://github.com/topfunky/gruff/archive/v0.18.0.tar.gz -> gruff-0.18.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	69b6ab182fab608b42dee39cae3d730c	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b521d205e7706db5b680c44726074355
diff --git a/metadata/md5-cache/dev-ruby/libusb-0.6.4-r2 b/metadata/md5-cache/dev-ruby/libusb-0.6.4-r2
new file mode 100644
index 000000000000..a9b4f73e11a4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/libusb-0.6.4-r2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/ffi:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/ffi:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/ffi:0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/eventmachine[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/eventmachine[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/eventmachine[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=virtual/libusb:1 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=binding that gives Ruby programmers access to arbitrary USB devices
+EAPI=8
+HOMEPAGE=https://github.com/larskanis/libusb
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=virtual/libusb:1 ruby_targets_ruby27? ( dev-ruby/ffi:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/ffi:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/ffi:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/libusb-0.6.4.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	69b6ab182fab608b42dee39cae3d730c	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a859706e184793c7ff8ae321ffd179a3
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.5.1 b/metadata/md5-cache/dev-ruby/ruby-atk-3.5.1
new file mode 100644
index 000000000000..0aecbc6ad7a9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-3.5.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby30(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby31(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[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(-)] ) 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 ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/pkg-config[ruby_targets_ruby30(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/pkg-config[ruby_targets_ruby31(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/atk[introspection] 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 Atk bindings
+EAPI=7
+HOMEPAGE=https://ruby-gnome.github.io/
+INHERIT=ruby-ng-gnome2
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/atk[introspection] ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby30(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby31(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[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=0
+SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.5.1.tar.gz -> ruby-gnome2-3.5.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	69b6ab182fab608b42dee39cae3d730c	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=316c20702db698bef520d2125c7588cc
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.5.1 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.5.1
new file mode 100644
index 000000000000..6e4b13f9c091
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.5.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/ruby-gio2-3.5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/ruby-gio2-3.5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/ruby-gio2-3.5.1[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(-)] ) 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 ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/pkg-config[ruby_targets_ruby30(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/pkg-config[ruby_targets_ruby31(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( x11-libs/gdk-pixbuf[jpeg] ) 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 GdkPixbuf2 bindings
+EAPI=7
+HOMEPAGE=https://ruby-gnome.github.io/
+INHERIT=ruby-ng-gnome2
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=x11-libs/gdk-pixbuf[introspection] ruby_targets_ruby27? ( ~dev-ruby/ruby-gio2-3.5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/ruby-gio2-3.5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/ruby-gio2-3.5.1[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=0
+SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.5.1.tar.gz -> ruby-gnome2-3.5.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	69b6ab182fab608b42dee39cae3d730c	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b8d4000b8210ae26bd2d16b50f2dc8d4
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-3.5.1 b/metadata/md5-cache/dev-ruby/ruby-pango-3.5.1
new file mode 100644
index 000000000000..d32de028598a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-3.5.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/rcairo[ruby_targets_ruby27(-)] ~dev-ruby/ruby-cairo-gobject-3.5.1[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rcairo[ruby_targets_ruby30(-)] ~dev-ruby/ruby-cairo-gobject-3.5.1[ruby_targets_ruby30(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rcairo[ruby_targets_ruby31(-)] ~dev-ruby/ruby-cairo-gobject-3.5.1[ruby_targets_ruby31(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[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(-)] ) 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 ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/pkg-config[ruby_targets_ruby30(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/pkg-config[ruby_targets_ruby31(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/glib >=x11-libs/pango-1.2.1[introspection] 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 Pango bindings
+EAPI=7
+HOMEPAGE=https://ruby-gnome.github.io/
+INHERIT=ruby-ng-gnome2
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/glib >=x11-libs/pango-1.2.1[introspection] ruby_targets_ruby27? ( dev-ruby/rcairo[ruby_targets_ruby27(-)] ~dev-ruby/ruby-cairo-gobject-3.5.1[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rcairo[ruby_targets_ruby30(-)] ~dev-ruby/ruby-cairo-gobject-3.5.1[ruby_targets_ruby30(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rcairo[ruby_targets_ruby31(-)] ~dev-ruby/ruby-cairo-gobject-3.5.1[ruby_targets_ruby31(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[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=0
+SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.5.1.tar.gz -> ruby-gnome2-3.5.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	69b6ab182fab608b42dee39cae3d730c	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4d0c116ebd5f4ff0fd8393626dc988a1
diff --git a/metadata/md5-cache/dev-ruby/slop-4.10.1 b/metadata/md5-cache/dev-ruby/slop-4.10.1
new file mode 100644
index 000000000000..b8716f2b59dc
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/slop-4.10.1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/minitest[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=A simple option parser with an easy to remember syntax and friendly API
+EAPI=8
+HOMEPAGE=https://github.com/leejarvis/slop
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=4
+SRC_URI=https://github.com/leejarvis/slop/archive/v4.10.1.tar.gz -> slop-4.10.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	69b6ab182fab608b42dee39cae3d730c	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=de5a031cf2672c6aa3e6968cb97e1081
diff --git a/metadata/md5-cache/dev-ruby/spring-4.1.1 b/metadata/md5-cache/dev-ruby/spring-4.1.1
new file mode 100644
index 000000000000..bdf81242860a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/spring-4.1.1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/activesupport[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/activesupport[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] dev-ruby/activesupport[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=Rails application preloader
+EAPI=8
+HOMEPAGE=https://github.com/rails/spring
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~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=1.1
+SRC_URI=https://github.com/rails/spring/archive/v4.1.1.tar.gz -> spring-4.1.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	69b6ab182fab608b42dee39cae3d730c	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a2e1f1a4beac2ebd1dc84b20e2ec4898
diff --git a/metadata/md5-cache/dev-ruby/sus-0.20.3 b/metadata/md5-cache/dev-ruby/sus-0.20.3
new file mode 100644
index 000000000000..f98e0e3f676f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sus-0.20.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_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=A fast and scalable test runner
+EAPI=8
+HOMEPAGE=https://github.com/ioquatix/sus
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ioquatix/sus/archive/v0.20.3.tar.gz -> sus-0.20.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	69b6ab182fab608b42dee39cae3d730c	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=2818860b506fe90e33ce25a925c18dd0
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 42c6ae8c1067..c9b27b4fb1a2 100644
--- a/metadata/md5-cache/dev-tcltk/Manifest.gz
+++ b/metadata/md5-cache/dev-tcltk/Manifest.gz
diff --git a/metadata/md5-cache/dev-tcltk/tcl3d-0.5.0 b/metadata/md5-cache/dev-tcltk/tcl3d-0.5.0-r1
index 21dbe2044037..1bc6a51f1c90 100644
--- a/metadata/md5-cache/dev-tcltk/tcl3d-0.5.0
+++ b/metadata/md5-cache/dev-tcltk/tcl3d-0.5.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare
 DEPEND=dev-lang/tcl:0= dev-lang/tk:0= x11-libs/libXi x11-libs/libXmu virtual/opengl virtual/glu ode? ( dev-games/ode ) osg? ( dev-games/openscenegraph ) truetype? ( media-libs/ftgl ) sdl? ( media-libs/libsdl ) >=dev-lang/swig-1.3.38:0= app-arch/unzip
 DESCRIPTION=Tcl bindings to OpenGL and other 3D libraries
-EAPI=7
+EAPI=8
 HOMEPAGE=http://www.tcl3d.org
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=debug ode osg sdl truetype
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= x11-libs/libXi x11-libs/libXmu virtual/opengl virtual/glu ode? ( dev-games/ode ) osg? ( dev-games/openscenegraph ) truetype? ( media-libs/ftgl ) sdl? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=http://www.tcl3d.org/download/tcl3d-0.5.0.distrib/tcl3d-src-0.5.0.zip
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=89674b25b6de849639d48f44f8af218a
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=77fca0998827ec6e4dc9124a22c188a0
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index d906cf1e167c..f1f5aaf9fa16 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-14.0.6 b/metadata/md5-cache/dev-util/lldb-14.0.6
index 8b44530d38a8..4b385a6b16b6 100644
--- a/metadata/md5-cache/dev-util/lldb-14.0.6
+++ b/metadata/md5-cache/dev-util/lldb-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c440bf0d29c528bd4a549fe2bac1c1fa
diff --git a/metadata/md5-cache/dev-util/lldb-15.0.7 b/metadata/md5-cache/dev-util/lldb-15.0.7
index 7662d5addef1..3c810600ebc9 100644
--- a/metadata/md5-cache/dev-util/lldb-15.0.7
+++ b/metadata/md5-cache/dev-util/lldb-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=6f8c56176a914b9a0329aa2acd261b13
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0 b/metadata/md5-cache/dev-util/lldb-16.0.0
new file mode 100644
index 000000000000..3c5665dd3ce7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( ~dev-python/lit-16.0.0[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-16.0.0[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-16.0.0[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) sys-devel/lld ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-16.0.0 ~sys-devel/llvm-16.0.0 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM debugger
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org python-single-r1
+IUSE=debug +libedit lzma ncurses +python test +xml test verify-sig python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-16.0.0 ~sys-devel/llvm-16.0.0 python? ( python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0/16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig )
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=90254b661bcbc72db1b72b17f80eefd8
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0.9999 b/metadata/md5-cache/dev-util/lldb-16.0.0.9999
index 137061a1359f..85546a1d1924 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0/16
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0_rc3 b/metadata/md5-cache/dev-util/lldb-16.0.0_rc3
index 66742470065c..fb4c7e857fca 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0_rc3
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0_rc3
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2a25e20ef8aaa790f1ec2991e9b25c7f
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0_rc4 b/metadata/md5-cache/dev-util/lldb-16.0.0_rc4
index 2ea0059e09a4..a1b657fe57ca 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0_rc4
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0_rc4
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=1644c53cd968477210c1eeff463e5a74
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0.9999 b/metadata/md5-cache/dev-util/lldb-17.0.0.9999
index 7ff9bb5cf525..063b887a751c 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0/17.0.0.9999
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230304 b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230304
index c90b3002b722..a59c768cd9cc 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230304
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230304
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/17.0.0_pre20230304
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230314 b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230314
index 55027ffdbbce..7d945e042c00 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230314
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230314
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/17.0.0_pre20230314
 SRC_URI=https://github.com/llvm/llvm-project/archive/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index fcbc72a1a418..deaa83c572b8 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-44.0 b/metadata/md5-cache/gnome-extra/gnome-contacts-44.0
new file mode 100644
index 000000000000..ae2a82e284bd
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-44.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) || ( dev-lang/vala:0.56 ) >=dev-libs/gobject-introspection-1.54 dev-libs/folks[vala(+)] gnome-online-accounts? ( net-libs/gnome-online-accounts[vala] ) gnome-extra/evolution-data-server[gtk,vala] >=dev-libs/libportal-0.6:=[vala] app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/appstream-glib dev-libs/libxml2:2 dev-libs/libxslt >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/folks-0.14.0:=[eds] >=dev-libs/libgee-0.10:0.8= >=dev-libs/glib-2.64:2 >=gui-libs/gtk-4.6:4 >=gui-libs/libadwaita-1.2:1 >=gnome-extra/evolution-data-server-3.42:=[gnome-online-accounts?] >=dev-libs/libportal-0.6:= >=media-gfx/qrencode-4.1.1:= gnome-online-accounts? ( net-libs/gnome-online-accounts:= )
+DESCRIPTION=GNOME contact management application
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
+IUSE=+gnome-online-accounts
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/folks-0.14.0:=[eds] >=dev-libs/libgee-0.10:0.8= >=dev-libs/glib-2.64:2 >=gui-libs/gtk-4.6:4 >=gui-libs/libadwaita-1.2:1 >=gnome-extra/evolution-data-server-3.42:=[gnome-online-accounts?] >=dev-libs/libportal-0.6:= >=media-gfx/qrencode-4.1.1:= gnome-online-accounts? ( net-libs/gnome-online-accounts:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-contacts/44/gnome-contacts-44.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	cd2865332c8d99e1da0655523ff4a28f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=664e7e5a19fb23cc5f03263a434e5976
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index b364e0e3ee9d..0a27c1502f4b 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libextractor-1.9-r5 b/metadata/md5-cache/media-libs/libextractor-1.9-r5
deleted file mode 100644
index 36810b3b97ab..000000000000
--- a/metadata/md5-cache/media-libs/libextractor-1.9-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/iso-codes dev-libs/glib:2 media-gfx/exiv2:= sys-devel/libtool virtual/libiconv virtual/libintl apparmor? ( sys-libs/libapparmor ) archive? ( app-arch/libarchive:= ) bzip2? ( app-arch/bzip2 ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac:= media-libs/libogg ) gif? ( media-libs/giflib:= ) gsf? ( gnome-extra/libgsf:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gtk+:3 ) jpeg? ( media-libs/libjpeg-turbo:= ) magic? ( sys-apps/file ) midi? ( media-libs/libsmf ) mp4? ( media-libs/libmp4v2 ) mpeg? ( media-libs/libmpeg2 ) tidy? ( >=app-text/htmltidy-5.0.0 ) tiff? ( media-libs/tiff:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Library to extract metadata from files of arbitrary type
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/libextractor/
-IUSE=apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib
-KEYWORDS=amd64 ~arm ppc ppc64 x86
-LICENSE=GPL-3
-RDEPEND=app-text/iso-codes dev-libs/glib:2 media-gfx/exiv2:= sys-devel/libtool virtual/libiconv virtual/libintl apparmor? ( sys-libs/libapparmor ) archive? ( app-arch/libarchive:= ) bzip2? ( app-arch/bzip2 ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac:= media-libs/libogg ) gif? ( media-libs/giflib:= ) gsf? ( gnome-extra/libgsf:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gtk+:3 ) jpeg? ( media-libs/libjpeg-turbo:= ) magic? ( sys-apps/file ) midi? ( media-libs/libsmf ) mp4? ( media-libs/libmp4v2 ) mpeg? ( media-libs/libmpeg2 ) tidy? ( >=app-text/htmltidy-5.0.0 ) tiff? ( media-libs/tiff:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) !sci-biology/glimmer
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnu/libextractor/libextractor-1.9.tar.gz
-_md5_=23abf438bd65668b4ba0e5eb3a98e276
diff --git a/metadata/md5-cache/media-libs/qtav-1.12.0-r3 b/metadata/md5-cache/media-libs/qtav-1.12.0-r3
deleted file mode 100644
index a28b479ab3df..000000000000
--- a/metadata/md5-cache/media-libs/qtav-1.12.0-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-video/ffmpeg:= gui? ( dev-qt/qtsql:5 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio )
-DESCRIPTION=Multimedia playback framework based on Qt + FFmpeg
-EAPI=7
-HOMEPAGE=https://www.qtav.org
-INHERIT=cmake qmake-utils
-IUSE=gui portaudio pulseaudio vaapi
-KEYWORDS=amd64 ~arm64
-LICENSE=GPL-3+ LGPL-2.1+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-video/ffmpeg:= gui? ( dev-qt/qtsql:5 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio )
-SLOT=0/1
-SRC_URI=https://github.com/wang-bin/QtAV/archive/v1.12.0.tar.gz -> qtav-1.12.0.tar.gz https://dev.gentoo.org/~johu/distfiles/qtav-1.12.0-capi.h-b43aa93.xz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5c487df539c4d28bcce38597d3dfeab7
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 2034033c53fb..c457b76eae66 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/vdr-vaapidevice-1.0.0_p20190526 b/metadata/md5-cache/media-plugins/vdr-vaapidevice-1.0.0_p20190526
deleted file mode 100644
index 662ac9f3a171..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-vaapidevice-1.0.0_p20190526
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=media-video/vdr media-video/ffmpeg[vaapi,X] media-libs/libva[X] media-libs/libva-intel-driver[X] x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-keysyms media-libs/alsa-lib media-tv/gentoo-vdr-scripts virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: A VA-API output device plugin for VDR
-EAPI=7
-HOMEPAGE=https://github.com/pesintta/vdr-plugin-vaapidevice
-INHERIT=vdr-plugin-2
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=media-video/vdr media-video/ffmpeg[vaapi,X] media-libs/libva[X] media-libs/libva-intel-driver[X] x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-keysyms media-libs/alsa-lib media-tv/gentoo-vdr-scripts app-eselect/eselect-vdr
-SLOT=0
-SRC_URI=https://github.com/pesintta/vdr-plugin-vaapidevice/archive/d19657bae399e79df107e316ca40922d21393f80.tar.gz -> vdr-vaapidevice-1.0.0_p20190526.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	65735fed9c1c30cb461c90db600ac990	vdr-plugin-2	9eb590b171d421a04f736d6a26b33c63	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8f38a9847533b364a85c9fffd4edd322
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 9ce867edd337..3d5359c87991 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/potamus-17-r1 b/metadata/md5-cache/media-sound/potamus-17-r1
deleted file mode 100644
index fcdf8503a98f..000000000000
--- a/metadata/md5-cache/media-sound/potamus-17-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=x11-libs/gtk+:2 gnome-base/libglade media-libs/libsamplerate media-video/ffmpeg:0= ao? ( media-libs/libao ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac:= ) jack? ( virtual/jack ) mad? ( media-libs/libmad ) modplug? ( media-libs/libmodplug ) opus? ( media-libs/opusfile ) vorbis? ( media-libs/libvorbis ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A lightweight audio player with an emphasis on high audio quality
-EAPI=7
-HOMEPAGE=http://offog.org/code/potamus/
-INHERIT=xdg
-IUSE=+ao audiofile flac jack mad modplug opus vorbis
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 gnome-base/libglade media-libs/libsamplerate media-video/ffmpeg:0= ao? ( media-libs/libao ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac:= ) jack? ( virtual/jack ) mad? ( media-libs/libmad ) modplug? ( media-libs/libmodplug ) opus? ( media-libs/opusfile ) vorbis? ( media-libs/libvorbis )
-SLOT=0
-SRC_URI=http://offog.org/files/potamus-17.tar.gz
-_eclasses_=xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d962ae6465f462e56a0573f7343ebf07
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index de3b04c3cfe4..3a5172afa16a 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/ffmpeg2theora-0.30-r1 b/metadata/md5-cache/media-video/ffmpeg2theora-0.30-r1
deleted file mode 100644
index 06cbeec54653..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg2theora-0.30-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=media-video/ffmpeg:0=[postproc] >=media-libs/libvorbis-1.1 >=media-libs/libogg-1.1 >=media-libs/libtheora-1.1[encode] kate? ( >=media-libs/libkate-0.3.7 )
-DESCRIPTION=A simple converter to create Ogg Theora files
-EAPI=7
-HOMEPAGE=http://www.v2v.cc/~j/ffmpeg2theora/
-INHERIT=python-any-r1 scons-utils
-IUSE=kate
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-3
-RDEPEND=media-video/ffmpeg:0=[postproc] >=media-libs/libvorbis-1.1 >=media-libs/libogg-1.1 >=media-libs/libtheora-1.1[encode] kate? ( >=media-libs/libkate-0.3.7 )
-SLOT=0
-SRC_URI=http://www.v2v.cc/~j/ffmpeg2theora/downloads/ffmpeg2theora-0.30.tar.bz2
-_eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0d76a8b9baeb2f617cb5bf7d1e44e496
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index ab5ff45734c1..30cbe83004fa 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.13.7 b/metadata/md5-cache/net-analyzer/icinga2-2.13.7
index 71dbb3eae9a0..74d32e72217f 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.13.7
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.13.7
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://icinga.com/
 INHERIT=cmake systemd
 IUSE=console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= dev-libs/boost:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl:= acct-user/icinga acct-group/icinga acct-group/icingacmd plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) acct-group/nagios
 REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) )
 SLOT=0
 SRC_URI=https://github.com/Icinga/icinga2/archive/v2.13.7.tar.gz -> icinga2-2.13.7.tar.gz
 _eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1cb11312a9da6eb2577362a56b1b71c5
+_md5_=864d481ae9eba544b67edb70e44860ec
diff --git a/metadata/md5-cache/net-analyzer/icinga2-9999 b/metadata/md5-cache/net-analyzer/icinga2-9999
index 8aef34062811..2a5e685115e1 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-9999
+++ b/metadata/md5-cache/net-analyzer/icinga2-9999
@@ -1,15 +1,15 @@
-BDEPEND=sys-devel/bison >=sys-devel/flex-2.5.35 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/bison >=sys-devel/flex-2.5.35 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=dev-libs/openssl:0= dev-libs/boost:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl:= acct-user/icinga acct-group/icinga acct-group/icingacmd
 DESCRIPTION=Distributed, general purpose, network monitoring engine
 EAPI=7
 HOMEPAGE=https://icinga.com/
-INHERIT=cmake systemd git-r3
-IUSE=console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax
+INHERIT=cmake git-r3
+IUSE=console jumbo-build lto mail mariadb minimal +mysql +plugins postgres systemd
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/openssl:0= dev-libs/boost:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl:= acct-user/icinga acct-group/icinga acct-group/icingacmd plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) acct-group/nagios
 REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) )
 SLOT=0
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8aedee63185b2c27607e676c16bed9fc
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=39860ebf9be6acd1fa93ceb4952fdbe4
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index e1b42be9736d..0d753b4b8dd9 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/gnome-connections-44.0 b/metadata/md5-cache/net-misc/gnome-connections-44.0
new file mode 100644
index 000000000000..1a587bf057a9
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gnome-connections-44.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/vala:0.56 ) dev-libs/glib dev-util/glib-utils dev-util/itstool sys-devel/gettext virtual/pkgconfig test? ( dev-libs/appstream-glib dev-util/desktop-file-utils ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/gobject-introspection >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection] >=net-libs/gtk-vnc-0.4.4[pulseaudio,vala] >=gui-libs/libhandy-1.6.0:1[vala] >=dev-libs/libxml2-2.7.8 app-crypt/libsecret[vala] >=net-misc/freerdp-2.0.0:0=
+DESCRIPTION=A remote desktop client for the GNOME desktop environment
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/connections
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson vala xdg
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-libs/gobject-introspection >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection] >=net-libs/gtk-vnc-0.4.4[pulseaudio,vala] >=gui-libs/libhandy-1.6.0:1[vala] >=dev-libs/libxml2-2.7.8 app-crypt/libsecret[vala] >=net-misc/freerdp-2.0.0:0=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-connections/44/gnome-connections-44.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	cd2865332c8d99e1da0655523ff4a28f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b81ff1e1691ae02956c0aef83b3e74df
diff --git a/metadata/md5-cache/net-misc/gsutil-5.9 b/metadata/md5-cache/net-misc/gsutil-5.9
deleted file mode 100644
index 02a112d05b60..000000000000
--- a/metadata/md5-cache/net-misc/gsutil-5.9
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/argcomplete-1.9.4[python_targets_python3_10(-)?] >=dev-python/boto-2.49.0[python_targets_python3_10(-)?] >=dev-python/crcmod-1.7[python_targets_python3_10(-)?] >=dev-python/fasteners-0.14.1[python_targets_python3_10(-)?] >=dev-python/gcs-oauth2-boto-plugin-3.0[python_targets_python3_10(-)?] >=dev-python/google-apitools-0.5.32[python_targets_python3_10(-)?] dev-python/google-auth[python_targets_python3_10(-)?] >=dev-python/google-reauth-python-0.1.0[python_targets_python3_10(-)?] >=dev-python/httplib2-0.20.4[python_targets_python3_10(-)?] >=dev-python/pyopenssl-0.13[python_targets_python3_10(-)?] >=dev-python/retry-decorator-1.0.0[python_targets_python3_10(-)?] >=dev-python/six-1.12.0[python_targets_python3_10(-)?]
-DESCRIPTION=command line tool for interacting with cloud storage services
-EAPI=8
-HOMEPAGE=https://github.com/GoogleCloudPlatform/gsutil
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/argcomplete-1.9.4[python_targets_python3_10(-)?] >=dev-python/boto-2.49.0[python_targets_python3_10(-)?] >=dev-python/crcmod-1.7[python_targets_python3_10(-)?] >=dev-python/fasteners-0.14.1[python_targets_python3_10(-)?] >=dev-python/gcs-oauth2-boto-plugin-3.0[python_targets_python3_10(-)?] >=dev-python/google-apitools-0.5.32[python_targets_python3_10(-)?] dev-python/google-auth[python_targets_python3_10(-)?] >=dev-python/google-reauth-python-0.1.0[python_targets_python3_10(-)?] >=dev-python/httplib2-0.20.4[python_targets_python3_10(-)?] >=dev-python/pyopenssl-0.13[python_targets_python3_10(-)?] >=dev-python/retry-decorator-1.0.0[python_targets_python3_10(-)?] >=dev-python/six-1.12.0[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_10 )
-RESTRICT=!test? ( test ) test
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_5.9.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2c913917f23e90db26227ea2415f94e2
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index dd77242896fb..e3bbf2ee9598 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r4 b/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r4
deleted file mode 100644
index ee9ea72bcefd..000000000000
--- a/metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( !!dev-python/pytest-testmon )
-DESCRIPTION=John Hoffman's fork of the original bittorrent
-EAPI=7
-HOMEPAGE=https://github.com/effigies/BitTornado
-INHERIT=distutils-r1
-IUSE=test test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=MIT GPL-2
-RDEPEND=dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/effigies/BitTornado/archive/ed327c4e1ebbe1fe949be81723527cfda87aeb8d.tar.gz -> BitTornado-0.4.1_p20160925.tar.gz
-_eclasses_=distutils-r1	ad4c1e4ec8737eb363aacd638f6a513b	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d42a43956e6df2c0085207457dca2461
diff --git a/metadata/md5-cache/net-p2p/vuze-5.7.6.0-r2 b/metadata/md5-cache/net-p2p/vuze-5.7.6.0-r2
deleted file mode 100644
index 3e2a0080985c..000000000000
--- a/metadata/md5-cache/net-p2p/vuze-5.7.6.0-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-java/log4j-12-api:2 dev-java/log4j-core:2 dev-java/swt:3.8[cairo] dev-java/commons-cli:1 dev-java/commons-text:0 dev-java/json-simple:0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=BitTorrent client in Java, formerly called Azureus
-EAPI=8
-HOMEPAGE=https://www.vuze.com/
-IDEPEND=dev-util/desktop-file-utils
-INHERIT=desktop edos2unix java-pkg-2 java-ant-2 xdg-utils
-IUSE=source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2 BSD
-PDEPEND=~net-p2p/vuze-coreplugins-5.7.6.0
-RDEPEND=dev-java/log4j-12-api:2 dev-java/log4j-core:2 dev-java/swt:3.8[cairo] dev-java/commons-cli:1 dev-java/commons-text:0 dev-java/json-simple:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_5760/Vuze_5760_source.zip
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	java-ant-2	f9b70c3474c0b326c8102814719dc554	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=85d6eb30d8c47c6c0778ba31e33f75d1
diff --git a/metadata/md5-cache/net-p2p/vuze-coreplugins-5.7.6.0 b/metadata/md5-cache/net-p2p/vuze-coreplugins-5.7.6.0
deleted file mode 100644
index d676504420bb..000000000000
--- a/metadata/md5-cache/net-p2p/vuze-coreplugins-5.7.6.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=~net-p2p/vuze-5.7.6.0 app-arch/unzip
-DESCRIPTION=Core plugins for Vuze that are included in upstream distribution
-EAPI=7
-HOMEPAGE=http://www.vuze.com/
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2 BSD
-RDEPEND=~net-p2p/vuze-5.7.6.0
-SLOT=0
-SRC_URI=http://azureus.sourceforge.net/plugins/azplugins_2.1.10.jar http://azureus.sourceforge.net/plugins/azrating_1.5.19.jar http://azureus.sourceforge.net/plugins/azupdater_1.9.2.zip http://azureus.sourceforge.net/plugins/azupnpav_0.5.7.zip
-_md5_=42bffbb4a4d5fe1c6b6d8788c9fd5128
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index dba0a1865bf5..df4868d57e80 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/wulfware-2.6.0 b/metadata/md5-cache/sys-cluster/wulfware-2.6.0
deleted file mode 100644
index 4ee5235d5d3c..000000000000
--- a/metadata/md5-cache/sys-cluster/wulfware-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=dev-libs/libxml2:= sys-libs/ncurses:0= sys-libs/zlib:= !sys-cluster/wulfstat !sys-cluster/xmlsysd
-DESCRIPTION=Applications to monitor on a beowulf- or GRID-style clusters
-EAPI=7
-HOMEPAGE=http://www.phy.duke.edu/~rgb/Beowulf/wulfware.php
-INHERIT=autotools flag-o-matic toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2:= sys-libs/ncurses:0= sys-libs/zlib:=
-SLOT=0
-SRC_URI=http://www.phy.duke.edu/~rgb/Beowulf/wulfware/wulfware-2.6.0.tgz
-_eclasses_=autotools	b5529dc611971a61a30153916014f616	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e04381129a322a983a4907b0a4f35ff7
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 11a6dca841b9..a79f0e2ab39f 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-14.0.6-r1 b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
index 5883a3327874..7798f0044d15 100644
--- a/metadata/md5-cache/sys-devel/clang-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=86c93692eb7f156cf22a7a103b6e1bea
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.7-r1 b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
index 6d228e898934..c14d1dd265ae 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.7-r1
+++ b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15g1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a165541c0e27cc5aaa8e451e68bd7128
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0 b/metadata/md5-cache/sys-devel/clang-16.0.0
new file mode 100644
index 000000000000..fb4f0a2835ee
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0
@@ -0,0 +1,18 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-util/cmake-3.16 doc? ( python_single_target_python3_9? ( dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-16.0.0: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[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.0[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
+DESCRIPTION=C language family frontend for LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs flag-o-matic
+IUSE=debug doc +extra ieee-long-double +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=~sys-devel/clang-runtime-16.0.0 sys-devel/clang-toolchain-symlinks:16
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~sys-devel/llvm-16.0.0: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 llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.0[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.0[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.0[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.0[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.0[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.0[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.0[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.0[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.0[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.0[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.0[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.0[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.0[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.0[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.0[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.0[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.0[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.0[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.0[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.0[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.0[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.0[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.0[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.0[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.0[llvm_targets_Xtensa] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=16/16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-16.0.0-manpages.tar.bz2 )
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=405b881a42872da962e7accb1d97fb55
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0.9999 b/metadata/md5-cache/sys-devel/clang-16.0.0.9999
index 640edebf25b0..8a4908c5104b 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) pyth
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=26c367d242e54669c25aac28cede3165
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0_rc3 b/metadata/md5-cache/sys-devel/clang-16.0.0_rc3
index 1c08daf3080f..7404169c5379 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0_rc3
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0_rc3
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=38a6e26399d1c00c341ec62dc29ab579
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0_rc4 b/metadata/md5-cache/sys-devel/clang-16.0.0_rc4
index 985beb7333b8..91ece0bd2fcd 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0_rc4
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0_rc4
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=21cf4874c7002bc65473d9cc9bdc7a7b
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0.9999 b/metadata/md5-cache/sys-devel/clang-17.0.0.9999
index c0ce5d134ae2..14386734893d 100644
--- a/metadata/md5-cache/sys-devel/clang-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-17.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) pyth
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0.9999
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b0e5d9f135423dd030004fedbd759e39
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230304 b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230304
index f4964dafa2c2..7ddfaeee6918 100644
--- a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230304
+++ b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230304
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0_pre20230304
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=26c367d242e54669c25aac28cede3165
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230314 b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230314
index 51b263b20f50..48e0dd9887c7 100644
--- a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230314
+++ b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230314
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0_pre20230314
 SRC_URI=https://github.com/llvm/llvm-project/archive/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b0e5d9f135423dd030004fedbd759e39
diff --git a/metadata/md5-cache/sys-devel/clang-common-14.0.6 b/metadata/md5-cache/sys-devel/clang-common-14.0.6
index 96ba086b00bc..196845e8efd7 100644
--- a/metadata/md5-cache/sys-devel/clang-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/clang-common-14.0.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=4b96bac2e683306fd625bd17c582e0e5
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r4 b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r4
index f23d10ab63e7..4c77249ff4ca 100644
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r4
+++ b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r4
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.7 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=901ceaf17fcfb8d049c808f8f1eed1ff
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.0 b/metadata/md5-cache/sys-devel/clang-common-16.0.0
new file mode 100644
index 000000000000..0943f8a32443
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.0
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=install preinst prepare pretend unpack
+DESCRIPTION=Common files shared between multiple slots of clang
+EAPI=8
+HOMEPAGE=https://llvm.org/
+IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
+INHERIT=bash-completion-r1 llvm.org
+IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind hardened stricter verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.0 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_md5_=dd422f619e8e028cf8b7b1f49d206929
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-16.0.0.9999
index 3d70d27418ee..85ab6c200231 100644
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.0.9999 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 PROPERTIES=live
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b31a4440fba471753d516578ec57412e
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc3-r2 b/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc3-r2
index f92bf174a0c8..feeb060b6bdc 100644
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc3-r2
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc3-r2
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.0_rc3 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=6d93600235ac60e81c00ec3afb641fc8
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc4-r1 b/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc4-r1
index 4d5e65b220dd..913eb2671ff4 100644
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc4-r1
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc4-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.0_rc4 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=6d93600235ac60e81c00ec3afb641fc8
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999
index 23715e071615..5ea604772d8e 100644
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0.9999 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 PROPERTIES=live
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b31a4440fba471753d516578ec57412e
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230304-r1 b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230304-r1
index 41a2c1ec748b..0dda72e89140 100644
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230304-r1
+++ b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230304-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230304 ) !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/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b31a4440fba471753d516578ec57412e
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230314 b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230314
index ee542dd0c15f..8776566c5ac0 100644
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230314
+++ b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230314
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230314 ) !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/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b31a4440fba471753d516578ec57412e
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-16.0.0 b/metadata/md5-cache/sys-devel/clang-runtime-16.0.0
new file mode 100644
index 000000000000..dfc05b7b8223
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-16.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=pretend
+DESCRIPTION=Meta-ebuild for clang runtime libraries
+EAPI=8
+HOMEPAGE=https://clang.llvm.org/
+INHERIT=multilib-build toolchain-funcs
+IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=metapackage
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-16.0.0:16[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-16.0.0:16[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-16.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-16.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=sanitize? ( compiler-rt )
+SLOT=16
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=26ee675f9dafad522d218d7d39c9454f
diff --git a/metadata/md5-cache/sys-devel/clang-toolchain-symlinks-16-r2 b/metadata/md5-cache/sys-devel/clang-toolchain-symlinks-16-r2
index f813910ff0ae..e876c487baa8 100644
--- a/metadata/md5-cache/sys-devel/clang-toolchain-symlinks-16-r2
+++ b/metadata/md5-cache/sys-devel/clang-toolchain-symlinks-16-r2
@@ -4,9 +4,9 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:LLVM
 INHERIT=multilib
 IUSE=gcc-symlinks multilib-symlinks +native-symlinks
-KEYWORDS=~loong
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos
 LICENSE=public-domain
 RDEPEND=!<sys-devel/gcc-config-2.6 sys-devel/clang:16
 SLOT=16
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1478359111b6bc244fb4977c1d89f4d5
+_md5_=5e0d1435c248fd10a1bc24d89f574a6e
diff --git a/metadata/md5-cache/sys-devel/lld-14.0.6-r1 b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
index dd8a44a10cb4..0e617a65a7e1 100644
--- a/metadata/md5-cache/sys-devel/lld-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-14.0.6 !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14/14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=26671ae41a4c43c90c6965c6a33bad29
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.7 b/metadata/md5-cache/sys-devel/lld-15.0.7
index e32a2ed2db13..d62f167f63a1 100644
--- a/metadata/md5-cache/sys-devel/lld-15.0.7
+++ b/metadata/md5-cache/sys-devel/lld-15.0.7
@@ -13,5 +13,5 @@ RDEPEND=~sys-devel/llvm-15.0.7 sys-libs/zlib:= !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=77afdbb022522342650c5d0c89af55de
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0 b/metadata/md5-cache/sys-devel/lld-16.0.0
new file mode 100644
index 000000000000..9800a8509fb2
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/llvm:16 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-16.0.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-16.0.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-16.0.0[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-16.0.0[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=debug test zstd test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:16
+RDEPEND=~sys-devel/llvm-16.0.0[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=16/16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig )
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=67393891fb7b536eee357f74739193b9
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0.9999 b/metadata/md5-cache/sys-devel/lld-16.0.0.9999
index 2e054a210b3b..e56deb735618 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-16.0.0.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0_rc3 b/metadata/md5-cache/sys-devel/lld-16.0.0_rc3
index a398e4350061..7c9b601ca3a1 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0_rc3
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0_rc3
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-16.0.0_rc3[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0_rc4 b/metadata/md5-cache/sys-devel/lld-16.0.0_rc4
index d7665dfcda39..66ae81bc36a8 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0_rc4
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0_rc4
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-16.0.0_rc4[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0.9999 b/metadata/md5-cache/sys-devel/lld-17.0.0.9999
index 67529cdae7a4..62b1b75162e8 100644
--- a/metadata/md5-cache/sys-devel/lld-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-17.0.0.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-17.0.0.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0.9999
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2aef7cd1f03a5f8c85179c598fa6b22b
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230304 b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230304
index 35609c4cf4cc..3acc3bb60b6a 100644
--- a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230304
+++ b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230304
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-17.0.0_pre20230304[zstd=] sys-libs/zlib:= zstd? ( app-ar
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0_pre20230304
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230314 b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230314
index cff8bc1833c9..87e935c51f79 100644
--- a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230314
+++ b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230314
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-17.0.0_pre20230314[zstd=] sys-libs/zlib:= zstd? ( app-ar
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0_pre20230314
 SRC_URI=https://github.com/llvm/llvm-project/archive/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2aef7cd1f03a5f8c85179c598fa6b22b
diff --git a/metadata/md5-cache/sys-devel/lld-toolchain-symlinks-16-r2 b/metadata/md5-cache/sys-devel/lld-toolchain-symlinks-16-r2
index f2258ea88d23..a151178d860d 100644
--- a/metadata/md5-cache/sys-devel/lld-toolchain-symlinks-16-r2
+++ b/metadata/md5-cache/sys-devel/lld-toolchain-symlinks-16-r2
@@ -4,9 +4,9 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:LLVM
 INHERIT=multilib
 IUSE=multilib-symlinks +native-symlinks
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=public-domain
-PROPERTIES=live
 RDEPEND=sys-devel/lld:16
 SLOT=16
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3fa53631b81df9b23e28ea3341e23e48
+_md5_=55adb79ca6c1a3d9f1ed8390e8d062a4
diff --git a/metadata/md5-cache/sys-devel/llvm-14.0.6-r2 b/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
index aa8d28a2f878..3cd8adac3c6b 100644
--- a/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
+++ b/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c85b453ff2e87bedb11e6b27dbbb787f
diff --git a/metadata/md5-cache/sys-devel/llvm-15.0.7 b/metadata/md5-cache/sys-devel/llvm-15.0.7
index ee1644cdc745..519fc8c08fe7 100644
--- a/metadata/md5-cache/sys-devel/llvm-15.0.7
+++ b/metadata/md5-cache/sys-devel/llvm-15.0.7
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a76072a74390bba744b933db44e6111c
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.0 b/metadata/md5-cache/sys-devel/llvm-16.0.0
new file mode 100644
index 000000000000..8db65fbe9873
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.0
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-16.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ) ) libffi? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
+DESCRIPTION=Low Level Virtual Machine
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs flag-o-matic
+IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 zstd test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
+PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:16 binutils-plugin? ( >=sys-devel/llvmgold-16 )
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=16/16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-16.0.0-manpages.tar.bz2 )
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e9c515f238c8e01a8d0fa263d2823287
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
index b9c95d653314..3c83d24940e8 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=88105e5213bbaf009c303ec910463ff0
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.0_rc3 b/metadata/md5-cache/sys-devel/llvm-16.0.0_rc3
index 53e199440b0f..dbfa5db61277 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.0_rc3
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.0_rc3
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c200f47c72f7252e2bf206fed203a0a4
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.0_rc4 b/metadata/md5-cache/sys-devel/llvm-16.0.0_rc4
index 52fd269d354f..9890ddb1d3a9 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.0_rc4
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.0_rc4
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=70cc1659b9b9a8001d9e60befebdc748
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
index ee9da526b102..b56b68018969 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0.9999
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=9b96ee33afc52cb77e6e3b2b841426f1
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230304 b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230304
index 7c2ad1cf21c6..28c3ecfbf020 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230304
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230304
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0_pre20230304
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=88105e5213bbaf009c303ec910463ff0
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230314 b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230314
index c068eacb6803..5ffd505f6355 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230314
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230314
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0_pre20230314
 SRC_URI=https://github.com/llvm/llvm-project/archive/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=9b96ee33afc52cb77e6e3b2b841426f1
diff --git a/metadata/md5-cache/sys-devel/llvm-common-14.0.6 b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
index fa5c8b1c9081..ab239e5c03f4 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	147e4b586c9c8959197340c9796961aa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=94f9554c557a233570c499d2a1abe891
diff --git a/metadata/md5-cache/sys-devel/llvm-common-15.0.7 b/metadata/md5-cache/sys-devel/llvm-common-15.0.7
index de29381c2ef2..9fe6113ada67 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-15.0.7
+++ b/metadata/md5-cache/sys-devel/llvm-common-15.0.7
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=llvm.org	147e4b586c9c8959197340c9796961aa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=29f96569e5107a0ca343c8accaa2d360
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.0 b/metadata/md5-cache/sys-devel/llvm-common-16.0.0
new file mode 100644
index 000000000000..84027f3c8a0d
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.0
@@ -0,0 +1,14 @@
+BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=llvm.org
+IUSE=verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig )
+_eclasses_=llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_md5_=4b406f98226318955c090ac02aec5138
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-16.0.0.9999
index 806300611784..59550b7948e2 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.0.9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
-_eclasses_=git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	147e4b586c9c8959197340c9796961aa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2d553af5e8a17dfd7140dd660f48b48a
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc3 b/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc3
index 82e2aedce55b..6f4c0c3570a0 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc3
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=llvm.org	147e4b586c9c8959197340c9796961aa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=c9d578123645e9827b6020e0dc4dd9b3
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc4 b/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc4
index 29292b2f704b..578f9270151e 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc4
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=llvm.org	147e4b586c9c8959197340c9796961aa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	fef00f802a62a8d9e66affc69e141df0
+_eclasses_=llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	fef00f802a62a8d9e66affc69e141df0
 _md5_=c9d578123645e9827b6020e0dc4dd9b3
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999
index 907d757b4846..75585a554de9 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
-_eclasses_=git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	147e4b586c9c8959197340c9796961aa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=git-r3	c57c50c922e121043788de0b40ada60a	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230304 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230304
index bba554caa431..58ff2124896d 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230304
+++ b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230304
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=llvm.org	147e4b586c9c8959197340c9796961aa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230314 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230314
index 31c0b2d9c050..123ca59ac636 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230314
+++ b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230314
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=llvm.org	147e4b586c9c8959197340c9796961aa	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-16-r1 b/metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-16-r1
index 0175c11e38ae..60b708bbbc93 100644
--- a/metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-16-r1
+++ b/metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-16-r1
@@ -4,9 +4,9 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:LLVM
 INHERIT=multilib
 IUSE=multilib-symlinks +native-symlinks
-KEYWORDS=~loong
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=public-domain
 RDEPEND=sys-devel/llvm:16
 SLOT=16
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=59b3791f0064538763f1c58111a09129
+_md5_=4b6261dc106dc5459beb312b09f4720b
diff --git a/metadata/md5-cache/sys-devel/llvmgold-16 b/metadata/md5-cache/sys-devel/llvmgold-16
index bbfbeaec33f4..920c18b622bb 100644
--- a/metadata/md5-cache/sys-devel/llvmgold-16
+++ b/metadata/md5-cache/sys-devel/llvmgold-16
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=LLVMgold plugin symlink for autoloading
 EAPI=8
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~loong
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=sys-devel/llvm:16[binutils-plugin] !sys-devel/llvm:0
 SLOT=0
-_md5_=41afdcbdc813122a94b1bc4dd358459a
+_md5_=ec6cea435407cd14f8fb1738c17d4f8b
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 8fcbccd1d703..563023324ac1 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20230310-r2 b/metadata/md5-cache/sys-kernel/linux-firmware-20230310-r2
new file mode 100644
index 000000000000..0e25be08d967
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20230310-r2
@@ -0,0 +1,16 @@
+BDEPEND=initramfs? ( app-arch/cpio ) compress-xz? ( app-arch/xz-utils ) compress-zstd? ( app-arch/zstd )
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup unpack
+DESCRIPTION=Linux firmware files
+EAPI=7
+HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+INHERIT=linux-info mount-boot savedconfig multiprocessing
+IUSE=compress-xz compress-zstd initramfs +redistributable savedconfig unknown-license savedconfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT ) unknown-license? ( all-rights-reserved )
+RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
+REQUIRED_USE=initramfs? ( redistributable ) ?? ( compress-xz compress-zstd )
+RESTRICT=binchecks strip test unknown-license? ( bindist )
+SLOT=0
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20230310.tar.xz
+_eclasses_=linux-info	ecb03306c95c6ccc55852c98abcfcc64	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=459b7523843a61bd0615339026fee586
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-99999999 b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
index 8a5d954ff9fb..3ae5384a35a3 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-99999999
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
@@ -12,4 +12,4 @@ REQUIRED_USE=initramfs? ( redistributable ) ?? ( compress-xz compress-zstd )
 RESTRICT=binchecks strip test unknown-license? ( bindist )
 SLOT=0
 _eclasses_=git-r3	c57c50c922e121043788de0b40ada60a	linux-info	ecb03306c95c6ccc55852c98abcfcc64	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8186929134c1f9ce77664107c13c358a
+_md5_=459b7523843a61bd0615339026fee586
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index d65cb7b6245a..a5896ca2cc4d 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-14.0.6-r1 b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
index b5bdc6b11131..21239f0ddbc9 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7f3a74dc36235bcb8a49192085575cfb
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-15.0.7 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
index 694b64c6c1c1..f8a5bf026aac 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
+++ b/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=53e39020c8d23997da8e61e17fdb8a19
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0
new file mode 100644
index 000000000000..af078947009d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-16.0.0*:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=sys-devel/llvm:16 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+abi_x86_32 abi_x86_64 +clang debug test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig )
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=244a0a596a9a13c591df67d430168e50
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
index 85bfedd448db..d9317e7d1eb3 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=74f1423cb0dd425d142263da2b2f30a2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc3 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc3
index 2105a7ac23d2..336e667df2c3 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc3
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7f1cfd6265c76cf75d7f4fcca558a9dc
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc4 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc4
index cd85c2fd1047..ec1329eaa8ce 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc4
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc4
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7f1cfd6265c76cf75d7f4fcca558a9dc
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
index b705de8a2ca3..6b97b9f4bf18 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=17
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=74f1423cb0dd425d142263da2b2f30a2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230304 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230304
index ed3a3c0ce506..3db7c8f2aee7 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230304
+++ b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230304
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=17
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=74f1423cb0dd425d142263da2b2f30a2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230314 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230314
index eb08fde77554..7d79152f1578 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230314
+++ b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230314
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=17
 SRC_URI=https://github.com/llvm/llvm-project/archive/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=74f1423cb0dd425d142263da2b2f30a2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
index 398840fc7c08..0ad695b70d58 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r3.tar.xz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=1c1c912e6047d4dbf13b18213c38e789
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
index 9711010a47eb..d9b3178f0e48 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=073adf97b984c7834ca31d3d6fe4093c
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0
new file mode 100644
index 000000000000..237b702c4e64
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-16.0.0*:16 sys-libs/compiler-rt:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=sys-devel/llvm:16 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+IUSE=+abi_x86_32 abi_x86_64 +clang debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
+RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
+SLOT=16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig )
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5e86c8a095c456e604a05f5ebefd11e0
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
index fa79698fa080..d52f64ee48e6 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc3 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc3
index e8ee4109bf19..c9dccd1946dd 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fce1412d6da5b3de84960351b38788f4
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc4 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc4
index 217e79a2aecb..81ce7eeec8f2 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc4
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fce1412d6da5b3de84960351b38788f4
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
index 49938c7f881f..23a9cfeca425 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=17
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230304 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230304
index 371c587b9beb..504eafd8bfd0 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230304
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230304
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230314 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230314
index 5620db948064..03b4cfff4253 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230314
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230314
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://github.com/llvm/llvm-project/archive/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	a5763be3a7ea9d44c19c5a73586aeeeb	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/libcxx-14.0.6 b/metadata/md5-cache/sys-libs/libcxx-14.0.6
index 14cacfd605db..bfa18c7c3c6f 100644
--- a/metadata/md5-cache/sys-libs/libcxx-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxx-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ed4b7b665367a12874548fbffbf304e1
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7 b/metadata/md5-cache/sys-libs/libcxx-15.0.7
index 931ad142bd8f..ad02f3b381fc 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7f5a8fba7d5d2d43189bfb259f861a89
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1 b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
index b57a8d34ea7a..22870e0458e9 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r1.tar.xz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ec12a0f6e108c8b13319626ed8ce9939
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0 b/metadata/md5-cache/sys-libs/libcxx-16.0.0
new file mode 100644
index 000000000000..4e7a97e9d5ce
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.0
@@ -0,0 +1,17 @@
+BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:16 !!sys-devel/llvm:0
+DESCRIPTION=New implementation of the C++ standard library, targeting C++11
+EAPI=8
+HOMEPAGE=https://libcxx.llvm.org/
+INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+clang +libcxxabi static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+REQUIRED_USE=test? ( clang )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig )
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8c5a3a3d8e6c8737caba04f720113314
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
index b1be779cc0c0..23a08c1be651 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.0.9999[static-libs?,abi_x86_32(-)?
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fba3a27cace2150ba0c8a71502d3ab89
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc3 b/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc3
index 2eec2bca7058..52401233703b 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc3
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3b5d2a89f3ff0de6b78538deede4c459
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc4 b/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc4
index 930569989d02..6c756b18d617 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc4
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc4
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3b5d2a89f3ff0de6b78538deede4c459
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
index 38fd6ee5f99a..182271d34aae 100644
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0.9999[static-libs?,abi_x86_32(-)?
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fba3a27cace2150ba0c8a71502d3ab89
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230304 b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230304
index 4e8cd1637205..42a8684727a2 100644
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230304
+++ b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230304
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fba3a27cace2150ba0c8a71502d3ab89
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230314 b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230314
index c0a7d598deae..be8ce63ce084 100644
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230314
+++ b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230314
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fba3a27cace2150ba0c8a71502d3ab89
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6 b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
index 2edd7485ed15..78756acb595f 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
@@ -12,5 +12,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=4e54b656411cc807bdd92b2f892aa32f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
index f7b2565997d5..025c05c5dcec 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
+++ b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=462e3f649f8df58db11379d6fa9c34ff
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0
new file mode 100644
index 000000000000..158ff7d5e1b5
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0
@@ -0,0 +1,17 @@
+BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:16 !!sys-devel/llvm:0
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=8
+HOMEPAGE=https://libcxxabi.llvm.org/
+INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+clang static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!<sys-libs/libcxx-15
+REQUIRED_USE=test? ( clang )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig )
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=cddf10e3bb0a3c9c5e62e50963549112
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
index 84235bf7be6f..5603ac126c21 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ebb65f8eb13cd404aa74c7e28a52d71b
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc3 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc3
index b71809490aed..30c7b8812800 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc3
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b954666ca4eb119a11c79056bb84e7da
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc4 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc4
index cb129f85d0ca..9ddd622edcf7 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc4
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc4
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b954666ca4eb119a11c79056bb84e7da
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
index bf19c13794e3..21ffd2cb9149 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ebb65f8eb13cd404aa74c7e28a52d71b
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230304 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230304
index bca55df3e87f..3b600fd8e7e6 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230304
+++ b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230304
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ebb65f8eb13cd404aa74c7e28a52d71b
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230314 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230314
index 63b96e7f31be..cae2b3f11a52 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230314
+++ b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230314
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ebb65f8eb13cd404aa74c7e28a52d71b
diff --git a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1 b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
index 6247c2a2db0f..224faaf3b8e0 100644
--- a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=cuda? ( llvm_targets_NVPTX ) offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=55c75cae8b91cb6694cc87a534f0ba90
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.7-r2 b/metadata/md5-cache/sys-libs/libomp-15.0.7-r2
index bd8c9a39f2f2..4879ae28b638 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.7-r2
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.7-r2
@@ -12,5 +12,5 @@ RDEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r2.tar.xz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=919fc31c2f3e10e592ad25fa7fc1b724
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0 b/metadata/md5-cache/sys-libs/libomp-16.0.0
new file mode 100644
index 000000000000..9ea5f6b2185c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/lit[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) sys-devel/clang ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.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(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) ) !!sys-devel/llvm:0
+DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
+EAPI=8
+HOMEPAGE=https://openmp.llvm.org
+INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1 toolchain-funcs
+IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.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(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
+REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=0/16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig )
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0bb8e878a04227c41db9cd819d0368da
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
index 6a69ee950d9b..c5b62299caa5 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/16
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5a2eb364e3f4cef2c1de7ae521228edf
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0_rc3 b/metadata/md5-cache/sys-libs/libomp-16.0.0_rc3
index dcb15532f10b..fea9fe13861b 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0_rc3
@@ -13,5 +13,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_tar
 RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=1af9c1498b02a693f52181308a3edab2
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0_rc4 b/metadata/md5-cache/sys-libs/libomp-16.0.0_rc4
index c6abc9115740..07568e5cf362 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0_rc4
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0_rc4
@@ -13,5 +13,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_tar
 RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=1af9c1498b02a693f52181308a3edab2
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
index d4cdc936c482..3fb4ecb60cd8 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0.9999
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5a2eb364e3f4cef2c1de7ae521228edf
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230304 b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230304
index cbc409bf10f9..c304550a109e 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230304
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230304
@@ -12,5 +12,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_tar
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0_pre20230304
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5a2eb364e3f4cef2c1de7ae521228edf
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230314 b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230314
index a4cec132f992..5ecb37f72e91 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230314
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230314
@@ -12,5 +12,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_tar
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0_pre20230314
 SRC_URI=https://github.com/llvm/llvm-project/archive/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	ecb03306c95c6ccc55852c98abcfcc64	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5a2eb364e3f4cef2c1de7ae521228edf
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1 b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
index 2ff44ebe4be0..834e04050804 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=25063be8361a17395740423df3d4e2ff
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
index 6670dac46594..20828db006fc 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0304c4cd124df43254ba42ff0fa5e262
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0
new file mode 100644
index 000000000000..54f83ddccac9
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0
@@ -0,0 +1,17 @@
+BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-devel/llvm:16 !!sys-devel/llvm:0
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
+INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+clang debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!sys-libs/libunwind
+REQUIRED_USE=test? ( clang )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/llvm-project-16.0.0.src.tar.xz.sig )
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f7ba76b42c0124510879b1ca8649d2dd
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
index 4b7ac345a388..96f358926063 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc3 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc3
index d38fc3086222..c255938efba8 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc3
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=18c4e40ac44a141aa1d0f2633a34cd9a
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc4 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc4
index da854e74d41f..ea9e17a03747 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc4
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc4
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc4/llvm-project-16.0.0rc4.src.tar.xz.sig )
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	fef00f802a62a8d9e66affc69e141df0	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=18c4e40ac44a141aa1d0f2633a34cd9a
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
index 972ddf0960fa..bec160d59b6d 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	c57c50c922e121043788de0b40ada60a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230304 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230304
index 5b84f2c67780..c1c161e987f1 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230304
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230304
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230314 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230314
index f66942751d85..5090a9c9f5b3 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230314
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230314
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz -> llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz
-_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	147e4b586c9c8959197340c9796961aa	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	a5763be3a7ea9d44c19c5a73586aeeeb	cmake-multilib	6ff22813d3a25c55e1b97457ec02a318	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	3337b24d0baa3db792ca6d7b9f10112f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 9c695f4eb26e..08cdddb0e792 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/wsmake-0.6.4-r1 b/metadata/md5-cache/www-misc/wsmake-0.6.4-r1
deleted file mode 100644
index f2ad54e6859b..000000000000
--- a/metadata/md5-cache/www-misc/wsmake-0.6.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install unpack
-DESCRIPTION=Website pre-processor features tag substitution and page ordering
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/wsmake/
-INHERIT=toolchain-funcs
-IUSE=examples
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2+ Artistic
-SLOT=0
-SRC_URI=mirror://sourceforge/wsmake/wsmake-0.6.4.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=634c7b524857001ee48e7967eda1037b
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index ac67a9358b0f..7b449b5d6115 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/thin-1.8.1-r1 b/metadata/md5-cache/www-servers/thin-1.8.1-r1
index f0854c3b7342..f4bd237a60e6 100644
--- a/metadata/md5-cache/www-servers/thin-1.8.1-r1
+++ b/metadata/md5-cache/www-servers/thin-1.8.1-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/macournoyer/thin/archive/v1.8.1.tar.gz -> thin-1.8.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	69b6ab182fab608b42dee39cae3d730c	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=10a23b9729b72409880c049b1be0381f
+_md5_=b6e032397088823358b8e861bfe035b1
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 48e69040c16f..18e8573bd7ef 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.10.0 b/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.10.0
new file mode 100644
index 000000000000..b5431f1029e0
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-notes-plugin-1.10.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/glib-2.30:2 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:= >=xfce-base/xfconf-4.14:=
+DESCRIPTION=Xfce4 panel sticky notes plugin
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-notes-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-notes-plugin/
+INHERIT=xdg-utils
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.30:2 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:= >=xfce-base/xfconf-4.14:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.10/xfce4-notes-plugin-1.10.0.tar.bz2
+_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=753fe0d8534c5c98b0db15bcce7dd254
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.18.0 b/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.18.0
new file mode 100644
index 000000000000..cc3e6073e598
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-screensaver-4.18.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils dev-util/intltool sys-apps/dbus virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/dbus-glib-0.30 >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.20:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= elogind? ( sys-auth/elogind ) locking? ( pam? ( sys-libs/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=Screen saver and locker (port of MATE screensaver)
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/apps/screensaver/start https://gitlab.xfce.org/apps/xfce4-screensaver/
+INHERIT=xdg-utils
+IUSE=elogind +locking opengl pam systemd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/dbus-glib-0.30 >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.20:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= elogind? ( sys-auth/elogind ) locking? ( pam? ( sys-libs/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfce4-screensaver/4.18/xfce4-screensaver-4.18.0.tar.bz2
+_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=06f0416dc3fea07330a333b6b546edcc
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 272c0a376170..8b4e409f38c7 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15153 BLAKE2B d9489813ffb032a3f6f6eacb6df9ad7819bf186e8ead6915d583a0259dd4ccdda908f27867444b45375911e6c60c83e1069b4a71a2a06470f795f6a9fac5b8e9 SHA512 14e11af3bb1e448bd105f6b59bfdeff65b818fc1e4fad2e98891985fef279f09bf5e599162f137b666332a787df599358edcef202bf7d6ad3e111d3c5ab90cd5
-TIMESTAMP 2023-03-18T06:10:01Z
+TIMESTAMP 2023-03-18T18:09:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQVVblfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQV/nRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAMEg/9FbuQX8kSjhxwvR9sI3lZ58nu9DtH1VYWogWunN0jX1FKzAu4b1EWuK3i
-2nKYC9UgoJQSqhHWZvrvWImepASTSwSK1AwKQ6lD3niRzU/c+k0/WsFQxhzGWDy+
-wEOpaYEt1nhhWmLTe/lofzKu9BHCoNlgoJG+Ofx7ldWpAHOlK0iYZM90D271Tazf
-3Cm3I+BGgYhjE2cPyvoKIevEEhXRQqvocf9Rpb0Dh5sY47NrhTZV4NEUvRKW9p6j
-kQKwO8ACk+6qiu9ZIpFBK3yrcmHLMVuS/Km8rJM6b31ZpuSx+Lymm3yETjmatOR/
-gSNPawXncKAsvOHx+mdmr0hKZKO4Xw2OKIs8v3BQ0RfLCWG4Wkw0qaydvPUzv2OX
-UjlLp3ROAbTmenl2D8U431x714X8hOokNsPdZ18onoXzipqVoVPPqmObBvpKl8NC
-5t6czWhWEcHwhm4y6Mx55D1Y/JcEmu69Sh3M88Ex74TVJkcbN9boOGfkeoit8O3u
-Uv+B+nz5znD4Tba12rmcGjjd7d7ARaleoFJ9VOEbjBKJnAWA384BSJIOMkvl2cxQ
-T2nY3rV+Xq4ZyoJnrYAlKAJCfNepFa+SCH7NOXQGAsshzmuCuKsYrADusSmdP+Lj
-JiDAXUoFm6nxAHDRgU7dFP+E9Lm5B4EukPIkxdAi87OzIs+G7D4=
-=+K0M
+klCrARAAm4b5KyuN7oWIroUCLXwkBXhY5B6ogwmL6QkgqxydEXY0Mz84a+2lpgbJ
+dHwu5A8jXQ7xJgzrcHc8lXqLw8qayvJKWK2g+2gibBlaYfnZ7jbkJ069LJDACSwj
+5zIjnoOpCXJRsOqA8YwsJ4BsduDYht7+F04FEu7d5xLkt4lZr1uXluC4RcjUHIbt
+sPWt7K69eAyj3CQv7+Bcd1eNyMiDpJZ8Q2YkTgKRrXNLmiPxYppXbvEf70BOxAJU
+3r57ur/EnV5mRjd5eY+4KtLd1Tyw8LhAAEQk4E5VHIe4gPHfWXQt+V++t5tzPlpx
+ZMcdq56woesx6KirfLpfujjpU71dD9Pq0KtM2SQOR+qqd/NOKtAl9lhJk76M0Jbo
+Njam5T1r73PTtvvVr0YJOkmk/N7iQXLL46sNKaonuxw1ZOhwPjnv7GcnipK1aNro
+fHZHPEtDej9nTwe9H8rPGLlGCoSyO/StcOoXh/5ZeubZN2WDKUmC6HTEtuAGXdq0
+Ff/mzCeLYcxZ6rv7wmweK2a25bKN67dlWwaPmPCubfArXwfYSN08h9iVtiKgRLLv
+6BuwSM4vUiziGWNFcZozUmuDcoe3MRARJ0GyIiBHQoydzn6BYqoTZIhNKxU8N9ZD
+mI+ygkBMqDHiyCdWgtWvP2V06CkTN1/PHvBCf0YoIjqEPhZUX40=
+=crMQ
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4c0a29e7157f..fb7ea8584a32 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 18 Mar 2023 06:09:57 +0000
+Sat, 18 Mar 2023 18:09:52 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index fc17a2c61aff..8a46960ed6f1 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Mar 18 06:09:57 AM UTC 2023
+Sat Mar 18 06:09:52 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9d8508d4e073..d663b6d2d03f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 18 Mar 2023 06:15:01 +0000
+Sat, 18 Mar 2023 18:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 966f68631d2b..091f191cbb0a 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-6464504099ed26f73eb32d676d1787ac0dbc60c6 1679119209 2023-03-18T06:00:09+00:00
+1474c406638eb5b41306a905e1cb60f5763fdba4 1679162526 2023-03-18T18:02:06+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 83ba4090f7ff..d46f180dbbaa 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1679119801 Sat 18 Mar 2023 06:10:01 AM UTC
+1679163002 Sat 18 Mar 2023 06:10:02 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 4c0a29e7157f..fb7ea8584a32 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 18 Mar 2023 06:09:57 +0000
+Sat, 18 Mar 2023 18:09:52 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 354fa001f976..9889763a496b 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index b3c1627bb5b4..3c0175d0b185 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -4,6 +4,6 @@ AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc
 DIST icinga2-2.13.6.tar.gz 9666870 BLAKE2B 50fd463ddb5d5d01ae96cb8457f2c4044c126c308f3d142bb6eb5ac95cf1f5704cd911236acd71ed7b77a596c07e65a96bbebce028bd666126324447d4f91aad SHA512 5fcf480c305487c7988d6cacfcb64c768c0f0e749704247c3d0ded746284ff5485e0a3d25c82fba1305414d47067a9eb80f84de594267ddf050a0b913825cd71
 DIST icinga2-2.13.7.tar.gz 9667526 BLAKE2B 0c3e9736ac66bdcbb3f5d94cc132b3e7e49fdf472bfdbf6900651d72ee9dbea38a06fc9df7c2a266f183b11132391d8174f6d5bd5c5045c4566fb8c3fb28bab9 SHA512 233b8c712b6c36e4d9e970213fac30b65ce72a3e078bbd900c3262c2b7f2b9cf3c1e606d2deb0a60bbb5d5bd3ea1be42bb884b91fc5a9801f4d774ffa1167357
 EBUILD icinga2-2.13.6-r1.ebuild 4033 BLAKE2B a4e8f10d6dbe72a2d7432e56a6dc0caffdbc9ab5831b52df963bc9369b630010938e1f2f669c73714c40dd63f0e44300c58f5d7044b486c70447eab651c524cb SHA512 62c3e63c711ea16d0081f1b0be4610b6f1d19d613d18cf733ffb751894e75f272d8c22354f30792c391d38626cd72a52ef81c2adbed785717dff5eeda1ab85ef
-EBUILD icinga2-2.13.7.ebuild 3985 BLAKE2B 2c4407c55cd1a0f04ff55cd3a9f258f4ea079d6a79dcc51f270bd4bf489ef5f535c936af136e68aa03c1b9c485d36094546ebc29166b27bd1233137850b8f73b SHA512 15c19604975ed39ba81ec62d0a2e6b83f4e6d99a2a173d195d4901334c603c4d1515b98502e086698ce4ea90997f195ae96ee3f59c025333c04753d10cbf285f
-EBUILD icinga2-9999.ebuild 3985 BLAKE2B 5f573b61590cdd31f5c3d18b0f58bc3f5639de5b2fa47462fe75b45f9b5d9c6efdf59816477accf950cbbe427f950dfb81a8e1f2990be8728e04a2012dc67595 SHA512 b53e41c683b2492e42f7ed0fc5f92ff1ead0e24e6fd4966b314f8d94af63468b7c71345017407e8f95c0f3ed340e58f4e6050c845f2c44f83abd07de0c05d058
+EBUILD icinga2-2.13.7.ebuild 3983 BLAKE2B 2cd06a8f2c034dcde4dc6c4c21e32f381d17e212137616d77463888cd253bfcec984c8ce2030d796bad79087cbe66a5d75d6cbf4d85f4358255340032619c0ab SHA512 627525a59a930b3ccdec516c8cae764fe7968eaa7b39ba9940bf561aa3665c8794fcdaac32157e53588901f67ee6a923daeeaeb576f8df46d02a24153eb138cb
+EBUILD icinga2-9999.ebuild 3889 BLAKE2B a0cca6d2dd0116dd86ec0f6af26ce1716aea33ca7e16c1b50769c121299fdbea5242fcf9aca3cc2532275ac0f7426134a7487c6273aa851575df85a0b80bfd7f SHA512 df7d83bda8910fe743dcd4467e2c7ec9bf2b97682dabc9cd5f99d1c1dc6ddfda5f555e26139c6bba104e933015a93066a202fe6e091222c082b3745dbbc75f1b
 MISC metadata.xml 871 BLAKE2B ffd6aeebf603ed90bfa4cc34d557e947e435d204c84e062532cedecd3e811710d9bd39f9f43dd70afd575104be5661b5f7e7de3f79365a961d45f61835a602c6 SHA512 3ca0916252061c1705d194066a30a8fc19cfe4341911646b7ed797e131e02f40eeddc91c2449a5b049888be749d16a5103e70678e5d6c1604db0ac3fe9f4e0d7
diff --git a/net-analyzer/icinga2/icinga2-2.13.7.ebuild b/net-analyzer/icinga2/icinga2-2.13.7.ebuild
index 06a84427309d..9c5f5a356fe9 100644
--- a/net-analyzer/icinga2/icinga2-2.13.7.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.7.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 2c5482fe5a8f..cf77ec3fb9e8 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake systemd
+inherit cmake
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -18,7 +18,7 @@ HOMEPAGE="https://icinga.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql +plugins postgres systemd"
 
 # Add accounts to DEPEND because of fowners in src_install
 DEPEND="
@@ -120,16 +120,12 @@ src_install() {
 	fperms ug+rwX,o-rwx /var/spool/icinga2
 	fperms ug+rwX,o-rwx /var/log/icinga2
 
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
-	fi
+	insinto /usr/share/vim/vimfiles
+	doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+	doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
 
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
+	insinto /usr/share/nano
+	doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
 }
 
 pkg_postinst() {
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 66191a1f1757..c5895b805cae 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gnome-connections/Manifest b/net-misc/gnome-connections/Manifest
index 5877c4ff90f9..b47703d98cde 100644
--- a/net-misc/gnome-connections/Manifest
+++ b/net-misc/gnome-connections/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-connections-43.0.tar.xz 3992760 BLAKE2B 16ff3cc5d587a6169fdf749ae6e743cd0fbec2b6e127c684ec42ba17da6e73d1d66ef4ef621d01452d21230dc8c99bc27678ec0364b9522b5685cec4b9c69445 SHA512 cd9d53f2e4b8e679992c5a65aa89554d1b840174ecf0f75f103265ebc2f07f63f210da4ef7e3c36af8b5fe761ec9ae4711eb92f5f40ae00225fcd9f2f8a9157b
+DIST gnome-connections-44.0.tar.xz 3998876 BLAKE2B 062769eafddb52da9962a59c11697205a0370d890425488a29d1bec2d4f2ba62041ff7d271d9bc7aae1a4fe108fa617864eea63755a6c02de07b340329dd2e5c SHA512 8193877175e5d553ada0b0c7985ee2029c85d0cb2fde16d5a47b9c6c0027deb22c4d1c8f4b2188ab430f3702318b2c1a229b0297a1e90aea45697e733733b3e9
 DIST gnome-connections-44.rc.tar.xz 3998264 BLAKE2B a6d44c699e6698cba6b794cd0f36db971a8fc59bad4b4fe8f9b2a9b4c5be2eb66368c5dac0c4321195a1f3b30d1ac7196d76284ff01ab2806b8fad462f32a7e9 SHA512 8c23725340595fc0e3642a362e539e0f87b6908d0b35d4871a61984c40523f3c30dec1bdff7f68bc04c8d89fea742c91f5c5c3f2e389039e0c295cb33d661c23
 EBUILD gnome-connections-43.0.ebuild 1153 BLAKE2B e320a91cca8aee268a4bcdfb811e4504c2c09077a8f7445e0c28bb4971375a466c864852702b8ce843e5ebde1878d0456c6542702f46063ecc3dc25171271f58 SHA512 724b662b31f4c80834789d1652bc317d43ba54112e465e96b3bda68659774d83f78350eeb5e3e89b177320dafeb5c020f482142b3af450004c3ab416620d29bd
+EBUILD gnome-connections-44.0.ebuild 1090 BLAKE2B 7cbe93b7a1cff2ff4750a4dac109d603cf707cf846282d2da576eb49950f37019d6c62e030eb9e6530d2b131d0a5d1e04384c58fe6911ef206254a0f7fb9d81d SHA512 916ff07453bad861d4746c63ff6afe7981dcd4d1f6f177a9a132fc5f28ecef199c1158b194c6e8aa842d9110950fc2b58f78ed4ea1f9964da10e2c3cc54e861d
 EBUILD gnome-connections-44_rc.ebuild 1190 BLAKE2B 33b13c44e2f86524748822e67154677c7666d326714dda88497c3a22606a00402ded4e12b22567084fdf1f94030141aaa12c9578a2ae2e3b262a8e38cac9380a SHA512 6734d897c4f899d5f386efe3ea7874b0bb37cb55da2e464b38349c2022434ae43ac214968ebbf6c66c2edea3774c2b01fcd2398ea27fa938c8ce10552ca28d93
 MISC metadata.xml 352 BLAKE2B e843ede0d59f837f8339c438264676285772ba6190b63048b122ede90592706decb25c49ac2023dd3fd386a1919b17175bb0e894ec094ed3c730e7ec41fd578f SHA512 154d829657ed75e1f906809a3ea5811094c4e47aaac68023c43c437284093419184663e6028d35deeaa882dbe0a6a333dc50f796482e21e493ea67ba4d8f3d02
diff --git a/net-misc/gnome-connections/gnome-connections-44.0.ebuild b/net-misc/gnome-connections/gnome-connections-44.0.ebuild
new file mode 100644
index 000000000000..325726aeadc2
--- /dev/null
+++ b/net-misc/gnome-connections/gnome-connections-44.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="A remote desktop client for the GNOME desktop environment"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/connections"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gobject-introspection
+	>=dev-libs/glib-2.50:2
+	>=x11-libs/gtk+-3.22:3[introspection]
+	>=net-libs/gtk-vnc-0.4.4[pulseaudio,vala]
+	>=gui-libs/libhandy-1.6.0:1[vala]
+	>=dev-libs/libxml2-2.7.8
+	app-crypt/libsecret[vala]
+
+	>=net-misc/freerdp-2.0.0:0=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/glib
+	dev-util/glib-utils
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	test? (
+		dev-libs/appstream-glib
+		dev-util/desktop-file-utils
+	)
+"
+
+src_prepare() {
+	default
+	vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofile=default
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
deleted file mode 100644
index 68cf685fb250..000000000000
--- a/net-misc/gsutil/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX dummy.boto 128 BLAKE2B f366c006392ef65857a3af2334f6776ce9609841fab260e27c15579b7f2603cc547f55f97ad053027aef670616e2e8c65c0c932ca930cb2a59de1428c62c3887 SHA512 9e420dde9d7e8e9fe2513529fd2681994763e8b9069ae9911c56a3ee72d77e40a8e5c8b0e7c006fe5c336ccb78935d908b20bd1bd275dded317a0c5d2b7bc97d
-AUX gsutil-4.41-tests.patch 810 BLAKE2B 93a2e7163d0684c8ad03ce03ae94aebc168922861ac89958e0a13a1fc3e53635b03d08531bd29b8301772c0a724647c33e5091af47e1c4bcf4c0478b4487fad6 SHA512 85fad475926755f32c4d08eaad9b023c9808c4ef696a2a7da4c61a68101d781c207c4f5817cda286f123e0c50477e8f7bf032a03d40420004d1aee412ef8375a
-AUX gsutil-4.50-boto-tests.patch 1483 BLAKE2B 9d40250f7a836535297da411bda76430dc844128f68f67d2817c6ffd2189b6cd5e40357ed15580f5bdd68a68148faf77c49198040e767af4c57f49163c5903f0 SHA512 53c20d01d60be0d560c5e15f26bbe206bba59ad97df486b8c24409e2a58b13093b09a4601f6d8add9ec4f5f01faf9e5c3ecee00e9818e5de84f7df7d39b5127a
-AUX gsutil-4.50-tests.patch 2451 BLAKE2B d84d1cd31eeabb3c0ecbb4b4850ec30d5f96e641b135b6c7fe6e7442edcfc4d2d076858b6fe1365f9424d32c81d9b818885df03f66405dfb8ca4d2149ee33ab5 SHA512 007e07b54a5f4182586f3defbc070f5883356214cb0e28861df66509c414d8bbde5718fd8598bcf023e9971331a34b2f1aefd89350e6d3c97e93ae80176b2d5a
-DIST gsutil_5.9.tar.gz 11620858 BLAKE2B 09f2a79d14458a6545c45df23bd86a2769a00441ff03ae47a984cf18ae20c38e7b725f148c4e1d465f850f89871ad70b29463b8c829674d9d70d330b008595c7 SHA512 4916f3ac9c00c310a3dbc342ea0ab245cdf6952a4cee4e5b810f73254fb93439bcd7be35acbedac43501c3f19d8851848eeeff5b6ada6f31d93d478809518e35
-EBUILD gsutil-5.9.ebuild 2916 BLAKE2B 1c8f01d2ff10c5d1101b4ab7dd571ecf3c19b1a690f1e43db2805ff14ec37bd405b0e9fbeb990d03969ab61a1924ab88270a945500f33a3298d057890533df47 SHA512 104332e6fb6d25a0493a504e99d27a4d2490741c8e7b75325fc5485edaf8a83a3991eafe933ac69b6ed4298eb385a8dde8977ef93fb8bd0930be60acdb6ceacf
-MISC metadata.xml 515 BLAKE2B 3e6c5322e5a945b1ea9e073ba98e135fdebf5d28f34bd6e5116f11668bf3505a6b8ab6f770348f2318c2bd3aa3aef782738e14ef6de60ee7c6fc1413a4a5a9c0 SHA512 53a143192dd605277e3ac4b8875400fbbcb892964e521de8768894f40580169d8ffd68f715a97f692b881ae6dc578a79e8d4573528bbdd881ffe4112d0d59734
diff --git a/net-misc/gsutil/files/dummy.boto b/net-misc/gsutil/files/dummy.boto
deleted file mode 100644
index 93e9dd2f8c77..000000000000
--- a/net-misc/gsutil/files/dummy.boto
+++ /dev/null
@@ -1,6 +0,0 @@
-# dummy .boto file for testing
-
-[Credentials]
-gs_oauth2_refresh_token = 1/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-[GSUtil]
diff --git a/net-misc/gsutil/files/gsutil-4.41-tests.patch b/net-misc/gsutil/files/gsutil-4.41-tests.patch
deleted file mode 100644
index 9b4a0bf509ae..000000000000
--- a/net-misc/gsutil/files/gsutil-4.41-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/gslib/third_party/storage_apitools/storage_v1_client.py b/gslib/third_party/storage_apitools/storage_v1_client.py
-index b8162310..933082e9 100644
---- a/gslib/third_party/storage_apitools/storage_v1_client.py
-+++ b/gslib/third_party/storage_apitools/storage_v1_client.py
-@@ -64,8 +64,7 @@ class StorageV1(base_api.BaseApiClient):
-         log_request=log_request, log_response=log_response,
-         credentials_args=credentials_args,
-         default_global_params=default_global_params,
--        additional_http_headers=additional_http_headers,
--        response_encoding=response_encoding)
-+        additional_http_headers=additional_http_headers)
-     self._version = version
-     self.bucketAccessControls = self.BucketAccessControlsService(self)
-     self.buckets = self.BucketsService(self)
diff --git a/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch b/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch
deleted file mode 100644
index 5a9b601604da..000000000000
--- a/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- gsutil.orig/gslib/vendored/boto/tests/integration/s3/mock_storage_service.py	2020-04-10 13:26:12.000000000 -0700
-+++ gsutil/gslib/vendored/boto/tests/integration/s3/mock_storage_service.py	2020-05-07 11:11:14.971631528 -0700
-@@ -30,13 +30,11 @@
- import boto
- import base64
- import re
--import six
- from hashlib import md5
-
- from boto.utils import compute_md5
- from boto.utils import find_matching_headers
- from boto.utils import merge_headers_by_name
--from boto.utils import write_to_fd
- from boto.s3.prefix import Prefix
--from boto.compat import six
-+import six
-
-@@ -90,14 +88,12 @@
-                              torrent=NOT_IMPL,
-                              version_id=NOT_IMPL,
-                              res_download_handler=NOT_IMPL):
--        data = six.ensure_binary(self.data)
--        write_to_fd(fp, data)
-+        fp.write(six.ensure_str(self.data, errors='replace'))
-
-     def get_file(self, fp, headers=NOT_IMPL, cb=NOT_IMPL, num_cb=NOT_IMPL,
-                  torrent=NOT_IMPL, version_id=NOT_IMPL,
-                  override_num_retries=NOT_IMPL):
--        data = six.ensure_binary(self.data)
--        write_to_fd(fp, data)
-+        fp.write(self.data)
-
-     def _handle_headers(self, headers):
-         if not headers:
-@@ -284,9 +280,6 @@
-         else:
-             return '<Subresource/>'
-
--    def get_tags(self):
--      return []
--
-     def new_key(self, key_name=None):
-         mock_key = MockKey(self, key_name)
-         self.keys[key_name] = mock_key
diff --git a/net-misc/gsutil/files/gsutil-4.50-tests.patch b/net-misc/gsutil/files/gsutil-4.50-tests.patch
deleted file mode 100644
index 757f1f4ed4d5..000000000000
--- a/net-misc/gsutil/files/gsutil-4.50-tests.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/gslib/boto_translation.py b/gslib/boto_translation.py
-index 0af2e663..7d2f549f 100644
---- a/gslib/boto_translation.py
-+++ b/gslib/boto_translation.py
-@@ -1457,7 +1457,8 @@ class BotoTranslation(CloudApi):
-         # TODO: Define tags-related methods on storage_uri objects. In the
-         # meantime, we invoke the underlying bucket's methods directly.
-         try:
--          boto_tags = bucket_uri.get_bucket().get_tags()
-+          bucket = bucket_uri.get_bucket()
-+          boto_tags = bucket.get_tags() if hasattr(bucket, 'get_tags') else []
-           cloud_api_bucket.labels = (
-               LabelTranslation.BotoTagsToMessage(boto_tags))
-         except boto.exception.StorageResponseError as e:
-diff --git a/gslib/tests/test_naming.py b/gslib/tests/test_naming.py
-index d91cda04..6b44719f 100644
---- a/gslib/tests/test_naming.py
-+++ b/gslib/tests/test_naming.py
-@@ -36,6 +36,7 @@ from __future__ import unicode_literals
- 
- import gzip
- import os
-+import unittest 
- 
- import six
- 
-@@ -504,6 +505,7 @@ class GsutilNamingTests(testcase.GsUtilUnitTestCase):
-     self.assertEqual(1, len(actual))
-     self.assertEqual('/obj', actual[0].root_object.name)
- 
-+  @unittest.skip('test appears to be flakey')
-   def testCopyingCompressedFileToBucket(self):
-     """Tests copying one file with compression to a bucket."""
-     src_file = self.CreateTempFile(contents=b'plaintext', file_name='f2.txt')
-diff --git a/gslib/tests/testcase/unit_testcase.py b/gslib/tests/testcase/unit_testcase.py
-index b25352b6..c958f670 100644
---- a/gslib/tests/testcase/unit_testcase.py
-+++ b/gslib/tests/testcase/unit_testcase.py
-@@ -27,7 +27,6 @@ import tempfile
- import six
- 
- import boto
--from boto.utils import get_utf8able_str
- from gslib import project_id
- from gslib import wildcard_iterator
- from gslib.boto_translation import BotoTranslation
-@@ -157,8 +156,8 @@ class GsUtilUnitTestCase(base.GsUtilTestCase):
-         stderr = sys.stderr.buffer.read()
-     [six.ensure_text(string) for string in self.accumulated_stderr]
-     [six.ensure_text(string) for string in self.accumulated_stdout]
--    stdout = six.ensure_text(get_utf8able_str(stdout))
--    stderr = six.ensure_text(get_utf8able_str(stderr))
-+    stdout = six.ensure_text(six.ensure_str(stdout))
-+    stderr = six.ensure_text(six.ensure_str(stderr))
-     stdout += ''.join(self.accumulated_stdout)
-     stderr += ''.join(self.accumulated_stderr)
-     _AttemptToCloseSysFd(sys.stdout)
diff --git a/net-misc/gsutil/gsutil-5.9.ebuild b/net-misc/gsutil/gsutil-5.9.ebuild
deleted file mode 100644
index a35f72008068..000000000000
--- a/net-misc/gsutil/gsutil-5.9.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.49.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-3.0[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.32[${PYTHON_USEDEP}]
-	dev-python/google-auth[${PYTHON_USEDEP}]
-	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.20.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/gsutil-4.41-tests.patch"
-	"${FILESDIR}/gsutil-4.50-boto-tests.patch"
-	"${FILESDIR}/gsutil-4.50-tests.patch"
-)
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( README.md CHANGES.md )
-
-# Needs to talk to Google to run tests.
-RESTRICT+=" test"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# NB: We don't delete all of boto/ because the tests are imported by the
-	# production code.  The same reason we can't delete gslib/tests/.  We can
-	# delete the main boto library and use the system version though.
-	rm -r gslib/vendored/boto/boto || die
-
-	# Fails to compile with py3.
-	rm gslib/vendored/boto/tests/mturk/cleanup_tests.py gslib/tests/test_wrapped_credentials.py || die
-
-	# monotonic is only used by bundled fasteners that we do not install.
-	sed -i \
-		-e 's/mock==/mock>=/' \
-		-e '/monotonic/d' \
-		setup.py || die
-	# Sanity check we didn't miss any updates.
-	grep '==' setup.py && die "Need to update version requirements"
-
-	# For debugging purposes, temporarily uncomment this in order to
-	# show hidden tracebacks.
-	#sed -e 's/^  except OSError as e:$/&\n    raise/' \
-	#	-e 's/def _HandleUnknownFailure(e):/&\n  raise/' \
-	#	-i gslib/__main__.py || die
-
-	# create_bucket raised ResponseNotReady.
-	sed -i \
-		-e 's/test_cp_unwritable_tracker_file/_&/' \
-		-e 's/test_cp_unwritable_tracker_file_download/_&/' \
-		gslib/tests/test_cp.py || die
-
-	sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \
-		gslib/commands/test.py || die
-
-	# IOError: close() called during concurrent operation on the same file object.
-	sed -i -e 's/sys.stderr.close()/#&/' \
-		gslib/tests/testcase/unit_testcase.py || die
-}
-
-python_test() {
-	BOTO_CONFIG="${FILESDIR}/dummy.boto" \
-		"${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}"
-}
diff --git a/net-misc/gsutil/metadata.xml b/net-misc/gsutil/metadata.xml
deleted file mode 100644
index 7ce240e8eff8..000000000000
--- a/net-misc/gsutil/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>zmedico@gentoo.org</email>
-    <name>Zac Medico</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="google-code">gsutil</remote-id>
-    <remote-id type="github">GoogleCloudPlatform/gsutil</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 9bff62d36af8..5fc74835a21d 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/bittornado/Manifest b/net-p2p/bittornado/Manifest
deleted file mode 100644
index 06cff28fc62d..000000000000
--- a/net-p2p/bittornado/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX bttrack.conf 613 BLAKE2B ad791caf43fc5cf0e22f8fd01acab3d2f93feb827d64e07a1d61f24415e77acdbbea01104e32a13596bdd29dc1493b6f518ffbf1b695f24b46354b5c321edb3c SHA512 62d63735f3329cca879aff33d64b2ab5bd12ea99ca94fe581980382dbf8a12a25ef39c8adcbdd45295ea9055fbe2e156473e072081618cb6175a77434ad0f8a4
-AUX bttrack.rc 519 BLAKE2B 829b1a4cdb29bae41e25e832d7383ea4fda3ec2473d6d9bebc2738f126c9c95a937cbce0473bf5cf3a049b75e00a0301c3d8b1179c8c46db5f327e467977d9bc SHA512 74255a6dae0d5b1b5809dd6b7b792bb1f681d9c002dd64c0b633e4c903af8748922abe4521d0e52f23ad2d1f12066bf6a2eec1ad8112251e081f07002609eae0
-DIST BitTornado-0.4.1_p20160925.tar.gz 164352 BLAKE2B 34cebe27ab0cb18a960ef830311ffa47f2064c83768a9a011dcd9e45e9460b60438e159824eaf9cf844d7c5604a9de832e6a85cea3335d9e6223c31e7b349014 SHA512 09971cc5705c421c4440cd51b9aa37da9f8ce992a882d342c0547fe1771199fa61c4924f6d6cd321776f9dcefafd3e244b9cbfce047c4cdd4502dd0a1a1fdaaa
-EBUILD bittornado-0.4.1_p20160925-r4.ebuild 1511 BLAKE2B 0ffe0715b15d486c127637848d95288a849832313e777e5bd0c7ba3413440260867a13e11a38b3c6803b9ad1a7ffb97cedd37bd56c73acdc600737920a480ba6 SHA512 5f2b2d7936e0a54ad785ce84cca4e312581967b85f549ec1c356a6126b48cfd2791f319070980127dc9e6131807a5c659658cc6276a74f23e502f92ceab270b9
-MISC metadata.xml 252 BLAKE2B cb85b5db20da782e53f27be48b292927d1e31ff678ca9dc38733efef2e50259353664cdee3ab283cd53d961ce89d46b6b15d3f3fe21765d9158be192e5fb04ac SHA512 be4a7b278c430197fabb490db8b0814e1245f9f6343fe1aae89fabce506279216697d52d01021a4a30db07b349193d2f34b77afc08652cdaffa6888d9cd188c0
diff --git a/net-p2p/bittornado/bittornado-0.4.1_p20160925-r4.ebuild b/net-p2p/bittornado/bittornado-0.4.1_p20160925-r4.ebuild
deleted file mode 100644
index 5bebef9b4079..000000000000
--- a/net-p2p/bittornado/bittornado-0.4.1_p20160925-r4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-MY_PN=BitTornado
-MY_P=${MY_PN}-${PV}
-EGIT_COMMIT="ed327c4e1ebbe1fe949be81723527cfda87aeb8d"
-
-DESCRIPTION="John Hoffman's fork of the original bittorrent"
-HOMEPAGE="https://github.com/effigies/BitTornado"
-SRC_URI="https://github.com/effigies/BitTornado/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-# GPL-2 is just for the init script from FILESDIR.
-LICENSE="MIT GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-# Block dev-python/pytest-testmon for bug #693508.
-DEPEND="
-	test? (
-		!!dev-python/pytest-testmon
-	)
-"
-
-S=${WORKDIR}/${MY_PN}-${EGIT_COMMIT}
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# https://github.com/effigies/BitTornado/pull/53
-	sed -e 's:"BitTornado.Tracker":\0, "BitTornado.Types":' -i setup.py || die
-	find "${S}" -name '*.py' -print0 | \
-		xargs --null -- \
-		sed -r -i '
-			s:time.clock\(\):time.perf_counter():g;
-			s:collections.(MutableSet|Set|Sequence|Mapping):collections.abc.\1:g
-		' || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest BitTornado/tests
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}"/bttrack.conf bttrack
-	newinitd "${FILESDIR}"/bttrack.rc bttrack
-}
diff --git a/net-p2p/bittornado/files/bttrack.conf b/net-p2p/bittornado/files/bttrack.conf
deleted file mode 100644
index 9757ce477ff6..000000000000
--- a/net-p2p/bittornado/files/bttrack.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# /etc/conf.d/bttrack
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Change this to this to the port you would like to connect to for the tracker.
-# It is accessible at http://localhost:PORT/ from any web browser.
-PORT=8082
-
-# where to store recent downloader info
-DFILE=/usr/share/bittorrent/tracker.dfile
-
-# path to favicon.ico which many popular web browsers can use
-FAVICON=/usr/share/bittorrent/favicon.ico
-
-# Connection logs are sent to stdout by default, so they should be sent to a
-# file when using this script.
-LOGFILE=/var/log/bttrack.log
diff --git a/net-p2p/bittornado/files/bttrack.rc b/net-p2p/bittornado/files/bttrack.rc
deleted file mode 100644
index 2c1dfe69cafd..000000000000
--- a/net-p2p/bittornado/files/bttrack.rc
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting bttrack"
-	start-stop-daemon --start --quiet --background --make-pidfile \
-	--pidfile /var/run/bttrack.pid \
-	--exec /usr/bin/bttrack.py -- --port ${PORT} \
-	--dfile ${DFILE} --favicon ${FAVICON} --logfile ${LOGFILE}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping bttrack"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bttrack.pid
-	eend $?
-}
diff --git a/net-p2p/bittornado/metadata.xml b/net-p2p/bittornado/metadata.xml
deleted file mode 100644
index cf542189efb2..000000000000
--- a/net-p2p/bittornado/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">effigies/BitTornado</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-p2p/vuze-coreplugins/Manifest b/net-p2p/vuze-coreplugins/Manifest
deleted file mode 100644
index c1b550874670..000000000000
--- a/net-p2p/vuze-coreplugins/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST azplugins_2.1.10.jar 313871 BLAKE2B 98d27cdf08adc27dffd6117f436a2868bf02d8b33d97bc6366182f7bd2a26293c79c4ac76aa198211b466cc90757acafd72b85703868acd42d0f748b8fae9708 SHA512 d61d517537e265cfdef5e48a8ad70afca43e1c53edb91e85e7e54296eab838b82510eb48911d545d27e4e014e6a3f599e4c1535a7c5468e69f89a88b178329c2
-DIST azrating_1.5.19.jar 114515 BLAKE2B fbd4251bfa1259d750d655f64e143437d7025badb849cf11e20b0119d8dc6c66e98f9f055c0a4d3830bc0f7fe3b3b5eaa32eefd6b8e9e56b40ba554becbb4eb0 SHA512 e75d331e21cb72b0401e62ab6828dc8c76301f84e1b3c8d01e8cbc1a95eda2a7736925212d4e4dc38239d02cddf864bf544a75f3d6d9ce5bb8cdddbc863ee03a
-DIST azupdater_1.9.2.zip 26390 BLAKE2B 9c146beee646cd4a31a1014286d4a2bdbe791b5841c0bc2dca1d0740546f224d34294efcc0ae7a36ae21b8a9e93a442369af8e896255bb11518a5a80b27fff11 SHA512 8a1b37d69e6c955f0e507c5455ae198c162f9de2f1713abd6d47bc9f32e65b6afba15152956f98eca101fbf4dbbecaa5b0f84813dcf11e9b7bf33171ce7432cd
-DIST azupnpav_0.5.7.zip 264998 BLAKE2B 70a8864c61a9b9c3520ae04b0576678c768c619de1f822cfa7968617d7d37597077126b7b562d7a6ebd7458fa8a4e1fecd733be2db41ebe2aec7b8825d00f669 SHA512 f58fa8a3e26d204080a8567240bcbac2868233137ddb073c2ca0c91c17ace5f7a07cebfb1eef04e7fb18eb9287418329b5ca742681806fce78a975e0053ddf1c
-EBUILD vuze-coreplugins-5.7.6.0.ebuild 1465 BLAKE2B 2d00105dcf43f7697b524963fe4024bd6fa585b2e717d334cced43b7989d87cb6ca7429fae5e7cbb4143c3b7e0145d8724c8bf68fc51eb0aaec179446501c4e1 SHA512 8e86902565dc2cff3eb0da593a695c5b82af808bd172959683e86e14bb875fd910f44c4116134a2d554e6b7083c1d535e6a77bf08df7bc6252b744c2b4efec92
-MISC metadata.xml 314 BLAKE2B 6e8758ffb95e1641ddb121951555ed9a9da59d48688db9bc51cf9d2d02574faddf35d874a9ca901e73f47bf456221bd8b5f2035b3e789ea13196a8c2c58b03c4 SHA512 bf06d56995ee3bb79073d3c12ed3486126dc336dc77d0fb86a6fb3229596df39836e0f0682128b883c66eb02061aff512ef64299f6cd2067bb10bd6c7f63527e
diff --git a/net-p2p/vuze-coreplugins/metadata.xml b/net-p2p/vuze-coreplugins/metadata.xml
deleted file mode 100644
index 71a06860d27c..000000000000
--- a/net-p2p/vuze-coreplugins/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">azureus</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.6.0.ebuild b/net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.6.0.ebuild
deleted file mode 100644
index f4e118503103..000000000000
--- a/net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.6.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# update these when bumping the version
-PLUGINS_V=2.1.10  # http://www.vuze.com/plugins/details/azplugins
-RATING_V=1.5.19   # http://www.vuze.com/plugins/details/azrating
-UPDATER_V=1.9.2   # http://www.vuze.com/plugins/details/azupdater
-UPNPAV_V=0.5.7    # http://www.vuze.com/plugins/details/azupnpav
-
-PLUGINS_DIST=azplugins_${PLUGINS_V}.jar
-RATING_DIST=azrating_${RATING_V}.jar
-UPDATER_DIST=azupdater_${UPDATER_V}.zip
-UPNPAV_DIST=azupnpav_${UPNPAV_V}.zip
-
-ALLPLUGINS_URL="http://azureus.sourceforge.net/plugins"
-
-DESCRIPTION="Core plugins for Vuze that are included in upstream distribution"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="
-	${ALLPLUGINS_URL}/${PLUGINS_DIST}
-	${ALLPLUGINS_URL}/${RATING_DIST}
-	${ALLPLUGINS_URL}/${UPDATER_DIST}
-	${ALLPLUGINS_URL}/${UPNPAV_DIST}"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND="~net-p2p/vuze-${PV}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	mkdir -p plugins/{azplugins,azrating,azupdater,azupnpav} || die
-	cp "${DISTDIR}"/${PLUGINS_DIST} plugins/azplugins || die
-	cp "${DISTDIR}"/${RATING_DIST} plugins/azrating || die
-	cd "${WORKDIR}"/plugins/azupdater && unpack ${UPDATER_DIST} || die
-	cd "${WORKDIR}"/plugins/azupnpav && unpack ${UPNPAV_DIST} || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/vuze/
-	doins -r "${WORKDIR}/plugins"
-}
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
deleted file mode 100644
index fc4547fa3d63..000000000000
--- a/net-p2p/vuze/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX build.xml 2275 BLAKE2B a4aea605301da5ad6af89915c686caabd9ee0f0d3b56f3ee46e2eae74adc86d88de4462228e0387b43b1d5b897c3d6b2e8939822000e86631c22ec5230e31461 SHA512 bdec7c10548ed2fda57235d14f0ae67e00e548a84b88855b5b683c947015b52bcf7011fb5952b4225370db54541614c0402fe6c77e723d310358a502837b40a3
-AUX vuze-4.1.0.0-pre 1850 BLAKE2B 3013871146bd43e7bcd0e7bd92c44ca5d06ebca634ed836918f89c1620095a200c81de2ce76c30a4cef5b3f659995c14532b410c8c39679ee821196009aba821 SHA512 04c5a77bff69e50963f3122c46f549dec78e462bfa0697b32ffe8630d22612a64f1adc52bc8d7d8868d972c4bdac3082a1e9b513459d9f97915ad87d05ab2b4a
-AUX vuze-5.3.0.0-disable-shared-plugins.patch 1069 BLAKE2B d2594d617396bee9506cf8060c61d7d97b4e5780b34ebed656cffa3d70cf69d27a50056d77d8527af716246a31918d81c626f931aa9b7a78bb3c823d2da79f7f SHA512 ee9e6513b2dd1d4e986f4c57fd5ace3593f98f7eaeb5e454fc7b5fb3c6876b86b85b511981c951ead96b1a106abb18a2e01047b2063d55c98300ed6356c0460b
-AUX vuze-5.3.0.0-disable-updaters.patch 1726 BLAKE2B 8a1d7ec1196ee27019f513d51290a0d5dae1f1ada84e21617f42d8e6bd9a42020be84eb962489f371c611f3af2edb2fb9c0bbd7d986a10ea31103a64fe3ada82 SHA512 743d48eeeac4534fc66463c0989a88d97117d988227b6cce77abdaa97c9cb9813aa1228f81a607af09e07fdf95ce02a3981f7f083fba0d9875d0951b8bbf29a3
-AUX vuze-5.3.0.0-java5.patch 618 BLAKE2B d939b9708bc4fa2902d1b5f78ceb4d707ff59e421cc9b2308178d57e78dede189eeb0723bea8ac22a3b6502f59533f72a1207be59e36cca7c568d2e0c52ce120 SHA512 0ecddf69a7fdd72860262cc73dd4a0852ba8e31d73dfc7ad1d96ad18eaa41ec23ca977207d6bff32e183d95c1a6918909ef3cab697d0c9d754345613544eb90c
-AUX vuze-5.3.0.0-remove-classpath.patch 545 BLAKE2B 52a33a81cf3803fa6f0f8e10b89b255c4e72cee2606c88abbc8c8566087d816fa0d8c951631cafb77f49c43ecc6edb78e4a083112dfc21c6df141218fb78d7be SHA512 867e932eab1f33af6a8320cbe1f1cf565b68f39c6e1c0188dada018de4b50823047a7e9a53d558c00fe2253c48e4e6276e7725681b33a115de694c43265cf42c
-AUX vuze-5.3.0.0-unbundle-json.patch 1322 BLAKE2B fc387740073933b9f99474dd2ac5e7ed8978e387ed5b903c7489d41684a6eafc44f4c85b7453d275988ad0105457966064b718e229cf8485d9fe4bb454062bb8 SHA512 60b8dc8216f5f51a4cb6c6b793d1b31b686f63d03e373741d76856a594468fa5c97781fc99fc9af30f2db8173bb86414cd52cb30ea7ebeac5a018633f661ce26
-AUX vuze-5.7.2.0-disable-osx.patch 2278 BLAKE2B 760b82f75b310d01b94891a3c1528fe48200e7c8fdc04baecb18965316e3ffb347c9b131540f7a30061751fd1b449d924536f9d8f77bde7743c88579b33e9be5 SHA512 39797193297d61c1e91bfdcbf6e4fa6acb523c067ac96a0de99d5f79fab69b327688f87f8c8f24c0d7967c4c1017bde478ecc10aa117f96f0b891dc10a21420a
-AUX vuze-5.7.6.0-commons-lang.patch 7613 BLAKE2B 00df394b0dddd442b693251d29a3bfd5c647e20b47bd94e1c5bf07267d0bee66f98c1ede2f2d070526f6829211755343184e25ee2e78c46100f5f866340571f2 SHA512 bc44e26d3ae93891e01023b2afe614c680caada24398459efa6640295b9bd9e0cc7e734c42364bac21082ec827c54f12d818b19db4ea20ff6b3046c145ffb998
-AUX vuze-5.7.6.0-log4j-12-api.patch 5749 BLAKE2B 87a63f03103e15a0a6d3ec6a44ef678c00b679ff205ce56d821676188a2042f8933b3dc9cdd623a89b1f5d225e1c94c29fe4b6ada7769ab3ccfab589c961518d SHA512 ded2cce1292e0cff747ed1e0209ab5f5728e5a2ac5d8f7037edba2380ca32e02fa6ae4f66f27780381ac53f347d0957ba04cf0cda468f54bf97769c8fcf3601c
-AUX vuze.desktop 164 BLAKE2B fa225e36d05244707ff0c0e72d2455cdc3843a2e1c7633f43f902c6372fccb14bb4baf77f07a00314a02f02e6ee682a09f95d75ff12ea0ce16d6681df0d9371e SHA512 4d68ed3af2c983435d1014ea1281076fd5d1171b23ebbe7cc8d7e6c45b39b036e7f4660fce81481ba3b7bddd29c8255ce22bbb79230f77c6ecfdecb24736d480
-DIST Vuze_5760_source.zip 10928786 BLAKE2B df8bbb797f2a1b0c92bc19be122a0da3b6382dc80f51bb652026e3d68503d19ddb3b16e3bc6c333f12c8bfa52b014f85b0812fd5683fe4553040feff39ab77d8 SHA512 c4c1cc84d3c8ce31772bd677f105f6d00e0a6d867d6890b6a834c9e189bb1752e065a64308cdf1315bace1ca4783843553b45fbf3c15240c57584e2926ba92c5
-EBUILD vuze-5.7.6.0-r2.ebuild 4096 BLAKE2B e15647da511f1e401a347ce00fe3729ba0ac4746faa2b978d159a3d65c479183c2a7d70c338532ee48bac0e8dcd044ab1be03c9f76c448330bdae5f31813e4c8 SHA512 757c168467002b4795c80d59b75e7facd8360c4137fe6e01c9e963c920c347551237abed5dfe416d177aa53198175360c1d66baaf62cab5ab759e0346b5a79cc
-MISC metadata.xml 314 BLAKE2B 6e8758ffb95e1641ddb121951555ed9a9da59d48688db9bc51cf9d2d02574faddf35d874a9ca901e73f47bf456221bd8b5f2035b3e789ea13196a8c2c58b03c4 SHA512 bf06d56995ee3bb79073d3c12ed3486126dc336dc77d0fb86a6fb3229596df39836e0f0682128b883c66eb02061aff512ef64299f6cd2067bb10bd6c7f63527e
diff --git a/net-p2p/vuze/files/build.xml b/net-p2p/vuze/files/build.xml
deleted file mode 100644
index 7b060c14b2f2..000000000000
--- a/net-p2p/vuze/files/build.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-	
-NOTE:  You may need to set the  ANT_OPTS="-Xmx512m"  env prop in order to compile this project successfully.
-
--->
-
-	
-<project default="jar" name="Azureus" basedir=".">
-
-   <property name="root.dir" value="." />  <!-- REMINDER: this needs to be "." for public source -->
-   <property name="libs.dir" value="build/libs" />
-   <property name="dist.dir" value="dist" />
-   
-   <property name="generic.excludes" value="**/*.jar **/*.txt **/*.jardesc **/.classpath **/.project **/aereg.lib **/aereg.dll" />
-   <property name="dist.jar.excludes" value="${generic.excludes} **/*.java " />
-   <!-- <property name="dist.source.excludes" value="${generic.excludes} **/*.class" /> -->
-   
-   
-   <target name="init" >
-      <echo message="Building Azureus2.jar..." />
-
-      <tstamp/>
-
-      <!-- <condition property="libs.dir" value="build/libs">
-         <not>  <isset property="libs.dir" />  </not>
-      </condition> -->
-       
-      <mkdir dir="${root.dir}/${dist.dir}" />
-   </target>
-
-   
-   <target name="compile" depends="init" >
-      <path id="libs.classpath">
-         <fileset dir="${root.dir}/${libs.dir}" includes="**/*.jar" />
-      </path>
-   
-   	<javac srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes" source="1.4" target="1.4" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source" >
-         <classpath refid="libs.classpath" />
-      </javac>
-   </target>
-
-
-   <target name="jar" depends="compile" >
-      <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar" basedir="${root.dir}" excludes="${dist.jar.excludes}" >
-         <manifest>
-            <attribute name="Main-Class" value="org.gudy.azureus2.ui.common.Main" />
-            <attribute name="Class-Path" value="Azureus2.jar apple-extensions.jar commons-cli.jar log4j.jar swt.jar swt-win32.jar swt-osx.jar" />
-         </manifest>
-      </jar>
-      
-      <!-- <zip destfile="${dist.dir}/Azureus2_source.zip" basedir="." excludes="${dist.source.excludes}" /> -->
-
-   </target>
-
-
-   <target name="clean" >
-      <delete quiet="true" >
-         <fileset dir="${root.dir}/com" includes="**/*.class"/>
-         <fileset dir="${root.dir}/org" includes="**/*.class"/>
-      </delete>
-      
-      <delete dir="${root.dir}/${dist.dir}" />
-   </target>
-
-</project>
-
diff --git a/net-p2p/vuze/files/vuze-4.1.0.0-pre b/net-p2p/vuze/files/vuze-4.1.0.0-pre
deleted file mode 100644
index 505a7e704df3..000000000000
--- a/net-p2p/vuze/files/vuze-4.1.0.0-pre
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (c) 2005, Petteri Räty <betelgeuse@gentoo.org>
-# Copyright (c) 2004, Jochen Maes <sejo@gentoo.org>
-# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
-# Copyright (c) 2004, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-
-# The Azureus config dir has moved
-olddotazudir="${HOME}/.Azureus"
-oldgentoocfg="${olddotazudir}/gentoo.config"
-dotazudir="${HOME}/.azureus"
-gentoocfg="${dotazudir}/gentoo.config"
-
-if [[ -f "${oldgentoocfg}" && -f "${gentoocfg}" ]]; then
-	cat > /dev/stderr <<END
-You have gentoo.config files in both 
-${dotazudir} and
-${olddotazudir}
-${olddotazudir} is deprecated and you can delete this directory.
-
-END
-fi
-
-create_initial_config() {
-	if [[ ! -e "${dotazudir}" ]] ; then
-		mkdir "${dotazudir}"
-		echo "Creating ${dotazudir}" 
-	fi
-
-	[[ ${UI} ]] && UI="swt"
-
-	echo "Creating ${gentoocfg}"
-
-	# Create the config file
-	cat > "${gentoocfg}" <<END
-# User Interface options:
-# console   - console based
-# swt       - swt (GUI) based
-UI="${UI}"
-
-# Options you want to pass to the java binary
-JAVA_OPTIONS=""
-END
-}
-
-if [[ -f "${gentoocfg}" ]] ; then
-	. "${gentoocfg}"
-	echo "using ${gentoocfg}"
-elif [[ -f "${oldgentoocfg}" ]]; then
-	. "${oldgentoocfg}"
-	echo "using ${oldgentoocfg}"
-else
-	create_initial_config
-fi
-
-if [[ -z "${UI}" && -n "${UI_OPTIONS}" ]]; then
-	echo '${UI_OPTIONS} is no longer supported. ${UI} should be used instead instead' > /dev/stderr
-	echo 'Unsetting ${UI_OPTIONS} and trying to migrate to ${UI}' > /dev/stderr
-	if [[ ${UI_OPTIONS} = *--ui=console* ]]; then
-		UI=console
-	elif [[ ${UI_OPTIONS} = *--ui=swt* ]]; then
-		UI=swt
-	else
-		echo 'Could not make $UI from $UI_OPTIONS' > /dev/stderr
-	fi
-	unset UI_OPTIONS
-fi
-
-if [[ -z "${UI}" ]]; then
-	echo '$UI not set defaulting to swt' > /dev/stderr
-	UI="swt"
-fi
-
-[[ ! -e "${dotazudir}" ]] && create_initial_config
diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-disable-shared-plugins.patch b/net-p2p/vuze/files/vuze-5.3.0.0-disable-shared-plugins.patch
deleted file mode 100644
index b459c8b38308..000000000000
--- a/net-p2p/vuze/files/vuze-5.3.0.0-disable-shared-plugins.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Disallow users to install into the shared plugin directory,
-which they won't have write access to.  This doesn't disable
-shared plugins, just removes the installation UI.
-
-
---- a/org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java
-+++ b/org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java
-@@ -234,13 +234,13 @@ public class IPWListPanel extends AbstractWizardPanel<InstallPluginWizard> {
-   	}
-   
- 	public boolean 
--	isNextEnabled() 
-+	isFinishEnabled()
- 	{
- 		return(((InstallPluginWizard)wizard).getPluginList().size() > 0 );
- 	}
- 	
--  public IWizardPanel<InstallPluginWizard> getNextPanel() {
--    return new IPWInstallModePanel(wizard,this);
-+  public IWizardPanel<InstallPluginWizard> getFinishPanel() {
-+    return new IPWFinishPanel(wizard,this);
-   }
- 	
-   public void updateList() {
-@@ -252,7 +252,7 @@ public class IPWListPanel extends AbstractWizardPanel<InstallPluginWizard> {
-       }
-     }
-     wizard.setPluginList( list );
--    wizard.setNextEnabled( isNextEnabled() );
-+    wizard.setFinishEnabled( isFinishEnabled() );
-     
-   }
- }
diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-disable-updaters.patch b/net-p2p/vuze/files/vuze-5.3.0.0-disable-updaters.patch
deleted file mode 100644
index 1bf78cf1009d..000000000000
--- a/net-p2p/vuze/files/vuze-5.3.0.0-disable-updaters.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java
-+++ b/org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java
-@@ -130,18 +130,6 @@ PluginInitializer
- 					"Magnet URI Handler",
- 					"true",
- 					"false"},
--			{	 PluginManagerDefaults.PID_CORE_UPDATE_CHECKER, 
--   					"org.gudy.azureus2.update.CoreUpdateChecker", 
--   					"azbpcoreupdater", 
--   					"CoreUpdater",
--					"true",
--					"true"},
--			{	 PluginManagerDefaults.PID_CORE_PATCH_CHECKER, 
--   					"org.gudy.azureus2.update.CorePatchChecker", 
--   					"azbpcorepatcher", 
--   					"CorePatcher",
--					"true",
--					"true"},
- 	   		{	 PluginManagerDefaults.PID_PLATFORM_CHECKER, 
-    					"org.gudy.azureus2.platform.PlatformManagerPluginDelegate", 
-    					"azplatform2", 
---- a/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java
-+++ b/org/gudy/azureus2/pluginsimpl/update/PluginUpdatePlugin.java
-@@ -562,6 +562,10 @@ PluginUpdatePlugin
- 					}
- 				}
- 				
-+				if ( pi.getPluginState().isShared()) {
-+					continue;
-+				}
-+
- 				String	mand = pi.getPluginProperties().getProperty( "plugin.mandatory");
- 				
- 				boolean	pi_mandatory = mand != null && mand.trim().toLowerCase().equals("true");
---- a/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java
-+++ b/org/gudy/azureus2/ui/swt/updater2/SWTUpdateChecker.java
-@@ -64,7 +64,7 @@ public class SWTUpdateChecker implements UpdatableComponent
-   public static void
-   initialize()
-   {
--  	PluginInitializer.getDefaultInterface().getUpdateManager().registerUpdatableComponent(new SWTUpdateChecker(),true);
-+//  	PluginInitializer.getDefaultInterface().getUpdateManager().registerUpdatableComponent(new SWTUpdateChecker(),true);
-   }
-   
-   public SWTUpdateChecker() {    
diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-java5.patch b/net-p2p/vuze/files/vuze-5.3.0.0-java5.patch
deleted file mode 100644
index b6d2a59c43a2..000000000000
--- a/net-p2p/vuze/files/vuze-5.3.0.0-java5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -36,7 +36,7 @@ NOTE:  You may need to set the  ANT_OPTS="-Xmx512m"  env prop in order to compil
-          <fileset dir="${root.dir}/${libs.dir}" includes="**/*.jar" />
-       </path>
-    
--   	<javac srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes" source="1.4" target="1.4" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source" >
-+   	<javac encoding="8859_1" srcdir="${root.dir}" destdir="${root.dir}" nowarn="yes" includeAntRuntime="no" debug="true" debuglevel="lines,vars,source" >
-          <classpath refid="libs.classpath" />
-       </javac>
-    </target>
diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch b/net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch
deleted file mode 100644
index 290b902203a8..000000000000
--- a/net-p2p/vuze/files/vuze-5.3.0.0-remove-classpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -46,7 +46,6 @@ NOTE:  You may need to set the  ANT_OPTS="-Xmx512m"  env prop in order to compil
-       <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar" basedir="${root.dir}" excludes="${dist.jar.excludes}" >
-          <manifest>
-             <attribute name="Main-Class" value="org.gudy.azureus2.ui.common.Main" />
--            <attribute name="Class-Path" value="Azureus2.jar apple-extensions.jar commons-cli.jar log4j.jar swt.jar swt-win32.jar swt-osx.jar" />
-          </manifest>
-       </jar>
-       
diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-unbundle-json.patch b/net-p2p/vuze/files/vuze-5.3.0.0-unbundle-json.patch
deleted file mode 100644
index 18d5ac7670ff..000000000000
--- a/net-p2p/vuze/files/vuze-5.3.0.0-unbundle-json.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/com/aelitis/azureus/util/ImportExportUtils.java
-+++ b/com/aelitis/azureus/util/ImportExportUtils.java
-@@ -360,7 +360,7 @@ public final class ImportExportUtils {
- 	
- 		throws IOException
- 	{
--		List	l = new JSONArray(data.length);
-+		List	l = new JSONArray();
- 		
- 		map.put( key, l );
- 		
---- a/com/aelitis/azureus/util/JSONUtils.java
-+++ b/com/aelitis/azureus/util/JSONUtils.java
-@@ -74,7 +74,7 @@ public class JSONUtils
- 	 * @since 3.0.1.5
- 	 */
- 	public static JSONObject encodeToJSONObject(Map map) {
--		JSONObject newMap = new JSONObject((int)(map.size()*1.5));
-+		JSONObject newMap = new JSONObject();
- 
- 		for (Map.Entry<String, Object> entry: ((Map<String,Object>)map).entrySet()){
- 			String key 		= entry.getKey();
-@@ -105,9 +105,7 @@ public class JSONUtils
- 	 */
- 	public static String encodeToJSON(Map map) {
- 		JSONObject jobj = encodeToJSONObject(map);		
--		StringBuilder	sb = new StringBuilder(8192);
--		jobj.toString( sb );
--		return( sb.toString());
-+		return( jobj.toString());
- 	}
- 
- 	public static String encodeToJSON(Collection list) {
-@@ -138,7 +136,7 @@ public class JSONUtils
- 	 * @since 3.0.1.5
- 	 */
- 	private static JSONArray encodeToJSONArray(Collection list) {
--		JSONArray newList = new JSONArray(list.size());
-+		JSONArray newList = new JSONArray();
- 
- 		for ( Object value: list ){
- 
diff --git a/net-p2p/vuze/files/vuze-5.7.2.0-disable-osx.patch b/net-p2p/vuze/files/vuze-5.7.2.0-disable-osx.patch
deleted file mode 100644
index 6ae2301e75e3..000000000000
--- a/net-p2p/vuze/files/vuze-5.7.2.0-disable-osx.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java b/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
-index 256daff..68010b9 100644
---- a/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
-+++ b/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
-@@ -231,66 +231,6 @@ public class SWTThread {
- 			}
- 		});
- 
--		if (Constants.isOSX) {
--			
--			// On Cocoa, we get a Close trigger on display.  Need to check if all
--			// platforms send this.
--			display.addListener(SWT.Close, new Listener() {
--				public void handleEvent(Event event) {
--					UIFunctions uiFunctions = UIFunctionsManager.getUIFunctions();
--					if (uiFunctions != null) {
--						event.doit = uiFunctions.dispose(false, false);
--					}
--				}
--			});
--
--			String platform = SWT.getPlatform();
--			// use reflection here so we decouple generic SWT from OSX specific stuff to an extent
--
--			if (platform.equals("carbon")) {
--				try {
--
--					Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CarbonUIEnhancer");
--
--					Constructor<?> constructor = ehancerClass.getConstructor(new Class[] {});
--
--					constructor.newInstance(new Object[] {});
--
--				} catch (Throwable e) {
--
--					Debug.printStackTrace(e);
--				}
--			} else if (platform.equals("cocoa")) {
--				try {
--
--					Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CocoaUIEnhancer");
--
--					Method mGetInstance = ehancerClass.getMethod("getInstance", new Class[0]);
--					Object claObj = mGetInstance.invoke(null, new Object[0] );
--
--					Method mHookAppMenu = claObj.getClass().getMethod("hookApplicationMenu", new Class[] {});
--					if (mHookAppMenu != null) {
--						mHookAppMenu.invoke(claObj, new Object[0]);
--					}
--
--					Method mHookDocOpen = claObj.getClass().getMethod("hookDocumentOpen", new Class[] {});
--					if (mHookDocOpen != null) {
--						mHookDocOpen.invoke(claObj, new Object[0]);
--					}
--					
--					Method mIsRetinaDisplay = claObj.getClass().getMethod("isRetinaDisplay");
--					if (mIsRetinaDisplay != null) {
--						isRetinaDisplay = (Boolean) mIsRetinaDisplay.invoke(claObj);
--					}
--
--					
--				} catch (Throwable e) {
--
--					Debug.printStackTrace(e);
--				}
--			}
--		}   
--
- 		if (app != null) {
- 			app.runInSWTThread();
- 			runner = new Thread(new AERunnable() {
diff --git a/net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch b/net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch
deleted file mode 100644
index a03995d167a6..000000000000
--- a/net-p2p/vuze/files/vuze-5.7.6.0-commons-lang.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-diff --git a/com/aelitis/azureus/core/metasearch/Result.java b/com/aelitis/azureus/core/metasearch/Result.java
-index bec05e1..9588f9a 100644
---- a/com/aelitis/azureus/core/metasearch/Result.java
-+++ b/com/aelitis/azureus/core/metasearch/Result.java
-@@ -28,7 +28,7 @@ import java.util.Locale;
- import java.util.Map;
- import java.util.Random;
- 
--import org.apache.commons.lang.Entities;
-+import org.apache.commons.text.StringEscapeUtils;
- import org.gudy.azureus2.core3.util.AENetworkClassifier;
- import org.gudy.azureus2.core3.util.DisplayFormatters;
- import org.gudy.azureus2.core3.util.HostNameToIPResolver;
-@@ -464,6 +464,6 @@ public abstract class Result {
- 		if ( input == null ){
- 			return( null );
- 		}
--		return( Entities.HTML40.unescape( input ));
-+		return( StringEscapeUtils.unescapeHtml4( input ));
- 	}
- }
-diff --git a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
-index 2d353b8..e03916b 100644
---- a/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
-+++ b/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
-@@ -22,7 +22,7 @@ package com.aelitis.azureus.core.metasearch.impl.web;
- import java.util.Date;
- import java.util.StringTokenizer;
- 
--import org.apache.commons.lang.*;
-+import org.apache.commons.text.StringEscapeUtils;
- import org.gudy.azureus2.core3.util.Base32;
- import org.gudy.azureus2.core3.util.ByteFormatter;
- import org.gudy.azureus2.core3.util.Debug;
-@@ -87,14 +87,14 @@ public class WebResult extends Result {
- 	public void setNameFromHTML(String name) {
- 		if(name != null) {
- 			name = removeHTMLTags(name);
--			this.name = Entities.HTML40.unescape(name);
-+			this.name = StringEscapeUtils.unescapeHtml4(name);
- 		}
- 	}
- 	
- 	public void setCommentsFromHTML(String comments) {
- 		if(comments != null) {
- 			comments = removeHTMLTags(comments);
--			comments = Entities.HTML40.unescape(comments);
-+			comments = StringEscapeUtils.unescapeHtml4(comments);
- 			comments = comments.replaceAll(",", "");
- 			comments = comments.replaceAll(" ", "");
- 			try{
-@@ -107,7 +107,7 @@ public class WebResult extends Result {
- 	public void setCategoryFromHTML(String category) {
- 		if(category != null) {
- 			category = removeHTMLTags(category);
--			this.category = Entities.HTML40.unescape(category).trim();
-+			this.category = StringEscapeUtils.unescapeHtml4(category).trim();
- 			/*int separator = this.category.indexOf(">");
- 			
- 			if(separator != -1) {
-@@ -136,7 +136,7 @@ public class WebResult extends Result {
- 	public void setNbPeersFromHTML(String nbPeers) {
- 		if(nbPeers != null) {
- 			nbPeers = removeHTMLTags(nbPeers);
--			String nbPeersS = Entities.HTML40.unescape(nbPeers);
-+			String nbPeersS = StringEscapeUtils.unescapeHtml4(nbPeers);
- 			nbPeersS = nbPeersS.replaceAll(",", "");
- 			nbPeersS = nbPeersS.replaceAll(" ", "");
- 			try {
-@@ -151,7 +151,7 @@ public class WebResult extends Result {
- 	public void setNbSeedsFromHTML(String nbSeeds) {
- 		if(nbSeeds != null) {
- 			nbSeeds = removeHTMLTags(nbSeeds);
--			String nbSeedsS = Entities.HTML40.unescape(nbSeeds);
-+			String nbSeedsS = StringEscapeUtils.unescapeHtml4(nbSeeds);
- 			nbSeedsS = nbSeedsS.replaceAll(",", "");
- 			nbSeedsS = nbSeedsS.replaceAll(" ", "");
- 			try {
-@@ -166,7 +166,7 @@ public class WebResult extends Result {
- 	public void setNbSuperSeedsFromHTML(String nbSuperSeeds) {
- 		if(nbSuperSeeds != null) {
- 			nbSuperSeeds = removeHTMLTags(nbSuperSeeds);
--			String nbSuperSeedsS = Entities.HTML40.unescape(nbSuperSeeds);
-+			String nbSuperSeedsS = StringEscapeUtils.unescapeHtml4(nbSuperSeeds);
- 			nbSuperSeedsS = nbSuperSeedsS.replaceAll(",", "");
- 			nbSuperSeedsS = nbSuperSeedsS.replaceAll(" ", "");
- 			try {
-@@ -248,7 +248,7 @@ public class WebResult extends Result {
- 	public void setPublishedDateFromHTML(String publishedDate) {
- 		if(publishedDate != null && publishedDate.length() > 0) {
- 			publishedDate = removeHTMLTags(publishedDate);
--			String publishedDateS = Entities.HTML40.unescape(publishedDate).replace((char)160,(char)32);
-+			String publishedDateS = StringEscapeUtils.unescapeHtml4(publishedDate).replace((char)160,(char)32);
- 			this.publishedDate = dateParser.parseDate(publishedDateS);
- 		}
- 	}
-@@ -257,7 +257,7 @@ public class WebResult extends Result {
- 	public void setSizeFromHTML(String size) {
- 		if(size != null) {
- 			size = removeHTMLTags(size);
--			String sizeS = Entities.HTML40.unescape(size).replace((char)160,(char)32);
-+			String sizeS = StringEscapeUtils.unescapeHtml4(size).replace((char)160,(char)32);
- 			sizeS = sizeS.replaceAll("<[^>]+>", " ");
- 			//Add a space between the digits and unit if there is none
- 			sizeS = sizeS.replaceFirst("(\\d)([a-zA-Z])", "$1 $2");
-@@ -303,7 +303,7 @@ public class WebResult extends Result {
- 	public void setVotesFromHTML(String votes_str) {
- 		if(votes_str != null) {
- 			votes_str = removeHTMLTags(votes_str);
--			votes_str = Entities.HTML40.unescape(votes_str);
-+			votes_str = StringEscapeUtils.unescapeHtml4(votes_str);
- 			votes_str = votes_str.replaceAll(",", "");
- 			votes_str = votes_str.replaceAll(" ", "");
- 			try {
-@@ -317,7 +317,7 @@ public class WebResult extends Result {
- 	public void setVotesDownFromHTML(String votes_str) {
- 		if(votes_str != null) {
- 			votes_str = removeHTMLTags(votes_str);
--			votes_str = Entities.HTML40.unescape(votes_str);
-+			votes_str = StringEscapeUtils.unescapeHtml4(votes_str);
- 			votes_str = votes_str.replaceAll(",", "");
- 			votes_str = votes_str.replaceAll(" ", "");
- 			try {
-diff --git a/org/gudy/azureus2/core3/util/AddressUtils.java b/org/gudy/azureus2/core3/util/AddressUtils.java
-index 2558313..8cafd8a 100644
---- a/org/gudy/azureus2/core3/util/AddressUtils.java
-+++ b/org/gudy/azureus2/core3/util/AddressUtils.java
-@@ -592,11 +592,11 @@ AddressUtils
- 			try{
- 					// unfortunately we have an incompatible base64 standard in i2p, they replaced / with ~ and + with -
- 				
--				char[]	encoded = to_decode.toCharArray();
-+				byte[]	encoded = to_decode.getBytes();
- 				
- 				for ( int i=0;i<encoded.length;i++){
- 					
--					char c = encoded[i];
-+					byte c = encoded[i];
- 					
- 					if ( c == '~' ){
- 						encoded[i] = '/';
-diff --git a/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java b/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
-index 1035997..5270c35 100644
---- a/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
-+++ b/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
-@@ -25,7 +25,7 @@ package org.gudy.azureus2.pluginsimpl.local.utils.xml.simpleparser;
- import javax.xml.parsers.*;
- 
- import org.xml.sax.*;
--import org.apache.commons.lang.Entities;
-+import org.apache.commons.text.StringEscapeUtils;
- import org.gudy.azureus2.core3.util.AENetworkClassifier;
- import org.gudy.azureus2.core3.util.Constants;
- import org.gudy.azureus2.core3.util.Debug;
-@@ -679,17 +679,8 @@ SimpleXMLParserDocumentImpl
- 		     					replacement = new String( buffer, 0, buffer_pos );
- 		     					
- 		     				}else{
--		     							     							     					
--			     				int num = Entities.HTML40.entityValue( ref );
--			     					
--		     					if ( num != -1 ){
--		     					
--		     						replacement = "&#" + num + ";";
--		     						
--		     					}else{
--		     						
--		     						replacement = new String( buffer, 0, buffer_pos );
--		     					}
-+
-+								replacement = StringEscapeUtils.escapeHtml4(ref);
- 		     				}
- 		     				
- 		     				char[] chars = replacement.toCharArray();
diff --git a/net-p2p/vuze/files/vuze-5.7.6.0-log4j-12-api.patch b/net-p2p/vuze/files/vuze-5.7.6.0-log4j-12-api.patch
deleted file mode 100644
index 4bcce5d5f32d..000000000000
--- a/net-p2p/vuze/files/vuze-5.7.6.0-log4j-12-api.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From d960f15294c451bda338e4d9998e8d009970f380 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Fri, 18 Feb 2022 12:47:20 -0800
-Subject: [PATCH] Migrate from Log4j 1.2 to log4j-1.2-api bridge from Log4j 2
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- org/gudy/azureus2/ui/common/Main.java         |  7 +++---
- .../azureus2/ui/console/ConsoleInput.java     |  8 +++---
- .../azureus2/ui/console/commands/Log.java     | 25 ++++++++++---------
- 3 files changed, 21 insertions(+), 19 deletions(-)
-
-diff --git a/org/gudy/azureus2/ui/common/Main.java b/org/gudy/azureus2/ui/common/Main.java
-index 8c533fb..f93e685 100644
---- a/org/gudy/azureus2/ui/common/Main.java
-+++ b/org/gudy/azureus2/ui/common/Main.java
-@@ -43,7 +43,8 @@ import org.apache.log4j.Appender;
- import org.apache.log4j.ConsoleAppender;
- import org.apache.log4j.Logger;
- import org.apache.log4j.PatternLayout;
--import org.apache.log4j.varia.DenyAllFilter;
-+import org.apache.log4j.bridge.FilterWrapper;
-+import org.apache.logging.log4j.core.filter.DenyAllFilter;
- 
- import com.aelitis.azureus.core.*;
- import com.aelitis.azureus.core.impl.AzureusCoreSingleInstanceClient;
-@@ -113,9 +114,9 @@ public class Main {
-   public static void initRootLogger() {
-     if (Logger.getRootLogger().getAppender("ConsoleAppender")==null) {
-       Appender app;
--      app = new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN));
-+      app = new ConsoleAppender();
-       app.setName("ConsoleAppender");
--      app.addFilter( new DenyAllFilter() );  //'log off' by default
-+      app.addFilter( new FilterWrapper(DenyAllFilter.newBuilder().build()) );  //'log off' by default
-       Logger.getRootLogger().addAppender(app);
-     }
-   }
-diff --git a/org/gudy/azureus2/ui/console/ConsoleInput.java b/org/gudy/azureus2/ui/console/ConsoleInput.java
-index d660bbb..0559f72 100644
---- a/org/gudy/azureus2/ui/console/ConsoleInput.java
-+++ b/org/gudy/azureus2/ui/console/ConsoleInput.java
-@@ -34,8 +34,8 @@ import java.util.Vector;
- import org.apache.log4j.Appender;
- import org.apache.log4j.ConsoleAppender;
- import org.apache.log4j.Logger;
--import org.apache.log4j.PatternLayout;
--import org.apache.log4j.varia.DenyAllFilter;
-+import org.apache.log4j.bridge.FilterWrapper;
-+import org.apache.logging.log4j.core.filter.DenyAllFilter;
- import org.gudy.azureus2.core3.config.COConfigurationManager;
- import org.gudy.azureus2.core3.download.DownloadManager;
- import org.gudy.azureus2.core3.download.DownloadManagerState;
-@@ -157,9 +157,9 @@ public class ConsoleInput extends Thread {
- 				
- 		if (Logger.getRootLogger().getAppender("ConsoleAppender")==null) {
- 	      Appender app;
--	      app = new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN));
-+	      app = new ConsoleAppender();
- 	      app.setName("ConsoleAppender");
--	      app.addFilter( new DenyAllFilter() );  //'log off' by default
-+	      app.addFilter( new FilterWrapper(DenyAllFilter.newBuilder().build()) );  //'log off' by default
- 	      Logger.getRootLogger().addAppender(app);
- 	    }
- 		
-diff --git a/org/gudy/azureus2/ui/console/commands/Log.java b/org/gudy/azureus2/ui/console/commands/Log.java
-index 43f66d5..8e9b222 100644
---- a/org/gudy/azureus2/ui/console/commands/Log.java
-+++ b/org/gudy/azureus2/ui/console/commands/Log.java
-@@ -18,10 +18,13 @@ import org.apache.commons.cli.Option;
- import org.apache.commons.cli.Options;
- import org.apache.log4j.Appender;
- import org.apache.log4j.ConsoleAppender;
--import org.apache.log4j.FileAppender;
- import org.apache.log4j.Logger;
- import org.apache.log4j.PatternLayout;
--import org.apache.log4j.varia.DenyAllFilter;
-+import org.apache.log4j.bridge.AppenderWrapper;
-+import org.apache.log4j.bridge.FilterWrapper;
-+import org.apache.log4j.bridge.LayoutAdapter;
-+import org.apache.logging.log4j.core.appender.FileAppender;
-+import org.apache.logging.log4j.core.filter.DenyAllFilter;
- import org.gudy.azureus2.plugins.PluginInterface;
- import org.gudy.azureus2.plugins.logging.LoggerChannel;
- import org.gudy.azureus2.plugins.logging.LoggerChannelListener;
-@@ -54,7 +57,7 @@ public class Log extends OptionsConsoleCommand {
- 			String subcommand = (String) args.get(0);
- 			if ("off".equalsIgnoreCase(subcommand) ) {
- 				if ( args.size() == 1 ){
--					con.addFilter(new DenyAllFilter());
-+					con.addFilter(new FilterWrapper(DenyAllFilter.newBuilder().build()));
- 					ci.out.println("> Console logging off");
- 				}else{
- 					
-@@ -81,25 +84,23 @@ public class Log extends OptionsConsoleCommand {
- 					{
- 						// send log output to a file
- 						String filename = commandLine.getOptionValue('f');
--						
--						try
--						{
--							Appender newAppender = new FileAppender(new PatternLayout("%d{ISO8601} %c{1}-%p: %m%n"), filename, true);
-+
-+							Appender newAppender = new AppenderWrapper(FileAppender.newBuilder()
-+									.setLayout(new LayoutAdapter(new PatternLayout("%d{ISO8601} %c{1}-%p: %m%n")))
-+									.withFileName(filename)
-+									.withAppend(true)
-+									.build());
- 							newAppender.setName("ConsoleAppender");
- 							Logger.getRootLogger().removeAppender(con);
- 							Logger.getRootLogger().addAppender(newAppender);
- 							ci.out.println("> Logging to filename: " + filename);
--						} catch (IOException e)
--						{
--							ci.out.println("> Unable to log to file: " + filename + ": " + e);
--						}					
- 					}
- 					else
- 					{
- 						if( ! (con instanceof ConsoleAppender) )
- 						{
- 							Logger.getRootLogger().removeAppender(con);
--							con = new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN));
-+							con = new ConsoleAppender();
- 							con.setName("ConsoleAppender");
- 						    Logger.getRootLogger().addAppender(con);
- 						}
--- 
-2.34.1
-
diff --git a/net-p2p/vuze/files/vuze.desktop b/net-p2p/vuze/files/vuze.desktop
deleted file mode 100644
index cee9fcae3824..000000000000
--- a/net-p2p/vuze/files/vuze.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Vuze
-Comment=Vuze BitTorrent Client
-Exec=vuze
-Icon=vuze
-Terminal=false
-Categories=Network;
-Type=Application
-MimeType=application/x-bittorrent;
diff --git a/net-p2p/vuze/metadata.xml b/net-p2p/vuze/metadata.xml
deleted file mode 100644
index 71a06860d27c..000000000000
--- a/net-p2p/vuze/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">azureus</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild b/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild
deleted file mode 100644
index 476d04539447..000000000000
--- a/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit desktop edos2unix java-pkg-2 java-ant-2 xdg-utils
-
-MY_PV=$(ver_rs 1- "")
-MY_SRC="Vuze_${MY_PV}"
-
-DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
-HOMEPAGE="https://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# bundles parts of http://www.programmers-friend.org/
-# bundles bcprov - 1.37 required but not in the tree
-CP_DEPEND="
-	dev-java/log4j-12-api:2
-	dev-java/log4j-core:2
-	dev-java/swt:3.8[cairo]
-	dev-java/commons-cli:1
-	dev-java/commons-text:0
-	dev-java/json-simple:0"
-
-RDEPEND="
-	${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-# does not compile with java 11, uses classes deprecated even in java 8
-DEPEND="
-	${CP_DEPEND}
-	virtual/jdk:1.8"
-
-BDEPEND="app-arch/unzip"
-
-IDEPEND="dev-util/desktop-file-utils"
-
-PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.0.0-java5.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch
-	"${FILESDIR}"/${PN}-5.7.2.0-disable-osx.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch
-	"${FILESDIR}"/${PN}-5.7.6.0-commons-lang.patch
-	"${FILESDIR}"/${PN}-5.7.6.0-log4j-12-api.patch
-)
-
-src_unpack() {
-	mkdir -p "${S}" || die
-	cd "${S}" || die
-	unpack ${A}
-
-	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
-	if [[ -f build.xml ]]; then
-		die "upstream has build.xml again, don't overwrite"
-	fi
-	cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml"
-}
-
-src_prepare() {
-	# upstream likes randomly changing a subset of files to CRLF every release
-	edos2unix $(find "${S}" -type f -name "*.java")
-
-	default
-
-	# OSX / Windows
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java || die
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java || die
-	rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
-
-	# Tree2 file does not compile on linux
-	rm -rf "${S}"/org/eclipse || die
-	# Bundled apache
-	rm -rf "${S}"/org/apache || die
-	# Bundled json
-	rm -rf "${S}"/org/json || die
-	# Bundled bcprov
-	# currently disabled - requires bcprov 1.37
-	#rm -rf "${S}"/org/bouncycastle || die
-
-	rm -rf "${S}"/org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
-	mkdir -p "${S}"/build/libs || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_compile() {
-	local mem
-	use amd64 && mem="512"
-	use x86   && mem="448"
-	use ppc   && mem="384"
-	use ppc64 && mem="448"
-	use sparc && mem="512"
-	export ANT_OPTS="-Xmx${mem}m"
-	java-pkg-2_src_compile
-
-	# bug #302058 - build.xml excludes .txt but upstream jar has it...
-	jar uf dist/Azureus2.jar ChangeLog.txt || die
-}
-
-src_install() {
-	java-pkg_dojar dist/Azureus2.jar
-	dodoc ChangeLog.txt
-
-	java-pkg_dolauncher "${PN}" \
-		--main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
-		--java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
-		--pkg_args '--ui=${UI}'
-	dosym vuze /usr/bin/azureus
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=204132
-	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
-
-	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
-	domenu "${FILESDIR}"/${PN}.desktop
-
-	use source && java-pkg_dosrc "${S}"/{com,edu,org}
-}
-
-pkg_postinst() {
-	ewarn "Running Vuze as root is not supported and may result in untracked"
-	ewarn "updates to shared components and then collisions on updates"
-	echo
-	elog "Vuze was formerly called Azureus and many references to the old name remain."
-	elog
-	elog "After running Vuze for the first time, configuration options will be"
-	elog "placed in '~/.azureus/gentoo.config'."
-	elog
-	elog "If you need to change some startup options, you should modify this file"
-	elog "rather than the startup script.  You can enable the console UI by"
-	elog "editing this config file."
-	echo
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index fae6ef96695e..3ed80dceb225 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index e5b236b27025..dd65251be0d0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,17 @@
 
 #--- END OF EXAMPLES ---
 
+# David Seifert <soap@gentoo.org> (2023-03-18)
+# Unmaintained in Gentoo, last upstream commit 7 years ago, breaks with
+# modern C under Clang, no revdeps. Bug #741078, #874648, #883303.
+# Removal on 2023-04-17.
+net-wireless/spectools
+
+# Hans de Graaff <graaff@gentoo.org> (2023-03-18)
+# Ancient out-of-date package. No proper upstream release since 2011.
+# No reverse dependencies. Masked for removal on 2023-04-18.
+dev-ruby/six
+
 # Sam James <sam@gentoo.org> (2023-03-16)
 # Breaks building C++ consumers. See bug #901211 and bug #901035.
 # Please upgrade to glib-2.76.0-r1.
@@ -258,18 +269,6 @@ app-eselect/eselect-opencascade
 # Removal on 2023-03-21.  Bug #895342.
 dev-python/flask-script
 
-# Sam James <sam@gentoo.org> (2023-02-18)
-# Last release in 2018, needs porting to Python 3.11, and no reverse
-# dependencies. Removal on 2023-03-18. bug #895174.
-dev-python/setuptools_trial
-
-# Sam James <sam@gentoo.org> (2023-02-18)
-# Backport to Python 3.5(!) hence irrelevant for newer versions of Python
-# where os.scandir() and os.walk() improvements were integrated in the stdlib.
-# Incompatible with Python 3.11. No reverse dependencies.
-# Removal on 2023-03-18. bug #895198
-dev-python/scandir
-
 # Michał Górny <mgorny@gentoo.org> (2023-02-17)
 # Merged into dev-python/pytest-cov in 2020.  No revdeps left.
 # Removal on 2023-03-19.  Bug #895120.
@@ -281,101 +280,12 @@ dev-python/cov-core
 # Removal on 2023-03-19.  Bug #865931.
 dev-python/pytest-flake8
 
-# Michał Górny <mgorny@gentoo.org> (2023-02-15)
-# A number of test failures, and the test phase does not fail correctly.
-# Last release in 2019.  No revdeps.
-# Removal on 2023-03-17.  Bug #894606.
-dev-python/urlgrabber
-
-# Michał Górny <mgorny@gentoo.org> (2023-02-15)
-# Unmaintained.  Broken with current version of dev-python/pyglet.
-# No upstream activity since Sep 2021.  No revdeps.
-# Removal on 2023-03-17.  Bug #887973.
-dev-python/glooey
-
-# Alfredo Tupone <tupone@gentoo.org> (2023-02-14)
-# Masked for removal in 30 days.
-# Not maintained (2020), no rev dep
-dev-ml/ppxfind
-
-# Michał Górny <mgorny@gentoo.org> (2023-02-14)
-# Unmaintained and archived.  Invalid version number causes total mayhem
-# when installed alongside new dev-python/packaging.
-# Removal on 2023-03-16.  Bug #894222.
-net-p2p/bittornado
-
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2023-02-10)
-# Unused Java libraries. Removal on 2023-03-12.
-dev-java/jcip-annotations
-dev-java/jformatstring
-dev-java/jta
-dev-java/pdf-renderer
-
-# Florian Schmaus <flow@gentoo.org> (2023-02-10)
-# Previous dependencies of ejabberd, now no longer needed.
-# Removal on 2023-03-10.
-dev-erlang/iconv
-dev-erlang/p1_xmlrpc
-dev-erlang/riak_pb
-
 # Florian Schmaus <flow@gentoo.org> (2023-02-09)
 # Leftovers from net-im/jabber-base. Unused and obsolete.
 # Removal on 2023-03-09.
 acct-user/jabber
 acct-group/jabber
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2023-02-07)
-# Unused Java libraries. Removal on 2023-03-08.
-# jspeex had last upstream activities in 2005.
-dev-java/jspeex
-dev-java/osgi-annotation-versioning
-dev-java/commons-text
-
-# Michał Górny <mgorny@gentoo.org> (2023-02-03)
-# The package has been archived upstream.  It is broken with all Python
-# versions supported by Gentoo, and it is broken with django-2.
-# The other listed packages are its reverse dependencies.
-# Removal on 2023-03-05.  Bug #718972.
-app-misc/gcalcli
-app-misc/goobook
-dev-python/gcs-oauth2-boto-plugin
-dev-python/google-apitools
-dev-python/google-reauth-python
-dev-python/oauth2client
-net-misc/gsutil
-
-# Michał Górny <mgorny@gentoo.org> (2023-02-02)
-# dev-python/citeproc-py requires dev-python/nose and is not maintained
-# upstream.  Its only revdep, dev-python/duecredit has no reverse
-# dependencies left.
-# Removal on 2023-03-04.  Bug #888239.
-dev-python/citeproc-py
-dev-python/duecredit
-
-# Michał Górny <mgorny@gentoo.org> (2023-02-01)
-# dev-python/blockdiag still requires dev-python/nose.  There was a PR
-# made to switch to pytest in Feb 2020 but it's not progressing at all.
-# It was needed only for dev-python/aiohttp[doc].
-# Removal on 2023-03-03.  Bug #888233.
-dev-python/blockdiag
-dev-python/sphinxcontrib-blockdiag
-
-# Michał Górny <mgorny@gentoo.org> (2023-02-01)
-# Requires legacy setuptools backend.  Hacky build system.  The only
-# revdep is dev-python/rdflib where it is entirely optional.
-# Removal on 2023-03-03.  Bug #892854.
-dev-python/berkeleydb
-
-# Michał Górny <mgorny@gentoo.org> (2023-01-31)
-# No tests, no activity since Aug 2020, no reverse dependencies.
-# Removal on 2023-03-02.  Bug #892744.
-dev-python/alagitpull
-
-# Michał Górny <mgorny@gentoo.org> (2023-01-31)
-# The test suite is broken (async tests don't run).  No revdeps.
-# Removal on 2023-03-02.  Bug #892742.
-dev-python/aiohttp-jinja2
-
 # Ben Kohler <bkohler@gentoo.org> (2023-01-30)
 # Breaks too many revdeps for now
 =app-text/discount-3*
@@ -384,55 +294,11 @@ dev-python/aiohttp-jinja2
 # Commands trigger an assertion and crashes, bug #892487
 =sys-fs/lvm2-2.03.18
 
-# Mike Gilbert <floppym@gentoo.org> (2023-01-28)
-# No upstream releases since 2008.
-# No Gentoo maintainer since 2009.
-# Installs files in the wrong places (bug #455542)
-# and with the wrong mode (bug #892325).
-# Removal on 2023-02-27.
-app-admin/bastille
-
-# Florian Schmaus <flow@gentoo.org> (2023-01-27)
-# Previous dependencies of dev-lang/clojure, now part of the clojure
-# ebuild and no longer needed.
-# Removal on 2023-02-27.
-dev-java/core-specs-alpha
-dev-java/spec-alpha
-
-# Michał Górny <mgorny@gentoo.org> (2023-01-26)
-# Unmaintained.  Last release in 2003.  The package fails to install
-# since Aug 2021 and while a fix would be trivial, there does not seem
-# to have been any interest in it during that period.
-# Removal on 2023-02-25.  Bug #806384.
-www-misc/wsmake
-
-# Michał Górny <mgorny@gentoo.org> (2023-01-25)
-# Unmaintained.  Multiple build failure bugs reported.  This version
-# predates 2008.
-# Removal on 2023-02-24.  Bug #837611.
-sys-cluster/wulfware
-
 # Sam James <sam@gentoo.org> (2023-01-23)
 # Please upgrade to >=app-eselect/eselect-wxwidgets-20230114-r1 as -r0 may
 # lead to build failures.
 =app-eselect/eselect-wxwidgets-20230114
 
-# Michał Górny <mgorny@gentoo.org> (2023-01-21)
-# Packages that are incompatible with ffmpeg-5.
-#
-# media-libs/libextractor: no Gentoo maintainer, ver from 2019, bug #834382
-# media-libs/qtav: no Gentoo maintainer, no porting progress, bug #834386
-# media-plugins/vdr-vaapidevice: no activity since 2019, bug #834390
-# media-sound/potamus: last rel. 2018, one commit in 2020, bug #834396
-# media-video/ffmpeg2theora: no activity since 2016, bug #834403
-#
-# Removal on 2023-02-20.
-media-libs/libextractor
-media-libs/qtav
-media-plugins/vdr-vaapidevice
-media-sound/potamus
-media-video/ffmpeg2theora
-
 # David Seifert <soap@gentoo.org> (2023-01-14)
 # Py3.8 only backports
 dev-python/backports-tempfile
@@ -444,13 +310,6 @@ dev-python/pkgutil_resolve_name
 # Breaks reverse dependencies: bug #889694, bug #888579.
 =sys-fs/btrfs-progs-6.1.1
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-12-29)
-# Upstream is dead, last activity in Nov 2017. Does not
-# work with newer log4j, bug #857663. Use net-p2p/biglybt
-# instead. Removal on 2023-02-28.
-net-p2p/vuze
-net-p2p/vuze-coreplugins
-
 # Sam James <sam@gentoo.org> (2022-12-27)
 # Regression in listing subvolumes (no UUIDs), bug #888549
 # https://github.com/kdave/btrfs-progs/issues/562
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 42b2a16f83e5..ef2b0ff19c20 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1837,7 +1837,6 @@ dev-libs/appstream:apt - Enables Debians APT support
 dev-libs/appstream-glib:fonts - Enable fonts support for appstream-builder.
 dev-libs/appstream-glib:stemmer - Add word stemming via dev-libs/snowball-stemmer.
 dev-libs/apr:old-kernel - Enable compatibility with older kernels
-dev-libs/apr:older-kernels-compatibility - Enable binary compatibility with older kernels
 dev-libs/apr:urandom - Use /dev/urandom instead of /dev/random
 dev-libs/apr-util:nss - Install apr_crypto_nss module
 dev-libs/apr-util:openssl - Install apr_crypto_openssl module
@@ -4193,9 +4192,6 @@ media-libs/libde265:enc265 - Enable build of enc265 tool
 media-libs/libde265:sdl - Enable video output of dec265 example program with media-libs/libsdl
 media-libs/libde265:tools - Enable installation of varous binary tools
 media-libs/libepoxy:egl - Enable EGL support.
-media-libs/libextractor:archive - Enable archive support using app-arch/libarchive
-media-libs/libextractor:gsf - Enable OLE2 (MS Office) plug-in support using gnome-extra/libgsf
-media-libs/libextractor:midi - Enable MIDI support through media-libs/libsmf
 media-libs/libffado:test-programs - Install standalone test programs
 media-libs/libggi:3dfx - Enables support for Voodoo chipsets, also called 3DFX and TDFX
 media-libs/libggi:vis - Enables sparc vis support for libggi
@@ -4337,7 +4333,6 @@ media-libs/phonon:designer - Install plugin for dev-qt/designer
 media-libs/phonon:vlc - Install VLC Phonon backend
 media-libs/phonon-gstreamer:network - Enable network streaming support via libsoup
 media-libs/portmidi:test-programs - Install various example programs
-media-libs/qtav:gui - Build a video player gui
 media-libs/quarter:designer - Install plugin for dev-qt/designer
 media-libs/quarter:qthelp - Build API documentation in QtHelp format
 media-libs/raptor:json - Enable support for JSON parsing
@@ -4974,7 +4969,6 @@ media-video/ffmpeg-chromium:cpudetection - Enables runtime CPU detection (useful
 media-video/ffmpeg-chromium:gpl - Build GPL code. Should be enabled unless you require LGPL binaries.
 media-video/ffmpeg-chromium:mmal - Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.
 media-video/ffmpeg-chromium:vulkan - Enables support for the vulkan API for GPU offload.
-media-video/ffmpeg2theora:kate - Adds support for Ogg Kate subtitles via libkate.
 media-video/guvcview:qt5 - Build with Qt5 interface instead Gtk+
 media-video/handbrake:fdk - Support for encoding AAC using media-libs/fdk-aac.
 media-video/handbrake:gstreamer - Support for the streaming media framework from media-libs/gstreamer.
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index c1e15e8c7b74..1d269d7c1f9f 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/wulfware/Manifest b/sys-cluster/wulfware/Manifest
deleted file mode 100644
index f9ae1c9762aa..000000000000
--- a/sys-cluster/wulfware/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX wulfware-2.6.0-opts_and_strip.patch 4138 BLAKE2B 78cb92a3aabb51832ed5138c3c380308259ae7c331f561bd3b79e89420ef5c3042dc9d9b0e1767843f6ba18bfbb652c33d2e319146a2d904f91b809489e8da3e SHA512 0252985b4cf6b70f8659b7ece3dfad705140916539ebd75f0c27c25ea04c9a8543ffcfd71225443aff0b4d37c1061fd50dc77d1061f98fa124ac30e627073e3b
-AUX wulfware-2.6.0-tinfo.patch 762 BLAKE2B 1ef928141e186ec8dceeea98c14123a0bbd71fa9707500a5ee9fbd7075877c0d993b86df5212780f7fcf072976dcfc4bb2ca267003ed67ffdcfc883eee0846bb SHA512 e0b0ae730078f083b5546d98a6f6b60d7df6083ad20fd31b0d7a277e3baab8f384bd0c1bb45315231743e2cf24764e8f1cf55edcbb6d30d515148884efb7ebc5
-DIST wulfware-2.6.0.tgz 469000 BLAKE2B 23730adeeafcef0761455fd62e744fec0fad1d8f1b13eabe256b27fa16a7bb468ff33b08ebff29e9c2c69c044e15fbf3b4d0ea2c39081ed7015089989bffa7b9 SHA512 626314124c836ee937f860a4093272d5b6e12b5d3aca631647bde6ef03880e2dd7916ab2805f34c4863e915ea3295e5c5d69ced9c5ec05b224cdf849738c78cd
-EBUILD wulfware-2.6.0.ebuild 1414 BLAKE2B 671c71d5f363a31318c668724c0b52c300128881b78d6f9abc223266d1622714d4cf9f6e615ebace3f1a1b3617c725433cb188b05c2bbbec78276df059b5aa1a SHA512 9a7c1ebf0210b7e82b7d51127fb1f2678aa46205996189031bf0f80fd8f60b25ae031abbdc7d29e3cb93301a30f3ed62e2250ce95e74632e36bcb69d3b6a3c2d
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-cluster/wulfware/files/wulfware-2.6.0-opts_and_strip.patch b/sys-cluster/wulfware/files/wulfware-2.6.0-opts_and_strip.patch
deleted file mode 100644
index 2db707d6a304..000000000000
--- a/sys-cluster/wulfware/files/wulfware-2.6.0-opts_and_strip.patch
+++ /dev/null
@@ -1,137 +0,0 @@
---- a/libwulf/Makefile.am
-+++ b/libwulf/Makefile.am
-@@ -48,14 +48,14 @@
- # Define parameters and directives needed in compile/link steps.
- #========================================================================
- # C Compiler
--CC = gcc
-+CC ?= gcc
- 
- # Compile flags.  -fpic creates "position independent code" for
- # shared libraries!
--CFLAGS = -O3 -I/usr/include/libxml2 -I ../include $(DEFINES) 
-+CFLAGS += -I/usr/include/libxml2 -I ../include $(DEFINES) 
- 
- # Linker flags
--LDFLAGS = -g -fpic --shared -Wl,-soname,$(PROGLIB_SONAME)
-+LDFLAGS += -fpic --shared -Wl,-soname,$(PROGLIB_SONAME)
- 
- # Libraries
- LIBS = -lpthread -lxml2 -lm 
-@@ -110,7 +110,7 @@
- install: $(PROGLIB_SO_VERSION) $(PROGMAN)
- 	(install -d $(libdir); \
- 	install -m 755 $(PROGLIB_SO_VERSION) $(libdir)/$(PROGLIB_SO_VERSION); \
--        ln -sf $(libdir)/$(PROGLIB_SO_VERSION) $(libdir)/$(PROGLIB_SO); \
-+        ln -sf $(PROGLIB_SO_VERSION) $(libdir)/$(PROGLIB_SO); \
- 	install -d $(includedir)/wulfware; \
- 	install -m 644 ../include/wulfware/*.h $(includedir)/wulfware; \
- 	install -d $(prefix)/share/man/man3; \
---- a/wulf2html/Makefile.am
-+++ b/wulf2html/Makefile.am
-@@ -62,8 +62,7 @@
- 	echo "Clean does nothing"
- 
- install : $(PROGRAM)
--	(strip $(PROGRAM);\
--	install -d $(prefix)/bin; \
-+	(install -d $(prefix)/bin; \
- 	install -m 755 $(PROGRAM) $(prefix)/bin; \
- 	install -d $(sysconfdir); \
- 	install -d $(sysconfdir)/init.d; \
---- a/wulflogger/Makefile.am
-+++ b/wulflogger/Makefile.am
-@@ -54,13 +54,13 @@
- # Define parameters and directives needed in compile/link steps.
- #========================================================================
- # C Compiler
--CC = gcc
-+CC ?= gcc
- 
- # Compile flags
--CFLAGS = -O3 -I/usr/include/libxml2 -I ../include $(DEFINES)
-+CFLAGS += -I/usr/include/libxml2 -I ../include $(DEFINES)
- 
- # Linker flags
--LDFLAGS =
-+LDFLAGS +=
- 
- # Libraries
- LIBS = -L ../libwulf -lwulf -lpthread -lcurses -lxml2 -lm 
-@@ -108,8 +108,7 @@
- 	- rm -f core $(PROGRAM) *.o $(PROGRAM).1.gz
- 
- install : $(PROGRAM)
--	(strip $(PROGRAM);\
--	install -d $(prefix)/bin; \
-+	(install -d $(prefix)/bin; \
- 	install -m 755 $(PROGRAM) $(prefix)/bin; \
- 	install -d $(prefix)/share/man/man1; \
- 	gzip -c -9 $(PROGRAM).1 > $(PROGRAM).1.gz; \
---- a/wulfstat/Makefile.am
-+++ b/wulfstat/Makefile.am
-@@ -54,13 +54,13 @@
- # Define parameters and directives needed in compile/link steps.
- #========================================================================
- # C Compiler
--CC = gcc
-+CC ?= gcc
- 
- # Compile flags
--CFLAGS = -O3 -I/usr/include/libxml2 -I ../include $(DEFINES)
-+CFLAGS += -I/usr/include/libxml2 -I ../include $(DEFINES)
- 
- # Linker flags
--LDFLAGS =
-+LDFLAGS +=
- 
- # Libraries
- LIBS = -L ../libwulf -lwulf -lpthread -lcurses -lxml2 -lm 
-@@ -108,8 +108,7 @@
- 	- rm -f core $(PROGRAM) *.o $(PROGRAM).1.gz
- 
- install : $(PROGRAM)
--	(strip $(PROGRAM);\
--	install -d $(prefix)/bin; \
-+	(install -d $(prefix)/bin; \
- 	install -m 755 $(PROGRAM) $(prefix)/bin; \
- 	install -d $(prefix)/share/man/man1; \
- 	gzip -c -9 $(PROGRAM).1 > $(PROGRAM).1.gz; \
---- a/xmlsysd/Makefile.am
-+++ b/xmlsysd/Makefile.am
-@@ -60,13 +60,13 @@
- # Define parameters and directives needed in compile/link steps.
- #========================================================================
- # C Compiler
--CC = gcc
-+CC ?= gcc
- 
- # Compile flags
--CFLAGS = -O3 -I/usr/include/libxml2 $(DEFINES)
-+CFLAGS += -I/usr/include/libxml2 $(DEFINES)
- 
- # Linker flags
--LDFLAGS =
-+LDFLAGS +=
- 
- # Libraries
- LIBS = -lxml2 -lz -lm
-@@ -79,7 +79,7 @@
- all: $(PROGRAM) 
- 
- $(PROGRAM): $(OBJECTS) $(INCLUDES)
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBS) $(OBJECTS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
- 
- #========================================================================
- # The only safe place to do commits is in the toplevel directory
-@@ -109,8 +109,7 @@
- # Application installation.
- #========================================================================
- install :  $(PROGRAM)
--	(strip $(PROGRAM); \
--	install -d $(sbindir); \
-+	(install -d $(sbindir); \
- 	install -m 755 $(PROGRAM) $(sbindir); \
- 	install -d $(sysconfdir); \
- 	install -d $(sysconfdir)/xinetd.d; \
diff --git a/sys-cluster/wulfware/files/wulfware-2.6.0-tinfo.patch b/sys-cluster/wulfware/files/wulfware-2.6.0-tinfo.patch
deleted file mode 100644
index 7e88e621d91e..000000000000
--- a/sys-cluster/wulfware/files/wulfware-2.6.0-tinfo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- wulfware-2.6.0/configure.ac
-+++ wulfware-2.6.0/configure.ac
-@@ -61,6 +61,8 @@
- 
- # Checks for libraries.
- # FIXME: Replace `main' with a function in `-lcurses':
-+AC_CHECK_LIB([tinfo], [main], TINFO_LIBS=-ltinfo, TINFO_LIBS=)
-+AC_SUBST(TINFO_LIBS)
- AC_CHECK_LIB([curses], [main])
- # FIXME: Replace `main' with a function in `-lm':
- AC_CHECK_LIB([m], [main])
---- wulfware-2.6.0/wulfstat/Makefile.am
-+++ wulfware-2.6.0/wulfstat/Makefile.am
-@@ -63,7 +63,7 @@
- LDFLAGS =
- 
- # Libraries
--LIBS = -L ../libwulf -lwulf -lpthread -lcurses -lxml2 -lm 
-+LIBS = -L ../libwulf -lwulf -lpthread -lcurses $(TINFO_LIBS) -lxml2 -lm 
- 
- #========================================================================
- # List of variants one can make.  all is the default.  We always
diff --git a/sys-cluster/wulfware/metadata.xml b/sys-cluster/wulfware/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/sys-cluster/wulfware/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-cluster/wulfware/wulfware-2.6.0.ebuild b/sys-cluster/wulfware/wulfware-2.6.0.ebuild
deleted file mode 100644
index 995fea33c954..000000000000
--- a/sys-cluster/wulfware/wulfware-2.6.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Applications to monitor on a beowulf- or GRID-style clusters"
-HOMEPAGE="http://www.phy.duke.edu/~rgb/Beowulf/wulfware.php"
-SRC_URI="http://www.phy.duke.edu/~rgb/Beowulf/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/libxml2:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:="
-DEPEND="
-	${RDEPEND}
-	!sys-cluster/wulfstat
-	!sys-cluster/xmlsysd"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-opts_and_strip.patch
-	"${FILESDIR}"/${P}-tinfo.patch #528588
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	append-cflags -fcommon
-	econf
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake prefix="${ED}"/usr libdir="${ED}"/usr/$(get_libdir) \
-		includedir="${ED}"/usr/include sysconfdir="${ED}"/etc \
-		install
-
-	dodoc AUTHORS ChangeLog NEWS NOTES README xmlsysd/DESIGN
-
-	# FIXME: Update to Gentoo style init script.
-	rm -r "${ED}"/etc/init.d/wulf2html || die
-
-	dosym libwulf.so.2.6.0 /usr/lib64/libwulf.so.2
-	gunzip "${ED}"/usr/share/man/man?/*.gz || die
-}
-
-pkg_postinst() {
-	elog "Add following line to /etc/services if you haven't done so already:"
-	elog
-	elog "xmlsysd       7887/tcp    # xmlsysd remote system stats"
-	elog
-	elog "Be sure to edit /etc/xinetd.d/xmylsysd to suit your own options."
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 8a542d6747b5..6b4ecd2ce1a4 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 9b10c3c77f0d..afc43c6fd02e 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -2,6 +2,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -11,6 +13,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD clang-common-14.0.6.ebuild 541 BLAKE2B 87b158e874cf600e23591a8095e0edb4d30d4482600ef8fe38984e9ba9559e6e2226107cd482f355d950392a6a452e1a8ae79d297d5afc3951a7f1c8f6227b5f SHA512 1bd0481468c278f131ec9f87243927b60a59752f4229450559bf8016e9599155a52593810fcdc1cf0aecd4aa1529e8df300d95123a53de18eb326152caafbbef
 EBUILD clang-common-15.0.7-r4.ebuild 5034 BLAKE2B 1159de8d27d4fbd771229bc298823e44cef20872d96832f5e49ba564fc321bfbb0e366e6ac9866ba4e537cb0baa14c5dd63931daf58c4eb9b791bdde412e093d SHA512 24431cb1fc31ebb43f3749d0f780f08d4acea701105817d21413006de48bf9d87293406dcf05d0bb3ac092b8739d5c773e46815013f497c544ddda1e1ae6cdde
 EBUILD clang-common-16.0.0.9999.ebuild 5011 BLAKE2B c39389ad4d45449ea239e1c0b8c64c9be098f0a6dd072b2ce85798b7cdbd5e63dc34659e3c792698b44e7e231dc5f19942bfdd0388533e1cbd32d99d704a6f3d SHA512 7b8556150b56f1f59a655ec1599c442be0e5f6c1a1d434243d9c2f422a542fb6e22e11ec6a9983ba0440eb4f1ebec70038e435d3b27da09284e2d150c658d175
+EBUILD clang-common-16.0.0.ebuild 5102 BLAKE2B cf6db25d4e3597ff0ccd039604c7c6a4c5ce7892c7ed2e2cf8031c0ebf7a039d8c30483dd152f71e0d89a85d6f1a0e807f044c4ab53709f913a1a361fdf8f49c SHA512 a0ed53847b12ead06552314ba7b69695ec93231b07a0c7cb835bad9c7ca8dfc5785c180ca5e00e89cc960c56bc770029bec6c873a8c0015becca5aaec19c01ad
 EBUILD clang-common-16.0.0_rc3-r2.ebuild 5017 BLAKE2B 861c1fa59ade1bd9dfe9bdb391c92d528f8426e958e30242299474462a1ed86d299419c6ca7b85a2e377b2a17854a1de74b45a82b5c8117ff2453ea69aa2c229 SHA512 dc37a47244d7b47b415fc1eb0d13d5c1b32be1a5edf4bc3c2b3c90ecd53946a971a4bb850781b1f964a7bedba407ead9560730c1fcb63880841a443f061052de
 EBUILD clang-common-16.0.0_rc4-r1.ebuild 5017 BLAKE2B 861c1fa59ade1bd9dfe9bdb391c92d528f8426e958e30242299474462a1ed86d299419c6ca7b85a2e377b2a17854a1de74b45a82b5c8117ff2453ea69aa2c229 SHA512 dc37a47244d7b47b415fc1eb0d13d5c1b32be1a5edf4bc3c2b3c90ecd53946a971a4bb850781b1f964a7bedba407ead9560730c1fcb63880841a443f061052de
 EBUILD clang-common-17.0.0.9999.ebuild 5011 BLAKE2B c39389ad4d45449ea239e1c0b8c64c9be098f0a6dd072b2ce85798b7cdbd5e63dc34659e3c792698b44e7e231dc5f19942bfdd0388533e1cbd32d99d704a6f3d SHA512 7b8556150b56f1f59a655ec1599c442be0e5f6c1a1d434243d9c2f422a542fb6e22e11ec6a9983ba0440eb4f1ebec70038e435d3b27da09284e2d150c658d175
diff --git a/sys-devel/clang-common/clang-common-16.0.0.ebuild b/sys-devel/clang-common/clang-common-16.0.0.ebuild
new file mode 100644
index 000000000000..784fa3ae7a88
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-16.0.0.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="
+	default-compiler-rt default-libcxx default-lld llvm-libunwind
+	hardened stricter
+"
+
+PDEPEND="
+	sys-devel/clang:*
+	default-compiler-rt? (
+		sys-devel/clang-runtime[compiler-rt]
+		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
+		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
+	)
+	!default-compiler-rt? ( sys-devel/gcc )
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	!default-libcxx? ( sys-devel/gcc )
+	default-lld? ( sys-devel/lld )
+	!default-lld? ( sys-devel/binutils )
+"
+IDEPEND="
+	!default-compiler-rt? ( sys-devel/gcc-config )
+	!default-libcxx? ( sys-devel/gcc-config )
+"
+
+LLVM_COMPONENTS=( clang/utils )
+llvm.org_set_globals
+
+pkg_pretend() {
+	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
+
+	local flag missing_flags=()
+	for flag in default-{compiler-rt,libcxx,lld}; do
+		if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
+			missing_flags+=( "${flag}" )
+		fi
+	done
+
+	if [[ ${missing_flags[@]} ]]; then
+		eerror "It seems that you have the following flags set on sys-devel/clang:"
+		eerror
+		eerror "  ${missing_flags[*]}"
+		eerror
+		eerror "The default runtimes are now set via flags on sys-devel/clang-common."
+		eerror "The build is being aborted to prevent breakage.  Please either set"
+		eerror "the respective flags on this ebuild, e.g.:"
+		eerror
+		eerror "  sys-devel/clang-common ${missing_flags[*]}"
+		eerror
+		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
+		die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
+	fi
+}
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+
+	insinto /etc/clang
+	newins - gentoo-runtimes.cfg <<-EOF
+		# This file is initially generated by sys-devel/clang-runtime.
+		# It is used to control the default runtimes using by clang.
+
+		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
+		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
+		--stdlib=$(usex default-libcxx libc++ libstdc++)
+		-fuse-ld=$(usex default-lld lld bfd)
+	EOF
+
+	newins - gentoo-gcc-install.cfg <<-EOF
+		# This file is maintained by gcc-config.
+		# It is used to specify the selected GCC installation.
+	EOF
+
+	newins - gentoo-common.cfg <<-EOF
+		# This file contains flags common to clang, clang++ and clang-cpp.
+		@gentoo-runtimes.cfg
+		@gentoo-gcc-install.cfg
+		@gentoo-hardened.cfg
+	EOF
+
+	# Baseline hardening (bug #851111)
+	newins - gentoo-hardened.cfg <<-EOF
+		# Some of these options are added unconditionally, regardless of
+		# USE=hardened, for parity with sys-devel/gcc.
+		-fstack-clash-protection
+		-fstack-protector-strong
+		-fPIE
+		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
+	EOF
+
+	dodir /usr/include/gentoo
+
+	local fortify_level=$(usex hardened 3 2)
+	# We have to do this because glibc's headers warn if F_S is set
+	# without optimization and that would at the very least be very noisy
+	# during builds and at worst trigger many -Werror builds.
+	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
+	#ifndef _FORTIFY_SOURCE
+	# if defined(__has_feature)
+	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
+	# else
+	#  define __GENTOO_HAS_FEATURE(x) 0
+	# endif
+	#
+	# if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
+	#  if !defined(__SANITIZE_ADDRESS__) && !__GENTOO_HAS_FEATURE(address_sanitizer) && !__GENTOO_HAS_FEATURE(memory_sanitizer)
+	#   define _FORTIFY_SOURCE ${fortify_level}
+	#  endif
+	# endif
+	# undef __GENTOO_HAS_FEATURE
+	#endif
+	EOF
+
+	if use hardened ; then
+		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
+			# Options below are conditional on USE=hardened.
+			-D_GLIBCXX_ASSERTIONS
+
+			# Analogue to GLIBCXX_ASSERTIONS
+			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
+			-D_LIBCPP_ENABLE_ASSERTIONS=1
+		EOF
+	fi
+
+	if use stricter; then
+		newins - gentoo-stricter.cfg <<-EOF
+			# This file increases the strictness of older clang versions
+			# to match the newest upstream version.
+
+			# clang-16 defaults
+			-Werror=implicit-function-declaration
+			-Werror=implicit-int
+			-Werror=incompatible-function-pointer-types
+
+			# constructs banned by C2x
+			-Werror=deprecated-non-prototype
+
+			# deprecated but large blast radius
+			#-Werror=strict-prototypes
+		EOF
+
+		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+			@gentoo-stricter.cfg
+		EOF
+	fi
+
+	local tool
+	for tool in clang{,++,-cpp}; do
+		newins - "${tool}.cfg" <<-EOF
+			# This configuration file is used by ${tool} driver.
+			@gentoo-common.cfg
+		EOF
+	done
+}
+
+pkg_preinst() {
+	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
+	then
+		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
+		if [[ -n ${gcc_path} ]]; then
+			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
+				--gcc-install-dir="${gcc_path%%:*}"
+			EOF
+		fi
+	fi
+}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index a1379cef9a5b..cc6a15aab469 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,6 +1,7 @@
 EBUILD clang-runtime-14.0.6.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e71056309690ad1c8e92543e64025bd5e009eac35018ec22b2c0f80c12f3a527cc7e0bfe4ec1bfcb2dd9dea54106abf46b13e5592 SHA512 580efee12fe0e53447f5644fad248ebded8ae6cd8cb5871cb38bb3148091886b6fb9a57ac712d3158d5c3fc38c043b0bfbf62fc550a609752a42c23e605b0ded
 EBUILD clang-runtime-15.0.7.ebuild 759 BLAKE2B d7b481faffc4da0a6dc1b4e708322cd17cd497dc75363bdb89e7fbb1ecb2aecd9cbf91bdf816505476c7aca2ec7b6fb9ef178705e6b77361d21a7a270404a70a SHA512 8128acfc92b1601e93ffca1fd4233456f8a28fbc4cc65a1782da25df48abd3af82d0128b31f12b966ca02ab1eafcd28016c4443d9c7f1d28bc3f951cfff5e07f
 EBUILD clang-runtime-16.0.0.9999.ebuild 1369 BLAKE2B a25d32189f78e993706138f339ad0645e3042bd283ddc26b4189c117ea2368d0a1c2b09c2f5f538112bcad65fc14dc0d29f16e4d6ff98e3401c3bdb74d59d750 SHA512 c37860675576d51047f5347400753a19469ea0e2e6ff49a3a5ba6e35f5b33372c06ee2ac1e82aa4a681f35e8c186a1ff8eb25a9eccd0ee35e5ab3d57873f40e0
+EBUILD clang-runtime-16.0.0.ebuild 1442 BLAKE2B ccd97064b84899371758ceab7640d2b9a3104e08dccbefc5523062437cec1358ab68773b96bbc8193d8cd52a2bac65e6687cb150127d953aa49ab7f8cb3dbcea SHA512 9b8639788a2bfab9fea6e717e684c4784ae6719ce8d6bb389d16d836df0b43d108be6c649b9aa17dfa60df7b3f490450d4d51e83dd80707467a844871b97535e
 EBUILD clang-runtime-16.0.0_rc3.ebuild 1357 BLAKE2B 8bffc2e195aea4f0c5c13d8f730dbf7cf5afade08d6ca9915addb9a148d4fa28d01331461adc16221840095a8b94d997795e25fb01c68ca6260b24471abd2747 SHA512 cd391453ef4a5ef739d9897b25fc1899062c20e23dbb1bfa4ef33ada3a697ffaedaf6956ba82fd114b8f24a5c8de3d255b5d114c545968f0689bd6cb38b64ba6
 EBUILD clang-runtime-16.0.0_rc4.ebuild 1357 BLAKE2B 8bffc2e195aea4f0c5c13d8f730dbf7cf5afade08d6ca9915addb9a148d4fa28d01331461adc16221840095a8b94d997795e25fb01c68ca6260b24471abd2747 SHA512 cd391453ef4a5ef739d9897b25fc1899062c20e23dbb1bfa4ef33ada3a697ffaedaf6956ba82fd114b8f24a5c8de3d255b5d114c545968f0689bd6cb38b64ba6
 EBUILD clang-runtime-17.0.0.9999.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
diff --git a/sys-devel/clang-runtime/clang-runtime-16.0.0.ebuild b/sys-devel/clang-runtime/clang-runtime-16.0.0.ebuild
new file mode 100644
index 000000000000..6483c7c0c78e
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-16.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build toolchain-funcs
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+
+LICENSE="metapackage"
+SLOT="${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		sanitize? (
+			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		)
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
+"
+
+pkg_pretend() {
+	if tc-is-clang; then
+		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
+		ewarn "upstream has turned a few warnings that commonly occur during"
+		ewarn "configure script runs into errors by default.  This causes some"
+		ewarn "configure tests to start failing, sometimes resulting in silent"
+		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
+		ewarn "not yet clear whether the change will remain or be reverted."
+		ewarn
+		ewarn "For more information, please see:"
+		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
+	fi
+}
diff --git a/sys-devel/clang-toolchain-symlinks/Manifest b/sys-devel/clang-toolchain-symlinks/Manifest
index e3aeb6f63d39..0de3206e23a1 100644
--- a/sys-devel/clang-toolchain-symlinks/Manifest
+++ b/sys-devel/clang-toolchain-symlinks/Manifest
@@ -1,5 +1,5 @@
 EBUILD clang-toolchain-symlinks-14-r2.ebuild 1154 BLAKE2B 1da81bdc43afd21ad3f45e3ede1decf1f2eb0aa0dd5a451b28b06a74837cb1354e785784d723a770b7fd3e4dfaeb3b7d095d8579ea07cc798c33d65f9fd6fb9f SHA512 f02f2c7c21def93692503fceae45f8aa6abd608ad99b3be0a63a85f80b54899b201457ee56666161c87d0039bc512eef2bbf6f819807f236e52ac2d88f4bbe54
 EBUILD clang-toolchain-symlinks-15-r2.ebuild 1147 BLAKE2B a3676de65810503e7009f0ae8df1c8233f02518decf27d602096c946081f459d4350541b807bb07e83a740080ac89c94482b6c48c7cd570fce4af4c083edb60b SHA512 cdd69cc55c5ed323852a031cda463504bf1de0676a3fbda80853d63c6b7fce28531940c4a47bc34a6c99f289038d65ba510dc314026a16795a060a0794b522aa
-EBUILD clang-toolchain-symlinks-16-r2.ebuild 1087 BLAKE2B 620d0d863160f7adf06dd72b299e04913a3802e0fc226eaa9adc2d4a0ec7440f2897e5c0ccd16719648a2cb2790e4fd1367fcddcbaa90888ac0413aabe87ff77 SHA512 54d0e0d1b4ea1d6e2f0c8b448f7bc39b250b3cd97ee4b3c6a834d68be7b7e45954289065aef06300836d2f1231719bd783ae193f66ed584f7b1f656632f430ea
+EBUILD clang-toolchain-symlinks-16-r2.ebuild 1166 BLAKE2B 3e5b3068f28755e5d666511586c3609d700305949b4bcc2c6fa484dc3a8a6c1b9ef39b50dabc48306301a09eaa67b3d5e5e8765f5f235a3bc07e55538b5f44fb SHA512 1f6ca94977eb4d8366f1fbad7f1b9caad2325d56f43d9f157c602932cd7f3c2cd40253a73bc3002d1e008b8cb64d6787aeb6716e47a0a8fcb747144acb88c22c
 EBUILD clang-toolchain-symlinks-17.ebuild 1104 BLAKE2B a22bdfe7dad1c912b254f692ba44da6931a52602d4ba448b015d9655103d5ec6faab4a5941bd8e8689f9528fc5adb16beaffd7123dfa451eebce5f8cca4adfd4 SHA512 a6e2494676fc92a1f0b5db87845a5db1904d50111d99340dbc000fe630e40da888d50287fbec79ba35b8815fcdf00b151eedb1aa806b6ea1b5a0d5e041f0e400
 MISC metadata.xml 904 BLAKE2B d2c8a31355b0f3bea6c5b4c72d198f40bf14b6908f5a3f765b48fffb2ba3e4f09a8bb37c87ea4e7d9b4e1de0a3ad2c80bdca6feb45538c973119f27ba6329ad8 SHA512 846548593c071d6905b56984c6924086d5f03929c813be986c89c57a6924d1976975b29769ee60a2796287753aa3453608794af8d36cf48b76c55920778c27d4
diff --git a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild
index 574b2739f3a0..86cc794fd88f 100644
--- a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild
+++ b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~loong"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
 IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
 
 # Blocker for bug #872416
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 65bd7fe8860f..0a8ba11bc31c 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,11 +1,14 @@
 DIST llvm-14.0.6-manpages.tar.bz2 218186 BLAKE2B 4491296e490936a2d7b518e19a0ff6312b89abeef3fbe5da5d0b93bb2add1088ddf64a0b00ec8846062d19b1ad31e53eadee7ce03c9034aab554e183d1baccf6 SHA512 f8328dc2ec1e8d941d47e583ee31fae7bdcebb3f854b5c8a4a84bd19a79bf5427ad204012c81349bc05a291e41cf48e5129b4578bbd5d4490dd01e1c0b5823bf
 DIST llvm-15.0.7-manpages.tar.bz2 228425 BLAKE2B 573b030a32407cfe241fb2c8c62bed8e7c54f9daf4b8cffdd2d4e5ca2e40b5ec5ed3724475aedf77119be1a4d9de847a989e933d315e6d94908e407a19c98047 SHA512 86d5eeea2757b0a627c8d2d6e70a3265fc0207085f4e473cdd6e8b624c719625dead23fd1737742a1bea27b1c4631ef3e8e3041a1122a85fcb49859e5bfbee49
+DIST llvm-16.0.0-manpages.tar.bz2 245787 BLAKE2B 362bd99a46cc61020d8c16bff8e438b6850229ee2b98d979c788e378ebe4a9fd369a87d5132e50a8802826b9e8bdff640fd19142a868b19b64b16bce78f85aff SHA512 fc9baffb1d92091ba6f556095797a0118013ee9265094459308d552c162f77651a07f5cd3752e457807a59238fcd1d0f7463c2fc7cde233bff64782ef47f041d
 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c
 DIST llvm-gentoo-patchset-15.0.7.tar.xz 19300 BLAKE2B b70e81d744c2eba5cd851e7b690ce8979b3064973f522be7c93bfb541860000a4bc8b17219f8788dfc8a527217dd13946cf7836640698ddd3d4b3fde493dfbf8 SHA512 daffff6ae4a0874aff1a423b4bb36701ecb5a35a36ae91d4ed7fda58b83e50ffcdc30498c84be4711fd3e1f227bf312dbe930019203e0a131944439af2aa94f7
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -15,6 +18,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD clang-14.0.6-r1.ebuild 12014 BLAKE2B 0f9eed7779a5b9aa8f92002f6f4d8e22e7baf3d3f6d1930e4716abf3aa00d866f68a682dc2a404655f53800e26c8b388da552184da6943287b2d91c5c1c2672b SHA512 c5e46f1044604f4e41cdb6c42d2079096c0bcdd396d99f8e95a6b5b66918e3519e4226741202f716fa5f53295188ec2bfcec66ae32480a8e10b4ab18bdb880ab
 EBUILD clang-15.0.7-r1.ebuild 12409 BLAKE2B 8f8d642b676f0ad01700fca43d8158e54180010443f5456a3d3d270638dd280e8e399534c97d8fa8f7bcacd132d9f5735154cf4e12fd0fbc9a1e2b7f1e914ba9 SHA512 77139debe5214dd3047b44ab98bfd8a6eec2caa8635ba8cbfc14c94ed4d3d13febe08612e74f33db491cc98c30eadfcfead20a1c13a73466d7e49028222c93db
 EBUILD clang-16.0.0.9999.ebuild 12338 BLAKE2B 9f1989ffd52f28006e256a97836ac9623b3efff14516d05dc4c3cd69c97bd5955abc97142ed4b2099283ff2364ee7e4a32bf33282faf700643fee63e7bfc9be7 SHA512 e93e8f87344051c093d28b53fe0184444a2f34d05a1c95257c361ac097687d225cf9d6df218093887cdc07e23490f77a2399ed1e075c582aaa9710504687d31b
+EBUILD clang-16.0.0.ebuild 12418 BLAKE2B 57dfd115224aa564222e44debc492053f9e8f557f035d3d673b025f5108ec335c9671392979c543e3d6400b5c0bad3a673e71b1972f287f969fb7190f96db006 SHA512 ba3aa9433fd6b65cc32b84c586fdbc87107b5ec61863ce15ba8fe7446b981547a34be3316955aa30780af29a1d1b53bcb6567cf7dacb4b95b2f985843d6266e4
 EBUILD clang-16.0.0_rc3.ebuild 12241 BLAKE2B a42245a7fb9b3bdb26e5f9fba2f671ed88ba24dfe8d105c04ce0bfe94c39116ab0bcc81f1fe05bc370397002a2c14d2b938c9e43060e3374b172abd6abb2b6ae SHA512 ff7dc938a522e6b802f7355cbe3f3b9542cbc51e24f735e46b3937db4fda5ef9543aa8e06ccafc48370b888fa475d0c840cef5fa15aac133dc3c51b305fe31c7
 EBUILD clang-16.0.0_rc4.ebuild 12344 BLAKE2B 7633c6a1e4bb07730c499d60e6c99b4c4ce2da902e1042b87827f2e580657fb3589de8e452478e8890f798d28e2909e11203c4a434eeb52abd8e31bf88e53f42 SHA512 2eee553e159a956e32da85d7849708d8461776577e505bc0611d4141cb48d70bcc8cab7bbf2d51c3d014c8188d994e54403efc54354356b0d171ad776af1ad58
 EBUILD clang-17.0.0.9999.ebuild 12338 BLAKE2B 869e9d4f63fa9a0dbd7b23ffea1f09060b1cf579d6d9c9a3f707f697bdfa20ba76f8da9b34986077fdcfb6877b04c3a03664592e612874b2991c69230fe5f7c7 SHA512 23fa3774f4fa649b1b927c700507ba29f3b41ab4f4385b9e4685648815f9f761c5a16864f37e5f809389c43456ac39db1f6b9a1d7dcbb9e2a7b226d16b824bd5
diff --git a/sys-devel/clang/clang-16.0.0.ebuild b/sys-devel/clang/clang-16.0.0.ebuild
new file mode 100644
index 000000000000..d2e8178b4e17
--- /dev/null
+++ b/sys-devel/clang/clang-16.0.0.ebuild
@@ -0,0 +1,481 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org multilib multilib-minimal \
+	prefix python-single-r1 toolchain-funcs flag-o-matic
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
+IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+	>=sys-devel/clang-common-${PV}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	doc? ( $(python_gen_cond_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	xml? ( virtual/pkgconfig )
+"
+PDEPEND="
+	~sys-devel/clang-runtime-${PV}
+	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=(
+	clang clang-tools-extra cmake
+	llvm/lib/Transforms/Hello
+)
+LLVM_MANPAGES=1
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing
+	llvm/utils
+	third-party
+)
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+	eprefixify \
+		lib/Lex/InitHeaderSearch.cpp \
+		lib/Driver/ToolChains/Darwin.cpp || die
+
+	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
+		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		aarch64-resource-headers
+		arm-common-resource-headers
+		arm-resource-headers
+		core-resource-headers
+		cuda-resource-headers
+		hexagon-resource-headers
+		hip-resource-headers
+		hlsl-resource-headers
+		mips-resource-headers
+		opencl-resource-headers
+		openmp-resource-headers
+		ppc-htm-resource-headers
+		ppc-resource-headers
+		riscv-resource-headers
+		systemz-resource-headers
+		utility-resource-headers
+		ve-resource-headers
+		webassembly-resource-headers
+		windows-resource-headers
+		x86-resource-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			amdgpu-arch
+			c-index-test
+			clang
+			clang-format
+			clang-offload-bundler
+			clang-offload-packager
+			clang-refactor
+			clang-repl
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+			nvptx-arch
+
+			# needed for cross-compiling Clang
+			clang-tblgen
+		)
+
+		if use extra; then
+			out+=(
+				# extra tools
+				clang-apply-replacements
+				clang-change-namespace
+				clang-doc
+				clang-include-cleaner
+				clang-include-fixer
+				clang-move
+				clang-pseudo
+				clang-query
+				clang-reorder-fields
+				clang-tidy
+				clang-tidy-headers
+				clangd
+				find-all-symbols
+				modularize
+				pp-trace
+			)
+		fi
+
+		if llvm_are_manpages_built; then
+			out+=( docs-clang-man )
+			use extra && out+=( docs-clang-tools-man )
+		fi
+
+		if use doc; then
+			out+=( docs-clang-html )
+			use extra && out+=( docs-clang-tools-html )
+		fi
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-build-py
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
+
+	local mycmakeargs=(
+		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+		-DCLANG_INCLUDE_TESTS=$(usex test)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# disable using CUDA to autodetect GPU, just build for all
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
+		# disable linking to HSA to avoid automagic dep,
+		# load it dynamically instead
+		-DCMAKE_DISABLE_FIND_PACKAGE_hsa-runtime64=ON
+
+		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if ! use elibc_musl; then
+		mycmakeargs+=(
+			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
+		)
+	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DLLVM_BUILD_DOCS=ON
+				-DLLVM_ENABLE_SPHINX=ON
+				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+			if use extra; then
+				mycmakeargs+=(
+					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+				)
+			fi
+		fi
+		mycmakeargs+=(
+			-DCLANG_INCLUDE_DOCS=${build_docs}
+		)
+	fi
+	if multilib_native_use extra; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
+			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
+		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
+		mycmakeargs+=(
+			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
+			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	local test_targets=( check-clang )
+	if multilib_native_use extra; then
+		test_targets+=(
+			check-clang-tools
+			check-clangd
+		)
+	fi
+	cmake_build "${test_targets[@]}"
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	if use extra; then
+		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
+	fi
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
+		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
+		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${LLVM_MAJOR}" \
+				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
+			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
+				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
+		done
+	done
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+	if multilib_native_use extra; then
+		# don't wrap clang-tidy headers, the list is too long
+		# (they're fine for non-native ABI but enabling the targets is problematic)
+		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
+	fi
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+	llvm_install_manpages
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
+	if use extra; then
+		elog "Some of them are vim integration scripts (with instructions inside)."
+		elog "The run-clang-tidy.py script requires the following additional package:"
+		elog "  dev-python/pyyaml"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/lld-toolchain-symlinks/Manifest b/sys-devel/lld-toolchain-symlinks/Manifest
index cbb9ed303744..11d0da123f90 100644
--- a/sys-devel/lld-toolchain-symlinks/Manifest
+++ b/sys-devel/lld-toolchain-symlinks/Manifest
@@ -1,5 +1,5 @@
 EBUILD lld-toolchain-symlinks-14-r2.ebuild 801 BLAKE2B 9d503356ed85fd996a922f531782550dc9d9fb8f8f70b6298083abb4bda017b4015932add186a9e55c54e55135913b2cb83f571b115de09e704c936435f53f02 SHA512 7280dff33d642c0b1d4a6f23fbca4d412fc90693b7a9b825d0044f41694d2d4438b0c270277851999688dd7f04c4e67393c435b087d837abdd1f59011f3eb7ae
 EBUILD lld-toolchain-symlinks-15-r2.ebuild 796 BLAKE2B 830b933f8535eef6b128c929b80bb90d80541bd3a5ed7b5b66f453ee3e09af3e70d3df9fe5994aaca0b25160042c6cd2e8ff0fcf618da8acb2215a32cc28a8a4 SHA512 b44ce89bf627b927d79a9b182e6675024f88a26e4f76709b8490c4c67fe294efad06f2e82f72006fc638d4f0fcb87a3b54d4ffd12c039160283838405bb02aa2
-EBUILD lld-toolchain-symlinks-16-r2.ebuild 777 BLAKE2B 7717e8a4bcedfacfb4c8e857345a8d57b7dedaa7986ce6e3f835e72089bf45d4904fe2f6aa50ed407d1b3b75e7fa293e3071cdef70c4b63a0002cf7a34c1e6ed SHA512 1163038de439599cc078642a4650f2b318d41ce92c25401e1c7a811e1eb15ea69f0877110d2a02c23700ac559255dfa55e02f0c079d9c1ba4679c3cd296be211
+EBUILD lld-toolchain-symlinks-16-r2.ebuild 806 BLAKE2B 1ee142c62ffa98b39d806f71f69f9caaddfec5d9f91214161090c28b1881ef63e7d808a92a76c3712793fbdb6d9e051a29ba9dd6444a31cb60a771dcc87b4b4f SHA512 2251199def02ce94d72ea287e47a7e2cb3a4d95b34da6a66a0715f477803e47ae13539c44cf2f8dc57f029bb5a6380375f00cf5b8e43e2d6cbfce8bcf2e3ef7e
 EBUILD lld-toolchain-symlinks-17.ebuild 782 BLAKE2B 8df819209ba58e4f772b2c192cc951433a673fe6c4e7367fd9de93acdae63b787c1563adbceea49451c78a4e0fb7e5c4b109dd7dd636b39f2b78fa708e1faf1f SHA512 c889bec3ac8aa431bb13f5cf6e0900f6114ae30299ba752ddd648494309a7cfb1e930d2a4fb4d933666ae1630e3158e4633c082271651791c084a333e08b91d2
 MISC metadata.xml 784 BLAKE2B 044eebb87ddac511186e137d9e255cb3ead2d53aeffafc641cc9a53556b833f06cae439907de8e8ead1090d54f7cc4bcacdbfff52449b6fab5908aa6d354a110 SHA512 50a9ac94efe64f8f6533049f496a19c37e375803ea3920a3729c93f346117ea5b662978570db27e8fffcfaf78f990691c4ab5aaf7dd48a7e2931f713eddedb4b
diff --git a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r2.ebuild b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r2.ebuild
index 75dc4a1de3c4..062d273129c7 100644
--- a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r2.ebuild
+++ b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,8 +12,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS=""
-PROPERTIES="live"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 669bc9af7124..d46387c09fbd 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -2,6 +2,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -11,6 +13,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD lld-14.0.6-r1.ebuild 2009 BLAKE2B 4db1dfc9b1997d31cc68240ae0b05afeae5a6b1cb24a0eb2012bc28b2ac8c0da4b532d270d070db5fd401717320a74b006628c19a12c787e2f9ba2dc24eb25b1 SHA512 73b2f0e7b27497ce9037cd10503b328378ff9a2e32cd36e6e264f5423cd05732da4ea2ef97b637fc344a4f3d5d3597c60dda29dba7eb509391c176d32d53a427
 EBUILD lld-15.0.7.ebuild 2262 BLAKE2B 8882ba45692d54840d8a5933910ade614427733f3da2e344cf4df2806c125a783ff3c6ad4a2f76fd577cb4787fe07495c93e981c03f116fa7f383575d59936f7 SHA512 9b08495f068a01e991d200363549d29e9146e8687b297fa06beda90da1da9a793b1ebf512c3dad9bb985518a8fd9d1d13049a90dd8f06d4bc3de97779ff8e6ed
 EBUILD lld-16.0.0.9999.ebuild 2197 BLAKE2B 0f6db5db6fff4f572187749ab1704fce82e1859db1b7dd8b9de3652eed3e63ae781f7c48d16237576e9a186fe0680e349d160f15047cb5f54998fab7b8c0d60e SHA512 5de60e7ae08bade5028fb325e81ef82bf2aca38507d131e40505320587cbc43db5d74203d849cb057bee27b7f4e3820263f429db8454e4ca38bcc6f7e873bf9b
+EBUILD lld-16.0.0.ebuild 2239 BLAKE2B 33f554acd6e1db31f9aec3d75b2c43994a95240ba42bcdf7060090231ff6214e896b5fd051fcb513337161cef408014f64391e9ecfcf5269749fcfdb8a3771da SHA512 a06a9e4ff4f9109dd4eb3f3fdb2308b043beca30c016b184a3f77e7c4728161b3a1b4a662fccf102419c4a3aabab9e30db5a3c87448fb8b2a91237bc08e834ea
 EBUILD lld-16.0.0_rc3.ebuild 2197 BLAKE2B 0f6db5db6fff4f572187749ab1704fce82e1859db1b7dd8b9de3652eed3e63ae781f7c48d16237576e9a186fe0680e349d160f15047cb5f54998fab7b8c0d60e SHA512 5de60e7ae08bade5028fb325e81ef82bf2aca38507d131e40505320587cbc43db5d74203d849cb057bee27b7f4e3820263f429db8454e4ca38bcc6f7e873bf9b
 EBUILD lld-16.0.0_rc4.ebuild 2197 BLAKE2B 0f6db5db6fff4f572187749ab1704fce82e1859db1b7dd8b9de3652eed3e63ae781f7c48d16237576e9a186fe0680e349d160f15047cb5f54998fab7b8c0d60e SHA512 5de60e7ae08bade5028fb325e81ef82bf2aca38507d131e40505320587cbc43db5d74203d849cb057bee27b7f4e3820263f429db8454e4ca38bcc6f7e873bf9b
 EBUILD lld-17.0.0.9999.ebuild 2149 BLAKE2B ee6280f1e83a7660c9ccd01ea2fbd6748996d8419d92ae8175af1616f6a86b267e15b90bf32d41585295b510457171ac071b82525828129f7484a40426aa009c SHA512 24e20f5ba77d2c79fe8db7836ed69879923c6f6f6a4c463776d5eada52073a668dfa5ce431bfe78f07a300519abb2c2bd1c6721bbfe89a2266fe339f7b80235f
diff --git a/sys-devel/lld/lld-16.0.0.ebuild b/sys-devel/lld/lld-16.0.0.ebuild
new file mode 100644
index 000000000000..7ddfd8f8a755
--- /dev/null
+++ b/sys-devel/lld/lld-16.0.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}[zstd=]
+	sys-libs/zlib:=
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+	${DEPEND}
+	!sys-devel/lld:0
+"
+BDEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)
+"
+PDEPEND="
+	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils third-party )
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	tc-is-cross-compiler &&	mycmakeargs+=(
+		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index cbf7175ea55b..b28d9ce063f3 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -2,6 +2,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -11,6 +13,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD llvm-common-14.0.6.ebuild 602 BLAKE2B ef26d6ac2606e9a316ddcce442da1762f578ade0346ba2a947fdace5e2020e8841c63d173e42506d23abf6efc062a2edfac0be98a3eefe1f7a29c88702e9f1d5 SHA512 789dad6fdcf9a930ddc1046e7e98ebc1e05b2dd3713bb1ec5b8a5711690d779691c91d1000d9776720b21ed241d2f12c0ae9a8dba0e6a17d0ddf563cdfbe657f
 EBUILD llvm-common-15.0.7.ebuild 601 BLAKE2B 3dd38d17640ed52ff0be26db026475a9d0e7e1acebe95043bc6e0e63e32ff4f03c5637a9dcce25987f673962447feb4aa015f8b5b5cb33553dc1a4f843b75399 SHA512 e8a93a72d06810cface48cce2d8f8a890cdf009939a96350a23fe407b064c05a3016c663d11a3866dc2dd0fd87599b5ac234895c8c42c902e9b0cdb37dba7b62
 EBUILD llvm-common-16.0.0.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
+EBUILD llvm-common-16.0.0.ebuild 615 BLAKE2B dddab327388341f3330d7374a76bc1ea144aa5cad62feea34140b5825daf13118ff7185a6c2cce07479c3ca13c3ba8ad7cac7ba71a8b49fdd25a979d899a5b0a SHA512 57e7d90e7fc4f5dd2daddd1c7e8ed7885112120aca2b13b21e2fc719cfe5a87bb640aa67c605827bcd60aa71300abeba937e158ae1a1a16559236ef9e6d18319
 EBUILD llvm-common-16.0.0_rc3.ebuild 530 BLAKE2B 8475e3b53197e4d4632f635af86038889c0e93161819f3b655a570f8b3b774f392a786c67320845ca7be620bcd22acfd0349ec9376435deff1f4333c993abeb3 SHA512 2f899fd29442895532c45eb8c97e1bdf19aaef19406382b81ebad16cb9eb6d4181a637a10d090060557f1d0b33dc579828c2c5c5d5ad02d0c5a4a3cca256caef
 EBUILD llvm-common-16.0.0_rc4.ebuild 530 BLAKE2B 8475e3b53197e4d4632f635af86038889c0e93161819f3b655a570f8b3b774f392a786c67320845ca7be620bcd22acfd0349ec9376435deff1f4333c993abeb3 SHA512 2f899fd29442895532c45eb8c97e1bdf19aaef19406382b81ebad16cb9eb6d4181a637a10d090060557f1d0b33dc579828c2c5c5d5ad02d0c5a4a3cca256caef
 EBUILD llvm-common-17.0.0.9999.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
diff --git a/sys-devel/llvm-common/llvm-common-16.0.0.ebuild b/sys-devel/llvm-common/llvm-common-16.0.0.ebuild
new file mode 100644
index 000000000000..4dd4fe395fe7
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-16.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	!sys-devel/llvm:0
+"
+
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r */
+	# some users may find it useful
+	newdoc README README.vim
+	dodoc vimrc
+}
diff --git a/sys-devel/llvm-toolchain-symlinks/Manifest b/sys-devel/llvm-toolchain-symlinks/Manifest
index 54d0aec9f4e0..38b65d06f9c0 100644
--- a/sys-devel/llvm-toolchain-symlinks/Manifest
+++ b/sys-devel/llvm-toolchain-symlinks/Manifest
@@ -1,5 +1,5 @@
 EBUILD llvm-toolchain-symlinks-14-r1.ebuild 1050 BLAKE2B 2e1e3a23812823c1a747a2b09d006f874b3a192c92b1ed275988bd84740df5ed68283f638fa36232d780eec817c26163d4d76335ad1dc2e0c5780b96dddd88bd SHA512 f54178846a398792a753174cd6b067f63b22bef13dba49485b14cc7f909a1da2a8d9bb2657a0b485ccfb5a3830388a855d52e8dea7a62e766a3bd65bb6602923
 EBUILD llvm-toolchain-symlinks-15-r1.ebuild 1043 BLAKE2B 2c2ea96910bf11e2263bb157b9ef071998b61a2ab06ef848d68d1622249f74b4d1752351a5f2569c5668093c8f0b4b494eded9a920601e8226d4f519f0642754 SHA512 ee650715492c5d08a51760d6c14396d6a9c5fcbe8af069370d8cd628fda1c10f79250e553fd67a5d56ba370e446affbb1b2d48f8557f2dd58bad3947863f6814
-EBUILD llvm-toolchain-symlinks-16-r1.ebuild 972 BLAKE2B c836eade62ca7a97c447e82aba05be5ec3504d35675d6a2ca6aa34ee72f28cafe2b0aa8020725cbea4e15c6924a578f7927ef38df0a63e741b8795154cd22795 SHA512 2edb9947c31ebd561645361cfbe4515751c5e6816c567ea77ace3564277322e4b84df4592c952f7673668599d05c1651fbf36f04f5a153e6bb59863c70f14fb4
+EBUILD llvm-toolchain-symlinks-16-r1.ebuild 1062 BLAKE2B 891f4ffbc620d580aa837d995efedde9877142c7bfd2947fd0c4e96ddb2ed35f92b92609be8f2bc5dc3b1e64e1db2396be297e2adada4e88c067e1358c426201 SHA512 ca89266631d06df77d1fd88fc7adfef1cdae8f84a9e59cea918a58882978cc168bb250962d5b2a94de2369b16858042d1a35cc684ab0fea106a89234be3b6521
 EBUILD llvm-toolchain-symlinks-17.ebuild 989 BLAKE2B 63e5d2f1312362e4570ecdb3bc190ab4d30245f0149871eaba00ad257e05c31d0ea3664c3e4abae366fa47cd5c5eef581334bd7dfa71dc4250042342ad114a2d SHA512 bbfc302b6b49b0d8398b3f6115e32da3a9a9f2c2069225598191cc1fda90a551d459fb92ff309270bcb9a792791fd0b302cabb81456f61f35adfdfdc812c2fbe
 MISC metadata.xml 815 BLAKE2B 963f1b8425495144d04659d2d8cdabab910f15f9861634bf436a82ccb70b27682b44c47415ca6884956097e92294457d09b5c44e7a2f108c93abb79df8884aa7 SHA512 940a6c63c4c13a1c78c041c02df9bd3d2ac0f19eb552fcfb8134784386a2197956b1dd4950c760ca6ac9e8fb154eb550d59fc6ab1aea9c9236e7e005882d556a
diff --git a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild
index c24f550dfe79..3d5290db05a7 100644
--- a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild
+++ b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~loong"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index b9225ab89096..308008ea2436 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,11 +1,14 @@
 DIST llvm-14.0.6-manpages.tar.bz2 218186 BLAKE2B 4491296e490936a2d7b518e19a0ff6312b89abeef3fbe5da5d0b93bb2add1088ddf64a0b00ec8846062d19b1ad31e53eadee7ce03c9034aab554e183d1baccf6 SHA512 f8328dc2ec1e8d941d47e583ee31fae7bdcebb3f854b5c8a4a84bd19a79bf5427ad204012c81349bc05a291e41cf48e5129b4578bbd5d4490dd01e1c0b5823bf
 DIST llvm-15.0.7-manpages.tar.bz2 228425 BLAKE2B 573b030a32407cfe241fb2c8c62bed8e7c54f9daf4b8cffdd2d4e5ca2e40b5ec5ed3724475aedf77119be1a4d9de847a989e933d315e6d94908e407a19c98047 SHA512 86d5eeea2757b0a627c8d2d6e70a3265fc0207085f4e473cdd6e8b624c719625dead23fd1737742a1bea27b1c4631ef3e8e3041a1122a85fcb49859e5bfbee49
+DIST llvm-16.0.0-manpages.tar.bz2 245787 BLAKE2B 362bd99a46cc61020d8c16bff8e438b6850229ee2b98d979c788e378ebe4a9fd369a87d5132e50a8802826b9e8bdff640fd19142a868b19b64b16bce78f85aff SHA512 fc9baffb1d92091ba6f556095797a0118013ee9265094459308d552c162f77651a07f5cd3752e457807a59238fcd1d0f7463c2fc7cde233bff64782ef47f041d
 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c
 DIST llvm-gentoo-patchset-15.0.7.tar.xz 19300 BLAKE2B b70e81d744c2eba5cd851e7b690ce8979b3064973f522be7c93bfb541860000a4bc8b17219f8788dfc8a527217dd13946cf7836640698ddd3d4b3fde493dfbf8 SHA512 daffff6ae4a0874aff1a423b4bb36701ecb5a35a36ae91d4ed7fda58b83e50ffcdc30498c84be4711fd3e1f227bf312dbe930019203e0a131944439af2aa94f7
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -15,6 +18,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD llvm-14.0.6-r2.ebuild 12389 BLAKE2B 549b4e1c7feceb40c7e5aaa624925ec08627c84236c460f85a044621dc388cfca248f8a311c657a3b3dadbd367472f3c820a635c14246f74fdac98dd2ddf6fd1 SHA512 8559954b641fc007c92d4b3e2fcc129bdd812f974dccf37d74f61cb9d7414e28cbb41d7088767356035b972c1e417561770a89169676841e762e62644c6d0323
 EBUILD llvm-15.0.7.ebuild 12558 BLAKE2B 1f73f500a38ee4e96438a5e478781a562d48e10d550cd6c5beaf37a754ead1f0bedb121be78c6bee229f694cb085ee665f7b33a44eacba0d6eeaa42b545f6ca7 SHA512 92dd8f7f8554ee24978ef4e1409f5356a95455d2b5006da0a5dbf27cc277962916a0e93d2f7630a0eb3a9f3a1167eb9aeec0a319de3637c5762a7c391d3f5330
 EBUILD llvm-16.0.0.9999.ebuild 12399 BLAKE2B d18e5df615286b2e89b9b4c8eb8b79984c20cc5022545f713d92df70bf5f404edc380d5175dd767fcd7957653a5bd0ba5a3ed602c7d7f3c2dea0a06eda7f7a4e SHA512 c0af4a0925717b1d8783383b543425f558a249056d8424d71d441e365867c24d6a8b243632d4c4f9685242d4f1b671591448553c5dde5acea1563e02381aa3a5
+EBUILD llvm-16.0.0.ebuild 12490 BLAKE2B 95b6ae05f64728668134ff348e5d084346285425e57c69a7345a44f85c832523b1219a76c3b2c6274e190b869569be3f91d9e5c0298e13167f3e6e0e8d676f66 SHA512 eec238ccb340ad901e130d984349ee4a9788bec4cd7def73a6c946becd1b86b74ee044e39cda48f892017a06e2a381a0424caaf44d073a51c64625c3b45411ba
 EBUILD llvm-16.0.0_rc3.ebuild 12359 BLAKE2B 85d7d40bdab6739dec1f844f880373a7ef9a0526d6b9b67528aae2a95c325d15ee777e698c3d1f977677a302e2e38b101eebb22cec00f66f3038dc52a69671b7 SHA512 98fc104c89605f0307fa98d727a11fd142b140b41327649a78729dee41850d232c3398d46efee4b3b847c5cd1155e7e9bcedeed8d4011b3465536e05c1858322
 EBUILD llvm-16.0.0_rc4.ebuild 12405 BLAKE2B 49fdb81ce857fd13ee834bb56343c4ff9af2f544195c6e7feaab2744e9b8cb58aaa794e26acc09f74fbf7dfe05bd75ebfa94d433ab0a7f588356eda450fde035 SHA512 27857612f2b1c574ec5614501f7c0dfab86975c98a20f1a6dad91dc5a8d683cde98e3289d032bbfe5a00850f02279f93d179becd7ee969512348f078d7c7fadb
 EBUILD llvm-17.0.0.9999.ebuild 12572 BLAKE2B 8cb52862e845d3b05271be7a94d5c3a2d955959ccb5d4bda87ca152a37746ddc848060e1d69e79daa0a1a06d3da745baeda7301f6790aee39e66a9c92a01f1cb SHA512 d0b022959fcf70ca0ab5320b11ae55ababd302fa0e62afc13b3ba519620c26e12b922449008b5d8dd2d7dc397b9d39bc79787f5d10aa0bc55410db28c9a39a9c
diff --git a/sys-devel/llvm/llvm-16.0.0.ebuild b/sys-devel/llvm/llvm-16.0.0.ebuild
new file mode 100644
index 000000000000..164977c556dc
--- /dev/null
+++ b/sys-devel/llvm/llvm-16.0.0.ebuild
@@ -0,0 +1,517 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs flag-o-matic
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="
+	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
+	xml z3 zstd
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	exegesis? ( dev-libs/libpfm:= )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	binutils-plugin? ( sys-libs/binutils-libs )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	>=dev-util/cmake-3.16
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<sys-libs/libcxx-${LLVM_VERSION}.9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	libffi? ( virtual/pkgconfig )
+"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="
+	${RDEPEND}
+	!sys-devel/llvm:0
+"
+PDEPEND="
+	sys-devel/llvm-common
+	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
+	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
+"
+
+LLVM_COMPONENTS=( llvm cmake )
+LLVM_TEST_COMPONENTS=( third-party )
+LLVM_MANPAGES=1
+LLVM_USE_TARGETS=provide
+llvm.org_set_globals
+
+python_check_deps() {
+	use doc || return 0
+
+	python_has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_uptodate() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eqawarn "Expected: ${exp_targets[*]}"
+		eqawarn
+	fi
+
+	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
+		eqawarn "Expected: ${prod_targets[*]}"
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the ebuild is up-to-date
+	check_uptodate
+
+	llvm.org_src_prepare
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+			UnicodeNameMappingGenerator
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-bitcode-strip
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-config
+			llvm-cov
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-debuginfo-analyzer
+			llvm-debuginfod
+			llvm-debuginfod-find
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwarfutil
+			llvm-dwp
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-jitlink-executor
+			llvm-lib
+			llvm-libtool-darwin
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-otool
+			llvm-pdbutil
+			llvm-profdata
+			llvm-profgen
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-reduce
+			llvm-remark-size-diff
+			llvm-remarkutil
+			llvm-rtdyld
+			llvm-sim
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-tapi-diff
+			llvm-tli-checker
+			llvm-undname
+			llvm-windres
+			llvm-xray
+			obj2yaml
+			opt
+			sancov
+			sanstats
+			split-file
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-dsymutil-man
+				docs-llvm-dwarfdump-man
+				docs-llvm-man
+			)
+		fi
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use binutils-plugin && out+=(
+			LLVMgold
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
+
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_INCLUDE_BENCHMARKS=OFF
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+		-DLLVM_ENABLE_ZSTD=$(usex zstd)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	local suffix=
+	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
+		# the ABI of the main branch is not stable, so let's include
+		# the commit id in the SOVERSION to contain the breakage
+		suffix+="git${EGIT_VERSION::8}"
+	fi
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		suffix+="+libcxx"
+		mycmakeargs+=(
+			-DLLVM_ENABLE_LIBCXX=ON
+		)
+	fi
+	mycmakeargs+=(
+		-DLLVM_VERSION_SUFFIX="${suffix}"
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=${build_docs}
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=${build_docs}
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use binutils-plugin && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
+			CMakeCache.txt ||
+		die "Incorrect version, did you update _LLVM_MASTER_MAJOR?"
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	tc-env_build cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${LLVM_MAJOR} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-devel/llvmgold/Manifest b/sys-devel/llvmgold/Manifest
index 672fd696f9d1..09fa934cc961 100644
--- a/sys-devel/llvmgold/Manifest
+++ b/sys-devel/llvmgold/Manifest
@@ -1,5 +1,5 @@
 EBUILD llvmgold-14.ebuild 576 BLAKE2B c9493f322fa0e387411df160c28078a514510e684f01c415a035c93868dd5a16ae718f10af0debe2e1a4112ea0864890a81a89ebf3fefc55ffdc89adc743524f SHA512 7cdb73379b9f6db22abde1f01043e28b8bfd797f3123f77d31ab3166e2c8d72747aad0963e8f6a41a0a01a19ea29eb468d869b5dbc7a35eb016a4a89c57715c3
 EBUILD llvmgold-15.ebuild 576 BLAKE2B c9493f322fa0e387411df160c28078a514510e684f01c415a035c93868dd5a16ae718f10af0debe2e1a4112ea0864890a81a89ebf3fefc55ffdc89adc743524f SHA512 7cdb73379b9f6db22abde1f01043e28b8bfd797f3123f77d31ab3166e2c8d72747aad0963e8f6a41a0a01a19ea29eb468d869b5dbc7a35eb016a4a89c57715c3
-EBUILD llvmgold-16.ebuild 526 BLAKE2B df3fe5c0b3f73b4751561b1637211a1606682610e273612e6caa5e55ffbca48aacaef6a56518e36e5e9969c23987ae2202a0e4c362c23ad69c1b5d422147eada SHA512 57f2057dfd7ce6d129df46715d732c260aa5e5de505b26e713b72ab5471d9e1632fe1762ebdeda6afda03ae983559d69a4d0a3aca51aa24a1e087917c4b1deb3
+EBUILD llvmgold-16.ebuild 589 BLAKE2B dc0432379234e24032fe1c2a9ba90c6e3ad325951ba00b7e4d8b600d03cf52a1f4045fa5ff6bde6c392ec7f014b1596e9ce7c467fc0237bf2981c07cda4e6d8b SHA512 a897e7a9612e0edf11bead9d33aae4a076cb6c6ba3599bc0e2bbe12913d740a569594a7dcef3af2dc49a481bf0f1ba5bdcf3659d7741e1b5951bd62efe7dc466
 EBUILD llvmgold-17.ebuild 538 BLAKE2B a3424159e17fb2fb91ee0ebc7b84bee83b48c0bc672bad2d55fde1be98066b718352cab72f422b4a7a6e33e7ac98463ef433fb6f7c37e27570359d2fdcd7bd75 SHA512 906506a5430e1c3f39b49f8e3b5bb6981f1781a14d3dff59f57d872f3790fe146e5e4e757f1e6486558c77d0ee6bff7bf1bc784d4d1b5e2ecc81e6bfbb335c13
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/llvmgold/llvmgold-16.ebuild b/sys-devel/llvmgold/llvmgold-16.ebuild
index 17566e8e5d16..83a4359d7099 100644
--- a/sys-devel/llvmgold/llvmgold-16.ebuild
+++ b/sys-devel/llvmgold/llvmgold-16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~loong"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
 
 RDEPEND="
 	sys-devel/llvm:${PV}[binutils-plugin]
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 0a3f93a388bb..b44d596e667d 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 133d49cef923..4f679acffa45 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -23,6 +23,7 @@ EBUILD linux-firmware-20221214.ebuild 10360 BLAKE2B 50e00de7440216bdf4e5e7ddfc05
 EBUILD linux-firmware-20230117.ebuild 10360 BLAKE2B 50e00de7440216bdf4e5e7ddfc05a27e00ae52ac7dbdaa95ca400295cf1030fe518367a17df1760595a26158ca3d70d1b454ff4f222c419a104d249f91454d8e SHA512 0f145cd2bc5e1c52dce018ff1fe622ec099b02d4fe8f814ee7a04114c33aff291a6b733cdd995c075b775eeed3859d0efd0b24aeb8e16d4e6d9b44d183065bec
 EBUILD linux-firmware-20230210.ebuild 10360 BLAKE2B 50e00de7440216bdf4e5e7ddfc05a27e00ae52ac7dbdaa95ca400295cf1030fe518367a17df1760595a26158ca3d70d1b454ff4f222c419a104d249f91454d8e SHA512 0f145cd2bc5e1c52dce018ff1fe622ec099b02d4fe8f814ee7a04114c33aff291a6b733cdd995c075b775eeed3859d0efd0b24aeb8e16d4e6d9b44d183065bec
 EBUILD linux-firmware-20230310-r1.ebuild 11323 BLAKE2B e86079a186416213908bbf944a4c31ae14a3c209e5fed5da1d28cba0a74cfd41ea18dcc3ce4ebb3a68fea230dac2015209c59ae1b035e8d751ab3cbf88f63dce SHA512 99ea767d4ce5e9727fbed5ab3be4b9ac7f6a9d5b3b895db196e4d93b87af534089a5f1ef2bf0c60c8239b6b83b8c999f4dc63c66b4862c2c76a62064b69bbd54
+EBUILD linux-firmware-20230310-r2.ebuild 11204 BLAKE2B 066c6a8347a4e9ab45c06a584172ee91f88c3459032602021f62c8a1cff5262ec5c7e03e649d339cb6fbcb2bd7af3cff9a4dbbf010b53c7449d0371413e04cf5 SHA512 83db43336064c576d5d5be7929a23ed906f8ee593f89e69280d0375895e6a7fb9ca274ed5fac63e4af15b6ae468ec394b20d7f2345b65825f027754b78130884
 EBUILD linux-firmware-20230310.ebuild 10368 BLAKE2B 0e13109bdcb3554a3ca34c56f9ac5aa3ce7628c01db4f49b6d865512b003011b728d2d398efc64ab447a2ef9626849f0ca73bf3af5cbbc3d4d56d16c672d26aa SHA512 bd5e91e98d085d55696be27ec13fc3f9f99c8ea8a3ca929bcb925bea0257d0109e048a313c24aaf1b3f1fcc21df950ffd736c2e13fdb5e25298a489990f59fac
-EBUILD linux-firmware-99999999.ebuild 11331 BLAKE2B 4640cb9b3db4484eba9eb195128f545e290f84f674af6e2d4359e6bd155e21e2d134669172137a4ca2cabc86c4805ccbe9f234ba28447103ccd726a1193a2dcc SHA512 918b4820c274f8190da7bae392a207e08a6b9ddbcc74576754425c33e5cc216a847b83b88cae34d96ff76b33972388878005530adaaff0f9b631ab486a5ff1aa
+EBUILD linux-firmware-99999999.ebuild 11204 BLAKE2B 066c6a8347a4e9ab45c06a584172ee91f88c3459032602021f62c8a1cff5262ec5c7e03e649d339cb6fbcb2bd7af3cff9a4dbbf010b53c7449d0371413e04cf5 SHA512 83db43336064c576d5d5be7929a23ed906f8ee593f89e69280d0375895e6a7fb9ca274ed5fac63e4af15b6ae468ec394b20d7f2345b65825f027754b78130884
 MISC metadata.xml 1300 BLAKE2B 075ac0595a6408aa708224e79109b4b542f77c63841d600a89a8cc94bd13eefda3d7c6db416f16814ae67426b0d16cff48ac88bb76b692e3c4524bd3ac3cad6e SHA512 bc946c219e24b905c55004323fc7bf213a5e012bdd6b20cfc1203680a7e6460dd56e30c2735da0f94f3c95aa96b3afbbd532e3e3215da9597a512c4d448b8de7
diff --git a/sys-kernel/linux-firmware/linux-firmware-20230310-r2.ebuild b/sys-kernel/linux-firmware/linux-firmware-20230310-r2.ebuild
new file mode 100644
index 000000000000..feed015c3e3e
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20230310-r2.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit linux-info mount-boot savedconfig multiprocessing
+
+# In case this is a real snapshot, fill in commit below.
+# For normal, tagged releases, leave blank
+MY_COMMIT=""
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+else
+	if [[ -n "${MY_COMMIT}" ]]; then
+		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${MY_COMMIT}"
+	else
+		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
+	fi
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
+	redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
+	unknown-license? ( all-rights-reserved )"
+SLOT="0"
+IUSE="compress-xz compress-zstd initramfs +redistributable savedconfig unknown-license"
+REQUIRED_USE="initramfs? ( redistributable )
+	?? ( compress-xz compress-zstd )"
+
+RESTRICT="binchecks strip test
+	unknown-license? ( bindist )"
+
+BDEPEND="initramfs? ( app-arch/cpio )
+	compress-xz? ( app-arch/xz-utils )
+	compress-zstd? ( app-arch/zstd )"
+
+#add anything else that collides to this
+RDEPEND="!savedconfig? (
+		redistributable? (
+			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
+			!sys-block/qla-fc-firmware
+			!sys-firmware/iwl1000-ucode
+			!sys-firmware/iwl6005-ucode
+			!sys-firmware/iwl6030-ucode
+			!sys-firmware/iwl3160-ucode
+			!sys-firmware/iwl7260-ucode
+			!sys-firmware/iwl3160-7260-bt-ucode
+			!sys-firmware/raspberrypi-wifi-ucode
+		)
+		unknown-license? (
+			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
+			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
+			!sys-firmware/alsa-firmware[alsa_cards_sb16]
+			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
+		)
+	)"
+
+QA_PREBUILT="*"
+
+pkg_setup() {
+	if use compress-xz || use compress-zstd ; then
+		local CONFIG_CHECK
+
+		if kernel_is -ge 5 19; then
+			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS_XZ"
+			use compress-zstd && CONFIG_CHECK="~FW_LOADER_COMPRESS_ZSTD"
+		else
+			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS"
+			if use compress-zstd; then
+				eerror "Kernels <5.19 do not support ZSTD-compressed firmware files"
+			fi
+		fi
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_pretend() {
+	use initramfs && mount-boot_pkg_pretend
+}
+
+src_unpack() {
+	if [[ ${PV} == 99999999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# rename directory from git snapshot tarball
+		if [[ ${#GIT_COMMIT} -gt 8 ]]; then
+			mv ${PN}-*/ ${P} || die
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	find . -type f -not -perm 0644 -print0 \
+		| xargs --null --no-run-if-empty chmod 0644 \
+		|| die
+
+	chmod +x copy-firmware.sh || die
+
+	if use initramfs; then
+		if [[ -d "${S}/amd-ucode" ]]; then
+			local UCODETMP="${T}/ucode_tmp"
+			local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
+			mkdir -p "${UCODEDIR}" || die
+			echo 1 > "${UCODETMP}/early_cpio"
+
+			local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
+			cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
+
+			if [[ ! -s "${amd_ucode_file}" ]]; then
+				die "Sanity check failed: '${amd_ucode_file}' is empty!"
+			fi
+
+			pushd "${UCODETMP}" &>/dev/null || die
+			find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
+			popd &>/dev/null || die
+			if [[ ! -s "${S}/amd-uc.img" ]]; then
+				die "Failed to create '${S}/amd-uc.img'!"
+			fi
+		else
+			# If this will ever happen something has changed which
+			# must be reviewed
+			die "'${S}/amd-ucode' not found!"
+		fi
+	fi
+
+	# whitelist of misc files
+	local misc_files=(
+		copy-firmware.sh
+		WHENCE
+		README
+	)
+
+	# whitelist of images with a free software license
+	local free_software=(
+		# keyspan_pda (GPL-2+)
+		keyspan_pda/keyspan_pda.fw
+		keyspan_pda/xircom_pgs.fw
+		# dsp56k (GPL-2+)
+		dsp56k/bootstrap.bin
+		# ath9k_htc (BSD GPL-2+ MIT)
+		ath9k_htc/htc_7010-1.4.0.fw
+		ath9k_htc/htc_9271-1.4.0.fw
+		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
+		cis/LA-PCM.cis
+		cis/PCMLM28.cis
+		cis/DP83903.cis
+		cis/NE2K.cis
+		cis/tamarack.cis
+		cis/PE-200.cis
+		cis/PE520.cis
+		cis/3CXEM556.cis
+		cis/3CCFEM556.cis
+		cis/MT5634ZLX.cis
+		cis/RS-COM-2P.cis
+		cis/COMpad2.cis
+		cis/COMpad4.cis
+		# serial_cs (GPL-3)
+		cis/SW_555_SER.cis
+		cis/SW_7xx_SER.cis
+		cis/SW_8xx_SER.cis
+		# dvb-ttpci (GPL-2+)
+		av7110/bootcode.bin
+		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
+		usbdux_firmware.bin
+		usbduxfast_firmware.bin
+		usbduxsigma_firmware.bin
+		# brcmfmac (GPL-2+)
+		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
+		brcm/brcmfmac43340-sdio.meegopad-t08.txt
+		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
+		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
+		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
+		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
+		brcm/brcmfmac43430-sdio.AP6212.txt
+		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
+		brcm/brcmfmac43430-sdio.MUR1DX.txt
+		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
+		# isci (GPL-2)
+		isci/isci_firmware.bin
+		# carl9170 (GPL-2+)
+		carl9170-1.fw
+		# atusb (GPL-2+)
+		atusb/atusb-0.2.dfu
+		atusb/atusb-0.3.dfu
+		atusb/rzusb-0.3.bin
+		# mlxsw_spectrum (dual BSD/GPL-2)
+		mellanox/mlxsw_spectrum-13.1420.122.mfa2
+		mellanox/mlxsw_spectrum-13.1530.152.mfa2
+		mellanox/mlxsw_spectrum-13.1620.192.mfa2
+		mellanox/mlxsw_spectrum-13.1702.6.mfa2
+		mellanox/mlxsw_spectrum-13.1703.4.mfa2
+		mellanox/mlxsw_spectrum-13.1910.622.mfa2
+		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
+	)
+
+	# blacklist of images with unknown license
+	local unknown_license=(
+		korg/k1212.dsp
+		ess/maestro3_assp_kernel.fw
+		ess/maestro3_assp_minisrc.fw
+		yamaha/ds1_ctrl.fw
+		yamaha/ds1_dsp.fw
+		yamaha/ds1e_ctrl.fw
+		ttusb-budget/dspbootcode.bin
+		emi62/bitstream.fw
+		emi62/loader.fw
+		emi62/midi.fw
+		emi62/spdif.fw
+		ti_3410.fw
+		ti_5052.fw
+		mts_mt9234mu.fw
+		mts_mt9234zba.fw
+		whiteheat.fw
+		whiteheat_loader.fw
+		cpia2/stv0672_vp4.bin
+		vicam/firmware.fw
+		edgeport/boot.fw
+		edgeport/boot2.fw
+		edgeport/down.fw
+		edgeport/down2.fw
+		edgeport/down3.bin
+		sb16/mulaw_main.csp
+		sb16/alaw_main.csp
+		sb16/ima_adpcm_init.csp
+		sb16/ima_adpcm_playback.csp
+		sb16/ima_adpcm_capture.csp
+		sun/cassini.bin
+		acenic/tg1.bin
+		acenic/tg2.bin
+		adaptec/starfire_rx.bin
+		adaptec/starfire_tx.bin
+		yam/1200.bin
+		yam/9600.bin
+		ositech/Xilinx7OD.bin
+		qlogic/isp1000.bin
+		myricom/lanai.bin
+		yamaha/yss225_registers.bin
+		lgs8g75.fw
+	)
+
+	if use !unknown-license; then
+		einfo "Removing files with unknown license ..."
+		rm -v "${unknown_license[@]}" || die
+	fi
+
+	if use !redistributable; then
+		# remove files _not_ in the free_software or unknown_license lists
+		# everything else is confirmed (or assumed) to be redistributable
+		# based on upstream acceptance policy
+		einfo "Removing non-redistributable files ..."
+		local OLDIFS="${IFS}"
+		local IFS=$'\n'
+		set -o pipefail
+		find ! -type d -printf "%P\n" \
+			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
+			| xargs -d '\n' --no-run-if-empty rm -v
+
+		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
+
+		IFS="${OLDIFS}"
+	fi
+
+	restore_config ${PN}.conf
+}
+
+src_install() {
+	./copy-firmware.sh -v "${ED}/lib/firmware" || die
+
+	pushd "${ED}/lib/firmware" &>/dev/null || die
+
+	# especially use !redistributable will cause some broken symlinks
+	einfo "Removing broken symlinks ..."
+	find * -xtype l -print -delete || die
+
+	if use savedconfig; then
+		if [[ -s "${S}/${PN}.conf" ]]; then
+			local files_to_keep="${T}/files_to_keep.lst"
+			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
+			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
+
+			einfo "Applying USE=savedconfig; Removing all files not listed in config ..."
+			find ! -type d -printf "%P\n" \
+				| grep -Fvx -f "${files_to_keep}" \
+				| xargs -d '\n' --no-run-if-empty rm -v
+
+			if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
+				die "Find failed to print installed files"
+			elif [[ ${PIPESTATUS[1]} -eq 2 ]]; then
+				# grep returns exit status 1 if no lines were selected
+				# which is the case when we want to keep all files
+				die "Grep failed to select files to keep"
+			elif [[ ${PIPESTATUS[2]} -ne 0 ]]; then
+				die "Failed to remove files not listed in config"
+			fi
+		fi
+	fi
+
+	# remove empty directories, bug #396073
+	find -type d -empty -delete || die
+
+	# sanity check
+	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
+		eerror "No files to install. Check your USE flag settings"
+		eerror "and the list of files in your saved configuration."
+		die "Refusing to install an empty package"
+	fi
+
+	# create config file
+	echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die
+	find * ! -type d >> "${S}"/${PN}.conf || die
+	save_config "${S}"/${PN}.conf
+
+	if use compress-xz || use compress-zstd; then
+		einfo "Compressing firmware ..."
+		local target
+		local ext
+		local compressor
+
+		if use compress-xz; then
+			ext=xz
+			compressor="xz -T1 -C crc32"
+		elif use compress-zstd; then
+			ext=zst
+			compressor="zstd -15 -T1 -C -q --rm"
+		fi
+
+		# rename symlinks
+		while IFS= read -r -d '' f; do
+			# skip symlinks pointing to directories
+			[[ -d ${f} ]] && continue
+
+			target=$(readlink "${f}")
+			[[ $? -eq 0 ]] || die
+			ln -sf "${target}".${ext} "${f}" || die
+			mv -T "${f}" "${f}".${ext} || die
+		done < <(find . -type l -print0) || die
+
+		find . -type f ! -path "./amd-ucode/*" -print0 | \
+			xargs -0 -P $(makeopts_jobs) -I'{}' ${compressor} '{}' || die
+
+	fi
+
+	popd &>/dev/null || die
+
+	if use initramfs ; then
+		insinto /boot
+		doins "${S}"/amd-uc.img
+	fi
+}
+
+pkg_preinst() {
+	if use savedconfig; then
+		ewarn "USE=savedconfig is active. You must handle file collisions manually."
+	fi
+
+	# Fix 'symlink is blocked by a directory' Bug #871315
+	if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then
+		rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX
+	fi
+
+	# Make sure /boot is available if needed.
+	use initramfs && mount-boot_pkg_preinst
+}
+
+pkg_postinst() {
+	elog "If you are only interested in particular firmware files, edit the saved"
+	elog "configfile and remove those that you do not want."
+
+	local ver
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test ${ver} -lt 20190514; then
+			elog
+			elog 'Starting with version 20190514, installation of many firmware'
+			elog 'files is controlled by USE flags. Please review your USE flag'
+			elog 'and package.license settings if you are missing some files.'
+			break
+		fi
+	done
+
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postinst
+}
+
+pkg_prerm() {
+	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
+	use initramfs && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postrm
+}
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 47424bcb967c..feed015c3e3e 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -65,22 +65,18 @@ QA_PREBUILT="*"
 
 pkg_setup() {
 	if use compress-xz || use compress-zstd ; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for compressed firmware support"
+		local CONFIG_CHECK
+
+		if kernel_is -ge 5 19; then
+			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS_XZ"
+			use compress-zstd && CONFIG_CHECK="~FW_LOADER_COMPRESS_ZSTD"
 		else
-			local CONFIG_CHECK
-
-			if kernel_is -ge 5 19; then
-				use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS_XZ"
-				use compress-zstd && CONFIG_CHECK="~FW_LOADER_COMPRESS_ZSTD"
-			else
-				use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS"
-				if use compress-zstd; then
-					eerror "You kernel does not support ZSTD-compressed firmware files"
-				fi
+			use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS"
+			if use compress-zstd; then
+				eerror "Kernels <5.19 do not support ZSTD-compressed firmware files"
 			fi
-			linux-info_pkg_setup
 		fi
+		linux-info_pkg_setup
 	fi
 }
 
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 41e1312e63af..b4b8a9e11e85 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 270ad867f2c7..0d9805c1a5c5 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -4,6 +4,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -13,6 +15,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6526 BLAKE2B 371b7d7bfbcacce1c04cf039b15f49bf5c8fb7de0352c4f477b92d1efe0c70442770ec0c6b60572cf5877b5c14492328cf727b2aa5c1dea761eb909aa1e1df6c SHA512 ee1f054abb9954eedd5b098afb1eb741cd2d7b1b329ef66ed3f25f8ed050227a31925852e3d893b0a9913e2ef2ac34efe89c66c19b562c586f7c0352a10a5814
 EBUILD compiler-rt-sanitizers-15.0.7.ebuild 6578 BLAKE2B 79b9477f9f426c7e5ffc07fe9e2abc86ee568d8e081ac5e5e3da3e3e169920fe8c0ce34f9a8ac03a4389f27ecb0b0ff7f5cf91622d614e03300f17ea97d20859 SHA512 9d23f6974edbe69e5d9fa53a3885e8e44741b5e5d90b0e72c6d191b70827d1e590a7c5a3373bc4fb4945a50db0eea5e119baeaeea956c6d92bb087410ce919b0
 EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6248 BLAKE2B 8548074a3b572bc5b19e9a70ed91225678172cb43b71ad501811d3741367c56f1ffe0e1b528934f620e7d8a30bd1fc463ada54113bea16c322f1d821a8503756 SHA512 8825b15e4965e58365a96517831120e1d5c02130f83cc1150b7a107142782cee74830d3dc0234453291d0f487789cd005303d47269381ad45356e4fd779decf5
+EBUILD compiler-rt-sanitizers-16.0.0.ebuild 6550 BLAKE2B a3d856b59f3ad6ce433952a31081576c91576e764119720cf9af44dd54a1813f9f08da03c26cab7a4d00e8b44852197588b14eb52826419b353b44c926cf37bf SHA512 509c25c720fb1f4e3664491f41b23242dd24ba541cc319680cea6e0dc01bebe929af943281fe03473f49fff369b3021cc6abb0d5e6b8b1fd7fabc071961cdaa6
 EBUILD compiler-rt-sanitizers-16.0.0_rc3.ebuild 6254 BLAKE2B cf7575a46a8678ff6ed69bb3e5863b062948af66bee98d60be8e728d30095ee34272b5a89d99bb31ee6ae87e3831cbb8120bc9f62ce0a0662caf42126582aa72 SHA512 da6daf348f285fe8c56d707fe185318647eb08bc6decc614d4b7f690f729fe4ae5580bc9d216aeb2a18881a729ed50cacf2d32a591c768ccc095e43969ac7b6b
 EBUILD compiler-rt-sanitizers-16.0.0_rc4.ebuild 6254 BLAKE2B cf7575a46a8678ff6ed69bb3e5863b062948af66bee98d60be8e728d30095ee34272b5a89d99bb31ee6ae87e3831cbb8120bc9f62ce0a0662caf42126582aa72 SHA512 da6daf348f285fe8c56d707fe185318647eb08bc6decc614d4b7f690f729fe4ae5580bc9d216aeb2a18881a729ed50cacf2d32a591c768ccc095e43969ac7b6b
 EBUILD compiler-rt-sanitizers-17.0.0.9999.ebuild 6248 BLAKE2B 8548074a3b572bc5b19e9a70ed91225678172cb43b71ad501811d3741367c56f1ffe0e1b528934f620e7d8a30bd1fc463ada54113bea16c322f1d821a8503756 SHA512 8825b15e4965e58365a96517831120e1d5c02130f83cc1150b7a107142782cee74830d3dc0234453291d0f487789cd005303d47269381ad45356e4fd779decf5
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.ebuild
new file mode 100644
index 000000000000..d7d5778a3c8c
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
+# base targets
+IUSE+=" +libfuzzer +memprof +orc +profile +xray"
+# sanitizer targets, keep in sync with config-ix.cmake
+# NB: ubsan, scudo deliberately match two entries
+SANITIZER_FLAGS=(
+	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
+	shadowcallstack gwp-asan
+)
+IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
+REQUIRED_USE="
+	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
+	test? (
+		cfi? ( ubsan )
+		gwp-asan? ( scudo )
+	)
+"
+RESTRICT="
+	!clang? ( test )
+	!test? ( test )
+"
+
+DEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
+"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+		sys-libs/compiler-rt:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	local flag
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if ! use "${flag}"; then
+			local cmake_flag=${flag/-/_}
+			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
+				cmake/config-ix.cmake || die
+		fi
+	done
+
+	# TODO: fix these tests to be skipped upstream
+	if use asan && ! use profile; then
+		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
+	fi
+	if use ubsan && ! use cfi; then
+		> test/cfi/CMakeLists.txt || die
+	fi
+
+	if has_version -b ">=sys-libs/glibc-2.37"; then
+		# known failures with glibc-2.37
+		# https://github.com/llvm/llvm-project/issues/60678
+		rm test/dfsan/custom.cpp || die
+		rm test/dfsan/release_shadow_space.c || die
+	fi
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local flag want_sanitizer=OFF
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if use "${flag}"; then
+			want_sanitizer=ON
+			break
+		fi
+	done
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX
+			# This disables i386 for SDK >= 10.15
+			# Will error if has_use tsan and SDK < 10.12
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake_build check-all
+}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index b243491c0212..eaf9ffea2fe7 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -4,6 +4,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -13,6 +15,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD compiler-rt-14.0.6-r1.ebuild 4247 BLAKE2B 53a61ea821f52d45691acce10f2aa6155606930796f142a18683b7259357ad770552de88d11115f9a97c77975c4866e2082fcfb770ad6ded5ec6d70393aabbc2 SHA512 bbfdc05c22f3750b0f8c9a84118b70beff97fc360c5c133ad58bdfe78762320cdbb0b170f6154eb5098bc9dc2ecb2643871c8ce85162c47235cf1408d5ef67e9
 EBUILD compiler-rt-15.0.7.ebuild 4259 BLAKE2B 2d7636f409dedb9bc78e77312355ca3859adbd108cb0d6001c2d9cab89b09847003d4148d013332ce93292678743a9b7197791d51048758d351292b8d53c833f SHA512 ebe6fbaaf6ff68d5f12f61f8e9d02608321b3e4db9ccf7be43e7a43de7c6600a1a506e48bf1468ca16b0d3ea894a5603b3f468a9ded7cbfa76145c7c8b8ec20e
 EBUILD compiler-rt-16.0.0.9999.ebuild 4164 BLAKE2B 332c450aab09115e23d14304e1f1bfa8c9482ced7acff7d6b80ac09d88f6d5a1481f090c837a7876bc264e3f1451b3bc5f285a71a38a7bf64ad3845299ca9b59 SHA512 7dcaae258434c5cce6b225c49b71e1987ac5af36f83ce25962ade4b2c836f13034fb54fed2723e7d089dc77b20159c0dd04c67f9a6928b62550d594db7f98cc2
+EBUILD compiler-rt-16.0.0.ebuild 4243 BLAKE2B 6ba018e518112b48bd4e8f0caa4d55427511ccfb0e997e2adfa709e0956f6f91b76d7bc38d959454c928488a07c81e62593fd7aa3a9e8bda591834210b3bc4d7 SHA512 7502c0fc37d396869862471cb5652d3adabf4273311e98001ffcadaa2f0e7c034568673e9031cbacb2f1acbca95dd3daeda0340c8767df046dddbab3d5ad77cc
 EBUILD compiler-rt-16.0.0_rc3.ebuild 4170 BLAKE2B 5c863321f73c784ae997fe46377fc6525ece43664cd41c8a8178aa764f820788c6b8072a99f0d79246721cbfdbba99cb06faacf93509246a94242af35f6820b7 SHA512 2eb75d0677db0d1ff130849651dae53c2f180a78e8103f012e4c4dc6d967db533b4457647221aa85a26adbb04c936ccbe18d5ad29a571554773049951e5b8de1
 EBUILD compiler-rt-16.0.0_rc4.ebuild 4170 BLAKE2B 5c863321f73c784ae997fe46377fc6525ece43664cd41c8a8178aa764f820788c6b8072a99f0d79246721cbfdbba99cb06faacf93509246a94242af35f6820b7 SHA512 2eb75d0677db0d1ff130849651dae53c2f180a78e8103f012e4c4dc6d967db533b4457647221aa85a26adbb04c936ccbe18d5ad29a571554773049951e5b8de1
 EBUILD compiler-rt-17.0.0.9999.ebuild 4164 BLAKE2B 332c450aab09115e23d14304e1f1bfa8c9482ced7acff7d6b80ac09d88f6d5a1481f090c837a7876bc264e3f1451b3bc5f285a71a38a7bf64ad3845299ca9b59 SHA512 7dcaae258434c5cce6b225c49b71e1987ac5af36f83ce25962ade4b2c836f13034fb54fed2723e7d089dc77b20159c0dd04c67f9a6928b62550d594db7f98cc2
diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.0.ebuild
new file mode 100644
index 000000000000..111c3be95d40
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-16.0.0.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+DEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version 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 ad990aa028d3..5d5582de4547 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -4,6 +4,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -14,6 +16,7 @@ EBUILD libcxx-14.0.6.ebuild 6948 BLAKE2B b8f0793a4542a76b789ae6c3cfc392bdba7c8d0
 EBUILD libcxx-15.0.7-r1.ebuild 5306 BLAKE2B 346390544e06d0fac9c21e341ab97a40b51c6af8c0bfe33771e634a1b4f081fabbbe24a749572f2129adfd26c5e8992442775dd5bfc557cbf50988bacc510137 SHA512 4cc723ca0b09ebedd5c7caed4008c392c3843f93674f0a913c067c147c74b755061bc9cdbfd51037505f0d395353791237275382e6b321f8dc7a83b24a7c5e4d
 EBUILD libcxx-15.0.7.ebuild 5281 BLAKE2B 91ef259e7e911d759553378e78dadac1f69a8d890eaec9572d987674b22943b07ae83bd6c7fa6f0968da0bb14709436117ca6beb7786fa329dfebb268273e0fd SHA512 038ccd5504bbb990f8b6bf35ed64ca197a84f14e2860e277bd488693e583474332c73afd1a48911786b6352373a1f09763899d2408907ada836a992cb733ed43
 EBUILD libcxx-16.0.0.9999.ebuild 5238 BLAKE2B d31f97c2b6fad3c8b357cf1d9c2bbcf52fcf8ddef4cd5e52a1e5a8d413751441032cc964eeb4ea3509e3ee16aab6342dcbd38a9b7e7d9299021834e834054c37 SHA512 4c7f95ca928f5d7dcada11ae250a0468a3797bf024985635eaf815dab7341863bd7add87abd459e49a2fa0b19b12ae87cfe6d5799780f1594130eb134e4347ff
+EBUILD libcxx-16.0.0.ebuild 5293 BLAKE2B 445cf284045e0ef67ca5e1720ccb7dc2e262cd02a91de8bc36480570f8197b0eedbbf516011eb2340e3bf6b48ae45f06fe0657fbd726fb1765aedd73fbb87766 SHA512 ff66dbfcd193e437e199e976746e208a8780b25459a857d477e329ea52f49b5fea2f9c708aded5fd1ef726b8acbe32e0b2246569ef093641199a5cb1b7909c21
 EBUILD libcxx-16.0.0_rc3.ebuild 5244 BLAKE2B 293399fe1fc0f91f115697a27d265f422e1c9535e0cfad5087a3faa3a9660e4e4210acf61bb4863d9c3fb4899eb23d74ceb8d6103da405eed47cb9157a413305 SHA512 c7ec13ea1c4a6e867fce9971b6fcfc4ab4c862f36a67c8b0484ebfe7708f0455310b9475c581ac1d635344db2a544eedf5649b0633900b10000f1ee0e9f065b9
 EBUILD libcxx-16.0.0_rc4.ebuild 5244 BLAKE2B 293399fe1fc0f91f115697a27d265f422e1c9535e0cfad5087a3faa3a9660e4e4210acf61bb4863d9c3fb4899eb23d74ceb8d6103da405eed47cb9157a413305 SHA512 c7ec13ea1c4a6e867fce9971b6fcfc4ab4c862f36a67c8b0484ebfe7708f0455310b9475c581ac1d635344db2a544eedf5649b0633900b10000f1ee0e9f065b9
 EBUILD libcxx-17.0.0.9999.ebuild 5238 BLAKE2B d31f97c2b6fad3c8b357cf1d9c2bbcf52fcf8ddef4cd5e52a1e5a8d413751441032cc964eeb4ea3509e3ee16aab6342dcbd38a9b7e7d9299021834e834054c37 SHA512 4c7f95ca928f5d7dcada11ae250a0468a3797bf024985635eaf815dab7341863bd7add87abd459e49a2fa0b19b12ae87cfe6d5799780f1594130eb134e4347ff
diff --git a/sys-libs/libcxx/libcxx-16.0.0.ebuild b/sys-libs/libcxx/libcxx-16.0.0.ebuild
new file mode 100644
index 000000000000..ebd073f968d0
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-16.0.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="+clang +libcxxabi static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? (
+		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+	)
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		>=dev-util/cmake-3.16
+		sys-devel/gdb[python]
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version 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 1442baff1e52..55f8554ce3a3 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -2,6 +2,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -11,6 +13,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD libcxxabi-14.0.6.ebuild 3384 BLAKE2B 71c0a0a1765bdfcc6829d5ac3a1e260f541cb6a4a8b1557db6d6fd17d540dcaa85df21ddae645afd72a620f1b52c42dd8d8d18bb0983b853059f4d598c9ef6ae SHA512 c7a8b74eaf423d166ff5eb8fdd7e7a124c6c0caebdc4f22cd542c7f08e3eb3906e6c3c2a1895cebc74eaef07e90c47721965873888ee4c0a46a8be72bf5fe6ef
 EBUILD libcxxabi-15.0.7.ebuild 2909 BLAKE2B a1aafff6c1499a13f5301819477c822ad16c32442d47d1ca04e343c8a56a7936dc1c4a8e8c75394bf2d77adcd91cefb4264e5ff0e15212a2df703fab0b1631de SHA512 9cfa80c345874e87e0adfa96b2e9382252f8ab989eb651133531e0ab86f29ac759f0485f017703c344dd21cf35f063c410160106dbbed4ccf29562b1621bee20
 EBUILD libcxxabi-16.0.0.9999.ebuild 2866 BLAKE2B 8eb6ad38adec95b1dfda64dfff47255bd19841975520320f9842ddd79b1162674dcc933d167585ed6f497c5b54095d8aa96b0af9335f1fa8bfb27619668f0c91 SHA512 be61b1a89549b0d531795483e350924ffc03f85bf0fb2f5fbf75a743d56e8da95598fb4f114ce2c3ffa903254dbbe35f171aacad7ce3cd5f358ca1d763d4934e
+EBUILD libcxxabi-16.0.0.ebuild 2921 BLAKE2B d16fb16230e04133a5c7e45aafd144a95f6714592d0fa6aefb0655db8157e8b34d77c1e49ef2945796cf38645d2b8838209d25d229622c02ea74eaf88d644656 SHA512 bc29d63525a771b546e9d310cae5f246ec54d965b0fd22f77eec7080f62c376bbd376e5b8ffa63eeb43f9c665162bd1ce23a4db64a92c83ef3fc16f912528376
 EBUILD libcxxabi-16.0.0_rc3.ebuild 2872 BLAKE2B 9a0dd0aa38b9e6229d49c96c4a7b97cfba583702c0fcd620cd570a9e2428b59ac0f1aa02153aba54c0a9187f07fd2ff85aec9e4df072d2f64f5af371c54a9b28 SHA512 85ad4be182dee73e514ed4d69ae6ad570c0854a79ed2d5660c86ed12f794ab6107564d6d46ee79933e3690f79a81bc573afa9cd194548dd9c68347bea4c79b17
 EBUILD libcxxabi-16.0.0_rc4.ebuild 2872 BLAKE2B 9a0dd0aa38b9e6229d49c96c4a7b97cfba583702c0fcd620cd570a9e2428b59ac0f1aa02153aba54c0a9187f07fd2ff85aec9e4df072d2f64f5af371c54a9b28 SHA512 85ad4be182dee73e514ed4d69ae6ad570c0854a79ed2d5660c86ed12f794ab6107564d6d46ee79933e3690f79a81bc573afa9cd194548dd9c68347bea4c79b17
 EBUILD libcxxabi-17.0.0.9999.ebuild 2866 BLAKE2B 8eb6ad38adec95b1dfda64dfff47255bd19841975520320f9842ddd79b1162674dcc933d167585ed6f497c5b54095d8aa96b0af9335f1fa8bfb27619668f0c91 SHA512 be61b1a89549b0d531795483e350924ffc03f85bf0fb2f5fbf75a743d56e8da95598fb4f114ce2c3ffa903254dbbe35f171aacad7ce3cd5f358ca1d763d4934e
diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-16.0.0.ebuild
new file mode 100644
index 000000000000..40271cf28572
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-16.0.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="+clang static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
+RDEPEND+="
+	!<sys-libs/libcxx-15
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
+	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version 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 51ed79b44d86..afdd7aaed0e7 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -4,6 +4,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -13,6 +15,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD libomp-14.0.6-r1.ebuild 3917 BLAKE2B d92540af690dd622122ad1a4ed2548afa141f1254fbe9a9b3d34286b36f0fa70ccaf915f218c1bea8c68377ea20724db9443d365e2e5f290707f444d3ff47ca5 SHA512 433ae63716103af5aa493c7dbae43f10003cac95abaae579dcb61cba6390da4b9b3fc921e410ba899719bd170fa153a7b3d66c8776c37fd074066173c1fea160
 EBUILD libomp-15.0.7-r2.ebuild 3474 BLAKE2B c75fddce61b7e8fe837b4c5bc1b7dacfbe4bc1572537dd7c44c23f894d05b104e8946d896b3b19d78de32a87d866d5911a0f3a8f81796469bba2753d051b2105 SHA512 7dc7c5fd7cd370acadfdf6e15ed09cde0798312ed3c72e770596aecb5817a4ec1477cc1092e3c159d1988bba4200808259705206f80d8fd0019fe07c34f4455d
 EBUILD libomp-16.0.0.9999.ebuild 3820 BLAKE2B ece0ea71d75b84994161cabb4f41e5d629d2fec55adf9f396b439ae0a98e81e0ca5934463a1aba66b36273cd4c1758a2bdb6c4de38f1d1ace79712c47afdc401 SHA512 575b64b257def9da4ae7aeca2591832b1f629e9e8416da642aa3d78bd4c05ddd484e09249c490158aa5a3b5b6f4703e39255ba97084225613e02288c532af978
+EBUILD libomp-16.0.0.ebuild 3893 BLAKE2B fa9a9694c2251578278e2e7dfadbfbba293b432896aa1b54cd1dc784ceef671c20c07e53c07bbc0241ab9069ac434e3837a5d5c99b4c837d903a6121078feb9b SHA512 7ace5de57243e2c130ca8a65666f8c48f6f7854ed67d650ed5ffb2cb2ef8b370a76b78b77f26e96355083f29c521b2680c080a5cf13a6534d88cbec3d3a7eeff
 EBUILD libomp-16.0.0_rc3.ebuild 3826 BLAKE2B 7672c02bf1a2ed674c07ed2c7fe5f6c1d3e386741877416dbc4a4914c30b63aed8d454c04a3ab164176b096ecb202dce066a369211a6445d2be72c3d3b5b9b19 SHA512 66e577041955f1328e5c6a2026f22eaac44f57131f78ee57f72517197506d7a24f8c4679319f49bb47b503259f9ff60a8be158be3dcdd2055713d9422421be5d
 EBUILD libomp-16.0.0_rc4.ebuild 3826 BLAKE2B 7672c02bf1a2ed674c07ed2c7fe5f6c1d3e386741877416dbc4a4914c30b63aed8d454c04a3ab164176b096ecb202dce066a369211a6445d2be72c3d3b5b9b19 SHA512 66e577041955f1328e5c6a2026f22eaac44f57131f78ee57f72517197506d7a24f8c4679319f49bb47b503259f9ff60a8be158be3dcdd2055713d9422421be5d
 EBUILD libomp-17.0.0.9999.ebuild 3820 BLAKE2B ece0ea71d75b84994161cabb4f41e5d629d2fec55adf9f396b439ae0a98e81e0ca5934463a1aba66b36273cd4c1758a2bdb6c4de38f1d1ace79712c47afdc401 SHA512 575b64b257def9da4ae7aeca2591832b1f629e9e8416da642aa3d78bd4c05ddd484e09249c490158aa5a3b5b6f4703e39255ba97084225613e02288c532af978
diff --git a/sys-libs/libomp/libomp-16.0.0.ebuild b/sys-libs/libomp/libomp-16.0.0.ebuild
new file mode 100644
index 000000000000..0c6f7ee11238
--- /dev/null
+++ b/sys-libs/libomp/libomp-16.0.0.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit flag-o-matic cmake-multilib linux-info llvm llvm.org
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+IUSE="
+	debug gdb-plugin hwloc offload ompt test
+	llvm_targets_AMDGPU llvm_targets_NVPTX
+"
+REQUIRED_USE="
+	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gdb-plugin? ( ${PYTHON_DEPS} )
+	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		dev-libs/libffi:=[${MULTILIB_USEDEP}]
+		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
+		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
+	)
+"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	offload? (
+		llvm_targets_AMDGPU? ( sys-devel/clang )
+		llvm_targets_NVPTX? ( sys-devel/clang )
+		virtual/pkgconfig
+	)
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+		sys-devel/clang
+	)
+"
+
+LLVM_COMPONENTS=( openmp cmake llvm/include )
+llvm.org_set_globals
+
+kernel_pds_check() {
+	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+		local CONFIG_CHECK="~!SCHED_PDS"
+		local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+		check_extra_config
+	fi
+}
+
+pkg_pretend() {
+	kernel_pds_check
+}
+
+pkg_setup() {
+	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	if use gdb-plugin || use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+multilib_src_configure() {
+	# LTO causes issues in other packages building, #870127
+	filter-lto
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local build_omptarget=OFF
+	# upstream disallows building libomptarget when sizeof(void*) != 8
+	if use offload &&
+		"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null \
+		<<-EOF &>/dev/null
+			int test[sizeof(void *) == 8 ? 1 : -1];
+		EOF
+	then
+		build_omptarget=ON
+	fi
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		-DOPENMP_ENABLE_LIBOMPTARGET=${build_omptarget}
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+
+	if [[ ${build_omptarget} == ON ]]; then
+		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
+			mycmakeargs+=(
+				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
+				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX)
+			)
+		else
+			mycmakeargs+=(
+				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
+				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
+			)
+		fi
+	fi
+
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	addpredict /dev/nvidiactl
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-libomp
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 23d70db1f71e..eddb51fce619 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -2,6 +2,8 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
+DIST llvm-project-16.0.0.src.tar.xz 117933476 BLAKE2B fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c SHA512 3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
+DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54 SHA512 38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-16.0.0rc4.src.tar.xz 117930024 BLAKE2B 55cf032ad3ba52d2af0942fe1c627319ae95b466122d04b24a917c33e29139fae546d92c375715600190c02426b798803ead0ab7a97d86960cf98fca80e8815c SHA512 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
@@ -11,6 +13,7 @@ DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAK
 EBUILD llvm-libunwind-14.0.6-r1.ebuild 3161 BLAKE2B ba7b19ed2bc77b52eee0b04d938541d2eb4053b65a641e55e54ebac85adcd432fa60b2b484003890bc96be83d61410bb58c2f3a86f12a7c574044a8e10427db9 SHA512 11854f9ef2a552a96e51c618958e553d4cd4affc78312845a223d0fe6d2ff62e8f8b2b3c29ad4a093b08a6df63b230f21b9ef6b63440058322f6a00f160df3e4
 EBUILD llvm-libunwind-15.0.7.ebuild 3032 BLAKE2B 9b47e894db1a764f3eca3135f4caba68261953f4433af017b7bb53181e345ad26c570733f997022c53c9ef49a0a3b823188d92cfcc16a2113825d767b1ffab2a SHA512 0b68480fb2a8e5a351574e81fbcff824cd324754ed40378f06fec12fedbba94a921043d72db6ecc37f8b0680b7f518bbbd8d63f69ce8d84f86ca522653d293fb
 EBUILD llvm-libunwind-16.0.0.9999.ebuild 2978 BLAKE2B 9143fac20e5d73511c56e8015c4758075bf62329b64428b9244812f2fe5fa32772c9ad29e3e7beb1aaa2ff3ef70ee69f9673c0becf7df09f4e2fc5d348c03512 SHA512 b790b15702e2ba0367c771d58dfe975f7b97bb6a90acca97d1180b1b3ba44893575bc92ee1cfe037c308b3191f3d1b8309a0a658cd8617b0993bfa8ce4630d97
+EBUILD llvm-libunwind-16.0.0.ebuild 3045 BLAKE2B e0704cc1c6a743ecd3c073df9456f7a549896a9992083ee650803f199d4285a7666fc819245fe3e5762046d8df875291283059033287b9e1f9d71345e86a20a2 SHA512 4da2d464da0d7f438e782bbb539c394588c046af0c1415718ffa2e43e6500eaa60aedefe58b814281c41873a4ebae8b01f5299798583e9662a347a95ed5a5e69
 EBUILD llvm-libunwind-16.0.0_rc3.ebuild 2984 BLAKE2B 89f6251c89eb54defcddf231cbc4c34005b5d0421e2886b2eebcc1a8f98f88271357e6efac8a46b8d4616912611bf7c935c7cd60b15a6b42f74e3bbedcd629a2 SHA512 d4b223d191f0d0bcd19805050e3e770dc7faf4e68031f329deb085bd1562d278e2eea3f040405526025711d6ac4b390497ecf329f4ab31a00c3edf53186cc2fd
 EBUILD llvm-libunwind-16.0.0_rc4.ebuild 2984 BLAKE2B 89f6251c89eb54defcddf231cbc4c34005b5d0421e2886b2eebcc1a8f98f88271357e6efac8a46b8d4616912611bf7c935c7cd60b15a6b42f74e3bbedcd629a2 SHA512 d4b223d191f0d0bcd19805050e3e770dc7faf4e68031f329deb085bd1562d278e2eea3f040405526025711d6ac4b390497ecf329f4ab31a00c3edf53186cc2fd
 EBUILD llvm-libunwind-17.0.0.9999.ebuild 2978 BLAKE2B 9143fac20e5d73511c56e8015c4758075bf62329b64428b9244812f2fe5fa32772c9ad29e3e7beb1aaa2ff3ef70ee69f9673c0becf7df09f4e2fc5d348c03512 SHA512 b790b15702e2ba0367c771d58dfe975f7b97bb6a90acca97d1180b1b3ba44893575bc92ee1cfe037c308b3191f3d1b8309a0a658cd8617b0993bfa8ce4630d97
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0.ebuild
new file mode 100644
index 000000000000..049f6bc1cc17
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="+clang debug static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!sys-libs/libunwind
+"
+DEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+
+	# https://github.com/llvm/llvm-project/issues/56825
+	# also separately bug #863917
+	filter-lto
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	# https://github.com/gentoo/gentoo/pull/21516
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libunwind"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
+		-DLIBUNWIND_INSTALL_HEADERS=ON
+
+		# support non-native unwinding; given it's small enough,
+		# enable it unconditionally
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+
+		# avoid dependency on libgcc_s if compiler-rt is used
+		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+
+			-DLIBCXXABI_LIBDIR_SUFFIX=
+			-DLIBCXXABI_ENABLE_SHARED=OFF
+			-DLIBCXXABI_ENABLE_STATIC=ON
+			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+			-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+			-DLIBCXX_LIBDIR_SUFFIX=
+			-DLIBCXX_ENABLE_SHARED=OFF
+			-DLIBCXX_ENABLE_STATIC=ON
+			-DLIBCXX_CXX_ABI=libcxxabi
+			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+			-DLIBCXX_HAS_GCC_S_LIB=OFF
+			-DLIBCXX_INCLUDE_TESTS=OFF
+			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-unwind
+}
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 64b5eb98f37c..9859f5832007 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/wsmake/Manifest b/www-misc/wsmake/Manifest
deleted file mode 100644
index bdd468789072..000000000000
--- a/www-misc/wsmake/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX wsmake-0.6.4-fix-const-va_list.patch 781 BLAKE2B e73ff7c6c7fb2edd44c0d174ac3a738fe4aab3e15622eec5e6e3c3d7eb68a700b733548ab0c1e06f5304c092ba0813915b4ad2836c6b18c63418934b581f05ec SHA512 ceae38c3fc09f8e88d4ba9eb64467df5266b8332b365fe217354bf362343fa074e1e4407303d93de7f82b444a02f79d719dc0173156254501eba9144975f6867
-AUX wsmake-0.6.4-gcc43.patch 771 BLAKE2B 0eb6b683f2a50a3f7e65175fa4de9100109733e924d9a846fdeaaa0f80f8bb50f48f2750f798aa1160db8e0e8f1b188e83f6f214c5419930d62712de52d17817 SHA512 d155fd9b7bfe27bff396c2adaad39b9bcaa876d5a5b7dc77d0bb6932e548a65b088f79c36570036c7a06b1f1ae3d433716e696f57cea1bb74ac4fdb48fb9bee8
-DIST wsmake-0.6.4.tar.bz2 351688 BLAKE2B 4e810b1b5f697bc8a7bbb27a4023ff50f90fbcab5f9bf7890277ebb95d5fbf90cfaad51f181c4a76bd532f802fd4eaf07dbab6757a15ee242f80dbef19ce0b08 SHA512 0f5d125053222c624f9c19f4147f0d97311acb11050e09112ae7b13175ea64d0ba75942c5772e2ffe12d2913cea370ed663d7cb649eef67e0f8379775a3459c4
-EBUILD wsmake-0.6.4-r1.ebuild 833 BLAKE2B 10a8a21cc6c6f4f2f6c78754bb1c5cf2861c971c74b2f7f7486849a96b65c206ed1d597275ae1b8002b7b7d98266f8d2b8644f1c07090365a306424ffe7260c8 SHA512 07e3969de508bda2d687d05ebd12cdd164eaef1c4a45be09d3f7c4a34bfbdc6e60aa09b545ac96cb3b240be05ed15aec9b53fc41d50ab0ca54b77fbcae80473d
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/www-misc/wsmake/files/wsmake-0.6.4-fix-const-va_list.patch b/www-misc/wsmake/files/wsmake-0.6.4-fix-const-va_list.patch
deleted file mode 100644
index 420bbb61b030..000000000000
--- a/www-misc/wsmake/files/wsmake-0.6.4-fix-const-va_list.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/libwsmake/wsUtil.cpp
-+++ b/libwsmake/wsUtil.cpp
-@@ -710,13 +710,13 @@
-   }
- }
- 
--void std::__wsmake_print_it(FILE *out, const char *output, const va_list *ap)
-+void std::__wsmake_print_it(FILE *out, const char *output, va_list *ap)
- {
-   if(__wsmake_quiet) return;
- 
-   vfprintf(out,output,*ap);
-   //BV: this does not compile:  va_end((void*&)*ap);
--  va_end((char*&)*ap);
-+  va_end(*ap);
- }
- 
- #ifdef DEBUG
---- a/libwsmake/wsUtil.h
-+++ b/libwsmake/wsUtil.h
-@@ -77,7 +77,7 @@
-   void __wsmake_print_error(const char *, ...);
-   void __wsmake_print(const char *, ...);
-   void __wsmake_print(int, const char *, ...);
--  void __wsmake_print_it(FILE *, const char *, const va_list *);
-+  void __wsmake_print_it(FILE *, const char *, va_list *);
- }
- 
- #endif /* __WSUTIL_H__ */
diff --git a/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch b/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch
deleted file mode 100644
index 9028c0695546..000000000000
--- a/www-misc/wsmake/files/wsmake-0.6.4-gcc43.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=251745
-https://sourceforge.net/tracker/index.php?func=detail&aid=2520894&group_id=5982&atid=105982
-
---- a/libwsmake/wsSubTag.cpp
-+++ b/libwsmake/wsSubTag.cpp
-@@ -22,6 +22,7 @@
-  ***********************************************************************/
- #include <cstdio>
- #include <cstring>
-+#include <cstdlib>
- 
- #include <unistd.h>
- #ifdef HAVE_SYS_WAIT_H
---- a/libwsmake/wsWebPage.cpp
-+++ b/libwsmake/wsWebPage.cpp
-@@ -23,6 +23,7 @@
- #include <cassert>
- #include <cerrno>
- #include <ctime>
-+#include <cstdlib>
- 
- #include "wsmake.h"
- 
---- a/libwsmake/wsUtil.cpp
-+++ b/libwsmake/wsUtil.cpp
-@@ -28,6 +28,7 @@
- #include <cassert>
- #include <cerrno>
- #include <cstring>
-+#include <cstdlib>
- 
- #ifdef HAVE_UTIME_H
- #include <utime.h>
diff --git a/www-misc/wsmake/metadata.xml b/www-misc/wsmake/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/www-misc/wsmake/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/www-misc/wsmake/wsmake-0.6.4-r1.ebuild b/www-misc/wsmake/wsmake-0.6.4-r1.ebuild
deleted file mode 100644
index a0bf513caf90..000000000000
--- a/www-misc/wsmake/wsmake-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Website pre-processor features tag substitution and page ordering"
-HOMEPAGE="https://sourceforge.net/projects/wsmake/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ Artistic"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="examples"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-bv.diff
-	"${FILESDIR}"/${P}-gcc43.patch	# 251745
-	"${FILESDIR}"/${P}-fix-const-va_list.patch
-)
-
-src_unpack() {
-	default
-
-	cd "${S}"/doc || die
-	tar -cf examples.tar examples || die
-}
-
-src_configure() {
-	tc-export CXX
-	default
-}
-
-src_install() {
-	default
-	dodoc doc/manual.txt
-
-	if use examples; then
-		rm -r doc/examples/CVS || die
-		dodoc -r doc/examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 1a6ac9eb9651..5e57bd6286a0 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/thin/Manifest b/www-servers/thin/Manifest
index 96415ff93b27..cee8e86af4de 100644
--- a/www-servers/thin/Manifest
+++ b/www-servers/thin/Manifest
@@ -1,6 +1,6 @@
 AUX thin.confd-2 1335 BLAKE2B c6821353bbf2dd35d7161394247c4c3d88237c94f976a693ef95d19f7b751256c2f943250737c9f66777df6520feadad853a4ccdcb2fafa779c39d4456d2a78b SHA512 1f6eb02faf7bea7da3be56fd358846c0d5b7fa177d4dbfbb9930cc6496848917a0ae88394d58a7631e78a36c62394b4893d238bee2226568dbc2868627c2105c
 AUX thin.initd-r4 1841 BLAKE2B 4cdf853cb536011d582c729d3c48d7335cd3fa508c5281139220d624c204fae1460d4d1c0252d42ff3d277eaaaedfe1259e895335fcf9c8b9134d3f288f2ba44 SHA512 08d06627bf61737837af40fc4253afbecf753e3c74edacb038e59e66b95ef6bb56d55065e7d02d393ba2df45b93c9882788debdd4965404a8088c0e52ec98c0a
 DIST thin-1.8.1.tar.gz 181377 BLAKE2B 883a35d60d5845defa1f20a85b90269838a1b1ebeb4d4f32561af061cdac05b545c254fe65cca828ccfed033ad934ad3b72f1795407734d3b377a6022b57397f SHA512 221ef0c0369c449f2ca121c435ffebed318d6179a3b5d52e24d2bd80212df9cac35db39d156275c915c24550f6d8ded9f29616785d0a38e85cd13a1702e31298
-EBUILD thin-1.8.1-r1.ebuild 2544 BLAKE2B 01ed6eca038c5ff0338608e9af99d944a88c8d1671ce30576251775281f66acb2a9d737a30a27f79150875a7366bb3068fb73db1e665712e4c51a9b19da2d5ed SHA512 b4285d4ad5358e477966f2a7bf880f4512b6b65bf8e361ef2b05c5105550dc45a1ff7dfe89b242c87038b5641f1dc345d383d722a4d7feabd40c53c217023d6b
+EBUILD thin-1.8.1-r1.ebuild 2544 BLAKE2B 0284d3d30f520faa73b85050a3414654ac9c4a85fec0853612b5086493be6de37a148dbbe8bead9ad8d08feccc15ce3c996d4088ead0568663922dcc5458f3a9 SHA512 e9df8e66a1f3469b41b01a4da780446d9edc463c0f169e1b8055b71102398946bb2e7c163dc9c182dc64c071982f27477f9003401eaf6ab719d867ebe134d24d
 EBUILD thin-1.8.1.ebuild 2525 BLAKE2B a94a70719c1e60e9aaf9c0b70144060b030b3cf5c5ea783a806e8b363dbe6d92d3a5365991f058190e757ffb83b59fa198cae7e1b1fbb0443713252c628d7c31 SHA512 6a8182b208ef3acf96053f066ab57be871c0ccdc00957d15d01a2f1e7b6017e7ae1e973829ecf8719055728099cc3593ff6b1a871e8c9357cb1a096f318d3b57
 MISC metadata.xml 610 BLAKE2B 8b633db16d80bc055f9e599b176dda37a854c615fcbbd399bf09b9dc26c08d207a170487b429351370b4b7160b1c5a3ba3ed1e582b282d07e05870805866a9e6 SHA512 af5acf36ba40b97581f13ec3fbb6b5519a4be59f3649d665df884847f14fb925bbff2c1480ef5a4c7b771b302927eb8a10350c7cb54e1d0c3e27ce7c7a31041a
diff --git a/www-servers/thin/thin-1.8.1-r1.ebuild b/www-servers/thin/thin-1.8.1-r1.ebuild
index 8f8e959d7f1e..53edc5ed6083 100644
--- a/www-servers/thin/thin-1.8.1-r1.ebuild
+++ b/www-servers/thin/thin-1.8.1-r1.ebuild
@@ -44,7 +44,7 @@ all_ruby_prepare() {
 	rm tasks/spec.rake || die
 
 	# Fix rspec version to allow newer 2.x versions
-	sed -i -e '/gem "rspec"/ s/1.2.9/2.0/ ; 2igem "rack", "<3"' spec/spec_helper.rb || die
+	sed -i -e '/gem "rspec"/ s/1.2.9/3.0/ ; 2igem "rack", "<3"' spec/spec_helper.rb || die
 
 	# Avoid CLEAN since it may not be available and we don't need it.
 	sed -i -e '/CLEAN/ s:^:#:' tasks/*.rake || die
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index bab4805008fe..fe074801192e 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-notes-plugin/Manifest b/xfce-extra/xfce4-notes-plugin/Manifest
index deff80c9aa91..5b47a40ebf63 100644
--- a/xfce-extra/xfce4-notes-plugin/Manifest
+++ b/xfce-extra/xfce4-notes-plugin/Manifest
@@ -1,3 +1,5 @@
+DIST xfce4-notes-plugin-1.10.0.tar.bz2 492901 BLAKE2B 4b4724bf767e61b7c73ddeda71d4097751786d60335947d233e78fb8967ee9302d55a7cc259be4dbf2f8122d33a108769fdccdaf77f8fd4b50789196794e0b91 SHA512 4c050a95f879f0ba5e28662853ab764a14fbcef513e037bfdef1e3cae91b504d0c55eb0b533098589cf568c8e6e6e3ec2dec0841eb54c99c50105f6fff55a447
 DIST xfce4-notes-plugin-1.9.0.tar.bz2 502606 BLAKE2B 2b1b2dd97301ab57363aeaa8a373c62a9e9c14bdc1eb7dd6355bb096728b05e5bee08ce8a5922c2a93f1c2b7fa7197f8aa3fb0c2a96d5eb71a7002c22eb8d13c SHA512 32ee410fa9d4dff4f73a844ac53024c39a884b48cee32faf14c1ed75200f912bd4e51a1fe3305deea9ec98a617b63a65e271437b09cb9b664498746a8095f4a1
+EBUILD xfce4-notes-plugin-1.10.0.ebuild 935 BLAKE2B c725fb0ed0ab455259666100ccffe771e5dd8427a44a2d982b93309f769dbffbccd8a12957e03fb1564c76fee398c95cda3960e5d1799328dd5b1006400565c9 SHA512 e010c7ad38526fc3063249fc4f2f59a5c33fc934b661b76ae188a2b1e494b3f7ff0315293c997b095485635e86ea7e367d59e38bd646e1e53958bb50ecd615a5
 EBUILD xfce4-notes-plugin-1.9.0.ebuild 873 BLAKE2B af3182161ffcefc171cd81dacb155f3a035e214e9c6e6d67bd267c60d6cc0e6f2c9569357c6b4d07a0a57ac55ddf310cc5cbe2943da3fbf3a0f54371f8c47e1d SHA512 4c273af29aa2bbb5eaf9ecab70f8a031b6f0d64b12a794e5370f678b25995bdd5df8dfd84f5a8bcc2ba8ed5c881a236331d049a04a43609d2dcd0f87a9e5a007
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.10.0.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.10.0.ebuild
new file mode 100644
index 000000000000..2caea09923fc
--- /dev/null
+++ b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.10.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Xfce4 panel sticky notes plugin"
+HOMEPAGE="
+	https://docs.xfce.org/panel-plugins/xfce4-notes-plugin/start
+	https://gitlab.xfce.org/panel-plugins/xfce4-notes-plugin/
+"
+SRC_URI="
+	https://archive.xfce.org/src/panel-plugins/${PN}/$(ver_cut 1-2)/${P}.tar.bz2
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.30:2
+	>=x11-libs/gtk+-3.22:3
+	>=xfce-base/libxfce4ui-4.14:=
+	>=xfce-base/libxfce4util-4.14:=
+	>=xfce-base/xfce4-panel-4.14:=
+	>=xfce-base/xfconf-4.14:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index 2805c5eeb9a8..6513fff92723 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,4 +1,6 @@
 DIST xfce4-screensaver-4.16.0-mem.patch 3265 BLAKE2B 38436c7c2047453109702fd54aee874dfb489819024e61899b807ea98686bdd491e578b65be89dfbd53ee89976bb215790df4fce6559f7ee4f5ff92b449374fe SHA512 dc9e289aa91ea4a5b65d2381bfabdbb48a6b07c67782afc53b003ffd2a07c0d225f4bb2ea48bcd478f14ab4c29a2521a0436085b40589e5a059e5561f7bcb42d
 DIST xfce4-screensaver-4.16.0.tar.bz2 687978 BLAKE2B 1656027af61a50ab97fd3d5744f0ab5f1a81353c64a2fd935a6113dbe2fce5c4b2a22c5f81f15d06d09c3b292f82afa95ce34a07facb5fffef7e6fef712cae63 SHA512 5fa0381395b48fdfb5bdd9b4cafe1ec625d0b7fb9600d59c22c42fe0248fb4b99dd18a94045df3ecdc77635f7271676329c658f25003a9d8d6f9a9a66739dbe9
+DIST xfce4-screensaver-4.18.0.tar.bz2 705730 BLAKE2B 190ef60167abe41021e2140ca9efcb8a2021c6e5f18f2ffb81aae1e8e9efee5a2b4da968f96d135ac74255281f8079c5705ac2fbf2d535f0bc14d56562b9a1cc SHA512 06d32c81411d41f96d5fd822e31fb8f256193114b7e60472a32ecb5f369c14780dfcd316c1698904c46c90713e25fd42b947357d3bf5edf65a25fc3a7cdaa45c
 EBUILD xfce4-screensaver-4.16.0-r1.ebuild 2017 BLAKE2B f258aef5128dbd11337573db4eef446ed7948796a4a413720b4ae9c98110d0c7bfd43d61b5879ea6d217e7ec173bc81d3fbad6378542062e51ee21b264f48ece SHA512 f26cb108fe2cfbbe3e60d3312b366f0b5512235da6bb3812465f064d9c2e52256d14973596584e8a665feb2a93569581296d73571ac0271664d20303c72eac6b
+EBUILD xfce4-screensaver-4.18.0.ebuild 1855 BLAKE2B 6ba11628ab00dcdaf5d1dd8a4fb14967155b912e5ee65edd47596ded087f0c8faae8b67cc8506fc9f7caaa6bfd0ef7ab210a609948bbe748c28f4dab0589d351 SHA512 fc513f44796954bfe404e52be5b25e2a612783a9b2317f67c57824d623b479d025df13935bab699339dc8d1e837ca6f64d04da1b459a36bbd7bc64c526c0ce90
 MISC metadata.xml 292 BLAKE2B cc7b9f7a72918097fc69b330b539d32dbae696c757c3a069bbc4514a8ff1f1931d2643ecaba63a28b7b58299fe1064c3425be00ae4c8f23d5413cef25ab738b3 SHA512 801d1715cbf897ea4ff01e49b7675b8522f07917b1e5908025c590fe18ae0d50463144f5d21ef7b33e9b3bac325f4cf96644c54eb62b8aacf7b512c612b10234
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.18.0.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.18.0.ebuild
new file mode 100644
index 000000000000..157de2196507
--- /dev/null
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-4.18.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Screen saver and locker (port of MATE screensaver)"
+HOMEPAGE="
+	https://docs.xfce.org/apps/screensaver/start
+	https://gitlab.xfce.org/apps/xfce4-screensaver/
+"
+SRC_URI="
+	https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2
+"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="elogind +locking opengl pam systemd"
+
+# Xrandr: optional but automagic
+DEPEND="
+	>=dev-libs/dbus-glib-0.30
+	>=dev-libs/glib-2.50:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libwnck-3.20:3
+	x11-libs/libICE:=
+	x11-libs/libX11:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXext:=
+	x11-libs/libXxf86vm:=
+	>=x11-libs/libXrandr-1.3:=
+	>=x11-libs/libxklavier-5.2:=
+	>=xfce-base/garcon-0.5.0:=
+	>=xfce-base/libxfce4ui-4.12.1:=
+	>=xfce-base/libxfce4util-4.12.1:=
+	>=xfce-base/xfconf-4.12.1:=
+	elogind? ( sys-auth/elogind )
+	locking? (
+		pam? ( sys-libs/pam )
+	)
+	opengl? ( virtual/opengl )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/intltool
+	sys-apps/dbus
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		# disable docbook for now
+		ac_cv_path_XMLTO=no
+
+		# xscreensaver dirs autodetection doesn't seem to work
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+		--without-console-kit
+
+		$(use_with opengl libgl)
+		$(use_enable locking)
+		$(use_enable pam)
+		$(use_with elogind)
+		$(use_with systemd)
+	)
+
+	if use pam; then
+		myconf+=( --with-pam-auth-type=system )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}