gentoo auto-resync : 11:11:2022 - 21:30:43

230 files changed, 5729 insertions, 337 deletions

diff --git a/Manifest b/Manifest
index 00e3f1d802bf..2d7398cc6340 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29577 BLAKE2B 1fb4e40846532bc9c428d76f816065cb54a2604bc2ce39bb2a45f9ef08b6f92b3c4ca89c9a1118262bffb11d8086d1a84fb1292e9b450eebde89d744e5890a9d SHA512 42a0ce0bd1ec166f0dd46b64a0577a229af7d6088ed597aa0d23039a8f156b43b0a569439abb58b9ced43800323daf00d998dc6acc7da67d02c98d8d6c4a025d
-TIMESTAMP 2022-11-11T14:39:42Z
+MANIFEST Manifest.files.gz 29603 BLAKE2B ae6906f1090af31589e7e1c691c44fbc1e29669c96d3c94765f2c3b71f63dcaa13c685be3b5b1ed512c4a02896334221741aa0364d74e9de039b16e42fcb98a4 SHA512 a64ebf109ac37de8fbb5eac6a27a7b55ce792d1de5a4ce6d53045106293c746ef598a7194d6fdc42007d28bf00899e1e0955a36fd242cf373e932d047aab2596
+TIMESTAMP 2022-11-11T20:39:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNuXq5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNusxVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAjqw//apW+Iu6yCKJNT0ZCHpPN0xPkL2boJ8fCi5ZUs/w5IV/s2XSkXM5pbGj0
-8INWGPqwF5iGh/tSY3q52mTfFmlev+LCNbgr06+M5FBfwf3El4CF6ozbT9gYmIVO
-QJo6mXsXLx6A62ga7/AieU5ipXBn39OdQqC3T05VljzXHb9tw8Jm826+0Shl+Tae
-MUBxDnTTkX1AWukvaVU1DCiqtNg/XtOXKCl37wtzvnBfS7x4KITMcle9OgZvqY9A
-My5BZnL9LT9B/8BfFLTjuaNQ+URqnt+nusZgFs2jhVPru8afGH+AcDAVC08EjoKf
-ePnjM5mVe3g8Lrtrg9yXIreM/MnhZcXH7UngHQYwHxGmZ7u2svyb7xM0fkNgb+8F
-5/lnsoEw7xqy0Q3G0acEc726S+ldrS/xM+lGbccsQtFFuZtlPSejkk4pTz4SFFjr
-MOxlUsPduj88805QsqHNQq3dLPoQ0bp1l7Hfu7vCAhPiYBEwT5Z/hBHyuLKbMlBU
-m7LzESJcuZCbsiDBIRBJIyruIPtIlZA4A+C4IONj8elzBtGPbylRYTgUo0dWedk1
-3+bYnHt/8Zzo6mzxNf8pE05JoxJUHG0D30KjGksNREq315Ujgzd3fObk7bDcrBNS
-fhr+4SXF2bcS6av9M9ZIsRgFO0C1DWHZsAaFN+YJ2wS16SbbODg=
-=gcG0
+klCVLRAAkxkL6TvlAPjT7nC766f+xoHG2PyPfIwbB791Mrxffw02SkICVh5Gybop
+jbOME56LDWEgEWqKgZjhiMg/BwI0CJkJqY+/EEjGWI7Luy90CxlTRCkF3aJvrleg
+baEs0t4wrb28bWyWRqybwU2lcbgMtlcLhai9DiR5o3tMQCMPyemX+CbRm350Mo2S
+wcgq6FUJxEps5EegaAQmbFCM+PnUurNdlfJk0rzBPFS5SntD0lFUJ6vjgv1ZX6v5
+TsrJPjEFTPNKM38NGPJL9+63/kP2zCs63fSzvjMQLweuP9gvLSzutSy+PlphaXRE
+i0p0PXpMzF5hM3o48urEFHTeXXAzs/MTT6R3F9ZUV8eeIgcSLULFUvXYu1Tq3PiA
+SL5z92BxzFcwPKlpS1yG0sGd7B1xdn8LdGoDH+gv27OESzaTlRB/R0vQhy2sNmvl
+7HRg4Bqe5mxWIZUE2ZoSylUMjgjQjOQparIdVqXAStyzyCbnDQWJShDbF0rtlN+j
+/5T8My3MyvW/mlDG/5f3BUKSZoxm4B8XKHmLZ8+jON8UPBmgVcWcN4VQYj/zZD/3
+0z3wj45OXMMubBxefBhJvi7NSeQmFFMbQZ9b6K88NuEOEaTTRkhHA29Giqzy+/u7
+F7L4+8rYSKRhSJDml+WgoBUbneKNw5Ssnyprx/uOe8VODOMt/5M=
+=U45G
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index dac5f9a00466..22bf15fe8668 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index f3c832e8386a..9efcfd1000c0 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
index d7744f6855db..ae8a3a508b58 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -2,5 +2,7 @@ AUX 60nxml-libvirt-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b
 AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf204c43bbea5db01626847af7ab96854efcbcc34e7fe9b1c32873ad22ef13873a1a06790e9580371d SHA512 3544959cc57ce1b273e4b9de95f51e1e21d23cc35fb48e02f179a055a61ee9092efdc43405f72c3aacb3c74eada7fabf5952eb49e3ff0514fd69a3092268dc4f
 AUX schemas.xml 560 BLAKE2B 32f01d2dd047aa7109112b47155a21825686385845fae2af0f6d052dbd36f3e1ca5027ec39d654735e390ef9aa8a31f7ae5c86b15b0cd9c4ef84128326e87ee9 SHA512 82ef6189610fc4e1a0d5546ae15f2f315e7c0d460fa141201c43a93e59d147613c7186302fdc3e6b2f0ec5c343e5566966892d4e9f55dc4957e4ad58793fc3ff
 DIST libvirt-8.8.0.tar.xz 8941928 BLAKE2B f3b8cb4fe30a156884a03e5c873f3fcef0c8d13315c79b865f387ea053635ae2435a3b4d6e81c988cfcd087d55223450e7b874e24e4503479d152b417c398250 SHA512 868e49b369afe200c5af6e2cd0606de2eeebfa92523b5ad3c653203c8838d304bd0cdc5acfb3c4d4c33c0a87ab8e769b84cc62e3f06e055936c43573a23d7190
+DIST libvirt-8.9.0.tar.xz 8946352 BLAKE2B 537b6badb6171110e99561613fb1318144991107139401296248afb747ae6f9cfafcd17b2292b8d8dcc9188ff4206035ea814efa6c129bae50c0518f61be9b81 SHA512 10426d45d55bb18e8e5d4327d698fbc6efd83c5f515ac40a0fcd72048a77936fe0b422ac14bce9966a65379d262df294c314f854a97861a223a0cbc6a8fd2382
 EBUILD nxml-libvirt-schemas-8.8.0.ebuild 1052 BLAKE2B 2f66499763abab90bc7ff91c49853d5c2be7dda44b0c708443f531db1d2e82fafc8db3c8c5363695b65e40a46cea9838eadd53aca68285e22bd9d31e9b3bc94e SHA512 e633a25db9d1c550952d94b8a37ed74cc37c645e14f01463a62ed4d41c6aae26abd325ec0535691a9be61b6c653853cf99f21633ace83ddc0bd1cc34416583c8
+EBUILD nxml-libvirt-schemas-8.9.0.ebuild 1052 BLAKE2B 2f66499763abab90bc7ff91c49853d5c2be7dda44b0c708443f531db1d2e82fafc8db3c8c5363695b65e40a46cea9838eadd53aca68285e22bd9d31e9b3bc94e SHA512 e633a25db9d1c550952d94b8a37ed74cc37c645e14f01463a62ed4d41c6aae26abd325ec0535691a9be61b6c653853cf99f21633ace83ddc0bd1cc34416583c8
 MISC metadata.xml 390 BLAKE2B 05bd110c71244cf02d22bcf823d3285e73bdb03f3bb06b8c9e2c13cd346f2367380345747d5eb0861f37983be970dc6c9fe5e7d93b422205a7b447dc3330852e SHA512 bb803aed730418caf43baf132b989963e84f5e0e0d8db915a48cae407f20fb52e27c147725cac88fc94303db070f300a7ce3bf6c18e7dc66dec37bf9ccea5f5b
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.9.0.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.9.0.ebuild
new file mode 100644
index 000000000000..1c0188f9655a
--- /dev/null
+++ b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.9.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+inherit elisp
+
+MY_P="libvirt-${PV}"
+DESCRIPTION="Extension for nxml-mode with libvirt schemas"
+HOMEPAGE="https://www.libvirt.org/"
+SRC_URI="https://libvirt.org/sources/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P%-rc*}/src/conf/schemas"
+
+# This is the license of the package, but the schema files are
+# provided without license, maybe it's bad.
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Yes this requires Java, but I'd rather not repackage this, if you
+# know something better in C, I'll be glad to use that.
+BDEPEND="app-text/trang"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() {
+	emake -f "${FILESDIR}"/Makefile-trang
+}
+
+src_install() {
+	insinto "${SITEETC}/${PN}"
+	doins "${FILESDIR}"/schemas.xml *.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 8bb7bf43d69e..54460fba32ab 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index b6cbfca38bf0..91066d5f464f 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -13,7 +13,10 @@ DIST libvirt-8.7.0.tar.xz 8937316 BLAKE2B 131d46206662627e952b6daa3ceeab187321ff
 DIST libvirt-8.7.0.tar.xz.asc 833 BLAKE2B ebea1430670bcb44e9ffb4460388b2ab41e8b409d1513d09ac56b12f379621f5ad39af0dba9691b36220bbed5634ad24b2efda8315b41bb2e7f3f6a65e9b028c SHA512 5ac09b10de74283c474fb80cfe600a171d6b49039df73113702cda565889f6c6919e99aff6ce60538ee7fda52287ef035ee15e8f47e5f724384c6ec474e6bed8
 DIST libvirt-8.8.0.tar.xz 8941928 BLAKE2B f3b8cb4fe30a156884a03e5c873f3fcef0c8d13315c79b865f387ea053635ae2435a3b4d6e81c988cfcd087d55223450e7b874e24e4503479d152b417c398250 SHA512 868e49b369afe200c5af6e2cd0606de2eeebfa92523b5ad3c653203c8838d304bd0cdc5acfb3c4d4c33c0a87ab8e769b84cc62e3f06e055936c43573a23d7190
 DIST libvirt-8.8.0.tar.xz.asc 833 BLAKE2B 3919af7c208d9a5f863a9351cfcf72916ff67cbef26fe7b86bb3b1042b5556f75a4a0c5210cdb67aee79bd3706047d2d2244c967297dbf2aba2d28c625797361 SHA512 9bc3c0ae6f7fa9d6ee17ca183e218b0f2f6e413b303bd429cda090828ac0521c142178ca4c3c3bc6030c9e58f36ae5d33c7c8a9d6c8147f214e1740a78f66d2a
+DIST libvirt-8.9.0.tar.xz 8946352 BLAKE2B 537b6badb6171110e99561613fb1318144991107139401296248afb747ae6f9cfafcd17b2292b8d8dcc9188ff4206035ea814efa6c129bae50c0518f61be9b81 SHA512 10426d45d55bb18e8e5d4327d698fbc6efd83c5f515ac40a0fcd72048a77936fe0b422ac14bce9966a65379d262df294c314f854a97861a223a0cbc6a8fd2382
+DIST libvirt-8.9.0.tar.xz.asc 833 BLAKE2B a2054d0d9c8301aa0f8697253690b1ddd530a577bc789c7f38dc36a835134d0c8e5fc88536371c75da66afd9808540b9236e8d1247e4d7bd5f3a0aaf35c45f97 SHA512 087d5406ef23d6beee4a37e471d7d0aa433990b892f0beb7be76609fbdfcb69381acd59d63c62dcd2e2f9ccfcdefc35109cc175a0da4263e9b189981cb2baff1
 EBUILD libvirt-8.7.0-r1.ebuild 8892 BLAKE2B 47bf4c928885c5851d40a24988464dc07bca48ba25d063ccf4543181e3302173102fb39c752b0b12a983475dc671241d85c795f208802d0901dc47b4d85373b5 SHA512 da44b1181cef1ddb22e9a23fec90ce37b5bccff61777e6d9645581a96080cb518b0aceac6d7611f48bb7b52c39859f7dc17b0c9f1d455fc6ff122ebbf60a8ae8
 EBUILD libvirt-8.8.0-r1.ebuild 8897 BLAKE2B 043c99143cb6a4826e54f330de311c0cc1076fc2e1344371e1c5bf7e63f39c42a30cca0c1c6e69dfa803dece2e582dff3f22174cb5b5f0bc851968d1cb33f33b SHA512 b840590e3314a21ad9dd5c169f2c12c02005711b28d6c3f48be535c7a219457ca205b2db2e9eeb6eeba02dcab83853299605259bf1a6af36eb3d689301d50a51
-EBUILD libvirt-9999.ebuild 8892 BLAKE2B e2b769812ecffd2f7ef6d5967d538a1fbd5140ff91f7a8fde62014232a5590ac1a2b12403d143ac2c83d7d243cef5949a5c64b39a91cb392d745c62550d6817d SHA512 63741913f7725b5b7530a3b2d4384eb0a360db12dc0b9be8b3195b1545e999ee3330e4b4c46e1cf945f31704ce2f1abf47db5a69d28277f220eeb500a5d9602f
+EBUILD libvirt-8.9.0.ebuild 9015 BLAKE2B 0e0e6edb4fa430aff8ab4718319479df7927303f4dc75075f8682811bda4318001661f3fcb1866df9234eab9ea28632c9f32c7dac9217fff0e95a0b24b6d62df SHA512 bd356916c10e7ba8da9aefb00e76c2def259f62c28844a7d2db60b5842c5855ce6aa4e0ea4126980dd42ad9f754abac501de6afbc602cf960803f0db5dc9f655
+EBUILD libvirt-9999.ebuild 9015 BLAKE2B 0e0e6edb4fa430aff8ab4718319479df7927303f4dc75075f8682811bda4318001661f3fcb1866df9234eab9ea28632c9f32c7dac9217fff0e95a0b24b6d62df SHA512 bd356916c10e7ba8da9aefb00e76c2def259f62c28844a7d2db60b5842c5855ce6aa4e0ea4126980dd42ad9f754abac501de6afbc602cf960803f0db5dc9f655
 MISC metadata.xml 3729 BLAKE2B 2e68676afb3820c7b8cd3d76b0a5c42886e246fc6b440ce49c71cbe60c124cdccd4ed8fb97f7153529b758d56dfba98b6a98a31b2fbff7e738f52bce796a3476 SHA512 0dfe519af8b740de9d41b1e2c40133026718a782b654a261c54cbe22b5f694cda8b73036c59411317757b73c40acaea77f70d7ab86ae8325e78d61151e6c64f1
diff --git a/app-emulation/libvirt/libvirt-8.9.0.ebuild b/app-emulation/libvirt/libvirt-8.9.0.ebuild
new file mode 100644
index 000000000000..b346d777488b
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-8.9.0.ebuild
@@ -0,0 +1,343 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{8..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="
+	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
+	parted pcap policykit +qemu rbd sasl selinux +udev
+	virtualbox +virt-network wireshark-plugins xen zfs
+"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+BDEPEND="
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig
+	net-libs/rpcsvc-proto
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent.
+# The 'circular' dependency on dev-python/libvirt-python is because of
+# virt-qemu-qmp-proxy.
+RDEPEND="
+	acct-user/qemu
+	app-misc/scrub
+	>=dev-libs/glib-2.56.0
+	dev-libs/libgcrypt
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.9.1
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-3.2.0:=
+	net-libs/libtirpc:=
+	>=net-misc/curl-7.18.0
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-devel/gettext
+	>=sys-libs/readline-7.0:=
+	virtual/acl
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dtrace? ( dev-util/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( sys-fs/fuse:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( >=net-libs/libssh-0.8.1:= )
+	libssh2? ( >=net-libs/libssh2-1.3 )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
+	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[lvm]
+	)
+	pcap? ( >=net-libs/libpcap-1.8.0 )
+	policykit? (
+		acct-group/libvirt
+		>=sys-auth/polkit-0.9
+	)
+	qemu? (
+		>=app-emulation/qemu-4.2
+		>=dev-libs/yajl-2.0.3:=
+		dev-python/libvirt-python
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[dhcp,ipv6(+),script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6(+)]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
+	xen? (
+		>=app-emulation/xen-4.9.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/libudev:=
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )
+	kernel_linux? ( sys-apps/util-linux )"
+DEPEND="${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
+	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
+)
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP_NF_TARGET_MASQUERADE
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	touch "${S}/.mailmap" || die
+
+	default
+	python_fix_shebang .
+
+	# Skip fragile tests which relies on pristine environment
+	# (Breaks because of sandbox environment variables)
+	# bug #802876
+	sed -i -e "/commandtest/d" tests/meson.build || die
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature apparmor)
+		$(meson_feature apparmor apparmor_profiles)
+		$(meson_feature audit)
+		$(meson_feature caps capng)
+		$(meson_feature dtrace)
+		$(meson_feature firewalld)
+		$(meson_feature fuse)
+		$(meson_feature glusterfs)
+		$(meson_feature glusterfs storage_gluster)
+		$(meson_feature iscsi storage_iscsi)
+		$(meson_feature iscsi-direct storage_iscsi_direct)
+		$(meson_feature libvirtd driver_libvirtd)
+		$(meson_feature libssh)
+		$(meson_feature libssh2)
+		$(meson_feature lvm storage_lvm)
+		$(meson_feature lvm storage_mpath)
+		$(meson_feature lxc driver_lxc)
+		$(meson_feature nls)
+		$(meson_feature numa numactl)
+		$(meson_feature numa numad)
+		$(meson_feature openvz driver_openvz)
+		$(meson_feature parted storage_disk)
+		$(meson_feature pcap libpcap)
+		$(meson_feature policykit polkit)
+		$(meson_feature qemu driver_qemu)
+		$(meson_feature qemu yajl)
+		$(meson_feature rbd storage_rbd)
+		$(meson_feature sasl)
+		$(meson_feature selinux)
+		$(meson_feature udev)
+		$(meson_feature virt-network driver_network)
+		$(meson_feature virtualbox driver_vbox)
+		$(meson_feature wireshark-plugins wireshark_dissector)
+		$(meson_feature xen driver_libxl)
+		$(meson_feature zfs storage_zfs)
+
+		-Dnetcf=disabled
+		-Dsanlock=disabled
+
+		-Ddriver_esx=enabled
+		-Dinit_script=systemd
+		-Dqemu_user=$(usex caps qemu root)
+		-Dqemu_group=$(usex caps qemu root)
+		-Ddriver_remote=enabled
+		-Dstorage_fs=enabled
+		-Ddriver_vmware=enabled
+
+		--localstatedir="${EPREFIX}/var"
+		-Drunstatedir="${EPREFIX}/run"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	export VIR_TEST_DEBUG=1
+	# Don't run the syntax check tests, they're fragile and not relevant
+	# to us downstream anyway.
+	# We also crank up the timeout (as Fedora does) just to preempt failures
+	# on slower arches.
+	meson_src_test --no-suite syntax-check --timeout-multiplier 10
+}
+
+src_install() {
+	meson_src_install
+
+	# Depending on configuration option, libvirt will create some bogus
+	# directoreis. They are either not used, or libvirtd is able to create
+	# them on demand, so let's remove them.
+	#
+	# Note, we are using -f here so that rm does not fail or warn if the
+	# directory is nonexistent.
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+	tmpfiles_process libvirtd.conf
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 41862ff36a59..b346d777488b 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -60,7 +60,9 @@ BDEPEND="
 # non-optional, so put it into RDEPEND.
 # We can use both libnl:1.1 and libnl:3, but if you have both installed, the
 # package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
+# we must go with the most recent.
+# The 'circular' dependency on dev-python/libvirt-python is because of
+# virt-qemu-qmp-proxy.
 RDEPEND="
 	acct-user/qemu
 	app-misc/scrub
@@ -107,6 +109,7 @@ RDEPEND="
 	qemu? (
 		>=app-emulation/qemu-4.2
 		>=dev-libs/yajl-2.0.3:=
+		dev-python/libvirt-python
 	)
 	rbd? ( sys-cluster/ceph )
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 4c89718a4b68..187cf8a2da08 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 705a42bfa3b8..4f30c7ce14dd 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -3,5 +3,5 @@ AUX dia-0.97.2-underlinking.patch 969 BLAKE2B 00c56ce70b89e2e78c565ac106633e0060
 AUX dia-0.97.3-freetype_pkgconfig.patch 2574 BLAKE2B 870617b939e4ab7ecdfbf5bba4e78cee9f34ee10b1de2bb85380cc96d31c319132861b8ddd0e89a5a03cae2578588c9483ba62f0bf4006096c4074beef77cc4f SHA512 0e937bb17cb69d3f266f68658b11b209a913300d2366adfa4bb608212cd82f00d85272be784f0442d0dcba8659d020e5e848d2e02ee7310ec8cfd6c7170aa8b7
 AUX dia-0.97.3-slibtool.patch 316 BLAKE2B bec9fe48c0107b9cccdafa9fe5e92dfbd29ae723c33b354c288034fb61d96bb8526315d723ff4acf0e7cbdaf7f3c5e075637d7b1ddd581c0df8f284190c98151 SHA512 a2a2c2983c633e85d2bab48bc4a9df4125b6f745b819ca7b7e1a433d9ea69e8498e71d05bd4874d62cc7b45deae92719c361887a36aa3ec8b2135d0a5138a580
 DIST dia-0.97.3.tar.xz 5548500 BLAKE2B ab476ce48e57c1def01095a8d6d92208c11817580cfca1cfcf38af12943153116b31149ca187c65e5121ef9fb281bacc4c3e7f1726ed23b46ba14902faaaa34f SHA512 34298980be930b87cb4a636344e4cb2a7e43eedc00b0969a5e446cee9b74b616fdc8c798efcb9a5832b98741f2e20632a44037b2bcb436f59591d531ef441efa
-EBUILD dia-0.97.3-r1.ebuild 2613 BLAKE2B d4226603733e928f7bedf79d241e27e525e65c33abfa68149e12b25e73cf2b579a3e7a474b38a5168ed121cfb17dd04f6688a4ba1058903b69eb58d854aa977f SHA512 fc6d093ed65840347ce786c1892ddcc3abc75b5ff5d6a0e0065a1f10565f26064dd7bb04bc438121c5b5380f2e8fb37f690da3fa50a1f37b045dff29869af99f
+EBUILD dia-0.97.3-r1.ebuild 2614 BLAKE2B 50e250a17bf79b24b090b8d561668bcb7665cb4299ce276c0406c4bb1e07ce36ca9e9bfd1edc9e5cb985f386c4e0c45a2bf91b048b866051604f8bb99ea5dd30 SHA512 906ee05f576543f5ca2a6e695e6e58eb95580adb65cb65b64ef7fee6046b78f49d5c1112a34805295e20b11c2923d1d28bfeda106ecbcb0e1bdeda2b2668dfcc
 MISC metadata.xml 773 BLAKE2B c654cf30f7cac3a198911772f4af09dce74ead25e1b2e501f092929c5967640a1df80d110579a7ffc3777f735ca5f485a5348eb707243266af574ccd8f38f160 SHA512 949a675449bdd4533153d890d5d8106d4c447fce85b33624e9ae693d0dc485b8e764a8d52174c509077ab7c304093313a894d41ed267f100a31923a89356e72f
diff --git a/app-office/dia/dia-0.97.3-r1.ebuild b/app-office/dia/dia-0.97.3-r1.ebuild
index e23acda9374e..7b6401a9959c 100644
--- a/app-office/dia/dia-0.97.3-r1.ebuild
+++ b/app-office/dia/dia-0.97.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit gnome2
 DESCRIPTION="Diagram/flowchart creation program"
 HOMEPAGE="https://wiki.gnome.org/Apps/Dia"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 # the doc USE flag doesn't seem to do anything without docbook2html
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index d7b3fd0373e2..3df72b3a1818 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index cf9ecfb4d35c..0fa61d888fb0 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -12,16 +12,28 @@ AUX postgresql.init-9.3-r1 4999 BLAKE2B f2bc23a51b6d9643bbc14320aaa9c41b7eb1df86
 AUX postgresql.service-9.6-r1 1477 BLAKE2B 2a652d5b2892f3a52f484fcc0b4f4dad09cf4b46c3739c3f805072040a26128cb2ad9a25d4a7c9f109a95696d739538d379af6bac53c656f5c41af45b6110de5 SHA512 9e2b04923f6ebec1424c0f276c58a6a0c4933f2de5e2a9776169227729afd06ce5284461be8b6ed70e5aaff2a68b9f96c6893d867d35761c9977f9847ccfe93d
 AUX postgresql.tmpfiles 39 BLAKE2B 25a5725af53c8e4e4009887e998172dd863ce218a5438351194548c4fc8ea15308dfba3602d5a922cf49b46015198268a4a4528119d8a74dcef4cc4c1767c052 SHA512 498060f2a597cf374f4fb31deaa2d6c5b00edef68efc0e71b82bfc20b717ae12518ba18fcb455a0c518ebba1a0868f38321470616151d02fa79b889a66dcb9f8
 DIST postgresql-10.22.tar.bz2 19455874 BLAKE2B 10a8a894ba6e649abcc68abfd829bd30bca04b6e90f987ae5771fe02474517254ea2b48c7c9f2a899309de7b84aeaf13bac025965a9cc44814727ba257a633d7 SHA512 2e1ea75be7696ffbbb947351a8e8e55aaf067f86ad318308499a6a58797f0bf86227ed33e257e261c5c71ebba2f73ba514ef195a2394b91414ce6a0c3ab62532
+DIST postgresql-10.23.tar.bz2 19485297 BLAKE2B 71045313ab03a6c0382c88d5c817c7d1647b0e2feba511b8a09e2f6ec2c1b9473d50aa29777b159f1362695a5a742471b00676bc85a25c80c9801761b6edb1e2 SHA512 9fd031cad0c3caacae105215167abd5dc4fdd15dea77a12cb0a977fab6e245e3fda163f202cc7786e50c69e5c3f180d32676a3b18ea30a9a14f0bcab56aa19dd
 DIST postgresql-11.17.tar.bz2 20385599 BLAKE2B d145bc0f5e0f277be91bf46868c78c9ce5bb2eebbbd84fbdcdbb1ec115911d124a0a054df783739fb912eeae1322fb7eb58b7b1b8d40a8f81cffe2f24d3dda01 SHA512 35304279c06577eca134581490710db976edeac8cca169d3436fcdce8eebb18159459ea3b5ef403f6a8efe85542726f9960c4ca653da4619e081ce5869866032
+DIST postgresql-11.18.tar.bz2 20428126 BLAKE2B f0f01cb1f479032615b1b15e37d5c9955c560218de5e5cb480d920253a23615636fd8ed5e5310bdc1f80dc1f6da81cbb2ca41b90b0cc095139b6d9b59fc57d78 SHA512 17b4f9a0200814ae210076a677b9c68375d896bb1817b4f8b327ee208da9a1672625cdcbd213af2b01fe501a051436e9acf5cc9ed0a2b798f257d07b08cdf1b8
 DIST postgresql-12.12.tar.bz2 21089064 BLAKE2B 7285dcfc8ed6cf2dbbe29d894dbcef53fad18cbeddbfdb3a43893234a1ee75a9bf5d966968a0c481a8ab15bf8a37400bf6eb4b57a83359501b729e70398e3551 SHA512 eeff79279ac11db04fdddeb2c52ba1ec6b549223b862222540e1f659fbfc3617130699c22694b465bde46b1a4a665c01aef70b68b86d80e58a5657efd019407d
+DIST postgresql-12.13.tar.bz2 21114311 BLAKE2B df168e29090376379b0e0de18f31f7d5c6c1297e9763c5ce2b0d453a36fabaec3477461b431fb319246d5fbc6c01f4a00dcc9172b29f1bc0b13041b009f6e68f SHA512 a502236dcc4c56645dd57ed3c920d996adace3bc3a855c869344c8580393ad4c6ad17503928564683817066f6e9c5794f3d214b5f8e3b900ebb23474673bac24
 DIST postgresql-13.8.tar.bz2 21397381 BLAKE2B eb076382027a175789652a6ae8579d9b9c8856918741e8058456d22f1ef89525cff5fafe863bf615f658bc94b740b00d1268825969e37a7cefed6b5c90f402c5 SHA512 3b39448b291342a5e9b610d410c222aeb85f8acf95632e73e138ae316133af3dadc795a6e706f6447f543cf10df3c786da4f1afa1d91489b50eb77e2d9ed5d84
+DIST postgresql-13.9.tar.bz2 21439045 BLAKE2B be653bcfa619af9319357f52aa7a289a6701cfb511574e60ea8321e6d5c646223e783343bdabbc43c151e10e8c50446d77b688a3d2d306a7d439019ec3fb3854 SHA512 7f226d917c97752a49bb603829789c02820d5a746e89bf879b63cad6ce22b0000762a2f5584af1a928fcb9a444abbf78f6fd8761898291830a21ac42b2d72858
 DIST postgresql-14.5.tar.bz2 22132996 BLAKE2B 6d303850ef1e8f9f5d66a53275fc814475646c762b9747a4f0401a472ebaf59be06d6e7c08e9c1c5ad5d3b9dbc3bb3c06d58bae137806e1a437c86bcc8cae501 SHA512 3051c5ab729f6a55952c6108098b022517398b1de64f7fefbdd6c806c7e2eb0637d00f3c98a6203c5bee654656528c4ff3530db5a69470e7888864c77900178a
+DIST postgresql-14.6.tar.bz2 22177474 BLAKE2B 675283751a51500382395cb07a956fa0392987f938e12c0757c4c537327aa119d62fe86c78372d7607ae1ff4c811a567ffb89a8c087d2d029c32bd7271733fb6 SHA512 133083eb5709ace65dd81d326a960654dd6cfb35b3e85a35f71763c59dad0052a561c2aa1d1f52652b4bf81ed71edd232f170d483989d65ca354e653331faf2e
 DIST postgresql-15.0.tar.bz2 22403741 BLAKE2B b5ac4ad23a92dc7f33278d551a40fb4e2f5bd770415eaf002f50f2ba224e279ba95f2fd76705b625c571f23dec502f032ffe1c349de3816b6bc0a3b1773996fb SHA512 537d223be619d8b192756791cb614638f7188532f981e233bbfa8c0245adf5afe94ba5160d771af77f7d4ead41bcf346cbb2197e1358a6411ead06b19e29f120
+DIST postgresql-15.1.tar.bz2 22666134 BLAKE2B 964607856637764cedf3f832a49ca673e22e2fa2afe9a141c98b0b4a1dfc5c978928f4c3ec470395dea041e8f1fdc218d54796c72ff597c819ad03e95d1730db SHA512 803900363106d2e343305e6d1546016b6a6a37bbd49d7a84a9a6467c1dc3fc4eb52698411af9c2178590c2f7680967466b1a211a76955dcec5445d0b8b254202
 EBUILD postgresql-10.22.ebuild 13396 BLAKE2B 76f9664e84f8fc6bc72932c823a9e86efccb9a11b238d743ed05a6b2173454a3289d4642b1a20a2aedac7468d91e03d300fbe91751f81efd896b83de6e047267 SHA512 d4586bf730baa7640f77e5c7578ca35e524c1828d7cc8849d8b4cbeac6a708d593f4ca0f44e301d515215e8f40bc98634b891d384363dd67dd743dd890172e95
+EBUILD postgresql-10.23.ebuild 13403 BLAKE2B 33ed819ed8ce49deb8f43281e4c38c7925f92b4fbbee85dd6d14c96e73a4c817c88e0b8f7af3bd6c3aa84693894c859df96e56b6dd903674bf21ba5eddc5358f SHA512 1fafb3c7a673d683e65a78095dfe85db0202912385cdbdf2609450c0d71cd4c1f35ba05c26143b61bf63b5a89bc683e401278d5bec8a3c7fc9b0e9903b07816c
 EBUILD postgresql-11.17.ebuild 13437 BLAKE2B 42dacf31738416dd83c647703b79b8e26d12e38c8efe47a88c3d379f32ea21e8cd21fde7308cb114c027cabc24811bcadd76491f041ba6529f1e19e81bc51e24 SHA512 bf72faaf82b701e340154eeb41f1ae9640c5324a9750093fbbf06e66d2f6c6daabf23a7042b6490c2b41681440ac0792d0964e14216eac40b3cd738e5f0dc8d7
+EBUILD postgresql-11.18.ebuild 13444 BLAKE2B c4b4ff3ea0852afdf4552e7c99e6134c41965b31092e6075cc1b52439643911d2dbb39beff8e5e936427395ec9768870ed29c8c0357a8d3de1eed619821bf7f1 SHA512 0cf3d62f1b59f91eee389e20068dae0bc19cf62f38f2dbee78b26dd92fbf7601736a4e7b4b8a0436659966258d1185ec0cf168508216915838ba7e700bd11dfc
 EBUILD postgresql-12.12.ebuild 13409 BLAKE2B 281c833ddabcb85f6044d30a3cd36c1626ce6f053dfd597f080ff82d9f4330190971e8fd605f12396fb6f4a983d66667761fdfbe4a02b7f7fe2d63c2e0535265 SHA512 f48c59daafb48564149269de494f4293fe09f851da7e37ee3181d1527b0469b388d8c97efb13bb28393d533c6de25ab6c9da54d3faeb59cdfbf685a9ec129d6d
+EBUILD postgresql-12.13.ebuild 13416 BLAKE2B e4a173aadd9c6cb17b06251f652d9f71943b9841c6639060cda5657d087f3301eceb93a2c430bd95447444f5ab46aadcb81a5d99c9765bf3dd883a37b3ca7e8f SHA512 cde9c50cce2e9b82137bd636c690c3342910da286dba779c72200dc3749d4a8c6bd0854b34a63f1ed52b2ba97d099e48f112e0e76b350b4666f977f24cabf019
 EBUILD postgresql-13.8.ebuild 13843 BLAKE2B 45c47bee6be51818fc067e8650817977baab83b5b8e2ed4af488a5b2020a330b22641844a8b12c2be21710d6166d02119c87d82b38c485d463271cae27460a40 SHA512 02e658d14c756bd34399a68c562d92b59deb6665d31d1d93058f1c1e7c3501ea4ac2150d620f288181ccfe7042a03fdccff60217a45bf6627fef775da80957ad
+EBUILD postgresql-13.9.ebuild 13850 BLAKE2B 7bf01e5c865a3f472679e64465e49e8ec6b57d08b896d6d4c0154fa023a053fd74445daf77a749765ea7afa915e28e952451787fb742350e2e9ae7de487b11b0 SHA512 2900d544ad69a80880942c5129e4ae6f91db83c5afcdffd944774ea3fc3b869195c8a35933e9302d5b98ba9865004cca1af81117627130e89c609b1a3c964582
 EBUILD postgresql-14.5.ebuild 13835 BLAKE2B 7790bffbe90d88caaeaf543c724fbfa4c5d9bcf35c2201b53721669b9d1046c6b67a5f49aae3d35afade62962e117be5afc04967e2882c3ab063c7c334710b59 SHA512 d835aa559b3f5523fab6397db9b3be6d15681d9d3fe27a7bd50a67d138911a36a064fbaa11f793ef3177cb79ebc5bec2bb14f4dc257aeafb43690ef0c8705368
+EBUILD postgresql-14.6.ebuild 13842 BLAKE2B c77ef73d613afb08908078a3ac15de1918675505f9a5f9004b22a356a741707841a711bbcf5b32980d986851eaf0cec37105d2a8b07ca6146c636013ace428a1 SHA512 9dd80ae479731b019e8d437c3e537c27c06c2e389eff911b678881c8a9f3627edcccf91e883ea7d58809c167adf89ac170aec39b5e1d9cd37480f4046bb6ede9
 EBUILD postgresql-15.0.ebuild 13894 BLAKE2B 1373428429ad93e6feeae1c582851972ae58bd9a03e1c17b2402f299d36502036d6212b7b2226752c87637aff15308e31310eeb7d6201080c2aa5987bb742134 SHA512 ab45cb9d9b164ff6e7eed7859d99a6db1c3e81fce42a2b17489e7be2f80c663fb5c5a74dcf92c419c18af90cdd8c169bf5bf8740b6ff9383fa4aed2bb6f90718
+EBUILD postgresql-15.1.ebuild 13894 BLAKE2B 5ad85240bb641219b69ebd0724209aca78f812b23549df8cbc3a2bf197caea027af1cf92e0b557f30629841b5151b482b09dd58e02631201ed165dc92983086e SHA512 60061e66718743fb60df0006a88d7967e48811ce0e507cfb001931ebc6c7feaed14bc7daec25f163b5b7ca1c77efe64267b2e5a6d527937608a34f6055ef32fe
 EBUILD postgresql-9999.ebuild 14085 BLAKE2B 451cd42e7fede68e3c27c77a86ec19bf29eecd254d12f235aaf07cb5ab58aa74e3ef9d8c4ea1b8a1bdafb6590608387eb1b30f1c7387e9eb2bce466cbb170fbe SHA512 90d7c1b53706a4015c7292b1f3bce730f2326541071eb08c84a6b0aa76b0d2e5f98b43f7b6f677df1a1a926cdf270b7b2fb076efca4d7f48bc67942d44d994bb
 MISC metadata.xml 653 BLAKE2B b5b85d83ee78ac502e2707d156e2fadf6fea857160e2f48da51c755e221c52a14b9eb04354202287f4aba15c274c07ba7b0911c76fd034bfa774ce3500ccb165 SHA512 fd543af224f6f8677e138cb1db7154d2444295c45df8696e3584911943176023d8d1b179f6b16d88ffc6d290265ec1b2f4c902cf95cc79eb37599ae3635b0942
diff --git a/dev-db/postgresql/postgresql-10.23.ebuild b/dev-db/postgresql/postgresql-10.23.ebuild
new file mode 100644
index 000000000000..bf8414a03338
--- /dev/null
+++ b/dev-db/postgresql/postgresql-10.23.ebuild
@@ -0,0 +1,453 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10,11} )
+
+inherit flag-o-matic linux-info pam python-single-r1 systemd tmpfiles
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos ldap nls pam perl
+	  python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libcrypt:=
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap:= )
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-10.2-no-server.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	# https://bugs.gentoo.org/753257
+	# https://bugs.gentoo.org/766225
+	eapply "${FILESDIR}"/postgresql-10.0-icu68.patch
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-11.18.ebuild b/dev-db/postgresql/postgresql-11.18.ebuild
new file mode 100644
index 000000000000..aeca9ad626a6
--- /dev/null
+++ b/dev-db/postgresql/postgresql-11.18.ebuild
@@ -0,0 +1,453 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10,11} )
+LLVM_MAX_SLOT=15
+
+inherit flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos ldap llvm nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap:= )
+llvm? (
+	<sys-devel/llvm-16:=
+	<sys-devel/clang-16:=
+)
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use llvm && llvm_pkg_setup
+
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-11_beta1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-12.13.ebuild b/dev-db/postgresql/postgresql-12.13.ebuild
new file mode 100644
index 000000000000..aeeacbbb47cc
--- /dev/null
+++ b/dev-db/postgresql/postgresql-12.13.ebuild
@@ -0,0 +1,453 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10,11} )
+LLVM_MAX_SLOT=15
+
+inherit flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos ldap llvm nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap:= )
+llvm? (
+	<sys-devel/llvm-16:=
+	<sys-devel/clang-16:=
+)
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use llvm && llvm_pkg_setup
+
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-13.9.ebuild b/dev-db/postgresql/postgresql-13.9.ebuild
new file mode 100644
index 000000000000..09397ed2e2fa
--- /dev/null
+++ b/dev-db/postgresql/postgresql-13.9.ebuild
@@ -0,0 +1,465 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10,11} )
+LLVM_MAX_SLOT=15
+
+inherit flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos ldap llvm nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap:= )
+llvm? (
+	<sys-devel/llvm-16:=
+	<sys-devel/clang-16:=
+)
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use llvm && llvm_pkg_setup
+
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-13.3-riscv-spinlocks.patch
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-13.8-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	local myconf="\
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)"
+	if use alpha; then
+		myconf+=" --disable-spinlocks"
+	else
+		# Should be the default but just in case
+		myconf+=" --enable-spinlocks"
+	fi
+	econf ${myconf}
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
+		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
+		local old_ctype=${LC_CTYPE}
+		export LC_CTYPE=${LC_COLLATE}
+		emake check
+		export LC_CTYPE=${old_ctype}
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-14.6.ebuild b/dev-db/postgresql/postgresql-14.6.ebuild
new file mode 100644
index 000000000000..196aeeeb7ff8
--- /dev/null
+++ b/dev-db/postgresql/postgresql-14.6.ebuild
@@ -0,0 +1,465 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10,11} )
+LLVM_MAX_SLOT=15
+
+inherit flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos ldap llvm lz4 nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap:= )
+llvm? (
+	 <sys-devel/llvm-16:=
+	 <sys-devel/clang-16:=
+)
+lz4? ( app-arch/lz4 )
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use llvm && llvm_pkg_setup
+
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-14.5-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	local myconf="\
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with lz4) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)"
+	if use alpha; then
+		myconf+=" --disable-spinlocks"
+	else
+		# Should be the default but just in case
+		myconf+=" --enable-spinlocks"
+	fi
+	econf ${myconf}
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
+		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
+		local old_ctype=${LC_CTYPE}
+		export LC_CTYPE=${LC_COLLATE}
+		emake check
+		export LC_CTYPE=${old_ctype}
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-15.1.ebuild b/dev-db/postgresql/postgresql-15.1.ebuild
new file mode 100644
index 000000000000..9423fe68d108
--- /dev/null
+++ b/dev-db/postgresql/postgresql-15.1.ebuild
@@ -0,0 +1,467 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10,11} )
+LLVM_MAX_SLOT=15
+
+inherit flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos ldap llvm lz4 nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib zstd"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap:= )
+llvm? (
+	<sys-devel/llvm-16:=
+	<sys-devel/clang-16:=
+)
+lz4? ( app-arch/lz4 )
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+zstd? ( app-arch/zstd )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,musl} )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use llvm && llvm_pkg_setup
+
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-15_beta3-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	local myconf="\
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with lz4) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_with zstd) \
+		$(use_enable nls)"
+	if use alpha; then
+		myconf+=" --disable-spinlocks"
+	else
+		# Should be the default but just in case
+		myconf+=" --enable-spinlocks"
+	fi
+	econf ${myconf}
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		# Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set
+		# LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage.
+		local old_ctype=${LC_CTYPE}
+		export LC_CTYPE=${LC_COLLATE}
+		emake check
+		export LC_CTYPE=${old_ctype}
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index d153172a5824..a4c12bb6052c 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -3,8 +3,10 @@ AUX configure.ac-7.0 1523 BLAKE2B fc05fd3fd13bf192d2a52096c89bfb87d6660c19b9c88f
 AUX redis-5.0-shared.patch 883 BLAKE2B 71a490d5c40d873db7d363c4f3cab966bf8e92fa84bcb7209344b79b3bfc4c6f8df5224c8ae0e5d9ee8dbd62d9e288e90934809e91fd6f63c7d1dd4a518170a9 SHA512 f1d1e37a4786a84e9543956e21644a1dcfdc52742299119ba1547b9fb56a92fdef3ca518d94a1db8a88222b661ac7849a4db0bf7ba38b1ae65f286e7df90f0c1
 AUX redis-6.2.1-config.patch 1477 BLAKE2B bc87272e52b44fc58e7e8b08b5d97e53c9ba22eab02f89c3803d02e526c6c5eb1df5d1565021d96dabf8b9936dfc0b2c27c9dd148d1968d98d31d10470687741 SHA512 da2a2f4321fc4f5fef4db1e399bd6a011c18a997b28c4355ed4284d07c24a5038f086f7dcbb26d4534d800baf9be0634cf53466524a8323d16ad542042d89d98
 AUX redis-6.2.3-ppc-atomic.patch 465 BLAKE2B 9324bb198f03a3e5043986adaac170f30f378f5835a53e1c749ccf3392edcfecb22f4f7ae2b325ced3b06bf20535a243daa138073014a109e6e54b27d736dde5 SHA512 803ea4e1dfcb2f87187a0294051bf91f4e67a9b7de421dca20fe8b574741dc454f83fe1eadac7a4ef5d29b7a707a9dc2a56479f8d86c9e82de6332b21101456f
+AUX redis-6.2.7-cve-2022-3647.patch 5982 BLAKE2B 3f8116d170bcf6cc8ed1f67086e9c84fe404c28dd560919fe2d4078ab92fc6108901e7387d7f62677d100d6d27c9dede326018f60d8167587bd5d9b7cb79c539 SHA512 f72798fcd7c9e5722d0d78f1d5988251f49eaa1c32f670c0dd1356bf10df4ac5e802daf1a855263120446e453c19564409ea3777c4520b7cab01cc6c226ea392
 AUX redis-7.0.4-no-which.patch 1876 BLAKE2B 9461bdfac73c21d338fbac0a41d64ecb4c14f993b2932ae2df35317529cec399ef9163ce8ebae012dd215d755c3d5a2527bb6f8647ffb0cc6365e1a67a19a331 SHA512 eb22bb26642f1c602bb2fd4b08af7de9036c0acc5fb2a4139608bec10962031f0515f31fc18c7dcd1f8352359fc381a752ac6f63adc01b46df853019bd886d16
 AUX redis-7.0.4-replica-tests-fix.patch 2183 BLAKE2B a5452adf9776c9dd6c443020264e65a4a1e9c148451f133e1e117208118b63507e6641ce60ada4cedc469869085f03dff7b84836fd7f924d6c37a5aacaa612ee SHA512 0ccfe595a76f8570fe735cbebbf887c505ac264f5419a0b34e8c618ff6d082100651042d42de4989e560838e8c8526a4ab6071ff3bbdc6c9eaf3daa1d56672b5
+AUX redis-7.0.5-cve-2022-3647.patch 5965 BLAKE2B e5abd4079c280e9ff1b3e80d4cf3224b53d426dc51411e7c05772603da3a43b3880bd114c970c9833991f61464845a45ff5f6b28832032692783d96f91e5efc6 SHA512 164c400b0b431b3b5ff738c88db691bc0e6cb9be1ab4170b2ffec1f03c704ce1f6851ce9d80e5a6a76534183e8b1b58b53654433208793a018d807ab3de9b268
 AUX redis-sentinel-5.0-config.patch 706 BLAKE2B 0fa0166bbb3460e783e85b90acf4c606b83e271d8e9828bb5b3a39b623508b21dac33369ac25b645169271822e9c5deb6ea7294e40fc8d1a5ceec5129c174505 SHA512 2dee5666d50fc5d9b6021735a95c9a9647ba99c562e348785381d5a05f1388c3fb9e8c4a15b0de771cf73fb80e5e29f1df25805df749457a2ce4f2e3f2e0e9e8
 AUX redis-sentinel.confd-r1 476 BLAKE2B e06aba8c65637a02dd7c778e7ddeb1ee8f25abbe24cea6d9ab90aee0ab512d36ad342dc4aba73c792533c561a00413a6432c6a635246e2fa7f44d2c4cf244972 SHA512 be2bdfa5efa5c55294da382e0d648c06788e77df150acbb2004ac3fe88d8545992787df4a5dd585e5e5fed9a9018e55e03e5f048601d5401795c37a476232c9f
 AUX redis-sentinel.initd-r1 654 BLAKE2B 064f7ac04ead49052aa221d295067df5cd23081bf7a65546d680281eeb4fcf0fe42c4d756917b0aa05f110be84b142d23410ba4829e1d82725826f788107f235 SHA512 b483902f343a52a4f285d7aed6a56c3bd8e820eb5f3e8805c4bd93c0df009e944e6479fea6060bc07b493d655d995ae8e6f91548c2e512215a5966abdb0aa6a6
@@ -16,5 +18,7 @@ AUX redis.tmpfiles-2 57 BLAKE2B 1e0577c1828bb693cf820f3ba5e77d7d748adf4df2d1910d
 DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953
 DIST redis-7.0.5.tar.gz 2968205 BLAKE2B c319a2f656e4bd26637735ef73e58eecc306e202b57d6da3a38150a02d738a414c6696e261b8ab88033e117aee4f02308aab9ca4a5f382d66ec3a10f3e020580 SHA512 16ff920cb8df4d82e78ef34209285024aa98189be8acbca86b10fb3064dcc70eac60206aadece6af08406860ed01a004ce3aaa86be896ea36c7f486686646753
 EBUILD redis-6.2.7-r1.ebuild 5475 BLAKE2B c99ba8acc70ebf1295cf7cc4af5de7da7d1a64c44829a3f29f8b574c5cc418776a98879eb2199ee320da1e88b4e6db7dea0028be4557af7d1a847bd1afea77a2 SHA512 6406fe4209e5a79ab517ef29b73d31d69069a8569f0fc9fede9872b80ec607bcde4cc2e663bf19cd59497303d30ecbb4815a52a1b08f501f1cd1fcf442319f3e
+EBUILD redis-6.2.7-r2.ebuild 5548 BLAKE2B ee3152de463acdffce901ad8d853cef6ae665bea6a63bdf559c77bcaad52f17460653612ccd63876e537dca26769aec590724029dcbcf0b49e18ac1478a5a4dd SHA512 a83a718a9076dc08cdfd412bb608ddef2a22718844d7d2eee79cb53cc8dcc1f807d04d3e869727af24579d575a70b09d62ca2de94bae625597064db9be3f0201
+EBUILD redis-7.0.5-r1.ebuild 5059 BLAKE2B fd9858a76f71565450be545013979c37d1b557a373f3dbb9e4cf9811c0d1228ffbe86224776cbcc4c27451d31d7cff359f1eb625d01adfdb0ad025f14b70a2c6 SHA512 730d7693c4d00038b631eff6c5c1f920cfeb8930cf47f504a83b01e93bd53a2e5247aa78516b93b52ac54725bf4123986d60429a10a829d8b844849444c6b0f7
 EBUILD redis-7.0.5.ebuild 4986 BLAKE2B 8045126e373f5fc3151c06cb6ce7baec24674c8700f49a9e858c6b14365138a3a3f7d505b9c425a128672c6dfce0ab87d70b79dfbe7f848bd09be4d7686a2859 SHA512 fa48baeaec8e4a9e25b4883f754d5ee9f62653c07da2836338f4fb219ae035f4485b376b075e78420185fd795957c4ecbd8de38a911ae55079243621bc306b15
 MISC metadata.xml 692 BLAKE2B 884fa6be2c816c04a9a24db6d1e47f5e84da00a47cf7cf8a757b3a6d7a1d769597107db2c32904e9d1306cf5450fedc04bbcfb75a14a89c0d6bcdf4dbe85636e SHA512 48a675be7e6a294dea1cdde0a6988793150b8ad36fc0e9402476221012292d549916d8186e2ea97ca1be660f9d60a9c889cb8cb6e30fecaeed1525bf9003de88
diff --git a/dev-db/redis/files/redis-6.2.7-cve-2022-3647.patch b/dev-db/redis/files/redis-6.2.7-cve-2022-3647.patch
new file mode 100644
index 000000000000..8c3a2358c8eb
--- /dev/null
+++ b/dev-db/redis/files/redis-6.2.7-cve-2022-3647.patch
@@ -0,0 +1,173 @@
+This is backported patch from upstream commit for version 6.2.7 which fixes CVE-2022-3647.
+
+Upstream-commit: https://github.com/redis/redis/commit/0bf90d944313919eb8e63d3588bf63a367f020a3
+Bug: https://bugs.gentoo.org/877863
+
+diff --git a/src/debug.c b/src/debug.c
+index 71ef51f8b..40fffec52 100644
+--- a/src/debug.c
++++ b/src/debug.c
+@@ -1019,61 +1019,88 @@ void bugReportStart(void) {
+ }
+ 
+ #ifdef HAVE_BACKTRACE
+-static void *getMcontextEip(ucontext_t *uc) {
++
++/* Returns the current eip and set it to the given new value (if its not NULL) */
++static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) {
++#define NOT_SUPPORTED() do {\
++    UNUSED(uc);\
++    UNUSED(eip);\
++    return NULL;\
++} while(0)
++#define GET_SET_RETURN(target_var, new_val) do {\
++    void *old_val = (void*)target_var; \
++    if (new_val) { \
++        void **temp = (void**)&target_var; \
++        *temp = new_val; \
++    } \
++    return old_val; \
++} while(0)
+ #if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
+     /* OSX < 10.6 */
+     #if defined(__x86_64__)
+-    return (void*) uc->uc_mcontext->__ss.__rip;
++    GET_SET_RETURN(uc->uc_mcontext->__ss.__rip, eip);
+     #elif defined(__i386__)
+-    return (void*) uc->uc_mcontext->__ss.__eip;
++    GET_SET_RETURN(uc->uc_mcontext->__ss.__eip, eip);
+     #else
+-    return (void*) uc->uc_mcontext->__ss.__srr0;
++    GET_SET_RETURN(uc->uc_mcontext->__ss.__srr0, eip);
+     #endif
+ #elif defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6)
+     /* OSX >= 10.6 */
+     #if defined(_STRUCT_X86_THREAD_STATE64) && !defined(__i386__)
+-    return (void*) uc->uc_mcontext->__ss.__rip;
++    GET_SET_RETURN(uc->uc_mcontext->__ss.__rip, eip);
+     #elif defined(__i386__)
+-    return (void*) uc->uc_mcontext->__ss.__eip;
++    GET_SET_RETURN(uc->uc_mcontext->__ss.__eip, eip);
+     #else
+     /* OSX ARM64 */
+-    return (void*) arm_thread_state64_get_pc(uc->uc_mcontext->__ss);
++    void *old_val = (void*)arm_thread_state64_get_pc(uc->uc_mcontext->__ss);
++    if (eip) {
++        arm_thread_state64_set_pc_fptr(uc->uc_mcontext->__ss, eip);
++    }
++    return old_val;
+     #endif
+ #elif defined(__linux__)
+     /* Linux */
+     #if defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__))
+-    return (void*) uc->uc_mcontext.gregs[14]; /* Linux 32 */
++    GET_SET_RETURN(uc->uc_mcontext.gregs[14], eip);
+     #elif defined(__X86_64__) || defined(__x86_64__)
+-    return (void*) uc->uc_mcontext.gregs[16]; /* Linux 64 */
++    GET_SET_RETURN(uc->uc_mcontext.gregs[16], eip);
+     #elif defined(__ia64__) /* Linux IA64 */
+-    return (void*) uc->uc_mcontext.sc_ip;
++    GET_SET_RETURN(uc->uc_mcontext.sc_ip, eip);
+     #elif defined(__arm__) /* Linux ARM */
+-    return (void*) uc->uc_mcontext.arm_pc;
++    GET_SET_RETURN(uc->uc_mcontext.arm_pc, eip);
+     #elif defined(__aarch64__) /* Linux AArch64 */
+-    return (void*) uc->uc_mcontext.pc;
++    GET_SET_RETURN(uc->uc_mcontext.pc, eip);
++    #else
++    NOT_SUPPORTED();
+     #endif
+ #elif defined(__FreeBSD__)
+     /* FreeBSD */
+     #if defined(__i386__)
+-    return (void*) uc->uc_mcontext.mc_eip;
++    GET_SET_RETURN(uc->uc_mcontext.mc_eip, eip);
+     #elif defined(__x86_64__)
+-    return (void*) uc->uc_mcontext.mc_rip;
++    GET_SET_RETURN(uc->uc_mcontext.mc_rip, eip);
++    #else
++    NOT_SUPPORTED();
+     #endif
+ #elif defined(__OpenBSD__)
+     /* OpenBSD */
+     #if defined(__i386__)
+-    return (void*) uc->sc_eip;
++    GET_SET_RETURN(uc->sc_eip, eip);
+     #elif defined(__x86_64__)
+-    return (void*) uc->sc_rip;
++    GET_SET_RETURN(uc->sc_rip, eip);
++    #else
++    NOT_SUPPORTED();
+     #endif
+ #elif defined(__NetBSD__)
+     #if defined(__i386__)
+-    return (void*) uc->uc_mcontext.__gregs[_REG_EIP];
++    GET_SET_RETURN(uc->uc_mcontext.__gregs[_REG_EIP], eip);
+     #elif defined(__x86_64__)
+-    return (void*) uc->uc_mcontext.__gregs[_REG_RIP];
++    GET_SET_RETURN(uc->uc_mcontext.__gregs[_REG_RIP], eip);
++    #else
++    NOT_SUPPORTED();
+     #endif
+ #elif defined(__DragonFly__)
+-    return (void*) uc->uc_mcontext.mc_rip;
++    GET_SET_RETURN(uc->uc_mcontext.mc_rip, eip);
+ #else
+     return NULL;
+ #endif
+@@ -1800,6 +1827,10 @@ void dumpCodeAroundEIP(void *eip) {
+     }
+ }
+ 
++void invalidFunctionWasCalled() {}
++
++typedef void (*invalidFunctionWasCalledType)();
++
+ void sigsegvHandler(int sig, siginfo_t *info, void *secret) {
+     UNUSED(secret);
+     UNUSED(info);
+@@ -1817,13 +1848,30 @@ void sigsegvHandler(int sig, siginfo_t *info, void *secret) {
+ 
+ #ifdef HAVE_BACKTRACE
+     ucontext_t *uc = (ucontext_t*) secret;
+-    void *eip = getMcontextEip(uc);
++    void *eip = getAndSetMcontextEip(uc, NULL);
+     if (eip != NULL) {
+         serverLog(LL_WARNING,
+         "Crashed running the instruction at: %p", eip);
+     }
+ 
+-    logStackTrace(getMcontextEip(uc), 1);
++    if (eip == info->si_addr) {
++        /* When eip matches the bad address, it's an indication that we crashed when calling a non-mapped
++         * function pointer. In that case the call to backtrace will crash trying to access that address and we
++         * won't get a crash report logged. Set it to a valid point to avoid that crash. */
++
++        /* This trick allow to avoid compiler warning */
++        void *ptr;
++        invalidFunctionWasCalledType *ptr_ptr = (invalidFunctionWasCalledType*)&ptr;
++        *ptr_ptr = invalidFunctionWasCalled;
++        getAndSetMcontextEip(uc, ptr);
++    }
++
++    logStackTrace(eip, 1);
++
++    if (eip == info->si_addr) {
++        /* Restore old eip */
++        getAndSetMcontextEip(uc, eip);
++    }
+ 
+     logRegisters(uc);
+ #endif
+@@ -1918,7 +1966,7 @@ void watchdogSignalHandler(int sig, siginfo_t *info, void *secret) {
+ 
+     serverLogFromHandler(LL_WARNING,"\n--- WATCHDOG TIMER EXPIRED ---");
+ #ifdef HAVE_BACKTRACE
+-    logStackTrace(getMcontextEip(uc), 1);
++    logStackTrace(getAndSetMcontextEip(uc, NULL), 1);
+ #else
+     serverLogFromHandler(LL_WARNING,"Sorry: no support for backtrace().");
+ #endif
+-- 
+2.37.4
+
diff --git a/dev-db/redis/files/redis-7.0.5-cve-2022-3647.patch b/dev-db/redis/files/redis-7.0.5-cve-2022-3647.patch
new file mode 100644
index 000000000000..8f5eaff13fed
--- /dev/null
+++ b/dev-db/redis/files/redis-7.0.5-cve-2022-3647.patch
@@ -0,0 +1,173 @@
+This is the patch recommended to apply in order to fix CVE-2022-3647.
+
+Upstream-commit: https://github.com/redis/redis/commit/0bf90d944313919eb8e63d3588bf63a367f020a3
+Bug: https://bugs.gentoo.org/877863
+
+diff --git a/src/debug.c b/src/debug.c
+index 8cc811be4..b15ac8780 100644
+--- a/src/debug.c
++++ b/src/debug.c
+@@ -1123,73 +1123,88 @@ void bugReportStart(void) {
+ }
+ 
+ #ifdef HAVE_BACKTRACE
+-static void *getMcontextEip(ucontext_t *uc) {
++
++/* Returns the current eip and set it to the given new value (if its not NULL) */
++static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) {
+ #define NOT_SUPPORTED() do {\
+     UNUSED(uc);\
++    UNUSED(eip);\
+     return NULL;\
+ } while(0)
++#define GET_SET_RETURN(target_var, new_val) do {\
++    void *old_val = (void*)target_var; \
++    if (new_val) { \
++        void **temp = (void**)&target_var; \
++        *temp = new_val; \
++    } \
++    return old_val; \
++} while(0)
+ #if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
+     /* OSX < 10.6 */
+     #if defined(__x86_64__)
+-    return (void*) uc->uc_mcontext->__ss.__rip;
++    GET_SET_RETURN(uc->uc_mcontext->__ss.__rip, eip);
+     #elif defined(__i386__)
+-    return (void*) uc->uc_mcontext->__ss.__eip;
++    GET_SET_RETURN(uc->uc_mcontext->__ss.__eip, eip);
+     #else
+-    return (void*) uc->uc_mcontext->__ss.__srr0;
++    GET_SET_RETURN(uc->uc_mcontext->__ss.__srr0, eip);
+     #endif
+ #elif defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_6)
+     /* OSX >= 10.6 */
+     #if defined(_STRUCT_X86_THREAD_STATE64) && !defined(__i386__)
+-    return (void*) uc->uc_mcontext->__ss.__rip;
++    GET_SET_RETURN(uc->uc_mcontext->__ss.__rip, eip);
+     #elif defined(__i386__)
+-    return (void*) uc->uc_mcontext->__ss.__eip;
++    GET_SET_RETURN(uc->uc_mcontext->__ss.__eip, eip);
+     #else
+     /* OSX ARM64 */
+-    return (void*) arm_thread_state64_get_pc(uc->uc_mcontext->__ss);
++    void *old_val = (void*)arm_thread_state64_get_pc(uc->uc_mcontext->__ss);
++    if (eip) {
++        arm_thread_state64_set_pc_fptr(uc->uc_mcontext->__ss, eip);
++    }
++    return old_val;
+     #endif
+ #elif defined(__linux__)
+     /* Linux */
+     #if defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__))
+-    return (void*) uc->uc_mcontext.gregs[14]; /* Linux 32 */
++    GET_SET_RETURN(uc->uc_mcontext.gregs[14], eip);
+     #elif defined(__X86_64__) || defined(__x86_64__)
+-    return (void*) uc->uc_mcontext.gregs[16]; /* Linux 64 */
++    GET_SET_RETURN(uc->uc_mcontext.gregs[16], eip);
+     #elif defined(__ia64__) /* Linux IA64 */
+-    return (void*) uc->uc_mcontext.sc_ip;
++    GET_SET_RETURN(uc->uc_mcontext.sc_ip, eip);
+     #elif defined(__arm__) /* Linux ARM */
+-    return (void*) uc->uc_mcontext.arm_pc;
++    GET_SET_RETURN(uc->uc_mcontext.arm_pc, eip);
+     #elif defined(__aarch64__) /* Linux AArch64 */
+-    return (void*) uc->uc_mcontext.pc;
++    GET_SET_RETURN(uc->uc_mcontext.pc, eip);
+     #else
+     NOT_SUPPORTED();
+     #endif
+ #elif defined(__FreeBSD__)
+     /* FreeBSD */
+     #if defined(__i386__)
+-    return (void*) uc->uc_mcontext.mc_eip;
++    GET_SET_RETURN(uc->uc_mcontext.mc_eip, eip);
+     #elif defined(__x86_64__)
+-    return (void*) uc->uc_mcontext.mc_rip;
++    GET_SET_RETURN(uc->uc_mcontext.mc_rip, eip);
+     #else
+     NOT_SUPPORTED();
+     #endif
+ #elif defined(__OpenBSD__)
+     /* OpenBSD */
+     #if defined(__i386__)
+-    return (void*) uc->sc_eip;
++    GET_SET_RETURN(uc->sc_eip, eip);
+     #elif defined(__x86_64__)
+-    return (void*) uc->sc_rip;
++    GET_SET_RETURN(uc->sc_rip, eip);
+     #else
+     NOT_SUPPORTED();
+     #endif
+ #elif defined(__NetBSD__)
+     #if defined(__i386__)
+-    return (void*) uc->uc_mcontext.__gregs[_REG_EIP];
++    GET_SET_RETURN(uc->uc_mcontext.__gregs[_REG_EIP], eip);
+     #elif defined(__x86_64__)
+-    return (void*) uc->uc_mcontext.__gregs[_REG_RIP];
++    GET_SET_RETURN(uc->uc_mcontext.__gregs[_REG_RIP], eip);
+     #else
+     NOT_SUPPORTED();
+     #endif
+ #elif defined(__DragonFly__)
+-    return (void*) uc->uc_mcontext.mc_rip;
++    GET_SET_RETURN(uc->uc_mcontext.mc_rip, eip);
+ #else
+     NOT_SUPPORTED();
+ #endif
+@@ -1951,6 +1966,10 @@ void dumpCodeAroundEIP(void *eip) {
+     }
+ }
+ 
++void invalidFunctionWasCalled() {}
++
++typedef void (*invalidFunctionWasCalledType)();
++
+ void sigsegvHandler(int sig, siginfo_t *info, void *secret) {
+     UNUSED(secret);
+     UNUSED(info);
+@@ -1968,13 +1987,30 @@ void sigsegvHandler(int sig, siginfo_t *info, void *secret) {
+ 
+ #ifdef HAVE_BACKTRACE
+     ucontext_t *uc = (ucontext_t*) secret;
+-    void *eip = getMcontextEip(uc);
++    void *eip = getAndSetMcontextEip(uc, NULL);
+     if (eip != NULL) {
+         serverLog(LL_WARNING,
+         "Crashed running the instruction at: %p", eip);
+     }
+ 
+-    logStackTrace(getMcontextEip(uc), 1);
++    if (eip == info->si_addr) {
++        /* When eip matches the bad address, it's an indication that we crashed when calling a non-mapped
++         * function pointer. In that case the call to backtrace will crash trying to access that address and we
++         * won't get a crash report logged. Set it to a valid point to avoid that crash. */
++
++        /* This trick allow to avoid compiler warning */
++        void *ptr;
++        invalidFunctionWasCalledType *ptr_ptr = (invalidFunctionWasCalledType*)&ptr;
++        *ptr_ptr = invalidFunctionWasCalled;
++        getAndSetMcontextEip(uc, ptr);
++    }
++
++    logStackTrace(eip, 1);
++
++    if (eip == info->si_addr) {
++        /* Restore old eip */
++        getAndSetMcontextEip(uc, eip);
++    }
+ 
+     logRegisters(uc);
+ #endif
+@@ -2079,7 +2115,7 @@ void watchdogSignalHandler(int sig, siginfo_t *info, void *secret) {
+ 
+     serverLogFromHandler(LL_WARNING,"\n--- WATCHDOG TIMER EXPIRED ---");
+ #ifdef HAVE_BACKTRACE
+-    logStackTrace(getMcontextEip(uc), 1);
++    logStackTrace(getAndSetMcontextEip(uc, NULL), 1);
+ #else
+     serverLogFromHandler(LL_WARNING,"Sorry: no support for backtrace().");
+ #endif
+-- 
+2.37.4
+
diff --git a/dev-db/redis/redis-6.2.7-r2.ebuild b/dev-db/redis/redis-6.2.7-r2.ebuild
new file mode 100644
index 000000000000..012ad4d40847
--- /dev/null
+++ b/dev-db/redis/redis-6.2.7-r2.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Redis does NOT build with Lua 5.2 or newer at this time:
+#  - 5.3 and 5.4 give:
+# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
+#  - 5.2 fails with:
+# scripting.c:(.text+0x1f9b): undefined reference to `lua_open'
+#    because lua_open became lua_newstate in 5.2
+LUA_COMPAT=( lua5-1 luajit )
+
+# Upstream have deviated too far from vanilla Lua, adding their own APIs
+# like lua_enablereadonlytable, but we still need the eclass and such
+# for bug #841422.
+inherit autotools edo flag-o-matic lua-single multiprocessing systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="A persistent caching system, key-value, and data structures database"
+HOMEPAGE="https://redis.io"
+SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+jemalloc selinux ssl systemd tcmalloc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	${LUA_DEPS}
+	jemalloc? ( >=dev-libs/jemalloc-5.1:= )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/redis
+	acct-user/redis
+	selinux? ( sec-policy/selinux-redis )
+"
+
+BDEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+# Tcl is only needed in the CHOST test env
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-lang/tcl:0=
+		ssl? ( dev-tcltk/tls )
+	)"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )
+	${LUA_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.1-config.patch
+	"${FILESDIR}"/${PN}-5.0-shared.patch
+	"${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
+	"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
+
+	# see bug 877863
+	"${FILESDIR}/${PN}-6.2.7-cve-2022-3647.patch"
+)
+
+src_prepare() {
+	default
+
+	# Copy lua modules into build dir
+	#cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
+	#cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
+	# Append cflag for lua_cjson
+	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+	append-cflags "-DENABLE_CJSON_GLOBAL"
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die
+
+	# Use the correct pkgconfig name for Lua.
+	# The upstream configure script handles luajit specially, and is not
+	# affected by these changes.
+	sed -i	\
+		-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
+		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${ELUA},g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoreconf
+}
+
+src_configure() {
+	econf #$(use_with lua_single_target_luajit luajit)
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	local myconf=""
+
+	if use jemalloc; then
+		myconf+="MALLOC=jemalloc"
+	elif use tcmalloc; then
+		myconf+="MALLOC=tcmalloc"
+	else
+		myconf+="MALLOC=libc"
+	fi
+
+	if use ssl; then
+		myconf+=" BUILD_TLS=yes"
+	fi
+
+	export USE_SYSTEMD=$(usex systemd)
+
+	tc-export AR CC RANLIB
+	emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
+}
+
+src_test() {
+	local runtestargs=(
+		--clients "$(makeopts_jobs)" # see bug #649868
+	)
+
+	if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then
+		ewarn "unit/oom-score-adj test will be skipped." \
+			"It is known to fail with FEATURES usersandbox or -userpriv. See bug #756382."
+
+		# unit/oom-score-adj was introduced in version 6.2.0
+		runtestargs+=( --skipunit unit/oom-score-adj ) # see bug #756382
+	fi
+
+	if use ssl; then
+		edo ./utils/gen-test-certs.sh
+		runtestargs+=( --tls )
+	fi
+
+	edo ./runtest "${runtestargs[@]}"
+}
+
+src_install() {
+	insinto /etc/redis
+	doins redis.conf sentinel.conf
+	use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
+	fperms 0750 /etc/redis
+	fperms 0644 /etc/redis/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd-r2" redis
+	newinitd "${FILESDIR}/redis.initd-6" redis
+
+	systemd_newunit "${FILESDIR}/redis.service-4" redis.service
+	newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+	newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
+
+pkg_postinst() {
+	tmpfiles_process redis.conf
+
+	ewarn "The default redis configuration file location changed to:"
+	ewarn "  /etc/redis/{redis,sentinel}.conf"
+	ewarn "Please apply your changes to the new configuration files."
+}
diff --git a/dev-db/redis/redis-7.0.5-r1.ebuild b/dev-db/redis/redis-7.0.5-r1.ebuild
new file mode 100644
index 000000000000..83d9c9646600
--- /dev/null
+++ b/dev-db/redis/redis-7.0.5-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# N.B.: It is no clue in porting to Lua eclasses, as upstream have deviated
+# too far from vanilla Lua, adding their own APIs like lua_enablereadonlytable
+
+inherit autotools edo flag-o-matic multiprocessing systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="A persistent caching system, key-value, and data structures database"
+HOMEPAGE="https://redis.io"
+SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+jemalloc selinux ssl systemd tcmalloc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	jemalloc? ( >=dev-libs/jemalloc-5.1:= )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/redis
+	acct-user/redis
+	selinux? ( sec-policy/selinux-redis )
+"
+
+BDEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+# Tcl is only needed in the CHOST test env
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-lang/tcl:0=
+		ssl? ( dev-tcltk/tls )
+	)"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.1-config.patch
+	"${FILESDIR}"/${PN}-5.0-shared.patch
+	"${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
+	"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
+	"${FILESDIR}"/${PN}-7.0.4-no-which.patch
+	"${FILESDIR}"/${PN}-7.0.4-replica-tests-fix.patch
+
+	# see bug 877863
+	"${FILESDIR}/${PN}-7.0.5-cve-2022-3647.patch"
+)
+
+src_prepare() {
+	default
+
+	# Append cflag for lua_cjson
+	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+	append-cflags "-DENABLE_CJSON_GLOBAL"
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-7.0 configure.ac || die
+
+	sed -i	\
+		-e "/^AC_INIT/s|, __PV__, |, $PV, |" \
+		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoreconf
+}
+
+src_configure() {
+	econf
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	local myconf=""
+
+	if use jemalloc; then
+		myconf+="MALLOC=jemalloc"
+	elif use tcmalloc; then
+		myconf+="MALLOC=tcmalloc"
+	else
+		myconf+="MALLOC=libc"
+	fi
+
+	if use ssl; then
+		myconf+=" BUILD_TLS=yes"
+	fi
+
+	export USE_SYSTEMD=$(usex systemd)
+
+	tc-export AR CC RANLIB
+	emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
+}
+
+src_test() {
+	local runtestargs=(
+		--clients "$(makeopts_jobs)" # see bug #649868
+
+		--skiptest "Active defrag eval scripts" # see bug #851654
+	)
+
+	if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then
+		ewarn "oom-score-adj related tests will be skipped." \
+			"They are known to fail with FEATURES usersandbox or -userpriv. See bug #756382."
+
+		runtestargs+=(
+			# unit/oom-score-adj was introduced in version 6.2.0
+			--skipunit unit/oom-score-adj # see bug #756382
+
+			# Following test was added in version 7.0.0 to unit/introspection.
+			# It also tries to adjust OOM score.
+			--skiptest "CONFIG SET rollback on apply error"
+		)
+	fi
+
+	if use ssl; then
+		edo ./utils/gen-test-certs.sh
+		runtestargs+=( --tls )
+	fi
+
+	edo ./runtest "${runtestargs[@]}"
+}
+
+src_install() {
+	insinto /etc/redis
+	doins redis.conf sentinel.conf
+	use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
+	fperms 0750 /etc/redis
+	fperms 0644 /etc/redis/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd-r2" redis
+	newinitd "${FILESDIR}/redis.initd-6" redis
+
+	systemd_newunit "${FILESDIR}/redis.service-4" redis.service
+	newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+	newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING.md MANIFESTO README.md
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
+
+pkg_postinst() {
+	tmpfiles_process redis.conf
+
+	ewarn "The default redis configuration file location changed to:"
+	ewarn "  /etc/redis/{redis,sentinel}.conf"
+	ewarn "Please apply your changes to the new configuration files."
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 27fc941def51..1c778886bf9b 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 6bcc4e004782..08c5155c3f60 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,5 +1,7 @@
 DIST mill-bin-0.10.7 65704975 BLAKE2B bd6cb205f58ef51eb43f45f5980de0dc1afbfb3b0a56ce81c541e88cae5d3cdcb65efcaffb90bd3a7b53a33410b26873d9db3a4863edf564a1ccb10c7be34e71 SHA512 9323212fd773de602ec8dbd1bf776169b402e9c60decc424b258254cc293cb4675a4caeb18addf853a7b1bdf0555cb3377e97a0dcf491b87286777c77c4232b5
 DIST mill-bin-0.10.8 65855208 BLAKE2B 4d165055a00f0373387064b98b8bf3548854213ad7a7317d7a8a03264fece5e882eb1705c45176e312a9444ab3e9f741ec638792e187a7e1b0941e1ac0862bd1 SHA512 9864c70b8a32f1ab451e07ab6e91f6fd9bf20e2cf400edca999c7585316696d90f446f68842413ae552c71f782d1687df5679857748dcc20c8d6bc7d38255b81
+DIST mill-bin-0.10.9 71023828 BLAKE2B 6cd71ad3a293b92957b504b850110103290f0017416c370f6de172247e96a42daffe94f7460325bff89b3136e3890eddb0ff7857418a0166327684e785a8e956 SHA512 494ad57e036180a285e44ff24ab8a7070b1b444e4267eb9ea76823f3717db4ca7bcab17013932764ed04fd7127272d87fef08cb59bc43ae257a76fdd715581e9
 EBUILD mill-bin-0.10.7.ebuild 480 BLAKE2B 975ae40b61d1aee9e011cd04fddac1b6adfb788cfb6218648284330e1d936611b73473e82383524e4be1a4ce6bff26bcc047bfb1ab9c67c9c646a85d892bdff4 SHA512 1625db9ae485f31f37033d30c5de765850f77a57d22f772645c38de7077f87431d41826241e108b9f8deab2d8e04bea4b98e7aeaba35a13ca1693888b6d1e67f
 EBUILD mill-bin-0.10.8.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
+EBUILD mill-bin-0.10.9.ebuild 482 BLAKE2B bd450dd8e02ed513d1d9a2546220e91556ccdc46a515bd41ca1450f9f36c602e25a36830c65211dcf87946b1dd028a474c84638e3f1039d83b4cc048b7100e33 SHA512 0c47890e11f7b3d2fcfb1469213dcb2f7103ff7f3460968dee8d4ce54bb0fe7efd80e0604a5a6ed5cbfb0c47fe68f43b02b6c653ea2401707bb9f318a6ddfddc
 MISC metadata.xml 464 BLAKE2B b60279b753026e5ba2247448a3e009a02b1d017cd3269fbf518783dc7f0a59adfdea03201123891d113da14f9d5a3cafd66628d71037064387086b622412994f SHA512 d7eeb833078c86092aaebc30a92d5029aea2ecbd1274c0f8eb86bc9015bf1bd1a2ab91b50ee0fc9816a661ace9635f4c06e9dcfb9d0bf1402b6f94867eb4e505
diff --git a/dev-java/mill-bin/mill-bin-0.10.9.ebuild b/dev-java/mill-bin/mill-bin-0.10.9.ebuild
new file mode 100644
index 000000000000..e8485c57dfd6
--- /dev/null
+++ b/dev-java/mill-bin/mill-bin-0.10.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN%-bin}
+
+DESCRIPTION="A Java/Scala build tool"
+HOMEPAGE="https://com-lihaoyi.github.io/mill/"
+SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	newbin "${DISTDIR}"/${P} ${MY_PN}
+}
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index 668f53ff7841..17d40eb7e76c 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -3,9 +3,9 @@ DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671
 DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
-EBUILD tomcat-el-api-10.0.27-r1.ebuild 1085 BLAKE2B 239bfc2e6138a76b292aa480e1f8b85824de37e25f1119b8b5c4f8a5512f5b94a6ed19b2378b0cda06ef5214eb81d8409b5dc7dce73d7663c1f029433946e20c SHA512 2a7257c8223b48fe88cd28eb781b5a4cd1509d49df3e2bd7f0495256a3ec940166f45b71f37a0bae6ee7f4ae2c9f935c23df64210708fc544b017568d62c8714
+EBUILD tomcat-el-api-10.0.27-r1.ebuild 1083 BLAKE2B e51a48c2be8b7e9fb5ace64339b274f933fb881fc00ea31e2d203d91b7478a2b7fc3079671e8fcabb001b7f6fc05b23620ca3f18e7ee7248643955df8c114825 SHA512 a1fd45e8cbcbee6e832cfda7728255d3d1059118bedfce148b616d0983f8160bbf8566e2589d633bcf51649af81a131e89a0e2ac6ddda8529f705543cc61f791
 EBUILD tomcat-el-api-10.1.0.ebuild 1082 BLAKE2B adc315817fed7b3e6a1a45b27b25b0e957c429635afd31e49175c82cbaa47b5a4174bab46e41dd82d01e60a682fc81b42d96284a5a7512759f67afcd74343a52 SHA512 6d282345502bb66b6382b4fa3d8ccdb6ed76433a82a434affb05b455eead27c4665e5ee1481ea55317d2d9b5b887da63b298cdfc4536bb3e2508b1e76451cf3b
-EBUILD tomcat-el-api-10.1.1.ebuild 1082 BLAKE2B 20ff75d660d6d5ee3dfa7a72cf12cddf1cf2050a77aa126eff41b4d8a66c12b857ae6c41c455948ef55115bf528d32360cff146e5cd09dae2da646b624923cd1 SHA512 47056f27631aba63f320f3db12a6cf4994a1bb3584fd62bc4214eb529ad6a58a335de3359466a0243fc060594e5fafea5b7b7b3a3fba506689e07fde0326ff70
-EBUILD tomcat-el-api-8.5.83-r1.ebuild 1078 BLAKE2B eee0be9538f96beac5d029f94738024ad0039112beae20b6d993e28fd6f9f16ce550699c29752afcd6650a9cb8aace5caa7056868ea70d9a5a8bdf545c9e6ec2 SHA512 1710953af638d3bf09ce71ed655e3d33edfc5d2e29a2965a93ced88ef01d04bf4c5dc5f2c48b40ff7eef925d449ecb7eab27cab608b60f1ce3f5c0f7880c1616
-EBUILD tomcat-el-api-9.0.68-r1.ebuild 1078 BLAKE2B a050aae2999b94167e2d8fd0863a460909b18181c30548d6323f3767b0873937ec606c2704bc9c2a0fdc563c279640896d301c892608029e108cc3484dbdf78e SHA512 fd6d23a5515c405ce695b5ff1064db09641085f441f75dbbde017a07b7e92ab6b718a850119b191042fc365a5e807074f5d8e3b519411d83956ddc3dfc6dc3a3
+EBUILD tomcat-el-api-10.1.1.ebuild 1080 BLAKE2B 6f1658221ba75f58e408d2b4ba54e5d3c51660d75d6ec85deaf8af1a2f8ab72082c94a6ed28bb758ac047e66ef04dc3110e37fc3a3a5d884fe4caf252ae865dc SHA512 b6946ca7d5148796a9ba0bc4e08e8807221122e0c4f1dede82e7bb120b465b14c38eacc2c36adc55e4b662c117d57e660d2ed979bd1acc833c379303ebe65a79
+EBUILD tomcat-el-api-8.5.83-r1.ebuild 1076 BLAKE2B 95a963dd26e723c14846046392e48219c25a6a30f80bd9e06f95a29e727e7d781292b26b9e76cf999fbe5996566166b347cb8ef78bab13980edeb70414c548a2 SHA512 bbfa84df56ad08ba552c02caa5cb3291075313cd1b92a87d70e177356fbbdd44446b5d6ddebb0bd9d58b12e4d054c00be08e640248e7fbbb272bdf5a549c3402
+EBUILD tomcat-el-api-9.0.68-r1.ebuild 1076 BLAKE2B 5d77f535cdeb48dbe3b3840ea051ccb0429f0f72cd40088285c33fff777e93bf1dd62d438977cd8220c662a37966e4634435ae50624a8b0980a17436a5011d26 SHA512 592dbe7ae237e46365491624648f1e3631d0762c41d65956f847e3d47615b86b735ab0ed4f7a194b21368bc9b5ca38bad0455db70fce1f2eeb8fae7e97c02332
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild
index 9835da231517..1ee34dfb4b81 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.0.27-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild
index c8754c29a16a..af1b9927da30 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-11:*"
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-8.5.83-r1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-8.5.83-r1.ebuild
index 4bb1ecb9f608..8bdadadd51dd 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-8.5.83-r1.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-8.5.83-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild
index 61f7984c3420..eca7208580da 100644
--- a/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild
+++ b/dev-java/tomcat-el-api/tomcat-el-api-9.0.68-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/tomcat-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest
index 76de98d092d5..57d12f4b55ca 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -3,9 +3,9 @@ DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671
 DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
-EBUILD tomcat-jsp-api-10.0.27-r1.ebuild 1128 BLAKE2B 93ac23cb14cdcc5e4a501dde03de69bfd5e45a0535b38e36a961e7d09ab191331cf27d85e31e239378abf82bad2077f1755981db1ac8bda33e3e4f7001cd024e SHA512 bae8727d620a8b3786b01c3c2cb0c32cbdf7aec482d19f6c07acb9d991509f191d6611cc4ba0dd47efba7d7b0140a72d907ce1c975cbf1dd40193f6a84d50be0
+EBUILD tomcat-jsp-api-10.0.27-r1.ebuild 1126 BLAKE2B 9f7389f56ebcdbe0653944c86402ed6dd0a5210e659dcd8e58d7a48a02b0149bfe64d44fba246f8cce25a91c794892c4fed4c8169254a22e4699611eb3bfeaa6 SHA512 66af30cc54b4b098c23ef15affff0ccb5c28d776c580b9515d405785b7d6dc44e2343ac31de1c031794c34eb9e0bf0e872d718cc4bb206eb25aaa089a45ac0e5
 EBUILD tomcat-jsp-api-10.1.0.ebuild 1125 BLAKE2B 5c59fe6a146a1540ee6bacdb34d80b3d171f97a7c902b5cbb0e7a49fb04f2d6baaec3561dabb3a7c95d9411629bf5b0ed654535d09bd59553b2653a3456695a7 SHA512 3162b038a1dcce3557941f850e430f55d95acdbaa9916c4b5c59cb12f9afebb9bad2fbdedfb59e3cbdfb43f409dea9baaa5051ce5f94a48d889a54d091b9595b
-EBUILD tomcat-jsp-api-10.1.1.ebuild 1125 BLAKE2B f3b45e551b1e1daa68659cb713479edab10d31983a1a2ec70c83dfa84028b7bac7f85af3c07ab65447c04c1184d01a635043c31f916e49f13d2f37af604c403f SHA512 ba7f23b9bc7b74ba0c5b51bef0ba276a481455c4056461c4e340e1b2d37dc498fc76eccf12679b64e6c46ec3f31bb147049953cd1e61ae494006750c6a47d661
-EBUILD tomcat-jsp-api-8.5.83-r1.ebuild 1121 BLAKE2B bece346b9599cb9c10cb042fba31a28889dc43b245309da3d16270bb12b24555812e770121b2b2197065492244d48caa1f015647dc9b6180f2fd109a49bcb9b1 SHA512 6ce13e8d973b93a33dc5deb95c7bc72d3b38a77528e15f55756ff8202089e49dd2deb267885b7dd66f84d7d4dae08ea70c1712f757d38f0ca32e1349b2c80d2f
-EBUILD tomcat-jsp-api-9.0.68-r1.ebuild 1121 BLAKE2B 3af7559e822c96d90093fe681b2dcefbd8963b843b11e8d5dc11ba49c13ca2e3adcbccf21488d9d4d62ca10c027acd31b69c57f1617a6ebc261c56de64c35afb SHA512 b0b9892ff2274730152a4b12b8c006134e2dc6b341a8afbdd1fd588f02a37a1a8e4ed294d8bb6ea499207e8e487985165df31b00c886f4292024c4bb9da86047
+EBUILD tomcat-jsp-api-10.1.1.ebuild 1123 BLAKE2B 2b02ef7659b22b7741ac391f37032225428c93959fa3b972e555c7fe703dfee60c81b42414aa16156edcc016bb51e34b0953f58ca570f4dafa9595488e3f0d81 SHA512 48e1fa5cc249295eeb3715e2492ee00330532ee0b832d2a7f62e46d11547f50be50873c5f2dc7213cff7575b31dce05111a129fe93b4425cd2d4373098e4eef8
+EBUILD tomcat-jsp-api-8.5.83-r1.ebuild 1119 BLAKE2B 80e064c062f9d95fed34ede531dcfba8616b016e6a4d77f39de7aab366dea3d9db88d4329a360928ed3944af49da475fd6ff93bd8467eb1ccd6591045e8e3c83 SHA512 4913e904d36c2542a88eb32135f37e4a60af9f19c43151232c225e83f9abc1b6035635e0c7891d6a975099f7ca5b27c6ddd1b0f700d3cce4a102d401b86aa238
+EBUILD tomcat-jsp-api-9.0.68-r1.ebuild 1119 BLAKE2B 06d9e661ced0f06fb1b7d137894b2bd4583a2bca641def0e1b3a52db11db377a9e3b238784820d171c47a7246be9ab618c90c8ca802f54e6b3daddd17b3cfb25 SHA512 f98c09e991aef980d536915f8b2c17a0233523f55119e8ace5cf7579b2667b85ff46d679dbec59b7a5c5c9f7b286b02d0e76dbe4e92f332b7cddbfd78bc326ef
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27-r1.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27-r1.ebuild
index e838e36e4359..7a69a2c92b06 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27-r1.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.0.27-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/tomcat-el-api-${PV}:4.0
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild
index b5373fb0891a..22f57cc4a51a 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/tomcat-el-api-${PV}:5.0
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83-r1.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83-r1.ebuild
index b9d201f10b20..e0c1409e1b89 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83-r1.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-8.5.83-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/tomcat-el-api-${PV}:3.0
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild
index 14d40969d205..635058338fad 100644
--- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.68-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/tomcat-el-api-${PV}:3.0
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index e0b9188071e5..bcc08b86e107 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -14,15 +14,15 @@ DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c
 DIST apache-tomcat-9.0.67-src.tar.gz 6211392 BLAKE2B 273b921ce580be6fb76d8567e5b0aec01b936518875f8470c1cee4b159519f723e606680d9986f61fbbab79cea2d027195f3debe9af59dfac786b0d0566d7c02 SHA512 33319d70c50fde71d163f66dc388ed2d5855aa4f087f7e2259adc27cc7ed30ace079d81e52def43a904c88ac670bb0c71667938b931a214470d77679108914cc
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
 EBUILD tomcat-servlet-api-10.0.26.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91a46d422b8b84455814a95f0ecc4b13634e8df876a1cc95e4f6318380392feb80f8a748bfe21898e18169ddb05eea7a0f086c2f SHA512 da77418b28127f4d7e05f691f835e7eb01a59e2f33daf15ecc2f76ccbc1f136e7b446d14104d9cbc62f9d251f926dc698e8051b877c61f4adbce45c51b21822a
-EBUILD tomcat-servlet-api-10.0.27-r1.ebuild 1175 BLAKE2B 8251cf902d082fae48bd5f0906bb23ad4dd2a69008ea6f127a50d009eb2e6f70a274b775d8edbc5eadd4c421b4d2d23d3176d92aebe017ada09186cca396c557 SHA512 cbc958b1ca9385a5bc04f9a689386b787a580f72f379217d3ddad8915d072f4f8c600a77bcb072972efa16f17a89b6f1e631215ce2d27777b739319ee82d08af
+EBUILD tomcat-servlet-api-10.0.27-r1.ebuild 1173 BLAKE2B 2bde09380d45e4c7066bbb83f6cc89b891a53294882058d9e850f46a98a72741a2a9d8f2430d4143f5a1a61bc5f447e615a2376dc736fc6c3adf5b2aa6aac452 SHA512 61b7a0fb1d4c66297db96f6e6b03fad8700b23081b2c2c50de360c014c8a8b357a71fb89ee18f7a2d58397393cb2066bb7bac23cfe23641e7b05d4c8e3a5c945
 EBUILD tomcat-servlet-api-10.1.0-r1.ebuild 1172 BLAKE2B 4f7067a7e31c04bf55c66c0fa25c10a3744bc6e010db04ad922739b4ad57130e667da67c3513636ecbd61f126866e9edafa0c05dedaed2a60ce4adc875183971 SHA512 73640743378e8914d06fd4ab02cb7418356b03b152e24272a3600a14eaaaa85045c8e4f47378c3bb397a6bf08a9366fe13aa3f2bf574cdc6cc33ed1ed10756e6
-EBUILD tomcat-servlet-api-10.1.1.ebuild 1172 BLAKE2B a0e939bb1464ee12c11cd92ccba5ea6c868aaeea83fe0dd4a65d44ff5b04e9bbc7a8723575796833123232b351456e313530aa86cb9fdb94f1cd336bb355f9dd SHA512 98311d5bdcbb1e784bb8228b185c78bec7d46f06ec9ef6bae0f6bfc6f58dc0d5e5bc36b84df604864a332a4b53da5b750a092c99dcde8e1175b996b3a97433f5
+EBUILD tomcat-servlet-api-10.1.1.ebuild 1170 BLAKE2B b0db6284a5bf321dc272f68622b982560b6e845df7ef6f1acc9969e65eb2e6feab16bd5c3457e48626f6548d77c7eab2132a79ec235dc4f6d0003bcd9f982b2a SHA512 7cc04dfe018515be23085cb49c6334bf1f935b8461a87c184349887660b440b37ccfb26e83690192c41dec7bacf3de76d41f08ea72bf9e2f1c300dc378039605
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.82.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634
-EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1328 BLAKE2B 385d32707719ae49dff0255a2a5a432adfdd02ab57467c2b71e7edf70bcd6f502c30707e3a02ae80d243fa9453bcd4b6da0345a1f462b28a40c58aa3097607bc SHA512 4b22424585b88d442cf0441a810752d1dc8243d23cac139ab5259393a522a342d340b376e0adab288e6520732bad221950063c0b76eff7b165387b08c62ab254
+EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1326 BLAKE2B ac0c1dc5ea23bb0b7ccdb19b0fc6071dcf2f1903b3e0a4280fae253a9a1c8ba4c4bab4c9223de72d19ad7e1e833ebcf4954658c175bb5d4c1dcba85206d0f53d SHA512 9759bcae0f968978f6a79951032bbbc0eab020d166b7dce80235f1a4ac418a341a2df4dd9f350fe94c939238344b1fb07fd6c0ca14221d356941dee70a4b1ae6
 EBUILD tomcat-servlet-api-9.0.67.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a
-EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1168 BLAKE2B 772b7aa6f72ba5aa6534e8e866c167864415c780e431c3304413abdfb0f568630108c8ab2bbd388edcc4e88ed816de8992d341bd7a42823ca311ff43761c9fc1 SHA512 070aedbac428440cfe68810109c5a598fcb9ccc8a6a3cdf205f15e5769f91809c75a2ab6c3cb50214dcf6289b4a5b9f0bcfccb5901ba5d6684771caf2e5e8c79
+EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1166 BLAKE2B 060877a6405ddb140c01efd63db61bce05b6fd0e95c3d029adca849e6ea9983c88e14b1eaa293e9d816e35c3284c58d35df463db23ed8359361293aae038280c SHA512 8e11df73a21ebded3028e0ff945ec11a678346410514de680ed2dab59cf4ecc8fdd8d41ee4f4427ccc8909c8c5f05998e8b153657b7fc587489adc25c98d59f5
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27-r1.ebuild
index 8b1ec19d3a5b..b065669c2c02 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.27-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="~dev-java/tomcat-el-api-${PV}:4.0"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild
index a546fc617378..c82165af313c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="6.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="~dev-java/tomcat-el-api-${PV}:5.0"
 
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83-r1.ebuild
index 696bde7efc5a..96a9844f8dc6 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.83-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 # we can't use the exact same version of el as tomcat 9 implements the same slot and
 # it would prevent from installing both tomcat 8.5 and 9 at the same time
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild
index 7f3ba3864e80..096f58bb7447 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.68-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="~dev-java/tomcat-el-api-${PV}:3.0"
 
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 6bd283c3d4a4..7b61638f95e1 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 349cb8ccb6ba..227a3633cfbd 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -25,13 +25,13 @@ DIST python-gentoo-patches-3.9.15_p2.tar.xz 23244 BLAKE2B 0917396dd08f652f8ba06c
 DIST python-gentoo-patches-3.9.15_p3-r1.tar.xz 26400 BLAKE2B 27198acf3e9087b96ef15328b9da6d80837a459c62b21c9785fde77dc6f4a5c8c4ccbc3cb48e5af684a253a978c5562fb1a342e6a554d2247aa968fd5890d6f5 SHA512 d658dc89ca29070de2a39d643cc9585ae7f66232dececfd7007cb57a6c6ededd30ae030dbe9226686b8517c48fdb5ed7e681decb64b207e41173a0993f461aea
 EBUILD python-2.7.18_p16.ebuild 8307 BLAKE2B 4be343c831fc645acc31432978f0ddb6da538abadc55238b5907a7b7c822c2e308455d1bb0d27d53c887be89fca742088932c2d4ba570293097113f6b5c0c2a6 SHA512 5fb05c1a8f045fd3eb3e24fafef2063fc51db7cfd13fcb3475a1c0e54c458db76c5667f9e164bd9ec084ba9965b7745bbf3c6bc7070db228b32c934a19722ecf
 EBUILD python-3.10.8_p2.ebuild 12901 BLAKE2B b406040e5412b528ae58e26fbc8226707f22137cc372eb386267b45d3ba047c8cd03d94027e60ef337be05ff8b1f5d89a258d1f4568925a4495f6e577f829249 SHA512 5bfd248c730be86592a747b47e23f87dc7eb1a249e3eb61cea87c4add7738755a9d4badc12f59e0fe0cba5190d94dd4a29bb6707f255f16ca748e2acfcc2a042
-EBUILD python-3.10.8_p3.ebuild 12910 BLAKE2B 461d977ff54b319b30aa3efc6950ecaa5d3bb93b40ab2afda05f72235d82b2f3426d277dedf1394bdb52eb336453f8010145cdf159f33832b8aa7296c635b4c8 SHA512 192c29a404819d2cae6748f3804afb7bd2b5fe954b330e689b5648e863ef4059e2dab2db6500bbd6918e6dae55d77cbbdcbb6061731379bf0ca873e973b48ab1
+EBUILD python-3.10.8_p3.ebuild 12909 BLAKE2B d34aa69df1e96c3016458ead1dac2a2e1ef8f95e77ad941a9ec3ac7f6093502c228c088df80ace4881e001ccd8b39bdadcc1d7628f9edfdb5abc01146ab3b5f2 SHA512 8f22cce655ec3089123c0d1ef7e8a00a4b63e4dd7c090c7fa43b9424c039178258be6f908b7728b739d566b1ecc747dc0a48a5702831ebfafdefaf844980ddf1
 EBUILD python-3.11.0_p1.ebuild 13801 BLAKE2B cdff9df837481ddf9a6e008dff0fe9f235fe0c8847b5b2af351b207daa201d9bf5a9faa218aab640f6044c516a03d4676525224fc9fc83ca44f77c998a6a9030 SHA512 25640cfc9428e9b18d7fcd3653df65912eff1060717f8f8ef97ee33549471fe54f2c1b7088b55577fc3169f3c16da0ea53da18fd6ae22fb173cabeae2183d1c0
-EBUILD python-3.11.0_p2.ebuild 13809 BLAKE2B b4af3cb81fd014c1abd6d26a5767416e37b31552e0c7551716158aa6644f22a81083c1070d44ecff9f0a7005c9658b112acb4512b6a647a0e483cb19eaaba8c4 SHA512 a45398b7877dd6368db9f27b2ba96edbf9b447ca08c52cc2e5cc3fb957724dd9e3c8c013f817a832400b2a9175ca57e195b35089cfeb124bfbf0324605694716
+EBUILD python-3.11.0_p2.ebuild 13808 BLAKE2B e210caf33f14b9b3b20ea52b77198332db273444251855d6f708d0c888e8c5cb15ab7def695dfc296387565fe50064168eb1e2259edb1a9677660f46b4228401 SHA512 0d84f5ca1fbde5cacc01c723e5d833342d8e7db832c3cc93e1dbe78aba5e770c55272dd9d2e3588e5b38c0c0259cd8d1c250f24298ac576069d7d4ce5e5c0d33
 EBUILD python-3.12.0_alpha1_p1.ebuild 13694 BLAKE2B 77802b95f3b9bf8c5a88d4a50e7529cc094c332f408be39a1cbdf243ceba3a084765247f5acc9094f939fede82b24ff7967e6544cf73b755fb3b502be4979e96 SHA512 8b2665b81a0ffa78529e66db5559d23ef682244de9849aff3985ee013d3e6fbfbb359542744ef1f90e2ba85c7b22be2f5c6e2c3751a2d9fce449564f9abc99ae
 EBUILD python-3.12.0_alpha1_p2.ebuild 13697 BLAKE2B 40bf6c2ab7a475b8d430dc63989c50b8ea9a75813329f06efe4835a45ab90bb6358e22846eedc8794a791ab15004a90fd3314859ce186093d8c692eef66b58ce SHA512 5eec79eb25429604b17f3ceabcf5e9bc123168d050f1c368308ccc1306fcb29952edc6aeba9782930b75feed3676fac9514438bce380b1cb5588ed03030285e7
 EBUILD python-3.8.15_p2.ebuild 11439 BLAKE2B d6daa1f6acb91842a3eed6d47291ec664ce9e7fdb10644aaee576aa25ba50af80d613f47a97a0714d5ff981332efc3efca4b247bc852c08a5542ed4224fe499a SHA512 10fdfa955eed007c37640959b19ac01689cb38b9e1e2181439473ad1ca06e014393d8c7aec79835a00351d1e5b46b6b6ddba9037169920c4fbd2c637b9be0025
-EBUILD python-3.8.15_p3.ebuild 11448 BLAKE2B cb8c32f279b477a908b245c13a83508746c9702e4a92dd81ea79b14709d0473db21a281d8fca5d9b771711d30458ecbf29d57247c406df3c4615739b233dc6ce SHA512 17014f12d02bb78961cb0efc1b4e64f18af57de990b7c8f75365c6ed7adee93a351592af8853ab5e59b789a0320a6f0336b5f5376d8bfc7de9605d4fc219ec74
+EBUILD python-3.8.15_p3.ebuild 11447 BLAKE2B 4a170a648b26bc5b6eb67a213a3e642852e45267b79378be71d46594da221f80999ba71ffcd8660c1e172a830c698e23588ab137a4af6f783eb341995ff3752d SHA512 ed690cdbc966cff7c12cb9c0e63231e44e9e7a25ecb2b918da18459cd79f5e45ed9a53b5a6abbc03798b6d8ffb3217eba4dad8052beb830e0d7123a49c95fdcd
 EBUILD python-3.9.15_p2.ebuild 12699 BLAKE2B 0c79c486faf93fbf44143cdac9a4cae7d7f5296294209be9c0e6bbab524e80aa41a88f7be3f449a92e3ccb5e1edab0b412f4aa375f615825a77fe162edbc4ac4 SHA512 bd797e9555e3b67486a33431baf5e34a55756ce6afb849d36550ff12e7aa5fb80cf6e9148e6292ffe222318368f12b2e2ab65657444e35f44aa81aa8eef6c9bd
-EBUILD python-3.9.15_p3.ebuild 12708 BLAKE2B 9af56d4913f54717c7c9e75b3f323c6cfdf0f45155b59c9e9e6fa0e3f70bc8feef05661f4550ba9b7bce621d1649fc9a887a2c44265deae786f4c81f7427a6ee SHA512 edb14a275df31b0bbf86fa64f38ae92f049bf72aa65d51b3f6fa081eb49d89d55cac206de28002f7553c42b0d905af54580e85be756483784bffe4672877357d
+EBUILD python-3.9.15_p3.ebuild 12707 BLAKE2B 9b9020468cc4096a0ba5c974899e2828ac0fe5751208df50acbe04b5763c0792900687f128de9376f8f4ac008a5a31f81d585f9a74eedd8f371b16cf0d952f35 SHA512 00257516c47e3eddf3b66a216e4be6a686204f66d0fafee3691f376a75052bea150c8fc63e3d91432ec15ac761a1998a29ffc22b1becfbf516ffbdfc9c9b8eed
 MISC metadata.xml 1125 BLAKE2B 5302c84538eb30fe86c91d15faa2f6de0eaa4ee38c26a0f6845b4a95bda94ad0006a509bedf9f71288332a593d245191c0f358f0515d96c8aec8693eca22fd2a SHA512 2280aa3f309e1338d7e41c8cfa50cde4d0441bee7d98a86ce7bf4969560b34dfab8ef6171cbbe0d6a19f56c676e9c9dd63c65340ac7145317d2eab0fe618ae0d
diff --git a/dev-lang/python/python-3.10.8_p3.ebuild b/dev-lang/python/python-3.10.8_p3.ebuild
index 41322776b3ea..45395ff092bd 100644
--- a/dev-lang/python/python-3.10.8_p3.ebuild
+++ b/dev-lang/python/python-3.10.8_p3.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened libedit lto
 	+ncurses pgo +readline +sqlite +ssl test tk +xml
diff --git a/dev-lang/python/python-3.11.0_p2.ebuild b/dev-lang/python/python-3.11.0_p2.ebuild
index 42af2db5b50a..f105823fe095 100644
--- a/dev-lang/python/python-3.11.0_p2.ebuild
+++ b/dev-lang/python/python-3.11.0_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened libedit lto
 	+ncurses pgo +readline +sqlite +ssl test tk
diff --git a/dev-lang/python/python-3.8.15_p3.ebuild b/dev-lang/python/python-3.8.15_p3.ebuild
index 61a59289778c..addf6cc183f0 100644
--- a/dev-lang/python/python-3.8.15_p3.ebuild
+++ b/dev-lang/python/python-3.8.15_p3.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
 	+readline +sqlite +ssl test tk wininst +xml
diff --git a/dev-lang/python/python-3.9.15_p3.ebuild b/dev-lang/python/python-3.9.15_p3.ebuild
index ace7b7ea94e0..27a6bd524b03 100644
--- a/dev-lang/python/python-3.9.15_p3.ebuild
+++ b/dev-lang/python/python-3.9.15_p3.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
 	+readline +sqlite +ssl test tk +xml
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 9ab62e87b861..7f2f1071128e 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 2ab61cd79290..7da97704e39c 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -3,5 +3,5 @@ DIST libgusb-0.4.1.tar.xz 50384 BLAKE2B e6613758bb24710ce8326e12a6fb6a8708135c0c
 DIST libgusb-0.4.2.tar.xz 48440 BLAKE2B 6241271efe40a8653e417ffcbd9b7ba0463c5a1e289a39fb8aab6b6c70da75973af1bcb8afba0a6c3a1535a7015e7d0f121f22ca1dddcd74d57722af3c95c312 SHA512 c3e8e7a21f1e2f355cda5dddbde7235f9c48d4ff96c2d012e48df5bd7e1216ed41f3cc81f4a215ceead8b6e8cf0d04a85916043adfd074e543c041dbe63acd48
 EBUILD libgusb-0.3.10.ebuild 1519 BLAKE2B 63ca13cf5c6fca4a3654de2f41603a384248c5479a5fd54b25cddf5823c97be152d6b25e63ea8c29cda59738893a494083788d6f25a7e6dad6f7a32095668c72 SHA512 c19ec7712e2a532dba2b640ef9bb2e0d371a4de265ed8e5c12f23527f7300fa95a3d79e9d0b149560b51712b2596bc1a4ce3645906553f3e6edabadc35260b64
 EBUILD libgusb-0.4.1.ebuild 1735 BLAKE2B 5de8136b4e342d9283de839739a5f402d5050a840e31c847d540ce113356411ee168808a66c6c5da9017c3a365acb84ef22176253eb92b9cc2c784f42b52316f SHA512 865edaed1f11cabf1d49ec679ed3a4b4d11c28ce9c6943650aeffd9d293c9e4a805b24e009fb5444120a9ed80fc76c3bf13670bc58ababf8ff19ef0126d13d96
-EBUILD libgusb-0.4.2.ebuild 1729 BLAKE2B 94678d8e61a588c0f9e950d57fc5b5664a68be9cfeb05cf3d11bd134706a8b299f45dca78b827a996226156e6c98d65e10408951b59584c03fd87f13ae8d0049 SHA512 0e36c8b52261450657cf90216013c8d679856067660a096911b79e682ca9fcbce302eaf1af25338014d11c662e73ba573da0b0f36bfcaf1ee1daaccf5d9a137d
+EBUILD libgusb-0.4.2.ebuild 1744 BLAKE2B 4b3786cb676dbd5226a78dc08a33f5dea76215a7588464143d384ffa0f73d16d6b81c19cae8ffdfbe858511e85f63162f876e271680d0cad5d5b7f5d60ea1386 SHA512 1bcf26a382b6c6e79a16cf34f6651eeb8fdf3d551b95c5f68a929d465f270398229e9de57aaea56ba758fe28cf555fd6b3850d40c47b9a5d3e5cb0a0f99f0f2a
 MISC metadata.xml 344 BLAKE2B bd362d7e89ba2d88c2f220ab47593b4ae25bc4ca486bdafda16448407213d7558d7ea807c489e5aafbb8ec83a40e8e339c8ba20d3bfc3957da33a7e7711c6898 SHA512 93166c6dd4d764901c87fc567ab1c67add1c654b7ea1f3326e7144d5c14789bdee2a1e37874f8b6158136e03363372bf1d972f49f96095b0e3e568af89c4af34
diff --git a/dev-libs/libgusb/libgusb-0.4.2.ebuild b/dev-libs/libgusb/libgusb-0.4.2.ebuild
index e820e10669bc..18bc219300eb 100644
--- a/dev-libs/libgusb/libgusb-0.4.2.ebuild
+++ b/dev-libs/libgusb/libgusb-0.4.2.ebuild
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
 	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
-	>=dev-libs/json-glib-1.1.1[${MULTILIB_USEDEP}]
+	>=dev-libs/json-glib-1.1.1[${MULTILIB_USEDEP},introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 	sys-apps/hwdata
 "
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index c2dba275170e..6c3cd3952cd7 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index c8bb0b92ddba..ec670fbf2f5f 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -24,5 +24,5 @@ DIST sbcl-2.2.9-source.tar.bz2 7258148 BLAKE2B ed7c220644120c467bcf2ef0a254b5065
 DIST sbcl-2.2.9-x86-64-linux-binary.tar.bz2 11641067 BLAKE2B 4afeb6c3dee6d0b13790b005882d0702978f039feb3dd85fc483282b04b40ee797f8506f2db1611abf148589215583640f02022a11d4e01e854bd4a566fdd48e SHA512 53f9da74dd18056cf086e2f2258949eb53cdaabe9b3f24b004378e65c7a3ae5821a8501868415d662fc24d59bd0edb2c3b67419ebe48d459e8546e17fb692400
 EBUILD sbcl-2.2.0.ebuild 8344 BLAKE2B 1baa54b857fd84c98ca24cde84b6595a9b4d58df52205e41620b2bf028b40af77d3f50ba43b82949fd9c86c4e75653c080ee031b1be29bb3c50543b0b49fef72 SHA512 644db987685fbeb15e5eac754ac15138958c09fe657be8838ab18f9df336f3b86b0f34003a74c43a3d32248bf7dfed1752cdb302abf85fa882fefc46bbf92a07
 EBUILD sbcl-2.2.10.ebuild 8402 BLAKE2B d90f2214836876409168a845191e0191892268ce5d3738268b5267bdcbe9e6572876361cb9b9c0a4f63d65bd7b1daa7fb8715967f561743d30bb5b058b3c7768 SHA512 dc0aba7a8a22db78238384a9940f39e8e89b066a478c7aae2e0ec5c70c16d1fe832948f245e7cd14f62ba59e0fa016e11e630dd8ac49f041ad28e8218dcdecc3
-EBUILD sbcl-2.2.9.ebuild 8490 BLAKE2B aacb9179bbdd961b5575e4a704a8d9ab88a935daa07b151f0fa06de8e72ee80ba80b3e0699af75d6e55fcb1693def51480bc617d7890c953e52a9c822c2bc2bc SHA512 0583c30d496ffe54ad3aeceab39652c473ef91d2b98d36f781bcdeab023ae40df79fff9ba33eb18d51a2499bb17f9e56905e028a529afb945503dc4be6bf0d98
+EBUILD sbcl-2.2.9.ebuild 8489 BLAKE2B 0f5a221d0a237ec1ea7a3064588602860a80fc37bf8b27529cb327091cfcb9689af4620d635239c10b4c77cb76cd3b0167bf9baffd493a306c20f95a8761e853 SHA512 ae20fbc8bcfcedd9e07486dc6c5563e19c10d2a8efebca059b0be09ee260c8749e0b20eff7ff9ba6d7ac907f122867cdb800976843341457192d26f1a4aaa0c1
 MISC metadata.xml 1400 BLAKE2B f8ed0f7714ec54e42a3e17162a560d8cfb68ac2d981be02a31e5e64820d8e6cf1dbbc2774b52680d265042a48dfb497497a8d84289cfbe7da7a919ead68eadfc SHA512 22f3ff1dcd58a222319d6e4d46fee3b863ac3dbd997ec9a167e0038e28483d12f0f106332b2cb610cce0749f12828e68d71675ef43aa4dcd54441def6f9cb955
diff --git a/dev-lisp/sbcl/sbcl-2.2.9.ebuild b/dev-lisp/sbcl/sbcl-2.2.9.ebuild
index a18941194f16..0342f59644d1 100644
--- a/dev-lisp/sbcl/sbcl-2.2.9.ebuild
+++ b/dev-lisp/sbcl/sbcl-2.2.9.ebuild
@@ -39,7 +39,7 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="-* ~amd64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="-* amd64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="capstone debug doc source +threads +unicode +zstd"
 
 CDEPEND=">=dev-lisp/asdf-3.3:=
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index b7f4462fb6d4..ba5cf1d2a98c 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Sys-Virt/Manifest b/dev-perl/Sys-Virt/Manifest
index 618586123eae..f72eae2cc7bc 100644
--- a/dev-perl/Sys-Virt/Manifest
+++ b/dev-perl/Sys-Virt/Manifest
@@ -6,6 +6,7 @@ DIST Sys-Virt-v8.3.0.tar.gz 169060 BLAKE2B cff54463afe9cc8ac2c6fab5f00bb00b3bb38
 DIST Sys-Virt-v8.4.0.tar.gz 170680 BLAKE2B 0b6c40bcfeba0f5c98fea0e17e3ecc434cc5adf14ed5a92c9c7424a5745e3327c1a8ef05c79ba182d4eebd04b50abcafc68c59e8064ba28faf78bebbb500dbc2 SHA512 25c5b9013df2a916352c07be693c9a9410a4d3caf92a1da106176df314efa534078b5d4dc2501b9afda5ae1628ccf1394a346410972f6ebdd2282971c3efc17a
 DIST Sys-Virt-v8.5.0.tar.gz 170318 BLAKE2B 7ec1bef9814d85ed5aad1e50c6f01d8c133cb5d537ca9f0bc1e21c4bb955a9bc1bf8bee127da7747c7ed8b29509b84cba4c52d5b49d343cd393056b29b32ba5d SHA512 acc839c4ff9e8dfd6660f32959b2baea94ea0e9fd77a6455a8c0c2010f7bb983ad7457349e77ee8494080fe62c4493462ac53b66a8eae1ad28e67828fef60434
 DIST Sys-Virt-v8.8.0.tar.gz 170362 BLAKE2B 9d340a17496cc70cf8bb4daa5ffb1cf88b8a66eaa2cf5847a28859cc9ed3c3d27762786e2f3d1cd16616af9cc2e532eff5a7f8e5eab1340356152944c688eb61 SHA512 76312086e389e12fe8332e9699d94003d03a8592951f590c7bb05d4352edf552a19a53f694543760f5a43d93d2b8af3d8386929498208ccd7273dc8bba197bdc
+DIST Sys-Virt-v8.9.0.tar.gz 170631 BLAKE2B 47c781a2cd75e37195fb43038ba69f4d9f0b2c7c6251f2f04fa39e8bde6cb6e139c25b8ecc4edd98fdebee8e7bcae277f22707243707722ab8e4f509be411e0d SHA512 a961d4bb9383465ec1b06885a8b70336804df3531b790d2dddc318075d61dd412cd9d6f155542205c7db7088e5a9a4c07dbee6ec32327eba0a8b68166fa9a048
 EBUILD Sys-Virt-7.0.0.ebuild 767 BLAKE2B 91778504d48bbf174a780e88a85450f0ea315267f16d004e61208c3d6a0c8458976899e1f312a2076d44790f8869d781fcbb78934adf6b98c4eba3a91d967ff0 SHA512 e17ed83d3d16535ad5089739da918f8f3234860f006e87677279c19ebe76695e93632be4ae33e2197451a21a1d17e8f765a5e949fdb5ce46fc47420d8eb2e1c5
 EBUILD Sys-Virt-7.5.0.ebuild 728 BLAKE2B bf373e31030ed74f341848b96c64d78b3d09c954e5d105860c61836460c92f32420de3125c314647d741e31c232b6e3a03f8a92d452da4cbf1330b1a8e5c6896 SHA512 bd03fafa2dc08471c61468f73b786f51b5f4290fbefb34833edeb27309c2d527c4fdf920ac2a77d9483f9e250d7a1c637ad8e12227c528fb53ff94fb1b55c9b8
 EBUILD Sys-Virt-8.1.0.ebuild 622 BLAKE2B 92bf555780e98adc1c802570cf67dfc7e576970f0fbc70c0033f8002afa769c90aa60ea721288d2cd628f29b5bdb166c3a6e907e9503f56ccbf7fe5672e0754a SHA512 8eb71ab58a95bf20ca781c1238dae19965322bf82b8a56589fadd45c2c82c54452729776b5117b27f95ab58f905cdb2e26a00bcabbccb24fb22070c03fca17bb
@@ -13,4 +14,5 @@ EBUILD Sys-Virt-8.3.0.ebuild 797 BLAKE2B 724e99fe9d274020ec2b9df941ab5b1cd1ae6b7
 EBUILD Sys-Virt-8.4.0.ebuild 1002 BLAKE2B 9338f433b9b2f5b7614f4184f55507de000a557d45449455069f0d8fe00d6b50bb2075a0baa78ff91b74128923d213063690995e14522883d0cd88a3934d4d97 SHA512 b29f9fe2758354c29e3b40a0ff67ce1486960370562f6475861dd70abb5d75233f5aa1daf85db6305ac0ce7fe4ed552c2a0c40c4c51662215909dd354e9875f0
 EBUILD Sys-Virt-8.5.0.ebuild 876 BLAKE2B bb3e423cf2cb21bc6be3bd7bf301fa88f88f252153823a130ba70faf22fde18754f78813f45c68b6ed281b504ffbbe7d3437e4a86d39f329d234cc882a0bd8f2 SHA512 6cda21c9aa72e535c609d1ce75a1e292dd4c0c0c2b527a18707a2dff24a997557fce7ba5b9b652d73b951e50603627ec91679e48f34be9fedb19d4552ab05ffa
 EBUILD Sys-Virt-8.8.0.ebuild 876 BLAKE2B bb3e423cf2cb21bc6be3bd7bf301fa88f88f252153823a130ba70faf22fde18754f78813f45c68b6ed281b504ffbbe7d3437e4a86d39f329d234cc882a0bd8f2 SHA512 6cda21c9aa72e535c609d1ce75a1e292dd4c0c0c2b527a18707a2dff24a997557fce7ba5b9b652d73b951e50603627ec91679e48f34be9fedb19d4552ab05ffa
+EBUILD Sys-Virt-8.9.0.ebuild 815 BLAKE2B 529e3ad191d2f7c7e4fff8dec88ab00008061adb14d07944dc87bb95caa1b8093d407d40020703f97a864e3d28307267554b30c9ffb8eae1f85ea23d8a200083 SHA512 220d35a2c1959a2ba41f42840ed87102a566ea4799d3b0654fdfd7c746ca707810a51925a4e6efcf2818b731604e482af47f7470ed31bdfe8e995af768a9ba2e
 MISC metadata.xml 1206 BLAKE2B bf5ec8f97d105c95b3beee58bf6afe0839c2d20f4a841b2d2d85ccca4933558d873932bae65c357e5b6d27ceefd3bfdd1a14ef157f1ba0116234b1199ad25e80 SHA512 bb97e87838d117b95872c7481813455d0e1c5a188908ea8680342553396aa8e26a703670ed2fe06abed6ad10774363e0d4893906d036067d4c84a4be06b243a7
diff --git a/dev-perl/Sys-Virt/Sys-Virt-8.9.0.ebuild b/dev-perl/Sys-Virt/Sys-Virt-8.9.0.ebuild
new file mode 100644
index 000000000000..2a37a5b631de
--- /dev/null
+++ b/dev-perl/Sys-Virt/Sys-Virt-8.9.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+DIST_AUTHOR=DANBERR
+DIST_VERSION=v${PV}
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="API for using the libvirt library from Perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=app-emulation/libvirt-${PV}
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-CBuilder
+	dev-perl/Module-Build
+	virtual/pkgconfig
+	test? (
+		dev-perl/CPAN-Changes
+		dev-perl/Test-More-UTF8
+		dev-perl/Test-Pod-Coverage
+		dev-perl/XML-XPath
+		virtual/perl-Test-Simple
+		virtual/perl-Time-HiRes
+	)"
+DEPEND="
+	>=app-emulation/libvirt-${PV}
+"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 1527142be08a..66b724fea183 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 526a4297217c..cd5c0d1806a8 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -2,7 +2,10 @@ DIST libvirt-python-8.7.0.tar.gz 236343 BLAKE2B 563cd1a18f06c0210465905267c46b3e
 DIST libvirt-python-8.7.0.tar.gz.asc 833 BLAKE2B 5386780d75114c21105d012fd0ec2fd22fdd979dd6cdaea59f578eff4c0616e377da52d8aec05f337b837fda663ce8afb6d670e960ee65146679cd8c9a60b12b SHA512 499324c7cb520edbd1778a16434de43be062545255abb271832a636ff1ce9f4ba87e90226a181e081d084fccd6c190acc15763fecfc89e80093845589c12f535
 DIST libvirt-python-8.8.0.tar.gz 236523 BLAKE2B 56504045d4c44c2419fb8f97b1c147f12539122acc35644aef748631db5bce0d1ded8ebb5c1bd1160d2472757c0887105f3dd5e41c271a56f963ef21616565c8 SHA512 bcfe69b1279d8e2fc1343959f2c17ff29ef957c1d7f98b233c8bb32cffe50285138d1be11b0c327f6b18e2395b6353c3552cecfd9bbfcb5cc6bc97981f9d6f26
 DIST libvirt-python-8.8.0.tar.gz.asc 833 BLAKE2B 2769a404916227ce9d77ec0e76d2985b67f7e59e3f280486b59f9a9edb4fe5405ae22dd03c2d4c9f1c620a977eef90ec8fdc93d3891d8824021a226a0581cb9a SHA512 edeace09e2de739d318f63ac7b33f814ac3d2e4ad7a32164fb0691723b4872d64bc60d0f96baf1809158e76fd7dbbff75c6ee4e9112b1ba6c264287c36d691b4
+DIST libvirt-python-8.9.0.tar.gz 240769 BLAKE2B 992f02fe584f33ea5bd91a28338e281d49515bae392d5209e07a916b9449965c753b9a12b2f4d8433069efc1e3c5907a378e3e2d8ee1d55ab682a3e983b2eca3 SHA512 f13767528518189bb4a6094dc029f3dee16179a269b25f1224ba448569e3a2f8b036124711060d4dda8de0f7719474a700b616e1e8e8d29028d585c2a631aa32
+DIST libvirt-python-8.9.0.tar.gz.asc 833 BLAKE2B 690613f7f558155db56a5194042bdf49e004143b2066bcaccb48fc9082364a88b5f8d4112623095838a116817a55e34e8ca29e01221299efc396fb1501a060ae SHA512 a490284745c948d87f0239b70257b5cd66ae2515a4f3f33c05a2b3e1ccc28e2769c8c61d45e4f855b595a6d82b6d73e50bcd00a8bbfc7cb7fbe1a4969e48e17b
 EBUILD libvirt-python-8.7.0.ebuild 1345 BLAKE2B 0a86ea375248535734389a9ca5bc6fb9c7e9784d17c7d18317ded9e5b657e717628375e235cd13c11a5a4f238eb51017210a5e8d6cc0f56cc7a9a7a626ee1b0e SHA512 b66b59e71ac0eed4f8a1ea330897ac8a865e5021838e9ef6c514c79e800773f834962321cd1b3b217e1a50679a99b61f25e7c25776dd718829f2c0be5293875b
 EBUILD libvirt-python-8.8.0.ebuild 1347 BLAKE2B b0e62429ecc6c357f082c3a86d2e60449862de600fb4cd5ea9fd26ee823b81432d39a6b6aa32671a57d5ed8ee94de5f041fbf108ed735bae60bb66ea1e77b5c6 SHA512 3d479e70d507625f86db1a2f03144d42b40f128047e8d58f0a14d3f7c54591ecdfa4ce81475ba659cd56881a07d2501dd799d65ddb429ab27b682a9dbe392ccc
-EBUILD libvirt-python-9999.ebuild 1347 BLAKE2B b0e62429ecc6c357f082c3a86d2e60449862de600fb4cd5ea9fd26ee823b81432d39a6b6aa32671a57d5ed8ee94de5f041fbf108ed735bae60bb66ea1e77b5c6 SHA512 3d479e70d507625f86db1a2f03144d42b40f128047e8d58f0a14d3f7c54591ecdfa4ce81475ba659cd56881a07d2501dd799d65ddb429ab27b682a9dbe392ccc
+EBUILD libvirt-python-8.9.0.ebuild 1335 BLAKE2B 6a2e5decfd3ccd4bd477281d70059668e7d729b130dc2034e37f2d07dabbe90eaff459bee1fb652cee9cde7b9e124bf8439917fb6b31ba5f774b119c7da6045d SHA512 c9a4a2aca31abce00aee67bf34b1bb5e74099ec6902fe72816d2652c4bf76bf2b6f258e5400b0ae261bf899cf188e04bf3878c61ce3ff1f9ba745888795733d3
+EBUILD libvirt-python-9999.ebuild 1335 BLAKE2B 6a2e5decfd3ccd4bd477281d70059668e7d729b130dc2034e37f2d07dabbe90eaff459bee1fb652cee9cde7b9e124bf8439917fb6b31ba5f774b119c7da6045d SHA512 c9a4a2aca31abce00aee67bf34b1bb5e74099ec6902fe72816d2652c4bf76bf2b6f258e5400b0ae261bf899cf188e04bf3878c61ce3ff1f9ba745888795733d3
 MISC metadata.xml 581 BLAKE2B b0ce75afc6b03055de71b4903b3d8ea2198790873051f4aaa5e15a2c3e77b50f320ec3d9fb7f379194889e771296f81c65f2826ca2283ba4d4a9a5ccc8af932f SHA512 a123b9833c1154c96842d234f5c8b729bd6be5a987a5d09035109261a27b0c6f2b26c3bed5865f4cc3b5b262e8a3d2c69908550fb804da15ea47d297ed9e39c8
diff --git a/dev-python/libvirt-python/libvirt-python-8.9.0.ebuild b/dev-python/libvirt-python/libvirt-python-8.9.0.ebuild
new file mode 100644
index 000000000000..e84055ce32c2
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-8.9.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+MY_P="${P/_rc/-rc}"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+inherit distutils-r1 verify-sig
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
+	RDEPEND="app-emulation/libvirt:="
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
+		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libvirt-python/libvirt-python-9999.ebuild b/dev-python/libvirt-python/libvirt-python-9999.ebuild
index 59818c6c51d9..e84055ce32c2 100644
--- a/dev-python/libvirt-python/libvirt-python-9999.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-9999.ebuild
@@ -19,7 +19,7 @@ inherit distutils-r1 verify-sig
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+	RDEPEND="app-emulation/libvirt:="
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
 		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
diff --git a/dev-python/parsedatetime/Manifest b/dev-python/parsedatetime/Manifest
index da16cbcb714e..6ea35e723436 100644
--- a/dev-python/parsedatetime/Manifest
+++ b/dev-python/parsedatetime/Manifest
@@ -1,3 +1,5 @@
+DIST parsedatetime-2.6.gh.tar.gz 70732 BLAKE2B 099b2d4d434fabf3e3d587923a037608a982eee7986f5843f7a463acc52a736a0661261da557a16cfb310414778ef49b1d2bcde62bbf53807132004b526aa175 SHA512 ed7649feb8773fdb33d609ef0abe4d20f555744bd70e9766aba6b9a79d8415c7e2efea1d7ef5c6b5906f3bc90bff124ef92992ce17d83fe70575da2db918e543
 DIST parsedatetime-2.6.tar.gz 70732 BLAKE2B 099b2d4d434fabf3e3d587923a037608a982eee7986f5843f7a463acc52a736a0661261da557a16cfb310414778ef49b1d2bcde62bbf53807132004b526aa175 SHA512 ed7649feb8773fdb33d609ef0abe4d20f555744bd70e9766aba6b9a79d8415c7e2efea1d7ef5c6b5906f3bc90bff124ef92992ce17d83fe70575da2db918e543
+EBUILD parsedatetime-2.6-r1.ebuild 506 BLAKE2B 0e063f7f9eb9e0cc9668575c28f6b521ff6e81ba44800ebce3f6d0e3dd56a7c13a6dc1ec0d8eb0cdd7bdac7842e286ef19ae7f78dbf3fa6e786695208ac103f9 SHA512 8ba19269d0e3e421e79e345ebda860f20927880f92a1ee6878d239a8b260ce3ab00f8b89f2f0d59e4a6df091d3bcb3afd790f37428ef74c1909172f83b6d0e26
 EBUILD parsedatetime-2.6.ebuild 554 BLAKE2B 94315e4bd91ef50da5b5c82a367859afb0acd2b78ffa5c26836378d45b7652bfb54a96cb446d613ad93a1b586bfff59d814b2a1e7ecc8ac4b03c99d476528dd1 SHA512 50810d5b069edb8bd5003df7ed36c9e1db26a4de49ee6e379091f4fbed2c3b56e7e5be0167330f62960594926cc057997ba7d24946836ebe7d2c7b9a47969ca8
 MISC metadata.xml 465 BLAKE2B 5e3487abd250c58c950ac03390ac0f62456552e5b7de1f17265df08dce01fb693d677aa8c8b0b27c789f2ae08d75cd6d9520a2ba4756db81109447d452e3601f SHA512 655e257c64c529b1ac34cd7a6ad466ff0eca85fed3a395e0bbbfc7f12c0df34ba0325ffb9f690dff23020b058ec2f5e9721b5f720708240e8d71afdfa9e14ed5
diff --git a/dev-python/parsedatetime/parsedatetime-2.6-r1.ebuild b/dev-python/parsedatetime/parsedatetime-2.6-r1.ebuild
new file mode 100644
index 000000000000..3a5beb2d1d1c
--- /dev/null
+++ b/dev-python/parsedatetime/parsedatetime-2.6-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Parse human-readable date/time strings"
+HOMEPAGE="https://github.com/bear/parsedatetime"
+SRC_URI="
+	https://github.com/bear/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyrfc3339/Manifest b/dev-python/pyrfc3339/Manifest
index 2b0fcfbaf5a6..292a2cb2b2e0 100644
--- a/dev-python/pyrfc3339/Manifest
+++ b/dev-python/pyrfc3339/Manifest
@@ -1,3 +1,6 @@
+AUX pyrfc3339-1.1-pytest.patch 7009 BLAKE2B d8bb9cdbb758ef990bb74c2b03991dc3cdcc89dbfa7d0ac4c3649bdeab27a2c34a943dc2ac9d9a56b68bd3679a5216e3176e7cf5401146c439760788ff7adfbe SHA512 8289e64a9c7cd01d13da0f7bf9d373a9f03b64c0a0f3f3ad53970106ca5791f7c52d27ed5e0c0a9004531e14a0bf57514989e95fc03bbb9d408283101fe45fdb
 DIST pyRFC3339-1.1.tar.gz 5290 BLAKE2B d3094a22b6903937ae5cfee1210f04b65eb05dd606fe1d3245dca8ec0719ca1a079b720568d8c8e87fea691cebe1944098f99913b97a04570f06354a883e5694 SHA512 958b7761fab590aa42bb57a955c5d834441f717796a452b60df21663099dcf2fc046afe60f8157fd0f1edfd95c5e9c9c5349ab10ca4078d210fc63d848496a2f
+DIST pyrfc3339-1.1.gh.tar.gz 11727 BLAKE2B 210104e5e7c3ed917d6a3475335fce74e4da1c55fddbb76c539b3dd37ec4ce943334e530a9558d13954bc625d4f7f1a7ac2296abf0fd01e87a9664167f7de4be SHA512 96627bcaa64556cc0a87be985fd4f42e7733b342882a4dc5bc5b7d0712bf3f197e09d7c9b7f760117a772bb012829176a61b848903fc41584f26776d3f18ec8f
+EBUILD pyrfc3339-1.1-r1.ebuild 681 BLAKE2B 761d9046cb7f734bce738b9b6ef8469dd8868fe533f86d18fe751d247c666e06f76c196c4c8b6960cd0545335afacbdeb7ccb08150346d675ffebe743e768460 SHA512 ef401a910a08d137b60827e15fbb496dd1a4bbfe9509ea6244afb79ea1c60da018b11d3f5a6f79b482d2819900be1b38beb630d004e47f781a30471c61649184
 EBUILD pyrfc3339-1.1.ebuild 540 BLAKE2B 369ad23bf3b80756e102afac86e1b79a40d4de9ae545c151d2d8dabb19807bde153067d45276f3745db4bffe60083b135bd8257b18ebab68ea30835fbc549730 SHA512 b6d4a2f048412cbdbdccc5e827cdf0fd4237a8f598e78ebcaccd1dcbe35feb19d35a69235f81187a1328416935939e1aa8414ed4ddf68197eaf4a909576134c2
-MISC metadata.xml 374 BLAKE2B c78560e5a89c6217862b26e6d1034afbaa32f40f0d2cf0814be6b12cdd1545e6e359ca824789950cbbee57f84c0862b604ce8c93a31c912a8fdb8f2d6bc2f586 SHA512 23e62dfe15993f74a6bb366770b2a731c466441917fa61ed00dfee0e31786bf175318cda7a3fd641983a3fc158b67c302d385e278063b6b886d4a13057b580ab
+MISC metadata.xml 398 BLAKE2B bfad31a8be665f06a25a74223b53564db718e6fd0f4aa2f66cec6f4e6af71ed1ebacdd81c647b48e01989a0515fba6fca1e0e0b63838cf6e2d102a2d3c8bbbf1 SHA512 fdb8053e8e073f3b545424812d1f46f7451ba1c8b36c6d3bef3286d4f32385e20fa41958d54125da07f56cd07c446ec550398e91483a38c117c5141ac0ea0bd1
diff --git a/dev-python/pyrfc3339/files/pyrfc3339-1.1-pytest.patch b/dev-python/pyrfc3339/files/pyrfc3339-1.1-pytest.patch
new file mode 100644
index 000000000000..82dbbb32f3dc
--- /dev/null
+++ b/dev-python/pyrfc3339/files/pyrfc3339-1.1-pytest.patch
@@ -0,0 +1,193 @@
+https://github.com/kurtraschke/pyRFC3339/pull/16
+From: Matthew Davis <github@virtual.drop.net>
+Date: Thu, 7 Apr 2022 18:29:02 -0400
+Subject: [PATCH] Remove python-nose requirements from tests
+
+Converted nose related tests to pytest.
+--- a/pyrfc3339/tests/tests.py
++++ b/pyrfc3339/tests/tests.py
+@@ -8,12 +8,11 @@
+ 
+ from pyrfc3339 import generate, parse
+ from pyrfc3339.utils import timezone
++import unittest
++import pytest
+ import pytz
+ 
+-from nose.tools import eq_, raises
+-
+-
+-class TestCore():
++class TestCore(unittest.TestCase):
+     '''
+     This test suite contains tests to address cases not tested in the doctests,
+     as well as additional tests for end-to-end verification.
+@@ -24,8 +23,11 @@ def test_timezone_rounding(self):
+         Test rounding of timezone values to the nearest second.
+ 
+         '''
+-        eq_(timezone(5429), '+01:30')
+-        eq_(timezone(5431), '+01:31')
++        if not timezone(5429) == '+01:30':
++            raise AssertionError("%r != %r" % (timezone(5429), '+01:30'))
++
++        if not timezone(5431) == '+01:31':
++            raise AssertionError("%r != %r" % (timezone(5431), '+01:31'))
+ 
+     def test_zero_offset(self):
+         '''
+@@ -34,11 +36,13 @@ def test_zero_offset(self):
+         '''
+         timestamp = '2009-01-01T10:02:03+00:00'
+         dt = parse(timestamp)
+-        eq_(dt.tzinfo, pytz.utc)
++        if not dt.tzinfo == pytz.utc:
++            raise AssertionError("%r != %r" % (dt.tzinfo, pytz.utc))
+ 
+         timestamp = '2009-01-01T10:02:03-00:00'
+         dt = parse(timestamp)
+-        eq_(dt.tzinfo, pytz.utc)
++        if not dt.tzinfo == pytz.utc:
++            raise AssertionError("%r != %r" % (dt.tzinfo, pytz.utc))
+ 
+     def test_deepcopy(self):
+         '''
+@@ -56,7 +60,8 @@ def test_parse_microseconds(self):
+         '''
+         timestamp = '2009-01-01T10:02:03.25Z'
+         dt = parse(timestamp)
+-        eq_(dt.microsecond, 250000)
++        if not dt.microsecond == 250000:
++            raise AssertionError("%r != %r" % (dt.microsecond, 250000))
+ 
+     def test_generate_microseconds(self):
+         '''
+@@ -65,7 +70,8 @@ def test_generate_microseconds(self):
+         '''
+         dt = datetime(2009, 1, 1, 10, 2, 3, 500000, pytz.utc)
+         timestamp = generate(dt, microseconds=True)
+-        eq_(timestamp, '2009-01-01T10:02:03.500000Z')
++        if not timestamp == '2009-01-01T10:02:03.500000Z':
++            raise AssertionError("%r != %r" % (timestamp, '2009-01-01T10:02:03.500000Z'))
+ 
+     def test_mixed_case(self):
+         '''
+@@ -76,7 +82,8 @@ def test_mixed_case(self):
+         dt1 = parse('2009-01-01t10:01:02z')
+         dt2 = datetime(2009, 1, 1, 10, 1, 2, tzinfo=pytz.utc)
+ 
+-        eq_(dt1, dt2)
++        if not dt1 == dt2:
++            raise AssertionError("%r != %r" % (dt1, dt2))
+ 
+     def test_parse_naive_utc(self):
+         '''
+@@ -84,15 +91,17 @@ def test_parse_naive_utc(self):
+ 
+         '''
+         dt1 = parse('2009-01-01T10:01:02Z', produce_naive=True)
+-        eq_(dt1.tzinfo, None)
++        if not dt1.tzinfo == None:
++            raise AssertionError("%r != %r" % (dt1.tzinfo, None))
+ 
+-    @raises(ValueError)
+     def test_parse_naive_local(self):
+         '''
+         Test that parsing a local timestamp to a naive datetime fails.
+ 
+         '''
+-        parse('2009-01-01T10:01:02-04:00', produce_naive=True)
++        with self.assertRaises(ValueError) as context:
++            parse('2009-01-01T10:01:02-04:00', produce_naive=True)
++
+ 
+     def test_generate_utc_parse_utc(self):
+         '''
+@@ -103,7 +112,8 @@ def test_generate_utc_parse_utc(self):
+         dt1 = dt1.replace(tzinfo=pytz.utc)
+ 
+         dt2 = parse(generate(dt1, microseconds=True))
+-        eq_(dt1, dt2)
++        if not dt1 == dt2:
++            raise AssertionError("%r != %r" % (dt1, dt2))
+ 
+     def test_generate_local_parse_local(self):
+         '''
+@@ -113,7 +123,8 @@ def test_generate_local_parse_local(self):
+         eastern = pytz.timezone('US/Eastern')
+         dt1 = eastern.localize(datetime.utcnow())
+         dt2 = parse(generate(dt1, utc=False, microseconds=True), utc=False)
+-        eq_(dt1, dt2)
++        if not dt1 == dt2:
++            raise AssertionError("%r != %r" % (dt1, dt2))
+ 
+     def test_generate_local_parse_utc(self):
+         '''
+@@ -123,10 +134,12 @@ def test_generate_local_parse_utc(self):
+         eastern = pytz.timezone('US/Eastern')
+         dt1 = eastern.localize(datetime.utcnow())
+         dt2 = parse(generate(dt1, utc=False, microseconds=True))
+-        eq_(dt1, dt2)
++        if not dt1 == dt2:
++            raise AssertionError("%r != %r" % (dt1, dt2))
+ 
+ 
+-class TestExhaustiveRoundtrip():
++@pytest.mark.parametrize('tz_name', pytz.all_timezones)
++class TestExhaustiveRoundtrip:
+     '''
+     This test suite exhaustively tests parsing and generation by generating
+     a local RFC 3339 timestamp for every timezone supported by pytz,
+@@ -135,36 +148,32 @@ class TestExhaustiveRoundtrip():
+ 
+     slow = True
+ 
+-    def test_local_roundtrip(self):
+-        for tz_name in pytz.all_timezones:
+-            yield self.local_roundtrip, tz_name
+-
+-    def local_roundtrip(self, tz_name):
++    def test_local_roundtrip(self, tz_name):
+         '''
+         Generates a local datetime using the given timezone,
+         produces a local timestamp from the datetime, parses the timestamp
+         to a local datetime, and verifies that the two datetimes are equal.
+ 
+         '''
+-        tzinfo = pytz.timezone(tz_name)
+-        dt1 = tzinfo.localize(datetime.utcnow())
+-        timestamp = generate(dt1, utc=False, microseconds=True)
+-        dt2 = parse(timestamp, utc=False)
+-        eq_(dt1, dt2)
+-
+-    def test_utc_roundtrip(self):
+-        for tz_name in pytz.all_timezones:
+-            yield self.utc_roundtrip, tz_name
++        if not tz_name == 'leapseconds':
++            tzinfo = pytz.timezone(tz_name)
++            dt1 = tzinfo.localize(datetime.utcnow())
++            timestamp = generate(dt1, utc=False, microseconds=True)
++            dt2 = parse(timestamp, utc=False)
++            if not dt1 == dt2:
++                raise AssertionError("%r != %r" % (dt1, dt2))
+ 
+-    def utc_roundtrip(self, tz_name):
++    def test_utc_roundtrip(self, tz_name):
+         '''
+         Generates a local datetime using the given timezone,
+         produces a local timestamp from the datetime, parses the timestamp
+         to a UTC datetime, and verifies that the two datetimes are equal.
+ 
+         '''
+-        tzinfo = pytz.timezone(tz_name)
+-        dt1 = tzinfo.localize(datetime.utcnow())
+-        timestamp = generate(dt1, utc=False, microseconds=True)
+-        dt2 = parse(timestamp)
+-        eq_(dt1, dt2)
++        if not tz_name == 'leapseconds':
++            tzinfo = pytz.timezone(tz_name)
++            dt1 = tzinfo.localize(datetime.utcnow())
++            timestamp = generate(dt1, utc=False, microseconds=True)
++            dt2 = parse(timestamp)
++            if not dt1 == dt2:
++                raise AssertionError("%r != %r" % (dt1, dt2))
diff --git a/dev-python/pyrfc3339/metadata.xml b/dev-python/pyrfc3339/metadata.xml
index d7b294b6dd87..e281084bc91a 100644
--- a/dev-python/pyrfc3339/metadata.xml
+++ b/dev-python/pyrfc3339/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pyRFC3339</remote-id>
 		<remote-id type="github">kurtraschke/pyRFC3339</remote-id>
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.1-r1.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.1-r1.ebuild
new file mode 100644
index 000000000000..4e06f4131a77
--- /dev/null
+++ b/dev-python/pyrfc3339/pyrfc3339-1.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Generates and parses RFC 3339 timestamps"
+HOMEPAGE="https://github.com/kurtraschke/pyRFC3339"
+SRC_URI="
+	https://github.com/kurtraschke/pyRFC3339/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/pyRFC3339-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${P}-pytest.patch"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest pyrfc3339/tests/tests.py
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 30afcde648db..8bdaa7a09b95 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index af2007ed144d..73459eecb8f5 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,7 @@
 DIST conan-1.47.0.tar.gz 1478478 BLAKE2B 1d97d5f9b4ce4ea850a335f625997d2785943553fad71954097cd8c59db095739850064425d4dc675ad35967149b16967d2c459ab99169704c3664a68da66e8d SHA512 16009a611138ed44c85cce29ab16448433bde850bea0f985a8969c55ab8fa696029b59e501a77e0bac6c433237aa90d77a6ba85b19fb4fc0dab5fe4a08e898c6
 DIST conan-1.48.0.tar.gz 1494486 BLAKE2B ef7aeeada788df95598ee222833ffa976a10ba0c9f69d58131be0145f5f57d4dec5cf1e9c89cff8f73e351820cd8ed0f93dd5e0d5901d1356c54aec2a2a2c32e SHA512 92b7797e0e67dcfaef9c0c87304ae46f1c39618fc42c4758b7f810fbd4e3c0f54396009981a6f816982bd8296613f9ef4b1b042bab7d8e3a4737db7423dd0e1c
+DIST conan-1.53.0.gh.tar.gz 1540050 BLAKE2B f3ce976566be427d5bec68ce7dd79a6236c4c5860f39fe5aed4077690061d9c671063575cab407b0aeecae1c47a12bae0126341014fba66f187d4c969fb8f3f3 SHA512 ec2e445c5e097459aabea62e2d77906614cbba8b3edcecc14b7ecc7205de3bac8027362580eb4c68f3a7d708a302ecef0f6d09d2b80db9aa6e4884ccec836fb2
 EBUILD conan-1.47.0.ebuild 1741 BLAKE2B 85ac74c20026ed7b5273090b4b4da0de881a6cb3907fe8deef3432720a812a6641fbb09efa544409dd18c0084c9e2d9ea23784a2e5663521a3670bb2a1cd7e07 SHA512 71c2cfa341eb9631b0ba6a2ea4dcb2f1709faaf97306a6e5ef6b22aba066e45847f25c9a5a38355f7e765a46a107143d95321cf66a9cd4f6fe319e648e75a554
 EBUILD conan-1.48.0.ebuild 1741 BLAKE2B 85ac74c20026ed7b5273090b4b4da0de881a6cb3907fe8deef3432720a812a6641fbb09efa544409dd18c0084c9e2d9ea23784a2e5663521a3670bb2a1cd7e07 SHA512 71c2cfa341eb9631b0ba6a2ea4dcb2f1709faaf97306a6e5ef6b22aba066e45847f25c9a5a38355f7e765a46a107143d95321cf66a9cd4f6fe319e648e75a554
+EBUILD conan-1.53.0.ebuild 1744 BLAKE2B 5d30664d6a3c45c1b5d8b55e5ea57c4a5b17a24cf36166db6c9e722c2fb8dee73b47ce12bc13425307e52c1a76d686a9429ea1264578be0997147c85a3a4f7da SHA512 94c83078ef26dbc951ef132df2d10ecef6028127ff2115700b5b23a3f02b386ba4ee8e64a692bae606c5caf27b7292583bc12feae79dc1098017a40f513c37ce
 MISC metadata.xml 770 BLAKE2B a6449d035d354804266fda862537f1005e4fff043bc5e8d28245392d7c7281e87cffb68029a5f8c941c2757f7343897eeeb8121376ec4b752d0451ca540c7ad8 SHA512 9666ab3361098a48ada5370ab5d897e9b1fabbea50d5eb141895ae8c7ef537317f087735f0924482b1248d3c6558dcd33cc65f4c085b029541f4d5c6144a8be8
diff --git a/dev-util/conan/conan-1.53.0.ebuild b/dev-util/conan/conan-1.53.0.ebuild
new file mode 100644
index 000000000000..76ce0a9a124f
--- /dev/null
+++ b/dev-util/conan/conan-1.53.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed C/C++ package manager"
+HOMEPAGE="https://conan.io/"
+SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# overly strict requirements?
+# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
+# https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt
+RDEPEND="
+	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/node-semver-0.8[${PYTHON_USEDEP}]
+	>=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
+	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.25[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.6[${PYTHON_USEDEP}]
+"
+
+# Try to fix it if you're brave enough
+# Conan requires noumerous external toolchain dependencies with restricted
+# versions and cannot be managable outside of a pure CI environment.
+RESTRICT="test"
+
+src_prepare() {
+	default
+	# Fix strict dependencies
+	sed -i \
+		-e 's:,[[:space:]]\?<=\?[[:space:]]\?[[:digit:]|.]*::g' \
+		-e 's:==:>=:g' \
+		conans/requirements{,_server}.txt || die
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 0d5e0ff20e39..d7b69c56c1e5 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -12,6 +12,6 @@ EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 272053742b016bf234e75bb6b05e4b113b1f8b342
 EBUILD lldb-15.0.3.ebuild 2716 BLAKE2B b4b4386fa20bb713bcefba2716a3a0c76a156c5d0b1e3119204662d262c4e76d08fc4e330ba5e1ff20bda3b684d78396a23d097869361776903c418942546437 SHA512 b6d0d29a828b38508f5814851bfc17914dbf668bf0207e8c6653b6df5fef631e9f25e38641e4786e34fe89b29138fabfa59bfe89a1267a95c310076a4b207de2
 EBUILD lldb-15.0.4.9999.ebuild 2697 BLAKE2B d713c22a59e74b93d059ca32c71555d89dc5e414994a07fee5a77440753385de23e59d09d4e7424f205adb9d06b639d4ff2ceadf6a074113b7c31c00c293e892 SHA512 d9ab075e295b873b1aad46f495d6e40d36114b7402df3fbb4360897d9d9c946fb6580cd4034fbea48e74ca3b27de925e4ecfdf1c3ef6bc024ecaaabe26ce1965
 EBUILD lldb-15.0.4.ebuild 2743 BLAKE2B c95d3acc30db1537fec7bd23a297db41f1e190862d93b12a1d4e107e372a22e721939726fb9596e34040a4c228d86ebec6805d09111f6e4c6793865826526439 SHA512 9794c7774b79227349e49eb1d311832f02f870c9c4bfb02f78941fb5497d37a865ae38d9a050e920a354a3dff756559e8e91cf67265dd58c451a21db82a0aee9
-EBUILD lldb-16.0.0.9999.ebuild 2654 BLAKE2B 1723b2b67b751dacb4c25d53f312d4f0ef381261640a1a488ed888a0c0692b6dac147f343f59ea63501e4758d323f05687c0cc033a5850caecd7f50c7a92af23 SHA512 f13b642ea83f536b7b0712a7757defbf629b1962438c8352cd15ed81d65ce4a5a5aa4117cbfff1b429da1fabe4e6db26e16fd851923f451da77bb9d64dff764c
+EBUILD lldb-16.0.0.9999.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
 EBUILD lldb-16.0.0_pre20221104.ebuild 2654 BLAKE2B 1723b2b67b751dacb4c25d53f312d4f0ef381261640a1a488ed888a0c0692b6dac147f343f59ea63501e4758d323f05687c0cc033a5850caecd7f50c7a92af23 SHA512 f13b642ea83f536b7b0712a7757defbf629b1962438c8352cd15ed81d65ce4a5a5aa4117cbfff1b429da1fabe4e6db26e16fd851923f451da77bb9d64dff764c
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-util/lldb/lldb-16.0.0.9999.ebuild b/dev-util/lldb/lldb-16.0.0.9999.ebuild
index 0f7dd9d5c5be..ee34e2696fe0 100644
--- a/dev-util/lldb/lldb-16.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-16.0.0.9999.ebuild
@@ -52,7 +52,7 @@ BDEPEND="
 "
 
 LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
 llvm.org_set_globals
 
 pkg_setup() {
@@ -87,7 +87,7 @@ src_configure() {
 		# of -ltinfo)
 		-DCURSES_NEED_NCURSES=ON
 
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_VERSION}"
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
 
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DPython3_EXECUTABLE="${PYTHON}"
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index e8fdd0f26246..2baf252b901c 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/gtk-layer-shell/Manifest b/gui-libs/gtk-layer-shell/Manifest
index db7a962bc7d6..a990d81cfb5f 100644
--- a/gui-libs/gtk-layer-shell/Manifest
+++ b/gui-libs/gtk-layer-shell/Manifest
@@ -1,5 +1,7 @@
 DIST gtk-layer-shell-0.1.0.tar.xz 34580 BLAKE2B db815d711e53485e00de2e0b7d238f6c66ddac9ca790d5f31c44eed965ad01ee07392d27552ae21bb1eab4905cc1d5f7dad9c10fd059afb43ba85c7ea1af2aa5 SHA512 3788559405a495d43279b20b9d64e1fb0fb9be4125eb3011a623565938246310c2e81cb6d52db111e42a9cd0739bb273ccf7fcb7c52db8b74a1e44108e061c6d
 DIST gtk-layer-shell-0.7.0.tar.gz 133511 BLAKE2B 49925796112f7ace01050beb56ebe2ff8a716db56075166c61a7b9d1e4f1b7402c970e14de59404ae9b05f70130542fff7601fee10e0d8780bffa34da0515aa9 SHA512 97463b4bd90318e95576e3f4b05c0acae401b8103b389cb9a0dc7716871d8d8285595ddda76419883c98c6f00fcd4ffdfd9dba48385cb8a6edcbdc7f202e2818
+DIST gtk-layer-shell-0.8.0.tar.gz 134857 BLAKE2B 2f41411c849182f95c068040a17e961a34d1a3df0bb1280b6c57046729396108d4627b5cf9bd826f17ffb5cf77f6761212af159d4326b2d34d9663063667f9f4 SHA512 710019b05785abc3cc8bc639a110f141dd2f37ce1d78e03ed361f1c21caee6c43817499fa05c8228f233bff3ac0b6f6123fa9014a87ae99edb6b10e4ff8f3dde
 EBUILD gtk-layer-shell-0.1.0-r1.ebuild 852 BLAKE2B c4d2823e3a8d4b33b598c029d4e56db888e61b071c70b8f1706833b8dd0cfa3492dcdcfe05cbd7025255e304004fb2503d496d5e5ee1ba9168e4efcd92e5fa7c SHA512 744fb57920dc4b7b3567c8ba8d6694308694bdfc4868ab10c523c6561096a7c2e4f05420df7ea9f13bfe0c2d82ce94b804f682abbff7f1db85ecc95a8dbd79ba
 EBUILD gtk-layer-shell-0.7.0.ebuild 1178 BLAKE2B 441996ee233f3440fd1402f47dece3a5c9841bc92bc37b9f5057d5de5dd08d0f6cdc896078424e1655c8f5cd7ecfdc587db67b6430e75787b5d4208918f08545 SHA512 f9a6fb39468c484a16fb23ac0e8f1732b45869091da27b7511df94c5bbfe73e38f3d4ef5b6de561bf8f061366fe4ccc4ecb469da43776f4c45bc692d7e70a591
+EBUILD gtk-layer-shell-0.8.0.ebuild 1317 BLAKE2B bdaae699f7f8d0278eec9e1e014bc386305344e996156663434c7521e834ca93d384668acf701ef7cac3b664361f6399e1b25d2fe8f5620fa3c752b22db66a9c SHA512 a393a81047691256dedcc2941b480b501937dc382237193be47788ae33add25dec8c3425a758ff927cd3617d9dc6aac3f222eb9f9b25ad0cf383caa622587012
 MISC metadata.xml 495 BLAKE2B 59bee54b6a6cc173655e2b482873f3ec5a21854a7dfcde8f6073a3c003642802978b182db94dae86c82c0b2409a153691b83720471530e4435ce0eebc5833f19 SHA512 625076c53f3dafb1812000eb3d50a68a837d751e53697429fabc6369161056f8ec16db584e830848cf57b659a10b8ece4b2cddeff1402ab42c4ff474aa954261
diff --git a/gui-libs/gtk-layer-shell/gtk-layer-shell-0.8.0.ebuild b/gui-libs/gtk-layer-shell/gtk-layer-shell-0.8.0.ebuild
new file mode 100644
index 000000000000..af38d280c13d
--- /dev/null
+++ b/gui-libs/gtk-layer-shell/gtk-layer-shell-0.8.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+VALA_USE_DEPEND="vapigen"
+inherit vala meson python-any-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wmww/${PN}"
+else
+	SRC_URI="https://github.com/wmww/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Library to create desktop components for Wayland using the Layer Shell protocol"
+HOMEPAGE="https://github.com/wmww/gtk-layer-shell"
+
+LICENSE="MIT-with-advertising LGPL-3+"
+SLOT="0"
+IUSE="examples gtk-doc introspection test vala"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+	>=x11-libs/gtk+-3.24.26:3[introspection?,wayland]
+	>=dev-libs/wayland-1.10.0
+	>=dev-libs/wayland-protocols-1.16
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	gtk-doc? ( dev-util/gtk-doc )
+	test? ( ${PYTHON_DEPS} )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use examples)
+		$(meson_use gtk-doc docs)
+		$(meson_use test tests)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index 39e9335b3702..bae8e42239b5 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -2,9 +2,11 @@ AUX wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch 2877 BLAKE2B ff
 DIST wlroots-0.14.0.tar.gz 505461 BLAKE2B d2fa28f64014ef9d840838cb5938af23f6f6b211b62dc352d0d5bb824ccaa7d7a85531e1eca14feeb06d31d59955ff9a913e40a73cad21ed1ebfe76ada39d558 SHA512 83f001133cb4b11a72bb9532b7321655428826662848f67de8e3220a33d9dff4d37c859602bdc319929949d387d014a257b0347039a6649944d7b084c76bb611
 DIST wlroots-0.14.1.tar.gz 505840 BLAKE2B fca4d259cdde62da0c196344ce1d0f5dd679d012ff33e3ceb5385b9374667e16d91059a2ba6a318153e79ac2f0a6464e3066e614a13398f8c433f442560d84d2 SHA512 4f557c827f9673eccf208a3644954de80e7355b95cc374cc5e851a47087b227f196e0936c0913d21a6c776c29b74de2d028a100931264e41934c747568d8ebe0
 DIST wlroots-0.15.1.tar.gz 565816 BLAKE2B 09b704a55d8b4a5ab19bb0fcdd041635fbbbb8eed94ff6d189ef47f9f86e90178efa8441c7db78839b1145ed79ed016d520d6599e256cdcf49130cda38bc307d SHA512 6228160f2f350a406c612f1048d7075cf2f78206cc84bc16f889d5d0acd614f9e98845fffed03d7067cfdbd7558b77fcc5d8cedc3868d866e476523126a63677
+DIST wlroots-0.16.0.tar.gz 588565 BLAKE2B d1233f85bc4d80bfc65efb04367e136a351efc5e47168e30f061a8b4eecdd4bdbde6355e35211c610285b4d031c754f90c94b49e63c5b2f665890765b139bf76 SHA512 0b56f31284cc250019cda1e80d1660031d397e880a8c1aac2e60d7758bcac26e50144a499c13c61e24fe2664ba1e6cbb8262bfe28c817f4664162b1de592f1b6
 EBUILD wlroots-0.14.0-r2.ebuild 1481 BLAKE2B f350d6bbaf05a349cb9ee5ac67cea0c29b1e737b7fdb819ab4fee051311e48c5a448e3d2f2690f9c6effcedde2fc940779fa409ba7ba03acf099b5e4961f7e19 SHA512 4f50dfcfa7fd7cc1e5c5653f9b79da8fdda49994f2a385c145a272bf1d9227d6c5b5a13bd7f4c381036343c9b7f65c6b322b2a3bc188ea39ab427c7d1a424c81
 EBUILD wlroots-0.14.1-r1.ebuild 1484 BLAKE2B 9de2dec4bbb573b4288a9c994047de1547ed6c7be66af4e8f7b5c3d459a4e2cccc97f3883bbb633942ade7f81ba2a883a14a40ac25f8033a57b24a6556d579b1 SHA512 c59c653561420f563e34584f48c646ea38a0622f65ed054d8895508f66fe4ef10e6b77d07b7bcb555fdf5c2077b7bd8f43df495a742b31075739630a666d4859
 EBUILD wlroots-0.15.1-r1.ebuild 1903 BLAKE2B db14251e37bb2448556a7a8f98fadfea64c4c6047b3c8736932ca08ea586a8cc0db0c8d54335f0dad5d36a52c7a10f87f6d60425c35d5bf361334ab0e3ad0f5a SHA512 6bd49fad40df4267c4490e928fe750677fadf9dd1f08856fab8777000af8a3769f0710be0741ce98cfbbe2cb4cb1cfc6020937078211abf5aa5a224b702b4135
 EBUILD wlroots-0.15.1.ebuild 1694 BLAKE2B 6612ccfa47cb13280a788b766b8c986c37f8ed256808e54068709e84e629e7618ecda9624faea2ac63878f232996c47a8f36a4ae760d7747cd7c918ed0667d90 SHA512 fbb4123948bc0d9f69bfd8d9c3990aa21e648b5e1a7018aa6c4bcc6bf6aa0982bf8ff5aea6df9ea460f29ba48646687747457ec3d146808a3f0ac2b8b667f374
+EBUILD wlroots-0.16.0.ebuild 1903 BLAKE2B ff8d73720c446ec2206291a2d9eef0002649faed2d71e40764196defb610b4160baf29702ab7a5ea956f3518adb17e43eb61c858586806c5328ea50c9efd18b6 SHA512 1943c9cba6a3836315f2f7eef548d314eb9700526c410e049833cc0ec49d69156fe8c7a0fddfc56806d91ed640967eff431e1588772656eddb0faf8d62830172
 EBUILD wlroots-9999.ebuild 1815 BLAKE2B 245cdb038c01b00bab6f387b03b0c2bfbf58be631a5542c2f259e10be6ec626a0ee063e10d04d7e9e80cf287b7d66fbc3a3ec08554681258d4b712f17fe4c237 SHA512 78dc65c3fc508e6647df56ffa0c2d3ada5007c53a94138f588f33df1ea6248b155a98ea5a89f9bf1e0034fd0b5c284f1a2920615a0cc002a8eecff84c6453fca
 MISC metadata.xml 1611 BLAKE2B 53a14b74dcf06f1d4b9621bf768b8d5642201bebaa0d8721708fcfdf60f7e21b0c415279676cfcb0ee0375b9af599d947a2895ebbb6fa83a19340837d3743269 SHA512 c20b33d2a7f2b98f0ef33fce9439ffd5bd562175adb92f65d64d53d038519d17f2e6a23a1457b36ddb5fbc92ef2420d26759d4bb15d6a5dd04571c3db35825b3
diff --git a/gui-libs/wlroots/wlroots-0.16.0.ebuild b/gui-libs/wlroots/wlroots-0.16.0.ebuild
new file mode 100644
index 000000000000..75ec633f9e48
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.16.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+	SLOT="0/9999"
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	SLOT="0/$(ver_cut 2)"
+fi
+
+LICENSE="MIT"
+IUSE="tinywl vulkan x11-backend X"
+
+DEPEND="
+	>=dev-libs/libinput-1.14.0:0=
+	>=dev-libs/wayland-1.21.0
+	>=dev-libs/wayland-protocols-1.24
+	media-libs/mesa[egl(+),gles2,gbm(+)]
+	sys-auth/seatd:=
+	virtual/libudev
+	vulkan? (
+		dev-util/glslang:0=
+		dev-util/vulkan-headers:0=
+		media-libs/vulkan-loader:0=
+	)
+	>=x11-libs/libdrm-2.4.109:0=
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xwayland
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-wm
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.24
+	>=dev-util/meson-0.60.0
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch )
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		$(meson_use tinywl examples)
+		-Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
+		-Dxwayland=$(usex X enabled disabled)
+		-Dbackends=drm,libinput$(usex x11-backend ',x11' '')
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use tinywl; then
+		dobin "${BUILD_DIR}"/tinywl/tinywl
+	fi
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 9a4ea0bcac72..07dab6f5f345 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 31bc03ac305a..6e6c4f68e9e9 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -4,6 +4,6 @@ AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a
 DIST intel-gmmlib-22.1.8.tar.gz 818360 BLAKE2B 5a7dadaead925eddfe52770c73eea92b8f071b498a2ed8d23928c93ba3d0284d9046339b7eb641918b17bf13bbcffc071ba71ba47cc53760258b1bb39f175e17 SHA512 4520105c7ceaae30e592acce7bae65841ecdb5d74c888cf03a2308a94a63d998941665794933c8247dbae841d13386ee99b365de0c6a5676acc960386c19ca2c
 DIST intel-gmmlib-22.2.1.tar.gz 820241 BLAKE2B 64eed8c1863d85355f47b3bfdd2740d2472f256a679189520d284c635a1ad722ed090d503b9e224ac262498091872e686cb1732be135627d7ec8170c946a6f80 SHA512 d3a68de83946319d582ff2d7785adaf007ea744fba6b1e9e2c53023f0b01b506f500aae3c4305c01bb97ce9176d39ae884fa306b1a075b1f2758faad3a1e0462
 EBUILD gmmlib-22.1.8.ebuild 795 BLAKE2B 6bcec2581a34ec5a169eaa3508c8d7e6085865b6df1d2746db4c114eeebfd082636a3bb1aad3c6f72bc00a87effc4e32921f8d315ee58db95d71a495be00afcc SHA512 d366ef04a77026dbb3d1cae5d4e4bf74846cb6a4b7842c218f04889d0e0a0450d3ad28016a3492f5ff723dff4ac16bfd00e2d618bfb7e3400a4e841451d6c7f8
-EBUILD gmmlib-22.2.1.ebuild 796 BLAKE2B 229b1cfde21427a045a0bbf7b93428bdd4173e447055201feb6d808b7406101de1a67f4a228ffb4206ec7b3941dcb894a9a91dd0d7777954640de1615c0a8429 SHA512 11ad5fbe1a2975e13233434673ccb36960f4a7517a5b0a45c8e35aa8a77e886a89c8e304c87d7e0e0d2eba250f12170eca460b0789ab5c9eea780c7fe641fa6e
+EBUILD gmmlib-22.2.1.ebuild 795 BLAKE2B 88959d7c98aba9bf4e9d1ac3cd7ab4520b547be03b21d7d341522d6f4440f2693c2e4e1f2f42dd58162edf564d3f0727bcccfc720ec36f50ef3c152fe6ad6251 SHA512 c616582ac1a65fab06d8bb4ff8119a263b46d41887d06012ab84999da0d309c004170eb4f354b821b4d06be23e195beede809c1b0a5b6da61b2a812054aa30c2
 EBUILD gmmlib-9999.ebuild 875 BLAKE2B e3b152fddf160615a384564528294e34a3e974cbca2c449c5f0c8eb35be42b0a5effca7c5f5206e0e557f1b3e97631285da731dededed27e61581bb0994236aa SHA512 c5c5798eb82b6ad5872c0b52888cb2ee3effd989b0aa1fa8b3c000c3f9842d8789e350b718d2a78c9ca465b63b90b2873eadae0528ebda3a9435b1729388b849
 MISC metadata.xml 401 BLAKE2B b8c3f2935afa450ec0eeedd745e91b14ed18386a87edc77d17894db4764b681cf1c1b80bac714662f506a9092813525f2365aad31d01b64dd8709da2df6c07f4 SHA512 ce6959033b6682ab01f830b869c972fcb774d241bca62faed86f6e1705eb2f6a7615f8781c7c75118ac5fd6bae096c08cf6a2e965429bbdcbe9f598ae67f91f7
diff --git a/media-libs/gmmlib/gmmlib-22.2.1.ebuild b/media-libs/gmmlib/gmmlib-22.2.1.ebuild
index d811e64621f4..5b4da8b5f957 100644
--- a/media-libs/gmmlib/gmmlib-22.2.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.2.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/intel/gmmlib"
 SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 S="${WORKDIR}/${PN}-intel-${P}"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="MIT"
 SLOT="0/12.2"
 IUSE="+custom-cflags test"
diff --git a/media-libs/libva-intel-driver/Manifest b/media-libs/libva-intel-driver/Manifest
index d250a8cdb725..2d9fc1bae1c9 100644
--- a/media-libs/libva-intel-driver/Manifest
+++ b/media-libs/libva-intel-driver/Manifest
@@ -1,5 +1,5 @@
 DIST intel-vaapi-driver-2.4.1.tar.bz2 2889762 BLAKE2B 25888ac7a1a42233c4b0269bd910c5161f99bf22c932b46e20c8c77ed0404bf99702dd9f11b73bc0fd76a3b012ffa1de6c6133cbd7be880428235de9cfcc6ad8 SHA512 1e9dc81ecd0b3640fccd1fb827a0ade0a1e5bbabe375130df159849e47ce98c8e879c65ddaaae11d16e916be76b507be69bc0c813494e37e7fca86b0b897a94f
 EBUILD libva-intel-driver-2.4.1-r3.ebuild 1313 BLAKE2B 6fadfb7331f0dbc3da6fde1e123d8e72512dc4bd3ac2be46c7bd88153bb38549b671b298eb4670b1afeb7a9fc434c34eb74bb3cf8200577f08b8194f61b52a0d SHA512 46198b827580c4d98e3da4689dcf695872b5cd44e45e5f8432a2e885c1d6189bef6bee632bc36dc3f1605cb74a7cc240c5db8b588f8aeafe01dbb1fb078076d0
-EBUILD libva-intel-driver-2.4.1-r4.ebuild 1433 BLAKE2B aa9760bd67061461e342ff7abe6fc655ce72b1e09c9e31c0e84a2b4cf1a5ca690ae0b4f4af5590bb69020b53c167faa757e12d52e9ad0254658b56c3db6317bf SHA512 66eb6650cb8ae5ab2cff72265a4a91715c55d4a9b446652a1392ec112d30232b14aed99ab159e458586671c8390310cb8888e9a72366e8859bbdf9185ab38be3
+EBUILD libva-intel-driver-2.4.1-r4.ebuild 1432 BLAKE2B 80fee8c5f431ad22d7bf8c1c6e87329683f5c94be2e93615945d310d792bdca76d4af1a57e1f0e57678320436367cf4b1f30433103be6a89a1734d05bec977bd SHA512 5e80f6d6d1587649952d06b59c513960d0786985102f5c7f6e986afccd1fbdd0fb74c4d012ef4417d7546a17ad4ae6c171c68bd93bc6f1ae7d5dc92dff3bac71
 EBUILD libva-intel-driver-9999.ebuild 1315 BLAKE2B 43f74385af30eaa60e053cd4ac6342fb71f4face46c0d019a2cf5d2330ca57b7c5903d113d188622803d30782c5e4d2902b7c3365ae6e3b76e188da1176a3674 SHA512 c9a8eb771580bcb66e65172a23feb6c03bfba03ac505003883479d6efe3a9df92b8595135e0e2db0ee6b6e7326e0613494e57b916f72af5fc76086de40067cf5
 MISC metadata.xml 490 BLAKE2B 1a66bd19f05f0c21849b8fe57ffc8f8e153af9a963e045b0c23050734a4aa506b920b91fb4606306f0850514df4465ef6f448042c0c339b61f75d7d6904e0ce7 SHA512 5bf8d70288c3b63678f6adafbf0a3284385e9122e4acf50455741e0472dd8fe1b8eb6d41ea92056cb2da462c31aa812b061297427dc9de1853539dbf762d7cef
diff --git a/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild b/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild
index 0f26cafe184a..4a0de8f43ac2 100644
--- a/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild
+++ b/media-libs/libva-intel-driver/libva-intel-driver-2.4.1-r4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
 if [[ ${PV} != *9999* ]] ; then
 	SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2"
 	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
index e3cb1aaadb51..35efb33a5cfe 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -8,6 +8,6 @@ DIST intel-media-22.5.4.tar.gz 27493483 BLAKE2B ac6a93e06eec33edd823b1fd4310cd63
 EBUILD libva-intel-media-driver-22.4.4.ebuild 1371 BLAKE2B f39c670b03e589f23277ff4c0416ecce09637ee0323e70a1d71c97ccb319b2fb1b47a218ae7f006c7cbace0085ed21d70d38e91e9f27e5fbee42bdbe0553f796 SHA512 b1217cfb4ba440520664d839bd5d5e0193c6b9107167a2dfd264015a0a38900a4e36e0326e459feb3a5ced5b10e54f9583f32bfe40540100eaec66c52412823b
 EBUILD libva-intel-media-driver-22.5.3.1.ebuild 1349 BLAKE2B 0bd3d76f5d3f7d9ec48ab77a424d3ef24c902484be12b3549f0d2dffe3857c49c09f08bdc3b48ad27aece6dddaff5de25cb7597a602dd1097f48bd2466c86a36 SHA512 125bac3e4dabaf97c8c4a6e1ac6fbde226adb6bce69942bbe2d03807a533bd518b71e000461810674aeec67038d7ffa5e9447ec89581dfe28380528f2a1a36a9
 EBUILD libva-intel-media-driver-22.5.3.ebuild 1349 BLAKE2B 0bd3d76f5d3f7d9ec48ab77a424d3ef24c902484be12b3549f0d2dffe3857c49c09f08bdc3b48ad27aece6dddaff5de25cb7597a602dd1097f48bd2466c86a36 SHA512 125bac3e4dabaf97c8c4a6e1ac6fbde226adb6bce69942bbe2d03807a533bd518b71e000461810674aeec67038d7ffa5e9447ec89581dfe28380528f2a1a36a9
-EBUILD libva-intel-media-driver-22.5.4.ebuild 1349 BLAKE2B 0bd3d76f5d3f7d9ec48ab77a424d3ef24c902484be12b3549f0d2dffe3857c49c09f08bdc3b48ad27aece6dddaff5de25cb7597a602dd1097f48bd2466c86a36 SHA512 125bac3e4dabaf97c8c4a6e1ac6fbde226adb6bce69942bbe2d03807a533bd518b71e000461810674aeec67038d7ffa5e9447ec89581dfe28380528f2a1a36a9
+EBUILD libva-intel-media-driver-22.5.4.ebuild 1348 BLAKE2B 06e45d9018fdfd720c9e2251d179cfb28db544595ef2daede5bce4c37e35c5e22b7a335fb19f7d239c5ed017362b91601144aa00efc836470c42ff88c21aef22 SHA512 5525f59567a4cba6ae9ed1d0db84c01445e349a2c9bb8040a08b503d98533a45559d7c128b895fdd9e6479ceb0ead7e71d95f9f899257166df59931d0ceacbdf
 EBUILD libva-intel-media-driver-9999.ebuild 1372 BLAKE2B a48874cc6d1cff79803390c8f1ff2651ddb6464f21365d74a2f0b7bc97e392ad0eefa0002f659feda8db7b3424d66938db48be1a238c8bbd76eed220fd241507 SHA512 d6414971a1487d155214b8cfdc053b4657364e547aeafdc3d18d8f16bea241a2b775616f614a4c5320c6c52f119e20ae3ea208f23af684ee712f90bc006ef487
 MISC metadata.xml 416 BLAKE2B 749876c200cd1ef9b1ecb850c8fc0c208ec2f51f7ea521621758f6e08851beb536efb8f042057eeb8289ffc46bd5ca2ed3b1117c581be28b7bc5c0b78b23236a SHA512 0acedef15e1a7f39639116b9fa911433ecd024bb404de211fab032c56f105690fbb5ee82bf66afb324760d548230727aa273c4f77396ac3e7029bebc2d0e53f7
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.4.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.4.ebuild
index 92a6257bc1b1..9d2d158297b4 100644
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.4.ebuild
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.4.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
 	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~amd64"
+		KEYWORDS="amd64"
 	fi
 fi
 
diff --git a/media-libs/libva/Manifest b/media-libs/libva/Manifest
index 37d8891a8fb0..aac0dc66cd47 100644
--- a/media-libs/libva/Manifest
+++ b/media-libs/libva/Manifest
@@ -3,6 +3,6 @@ DIST libva-2.15.0.tar.gz 264429 BLAKE2B c1bd8c3de25a266b8cc35400db464ea8b0dc81f0
 DIST libva-2.16.0.tar.gz 267735 BLAKE2B 59c5dc39e1c40c2f24455ec7b0588eb4898b3cab7c49ffbca997882c634ca7be6334fdb820afada8e2ebf39eb2166c95610df190d90c2a98c4fc25d25c733b32 SHA512 08a1481ac693ee9de639f2abd483e1fabfee87f9c04ead066dfce5c24cc7f1d1a29d8664707bb534ce4cc25e52086c5e4a0ecfe704ca59590ce41353fda31c2a
 EBUILD libva-2.14.0.ebuild 1656 BLAKE2B a65bcc2119e25a2a27e9324e83a2c9b11c6a646f09f6f592428d9ec445e08a63dfac192af1d7a4c8dc380c2e2172b1ee1bf0d399bf1384a5946c627efce047ca SHA512 31fba31b1464337f4b3a3f7005a6b3c2a1adee458e30c1e4ef55961c5494117bd084a7b0d71595d5bc07691dbe4a30b8b272c3aeef9fab8944695d410f95c83f
 EBUILD libva-2.15.0.ebuild 1656 BLAKE2B 170afb6271dc2b2ae47408ce47f2ab67ce800c0c5ab3f8444b85fc75aab49fe3ee07213f7b7a5bedb99fbaa3294d09cb80487ed63bacebb1711e568317faf2fe SHA512 c0dc31f442b0b81d066fb0e74cadcc2c763ac3b4706b680421d62dbc51689ead27282ecffebe08681429f84536470940df9afcef733fec66545ba223c7157ff1
-EBUILD libva-2.16.0.ebuild 1653 BLAKE2B f45e1021ec88c437b04b14d53217e560339e1d69787b6e3a2179d2b9c2a107c3899c852cc401186045c8e36a86b26d8e0bd36879fe4a06d18bac6e40dfc36896 SHA512 d014c7a39aca3cf80dd59863d523beafac978dcf81ae19b4bbb99195019bac9ce0c27f1954792b83366be659bea0e918675d14789aec51e8e46d8354f4c6d6e5
+EBUILD libva-2.16.0.ebuild 1652 BLAKE2B 117ed276b542d314cc6656a2b3e7d9735102bbc2550d5964772371d80bd9066c836475c0cfa52cefa560d050e1c3ca8c2ccf7fb1c2c7232774db07b02137c94e SHA512 22295415e8fdd49753f049a49ed049e6fdedd957ad8508790825a62e36ec85e4bfcad571818f64a728122ce59d2b8fc8fab34894242373164dcaaae25ff1a2cb
 EBUILD libva-9999.ebuild 1660 BLAKE2B e5a30d7b64db02bfa6b757adbbd673879ef7d790335459cc59755be541e002ebd827866dfd89a64d7aa7730456bf5516d5d8e1988c7c524b22a7aead81a189f8 SHA512 ec9d7e043fca8b048e4eeea549bec74c295fedd4f0cbda8f5f14674502a4715b89db81c66deb6454d1b4456f4410df7f0e0eb7beae79cc4af6943c47a0fce240
 MISC metadata.xml 405 BLAKE2B 02edd18ab96b6b2b45930e7c623275758bb763f2bd291459a587e020ec34f6a56d0152dcbaf662bff9573fc9e51c69def9ea1caf85f28dbfb6d2fe7be7a80879 SHA512 3ec8eeca943e313e32a5aaf77e5cb3ff277ab976ce2adc7a018d697ba1a45ee19b9555c29f304ade4132c70b2181ab67c04dedb8356d5a93a7a236b9221e3c8b
diff --git a/media-libs/libva/libva-2.16.0.ebuild b/media-libs/libva/libva-2.16.0.ebuild
index 6bd2f145f00e..362a3a75f8ab 100644
--- a/media-libs/libva/libva-2.16.0.ebuild
+++ b/media-libs/libva/libva-2.16.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva"
 else
 	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 3c40a5ff75db..a2dc8535e8ae 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -4,5 +4,5 @@ DIST mesa-22.2.3.tar.xz 16464020 BLAKE2B 8f1482983ff9de9565a7f48f22e315b022ea8a0
 EBUILD mesa-22.1.7.ebuild 12037 BLAKE2B 36b57a2a4184e6788a4ccee1bab1b1281defbb1a26443266a6ede1d63fcac8f07994045b1dbcc725be4e4b1191603dc4ecf305159861fc3423799fb97652fa2e SHA512 e5b1099fc84179b3feaa4bdd94b01e286ab208cd2207bdbe61d951752b6e7f1ddc3942c260c8e24c5bd6019be2b8e0f7cb69685ef18e7271b065aba859cd5b36
 EBUILD mesa-22.2.2.ebuild 12670 BLAKE2B 183cad628fc9b0f4af0dbc1306fb1b0d3c1abfd6d7278f04b407b5f1eee3906de0e646f21ad8c0351d233d214ee61b523dfb8e3553054465dc68bbeed8532c1b SHA512 ad642794372efcd0c3588ef198c8f81a4944e92c0f3b834cd833e1fca48d2b32e2422113999f3f1c807779d057498e6d304217b4028480ef9da045ec7beb160d
 EBUILD mesa-22.2.3.ebuild 12670 BLAKE2B 183cad628fc9b0f4af0dbc1306fb1b0d3c1abfd6d7278f04b407b5f1eee3906de0e646f21ad8c0351d233d214ee61b523dfb8e3553054465dc68bbeed8532c1b SHA512 ad642794372efcd0c3588ef198c8f81a4944e92c0f3b834cd833e1fca48d2b32e2422113999f3f1c807779d057498e6d304217b4028480ef9da045ec7beb160d
-EBUILD mesa-9999.ebuild 12287 BLAKE2B 42b150a4980a9a4e27ef4f1a529ad156e60e0f1e59756f8b2b16e029e572746590db813f6d809143574e5a9cee616a3b53a4bed608195eff5e1a996249655dc8 SHA512 507f2e9bdc6e403fe1f54f2844deabd992a70de30b6631aaa0c23f39640ff83e4c6b2dade2c54bf0292c04d72e88f32aebfa5ec1c4ea01e1879fb17cfbaf8795
+EBUILD mesa-9999.ebuild 12270 BLAKE2B e8a0af6cb91c8028d7516a664ae0b0c639811b384af1ad7de2d09058282c610f6e9901ae08e4da15e855fd505707d8ff8d989ea58bf38ae27e6a70b7367feaea SHA512 a400233014d63b8e17022c6cd6456988b3786404a3e90e42ef4210bb4ee205e1d6d40f61ff572a26136367b55f73c5a403b24464e49c1101352a5b2f04806893
 MISC metadata.xml 1705 BLAKE2B d00c5edf48d5fb9c7485958569d8be761b0a8a79b893d50347687d2fd1c4ffac1325bbc32254737f8249e8b2cef2e86ae7b06a3c6351f7a03844f48ce1df428d SHA512 5c67ebd046a486e5e45864f79233ce659e0fa1d4c30284e9f3908c73d2f3480af50dddcf0676b8ed0ffe60a991ed4b59ce199d7ea16d6520a191ad076c5a9ec0
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 8a0be5c983d5..b0737f166279 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -49,7 +49,7 @@ REQUIRED_USE="
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
 RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
 	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
 	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
@@ -75,17 +75,15 @@ RDEPEND="
 	)
 	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
 	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-	)
+	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
 	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
 	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
 		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 	)
 	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 04204bde4051..c38a9a22e358 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index c49245cb947a..2acb09166aae 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -4,6 +4,6 @@ DIST libva-utils-2.15.0.tar.gz 1245559 BLAKE2B 92fe1e7dbd3c953eecb351625213c2b53
 DIST libva-utils-2.16.0.tar.gz 1245723 BLAKE2B 3ce3b54f9b8d1e5960fdb7587da9dc4fa9754f3612155e86d99f2f120e31e0e69a40482d7a4571fefc0a8079ba987303cbb433203de9ef6e203e9419b6d91b91 SHA512 d5395c1de4b95f4d0a86621b0338852250a3893b732c6fd69d0622c989bff530461a183c151f322469b1ed7e4815173dbbcf36cc390db9ebbae6fb7d7a90cb9c
 EBUILD libva-utils-2.14.0.ebuild 2012 BLAKE2B 6fb1e146a16a80d34b8ea0c8528953b3ae432a317385e54b860f2079711cf490f83a977f795d74629d78b9cd31ec751b17541258a2813c8addfb005c33a32abb SHA512 58d90d9c308385676d8776303ecd2032025f189f4b2f0de61d75126d0ca465306bdd979e0fc592cd62898eb412585659206d5b0717260e521060b02310c771c7
 EBUILD libva-utils-2.15.0.ebuild 1947 BLAKE2B f601ecb208b1ed24b57cb265e66300b1d6c8ffe6baecc232ace2e9f1591f78ef8d4a3d3fbcfc48ad828be89556a0e355ffad0be469a617ca3e5db844576cd1a0 SHA512 3125e505baa2ca44b084977fd3c01be7460b5ef93b13cf59ca872ef998af1927956390dd953684f975de14106218324155195a6509e87202084a3a87b6323a72
-EBUILD libva-utils-2.16.0.ebuild 1891 BLAKE2B 145bb8219ed8cb3f95e613875702b50bdf7c5fb4ead04f8c77391a898afa3ef511ce3979953f809273a8c4759d0aaacb4a0f7e4414bcb7c7bee0c1a4120e555c SHA512 ae2f6b9257f18bcea03d2dd5decf3e13f084f2c3d25d2a020ce5d68097f621eab73aeea0fa553c445943140d7c63360f97fff33ccf8d09d7abf498a2e211d6f1
+EBUILD libva-utils-2.16.0.ebuild 1890 BLAKE2B 324484428dff361e599d188d67623d52493432cbe0a48e77d86d90218fecd4886a291d7925e9b8921590867c94066044c3a9f06301dc15650b2b75aa33857b8a SHA512 0530339fdad63ea81daf00b8de443ddf8e5d31c59eb8078119bb209fb1819607fd1ca6d3bc2907c58e004a8de75f42c02ecdceb4dabad2091be113899978f17f
 EBUILD libva-utils-9999.ebuild 1893 BLAKE2B 2922fd4d86e2f936b00f228662e18555404f5e888014966268326cf07935f02bc57c10534caa34dce14a65ecbde496c7da65bb5d244c326f7a21dac10fd50e75 SHA512 2c4cdc56233da136b0d4a96205ae26b3b43dc15472929b190142e838569005e3b9cec2cdd3dac378acf0510aa4fdbbc354b9846c48b90c3f4973681f8e67d696
 MISC metadata.xml 596 BLAKE2B 856d27918d6cd6c983271e4f762f7b1278bd90231d33181b5381dbc425523d637c65902526ed1b48a0df6aadf41d77bd249e886dbc485edf93f5394fa458cd13 SHA512 46e6d1ef1cc966aadb696293fb1b5f86d1f3fe5d0245ca01a2d9be6d1b35f29830cee41d4e04f0c8d557dd20eb41ae927dc60a854ce24862a2b2f7fc8faee766
diff --git a/media-video/libva-utils/libva-utils-2.16.0.ebuild b/media-video/libva-utils/libva-utils-2.16.0.ebuild
index 69bdfeaf1705..a9db9d993c05 100644
--- a/media-video/libva-utils/libva-utils-2.16.0.ebuild
+++ b/media-video/libva-utils/libva-utils-2.16.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 else
 	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 40e112f85372..16c12a84c7bb 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -4,5 +4,5 @@ DIST mpv-0.34.1_p20221105.tar.gz 3366581 BLAKE2B 52bf8f339e6535c17430d4a8f865a45
 DIST waf-2.0.22 104880 BLAKE2B 6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0 SHA512 4156cefa65b7e6349ddb1ca643bbdf3e4444449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
 EBUILD mpv-0.34.1-r1.ebuild 9733 BLAKE2B 7c2c0935efc35f23a5389f4f9e367e3e0e0dc862b27b27c816edcaf0623c5dc9879ccef5e3519fc35b9be1ae87b3ba80f5e60dd430bbb43df581245e92b3be80 SHA512 64f06b5d6e16d943d4bf614117304839c09cb34cba4ce561b5e68c826e83672a0e9218a486de68fd506ce9c7b2a50e92b0627c66c3ebe048175c214dabd09aba
 EBUILD mpv-0.34.1_p20221105.ebuild 7443 BLAKE2B 7da8e2e6283fa555ad2554c4ada42dd8ffa143cf4dc2b64e54dac4bb8f36913691c5951e012d18fddd57d127e78ae983ba22cfa9a33d9daf8e31f7ec67eab70e SHA512 9cd6ade78c5b4232e88339960ae79340c938eb339c4ef5addae369f4e9095ae53ead6c82d05cdf4d5c9d06eb979dd74289d7398d87613668927f460c129c12b8
-EBUILD mpv-9999.ebuild 7461 BLAKE2B 76f801117613d33c47aa7f2bb5bbf8ecce148e7b222eff71079224071a09452e4ab7964a9e97c14888f85b24b1fb65c91be933171e6b72e4b7ed36c2f03a3b7d SHA512 b4733ffae5d9a91749cee0743b925120849dccfd5314f206a9d5fc21ba2c03a32a982d7f8146fe7f6bf97c24ce40986f176276cc1d650b99600537498e83c97b
+EBUILD mpv-9999.ebuild 7389 BLAKE2B 742c5b973fabaca9261248deabcf08de55e67183d5f4758f01ea3f2fc7987a043edb27d04709c0766c059d5a99ca1b387110f67c37191e6d4a9267b8cf7f1721 SHA512 60d1f0bbfe057a4baabd80d4d49e3872e6eaf3b972c2aeb251989c0fa8bd61116e3fd51bf635c69e491eede9a853b0f4a06948e5fbf23c7140a1d26917a477cc
 MISC metadata.xml 2790 BLAKE2B e080803b3907aadd28e9d0b54177cf210def169d84242503b6bca102a621d0f75bd19a6e9ee2939aaae070bd9e09b6b33c10bba481d5e8db0927035057c048be SHA512 50ca35e8cb726bd6828801f97d49a3bd748051de8d4d94f8c21b3a63db28877b02de0d4599a92a9228113104314d7a99dc8c1a1c9a4e779a785382d74bf12bac
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 210b3b42bc51..44b6c139ad77 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -125,10 +125,6 @@ BDEPEND="
 	cli? ( dev-python/docutils )
 	wayland? ( dev-util/wayland-scanner )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.34.1_p20221105-macos-touchbar.patch
-)
-
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 	python-single-r1_pkg_setup
diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest
index d916fa83638f..e58d74f8bb9e 100644
--- a/media-video/webcamoid/Manifest
+++ b/media-video/webcamoid/Manifest
@@ -2,5 +2,6 @@ AUX webcamoid-8.7.1-gcc11.patch 469 BLAKE2B e6994f1f0bd90a83ee1a3510990ff3e31867
 DIST webcamoid-8.8.0.tar.gz 8887888 BLAKE2B d0c3f0cee1fe487e8e61cb50148415899f2df8bdd1c48f1d944cece167e69fc6872cc7a45dbf441d6b4b88d0ae99c1a227339594a6ad94416b765a89eb1a70e0 SHA512 e21e3f6b7ad4f4031658033e94f377db06e06d5bad8f0540af6ac824972aa2811336d5edfef19c674e9b98d0bf9d96f22ac46623d5cb4c39bc310d248daf0bfa
 DIST webcamoid-9.0.0.tar.gz 9257331 BLAKE2B df7044650c92fd1e557043e2a721079dcc2531a59fb9859c19e02f95bd091fb33cec5e69bbc323baf8c11faad404824f875afe643e9d21085d3496a78acc04f4 SHA512 0de39dc6a5bc3fb8d6477728d971bca933c57e354a6d041389b33c3e48ec7c7912007f6f87bc9be5db303f58ddc5143bb28dc1b475c9ca361f579e1532b515a4
 EBUILD webcamoid-8.8.0.ebuild 1741 BLAKE2B f80de276c25421a4187139976551e07192f2d716750e444e66633da59621d87a72cbf26d3afce398beda4486f3900ebab6885ce4009de59c71ce1a12992dbaa0 SHA512 b03f081bb55d6279657d6b05ce7eede8476669bfaf6a2e1fbdc48ac93648fc2012b8e08cad2487057308b032a65534deb1cd5e95ebd4baf6511319bf5fa607ec
-EBUILD webcamoid-9.0.0.ebuild 2055 BLAKE2B e3626e551683706f662fb118d6d1da56d92cad54635aa47a96699e720b62b5cd6de51c8f6718535ee3f7f7c60f7f418d8ee4bf7e787b0d36c6d1014dc9b21833 SHA512 f4339c708de2facf67b223c8800d301ed7f0700dc90ab598da475961e96cfbda79fdc4d5e42fb981c8f2c10affc2140433f1cc0c2d1387a7e76f255c9e958eb9
+EBUILD webcamoid-9.0.0.ebuild 2037 BLAKE2B 082af097bb6ce0aa1dc052bf549e1ddb7ffcb66ee5fbf058c4d4c0956640abd4f1cff6407ac16067aa47a71ce883e263b8aacde2798e6fb52b650609e0491bdf SHA512 dc6ff85712a6c2ca5c49ef21fc3e27bcfbedce1fcf664d2c6ea70d794c316391199ee545bd4a6d497d6d4e9e1f0f58e4022113b1fda820a0c61ec83f14369d73
+EBUILD webcamoid-9999.ebuild 2192 BLAKE2B 358450c8701a50cca99d33318f2e04599f39a65f95e11847e9ce9bace8011885709c5c1a34fe55a6491747cd2d8930f03f77e644a8a204522ce396108e6b0635 SHA512 7ba6855e8bfb5b4cd38be183b7caf15d24e59fbdffb3c1819a9ce0d8c9bbc8d32cc2f72c98fa0903bdd28920a97ec1464e04a59eb913daa8c1bad1663d54f9c6
 MISC metadata.xml 586 BLAKE2B 55df36c3b4fd6319354c699e5e789b47dfd6f223068721ae842cdfae1dd158b3765e5796deabe8ca63a50da450f541e37f194c8665c7a7a1a6c2272677159d5d SHA512 729ba6c451fcc437d71c0c379179913b22e169368695daaf3452313d061641d647697f47a76684fd4bfcac318c5c7126a5214d5e0e1474c6685cbbc29fd8d0e8
diff --git a/media-video/webcamoid/webcamoid-9.0.0.ebuild b/media-video/webcamoid/webcamoid-9.0.0.ebuild
index 67566447954b..f7d94e34ed8e 100644
--- a/media-video/webcamoid/webcamoid-9.0.0.ebuild
+++ b/media-video/webcamoid/webcamoid-9.0.0.ebuild
@@ -8,7 +8,6 @@ inherit cmake xdg-utils
 DESCRIPTION="A full featured webcam capture application"
 HOMEPAGE="https://webcamoid.github.io"
 SRC_URI="https://github.com/webcamoid/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-RESTRICT="mirror"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
diff --git a/media-video/webcamoid/webcamoid-9999.ebuild b/media-video/webcamoid/webcamoid-9999.ebuild
new file mode 100644
index 000000000000..c1ebeeeecd04
--- /dev/null
+++ b/media-video/webcamoid/webcamoid-9999.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A full featured webcam capture application"
+HOMEPAGE="https://webcamoid.github.io"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/webcamoid/webcamoid.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/webcamoid/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+RESTRICT="mirror"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects debug headers v4l"
+
+REQUIRED_USE="v4lutils? ( v4l )"
+
+COMMON_DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	ffmpeg?	( media-video/ffmpeg:= )
+	gstreamer? ( >=media-libs/gstreamer-1.6.0 )
+	jack? ( virtual/jack )
+	libuvc? ( media-libs/libuvc )
+	pulseaudio? ( media-sound/pulseaudio )
+	qtaudio? ( dev-qt/qtmultimedia:5 )
+	v4l? ( media-libs/libv4l )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.6
+"
+RDEPEND="${COMMON_DEPEND}
+	virtual/opengl
+"
+
+src_configure() {
+	#Disable git in package source. If not disabled the cmake configure process will show a lot of "fatal not a git repository" errors
+	sed -i 's|find_program(GIT_BIN git)|#find_program(GIT_BIN git)|' libAvKys/cmake/ProjectCommons.cmake || die
+
+	local mycmakeargs=(
+		"-DNOMEDIAFOUNDATION=1"
+		"-DNOAVFOUNDATION=1"
+		"-DNODSHOW=1"
+		"-DNOWASAPI=1"
+		"-DNOVLC=1"
+		"-DNOPIPEWIRE=1"
+		"-DNOALSA=$(usex alsa 0 1)"
+		"-DNOCOREAUDIO=$(usex coreaudio 0 1)"
+		"-DNOFFMPEG=$(usex ffmpeg 0 1)"
+		"-DNOGSTREAMER=$(usex gstreamer 0 1)"
+		"-DNOJACK=$(usex jack 0 1)"
+		"-DNOLIBUVC=$(usex libuvc 0 1)"
+		"-DNOPULSEAUDIO=$(usex pulseaudio 0 1)"
+		"-DNOV4L2=$(usex v4l 0 1)"
+		"-DNOV4LUTILS=$(usex v4lutils 0 1)"
+		"-DNOVIDEOEFFECTS=$(usex videoeffects 0 1)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	docompress -x /usr/share/man1/${PN}.1.gz
+	cmake_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 466270dd2203..88085e9a8990 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 610c700dbfbd..1619d54c5870 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 11 Nov 2022 14:39:38 +0000
+Fri, 11 Nov 2022 20:39:45 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index f40fb083b3f7..f7ee184f2910 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 536244 BLAKE2B 47908e9e54099299278f14e5112b789aac78178d7406b6880e3986163e8e2aeec411757dbe131202da7291c508ea72a7d158f7fe08facf6e36a23a28a992a7d8 SHA512 ef16d73b0d889ec01efae4d55e398ba1b384a7b46066c129d82b336f46e8804d0dd1765c65c49d93842dc829696efc67759ac790655f316a70359fb8847d9e4e
-TIMESTAMP 2022-11-11T14:39:41Z
+TIMESTAMP 2022-11-11T20:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNuXq1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNusxRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDuMw//YCR+Nwe7AkGKXk3/FWYhLKxxPNZ43SlnqC0zA10bitg2UxF0/xGnyuNK
-VyZY5z0tkeE5UebwNiF+djJAW7tnRxf42CW/mVMrBBBpldTCpGH7upPmPz1Djd11
-StI8mcbzv92WVxNjslNmonfD8c9brt3fiUOQMMOAqcDZi3M2ysmCysih59ORyctb
-sxqPGBYtpISyLu5x9vn93eHi1X9J/VQmPZBLg3AKeMgXMcwksq4EsTgExrcgIPod
-abNEOnA8hfDOBEvJXL/FBoY60K2eGfKLxYDIzyRGoFRLhCjxAK2tOEe/DvptqPLS
-kDg+2MLDnh1EItio2xM9bP5lfm8m5XkG1SMjsFgTBT8iQZRxp6i7tl2diL9jRgQ2
-cm5gSTH1OrLY4iO8oQzYR2fc+yYxXVVcv3Ju8gA1Jg/2Z1Sv09pnm5XjS7s0vBCu
-P8gRQRQc6flLPo5YkWcK50PS3rle9bmJIJQqjmhWR00SXiNiVgwIg1eoMYjzYRkm
-pJSzftAdaOR+Qoy3pJs+iKRnSJDvqbfOWaOOtdU8kpAKslBSwE90wcCO/VCaFtar
-Vs+/tWEwXCQB+Lb6PcuFLo29a5Xqxk73H2H5iMOOoDVfqsD/bO7JXuY+Z2yvCosZ
-4mYch9bGBGmcCDS8CvCcIYo4o/zPFKevERjgbqfjuWNuw8u/7WU=
-=jed0
+klAwKQ//RF8Ho8xqgT69fqZzVRay4UJybDbimQPmvgHebrbTaT2M3+nZ55XkZKmj
++jsg3WikHe08EI8QXEPDV0GlQptgDQDEJw49wH2SYTGVa3xHxBCJtFXUZ/uan+wF
+QR2oWLRlrPRhoF5c9suLG7zbwYtYC+HZ8Umvy4X9usxuK6IAw9k3LxJY9SFmOlRe
+MLWArF5gqfnOKpfwwhA+GClQZ6NDaik6gqv0U1i6JAkzVh4+5VTKCZfJ93Ft/t4B
+HhimMWwOCrK4gFeaaUyQ4B1d8z5F62Wdu0pwH2+Xkqpgko+EZewNP9Au3q5A8IIb
+MQ+Rk6CFIfkd+o2AgoALjpUZ6yVAolvKYm2D6IQ0EsuT5r7eTSAJg53ZLCb/Vb5E
+LLlLFG1IueZDvL3f616NueWYW/nS50mZtL/lWxYzUmpSSSvP/EkyPTU4lUHgR9+g
+HvhCPuvFVcsTITHLQo0HvjmtMde15P3r6ZYvnzgB+CvahwMtRxL/cysEz3Cipaa2
+Y2dY7NWaJ1ufAYTyV06hPyAD9b+dcahUahP8x86yRnRfCdPma46/soZ59T6Yq9V0
+my4mrDZAClIQGpL4FNWuuI8bX6rtWRNEXOODO2jQp/MKEzyR8qqDthNfcbUU7mUW
+4ZGDz2O0c16I5hlCGZ2akxBKgxc5g0qjdNDOKG55xq5Z4ptaH+Q=
+=IeZQ
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 610c700dbfbd..1619d54c5870 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 11 Nov 2022 14:39:38 +0000
+Fri, 11 Nov 2022 20:39:45 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 9d8b9883880a..14cd46f5c15e 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 3a09b6da6656..d7df3f58fe73 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.9.0 b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.9.0
new file mode 100644
index 000000000000..4223f2e14ed9
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.9.0
@@ -0,0 +1,13 @@
+BDEPEND=app-text/trang >=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Extension for nxml-mode with libvirt schemas
+EAPI=8
+HOMEPAGE=https://www.libvirt.org/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://libvirt.org/sources/libvirt-8.9.0.tar.xz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=de2635fd9f179dc2c588d1e709153fe2
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 38ee90c0f252..e034dddc4086 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/libvirt-8.9.0 b/metadata/md5-cache/app-emulation/libvirt-8.9.0
new file mode 100644
index 000000000000..3e598cb022f4
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libvirt-8.9.0
@@ -0,0 +1,16 @@
+BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= dev-python/libvirt-python ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
+DESCRIPTION=C toolkit to manipulate virtual machines
+EAPI=8
+HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
+INHERIT=meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+IUSE=apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= dev-python/libvirt-python ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) virtual/tmpfiles
+REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
+SLOT=0/8.9.0
+SRC_URI=https://libvirt.org/sources/libvirt-8.9.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-8.9.0.tar.xz.asc )
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=37c8703fadb9b4dd65a64b9eef284e00
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index 9022169ec206..56daed848e7e 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -1,6 +1,6 @@
 BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
+DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= dev-python/libvirt-python ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=8
 HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
@@ -8,8 +8,8 @@ INHERIT=meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig git-
 IUSE=apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs verify-sig
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) virtual/tmpfiles
+RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= dev-python/libvirt-python ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) virtual/tmpfiles
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/9999
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=96c4bd190862fa9071691e5e19005471
+_md5_=37c8703fadb9b4dd65a64b9eef284e00
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 7ea2c0a51aea..529d72b233b4 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/dia-0.97.3-r1 b/metadata/md5-cache/app-office/dia-0.97.3-r1
index 266aca837680..efe6e624c11c 100644
--- a/metadata/md5-cache/app-office/dia-0.97.3-r1
+++ b/metadata/md5-cache/app-office/dia-0.97.3-r1
@@ -6,9 +6,9 @@ HOMEPAGE=https://wiki.gnome.org/Apps/Dia
 INHERIT=gnome2
 IUSE=+cairo doc
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/popt >=media-libs/freetype-2 >=media-libs/libart_lgpl-2 media-libs/libpng:0 sys-libs/zlib x11-libs/gtk+:2 x11-libs/pango cairo? ( x11-libs/cairo ) doc? ( app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets )
 SLOT=0
 SRC_URI=mirror://gnome/sources/dia/0.97/dia-0.97.3.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=037101abac5a9d7df4d3bb69646f9a4c
+_md5_=cade84e2fa52d72eef7dce38b8fd695d
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index ba8a3e94acc3..e38bfd856771 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/postgresql-10.23 b/metadata/md5-cache/dev-db/postgresql-10.23
new file mode 100644
index 000000000000..99f971642081
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-10.23
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libcrypt:= virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=8
+HOMEPAGE=https://www.postgresql.org/
+INHERIT=flag-o-matic linux-info pam python-single-r1 systemd tmpfiles
+IUSE=debug doc icu kerberos ldap nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libcrypt:= virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=10
+SRC_URI=https://ftp.postgresql.org/pub/source/v10.23/postgresql-10.23.tar.bz2
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=7a7709a95c4f131a75ab50013e0ea4b6
diff --git a/metadata/md5-cache/dev-db/postgresql-11.18 b/metadata/md5-cache/dev-db/postgresql-11.18
new file mode 100644
index 000000000000..1d7c71a8befa
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-11.18
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-16:= <sys-devel/clang-16:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=8
+HOMEPAGE=https://www.postgresql.org/
+INHERIT=flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles
+IUSE=debug doc icu kerberos ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-16:= <sys-devel/clang-16:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=11
+SRC_URI=https://ftp.postgresql.org/pub/source/v11.18/postgresql-11.18.tar.bz2
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=17a4fc67ab4df4edaeede94372a61b17
diff --git a/metadata/md5-cache/dev-db/postgresql-12.13 b/metadata/md5-cache/dev-db/postgresql-12.13
new file mode 100644
index 000000000000..b8e4eca3382a
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-12.13
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-16:= <sys-devel/clang-16:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=8
+HOMEPAGE=https://www.postgresql.org/
+INHERIT=flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles
+IUSE=debug doc icu kerberos ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-16:= <sys-devel/clang-16:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=12
+SRC_URI=https://ftp.postgresql.org/pub/source/v12.13/postgresql-12.13.tar.bz2
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=076869b9064e80bbb303e7f17ad1d424
diff --git a/metadata/md5-cache/dev-db/postgresql-13.9 b/metadata/md5-cache/dev-db/postgresql-13.9
new file mode 100644
index 000000000000..c0ca702b49d6
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-13.9
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-16:= <sys-devel/clang-16:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=8
+HOMEPAGE=https://www.postgresql.org/
+INHERIT=flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles
+IUSE=debug doc icu kerberos ldap llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-16:= <sys-devel/clang-16:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=13
+SRC_URI=https://ftp.postgresql.org/pub/source/v13.9/postgresql-13.9.tar.bz2
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=e7de836d7f4b90552098c49282c22c0a
diff --git a/metadata/md5-cache/dev-db/postgresql-14.6 b/metadata/md5-cache/dev-db/postgresql-14.6
new file mode 100644
index 000000000000..1ba6d0abb8b2
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-14.6
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-16:= <sys-devel/clang-16:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=8
+HOMEPAGE=https://www.postgresql.org/
+INHERIT=flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles
+IUSE=debug doc icu kerberos ldap llvm lz4 nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-16:= <sys-devel/clang-16:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=14
+SRC_URI=https://ftp.postgresql.org/pub/source/v14.6/postgresql-14.6.tar.bz2
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=60f0bfd10ec4024d611a3926ffb00aed
diff --git a/metadata/md5-cache/dev-db/postgresql-15.1 b/metadata/md5-cache/dev-db/postgresql-15.1
new file mode 100644
index 000000000000..78b4eef1436d
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-15.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-16:= <sys-devel/clang-16:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) !!sys-devel/llvm:0
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=8
+HOMEPAGE=https://www.postgresql.org/
+INHERIT=flag-o-matic linux-info llvm pam python-single-r1 systemd tmpfiles
+IUSE=debug doc icu kerberos ldap llvm lz4 nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) llvm? ( <sys-devel/llvm-16:= <sys-devel/clang-16:= ) lz4? ( app-arch/lz4 ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_musl? ( dev-libs/ossp-uuid ) ) ) selinux? ( sec-policy/selinux-postgresql ) virtual/tmpfiles
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=15
+SRC_URI=https://ftp.postgresql.org/pub/source/v15.1/postgresql-15.1.tar.bz2
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=24e9939957e1e617085ea19863a7c49e
diff --git a/metadata/md5-cache/dev-db/redis-6.2.7-r2 b/metadata/md5-cache/dev-db/redis-6.2.7-r2
new file mode 100644
index 000000000000..ed2ba80e3545
--- /dev/null
+++ b/metadata/md5-cache/dev-db/redis-6.2.7-r2
@@ -0,0 +1,17 @@
+BDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) test? ( dev-lang/tcl:0= ssl? ( dev-tcltk/tls ) )
+DESCRIPTION=A persistent caching system, key-value, and data structures database
+EAPI=8
+HOMEPAGE=https://redis.io
+INHERIT=autotools edo flag-o-matic lua-single multiprocessing systemd tmpfiles toolchain-funcs
+IUSE=+jemalloc selinux ssl systemd tcmalloc test lua_single_target_luajit lua_single_target_lua5-1
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=BSD
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis selinux? ( sec-policy/selinux-redis ) virtual/tmpfiles
+REQUIRED_USE=?? ( jemalloc tcmalloc ) ^^ ( lua_single_target_luajit lua_single_target_lua5-1 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.redis.io/releases/redis-6.2.7.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=d3081d34f533264cc7e1b08746c2ca20
diff --git a/metadata/md5-cache/dev-db/redis-7.0.5-r1 b/metadata/md5-cache/dev-db/redis-7.0.5-r1
new file mode 100644
index 000000000000..b7475e632370
--- /dev/null
+++ b/metadata/md5-cache/dev-db/redis-7.0.5-r1
@@ -0,0 +1,17 @@
+BDEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) test? ( dev-lang/tcl:0= ssl? ( dev-tcltk/tls ) )
+DESCRIPTION=A persistent caching system, key-value, and data structures database
+EAPI=8
+HOMEPAGE=https://redis.io
+INHERIT=autotools edo flag-o-matic multiprocessing systemd tmpfiles toolchain-funcs
+IUSE=+jemalloc selinux ssl systemd tcmalloc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=BSD
+RDEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis selinux? ( sec-policy/selinux-redis ) virtual/tmpfiles
+REQUIRED_USE=?? ( jemalloc tcmalloc )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.redis.io/releases/redis-7.0.5.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=636ba8136d176ec439cfa14fe5308a3f
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index fb9574076b0b..4ceae65e5a25 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/mill-bin-0.10.9 b/metadata/md5-cache/dev-java/mill-bin-0.10.9
new file mode 100644
index 000000000000..71033b4bb0c3
--- /dev/null
+++ b/metadata/md5-cache/dev-java/mill-bin-0.10.9
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=A Java/Scala build tool
+EAPI=8
+HOMEPAGE=https://com-lihaoyi.github.io/mill/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=virtual/jre-1.8:*
+SLOT=0
+SRC_URI=https://github.com/com-lihaoyi/mill/releases/download/0.10.9/0.10.9-assembly -> mill-bin-0.10.9
+_md5_=2b4d4ada0013d7b03d498570ab932074
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-10.0.27-r1 b/metadata/md5-cache/dev-java/tomcat-el-api-10.0.27-r1
index b7d1991d878c..24a37b2d21bf 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-10.0.27-r1
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-10.0.27-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.27/src/apache-tomcat-10.0.27-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=c1ef28e808c81dc313eb569d65a259ea
+_md5_=cbfe1551bdf1d18c07a5201dc6778b11
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-10.1.1 b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.1
index b799d52825bd..7906dc4cd567 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-10.1.1
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.1/src/apache-tomcat-10.1.1-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=05622fead6861f79e1d93a89adaaff23
+_md5_=10ba957271dbc737d1408af508a67e05
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-8.5.83-r1 b/metadata/md5-cache/dev-java/tomcat-el-api-8.5.83-r1
index 6ab3ee8fed8b..45c973515233 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-8.5.83-r1
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-8.5.83-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.83/src/apache-tomcat-8.5.83-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=6952bc6e44200ab162c44b574374de4d
+_md5_=c0311fe9968b49b68158db9fb9f0329f
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-9.0.68-r1 b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.68-r1
index a1959d76f8f6..3bd4220bc5cd 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-9.0.68-r1
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.68-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.68/src/apache-tomcat-9.0.68-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=925daa3c52fd113d1d3eab199ebbf83c
+_md5_=741d8e4c89714073efdfce14efb3578b
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.0.27-r1 b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.0.27-r1
index 94e753dc812b..3037ee6810ca 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.0.27-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.0.27-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-10.0.27:4.0 ~dev-java/tomcat-servlet-api-10.0.27:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.27/src/apache-tomcat-10.0.27-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=d8d792607aa3f67fb8eacc30b7b5b2d9
+_md5_=4e767bb20d242552557f2cd2abc640ae
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.1 b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.1
index 6face2d95059..dcf2b11ef1ed 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.1
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.1:5.0 ~dev-java/tomcat-servlet-api-10.1.1:6.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.1/src/apache-tomcat-10.1.1-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=cccd58eb40a80dbc7d9d16433b455b2b
+_md5_=cbb8e9b8639b648f44ffa68ed84f63cc
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.83-r1 b/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.83-r1
index 0a7637f33be5..dad807c48f19 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.83-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.83-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-8.5.83:3.0 ~dev-java/tomcat-servlet-api-8.5.83:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.83/src/apache-tomcat-8.5.83-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=e6bec05b9c1fcc5ba7bdf9f5c54fc279
+_md5_=79723301fd822c0c6986d83150664c29
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.68-r1 b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.68-r1
index 47ef47cf99fb..9103b0a56f84 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.68-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.68-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.68:3.0 ~dev-java/tomcat-servlet-api-9.0.68:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.68/src/apache-tomcat-9.0.68-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=a3acf375e23ad93f631ab3d0f3e4e73d
+_md5_=370f3e6a822690de2f8af93a1a5f6e71
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.27-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.27-r1
index 09c139e21a41..c728fee7b77c 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.27-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.27-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-10.0.27:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.0.27/src/apache-tomcat-10.0.27-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=c1e80b4510a935bd917bf8da7f5f9de3
+_md5_=9be21b8f3f059e476c504d7cf85d7cb6
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.1
index 1dc7327b35ab..a3d9cd7f4261 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.1:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.1/src/apache-tomcat-10.1.1-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=f29c0f540e2a8681b9b6939e48088a56
+_md5_=54068b43c698365d6541cdf143525bbe
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.83-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.83-r1
index 5fa1f23378e5..db30a356c1f3 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.83-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.83-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/tomcat-el-api-8.5.83:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.83/src/apache-tomcat-8.5.83-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=e865ef92561225668986c155522f9a48
+_md5_=18f44e08406baf2bf6b5b4f166be8983
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.68-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.68-r1
index a7ce3101c6d6..162912b85265 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.68-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.68-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.68:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.68/src/apache-tomcat-9.0.68-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=dccfc0a42be76901bdf14dc5372421a1
+_md5_=3e618d932053877641bcb8fb19ecf0de
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index e71baaaac892..e9ad126aa021 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/python-3.10.8_p3 b/metadata/md5-cache/dev-lang/python-3.10.8_p3
index 379877400795..e87c7855133b 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.8_p3
+++ b/metadata/md5-cache/dev-lang/python-3.10.8_p3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.8_p3-r1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2ee75f9ec473507b81bfb70d8d7efab6
+_md5_=3bb3326a9cde54124f4a6b67c9c4235a
diff --git a/metadata/md5-cache/dev-lang/python-3.11.0_p2 b/metadata/md5-cache/dev-lang/python-3.11.0_p2
index 3d76134fe867..8cd998d84613 100644
--- a/metadata/md5-cache/dev-lang/python-3.11.0_p2
+++ b/metadata/md5-cache/dev-lang/python-3.11.0_p2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk verify-sig
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_11(-)]
 RESTRICT=!test? ( test )
 SLOT=3.11
 SRC_URI=https://www.python.org/ftp/python/3.11.0/Python-3.11.0.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.0_p2-r1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.0/Python-3.11.0.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=59325ff84ace23503b5bd6970663ea11
+_md5_=14f63f2fdc10bb5ce908aa03a602344c
diff --git a/metadata/md5-cache/dev-lang/python-3.8.15_p3 b/metadata/md5-cache/dev-lang/python-3.8.15_p3
index e66d4d010eab..aa6bf1610fd7 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.15_p3
+++ b/metadata/md5-cache/dev-lang/python-3.8.15_p3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.15_p3-r1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3edeb93299468a7ba2ad181813c049d7
+_md5_=9c2ca5b9a6c49350507079ba01da5e9b
diff --git a/metadata/md5-cache/dev-lang/python-3.9.15_p3 b/metadata/md5-cache/dev-lang/python-3.9.15_p3
index f7b6d39100de..21a7b96cb309 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.15_p3
+++ b/metadata/md5-cache/dev-lang/python-3.9.15_p3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.15_p3-r1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1b1f7ffb7844f8ab46b52c81a4ac63d9
+_md5_=b7c154eae7946efb0e65a9034b3a4992
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 02d3bbc5c99f..59d5fa694d89 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/libgusb-0.4.2 b/metadata/md5-cache/dev-libs/libgusb-0.4.2
index 821bbbd151ae..df58e4261474 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.4.2
+++ b/metadata/md5-cache/dev-libs/libgusb-0.4.2
@@ -1,6 +1,6 @@
 BDEPEND=|| ( ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) gtk-doc? ( dev-util/gi-docgen ) vala? ( || ( dev-lang/vala:0.56 ) ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwdata test? ( >=dev-util/umockdev-0.17.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwdata test? ( >=dev-util/umockdev-0.17.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=GObject wrapper for libusb
 EAPI=8
 HOMEPAGE=https://github.com/hughsie/libgusb
@@ -8,10 +8,10 @@ INHERIT=meson-multilib python-any-r1 vala
 IUSE=gtk-doc +introspection test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwdata
+RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwdata
 REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.4.2.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61
-_md5_=f1fa30c2242aa69f2737467a677510d4
+_md5_=7fd394e5d60a09297dd4debe1e2c3d06
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 93574155ce86..b1c1a33e648c 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.2.9 b/metadata/md5-cache/dev-lisp/sbcl-2.2.9
index 2d88c0bec763..67759beca537 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-2.2.9
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.2.9
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.sbcl.org/ http://sbcl.sourceforge.net/
 INHERIT=flag-o-matic pax-utils toolchain-funcs
 IUSE=capstone debug doc source +threads +unicode +zstd
-KEYWORDS=-* ~amd64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=-* amd64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-lisp/asdf-3.3:= capstone? ( dev-libs/capstone:0/4 ) zstd? ( app-arch/zstd ) !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/2.2.9
 SRC_URI=mirror://sourceforge/sbcl/sbcl-2.2.9-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.2.9-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) ppc64? ( mirror://sourceforge/sbcl/sbcl-1.5.8-ppc64le-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=06743f10486fd0a803528e911aace6bc
+_md5_=8bdeb797982396bbcc57a0f07a7bf049
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 3d14e6124178..7573939331a8 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Sys-Virt-8.9.0 b/metadata/md5-cache/dev-perl/Sys-Virt-8.9.0
new file mode 100644
index 000000000000..110721f73ce3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Sys-Virt-8.9.0
@@ -0,0 +1,16 @@
+BDEPEND=>=app-emulation/libvirt-8.9.0 virtual/perl-ExtUtils-CBuilder dev-perl/Module-Build virtual/pkgconfig test? ( dev-perl/CPAN-Changes dev-perl/Test-More-UTF8 dev-perl/Test-Pod-Coverage dev-perl/XML-XPath virtual/perl-Test-Simple virtual/perl-Time-HiRes ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-emulation/libvirt-8.9.0 dev-lang/perl
+DESCRIPTION=API for using the libvirt library from Perl
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Sys-Virt
+INHERIT=perl-module
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=app-emulation/libvirt-8.9.0 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DANBERR/Sys-Virt-v8.9.0.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=13c1f335b55a05ba82bcd74c41481606
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 4eebb57facf7..802532c49856 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/libvirt-python-8.9.0 b/metadata/md5-cache/dev-python/libvirt-python-8.9.0
new file mode 100644
index 000000000000..c122d6ccfea9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libvirt-python-8.9.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) test? ( app-emulation/libvirt:0/8.9.0 >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=libvirt Python bindings
+EAPI=8
+HOMEPAGE=https://www.libvirt.org
+INHERIT=distutils-r1 verify-sig
+IUSE=examples test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=app-emulation/libvirt:0/8.9.0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://libvirt.org/sources/python/libvirt-python-8.9.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-8.9.0.tar.gz.asc )
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=f856ee29eb94aefc288704aeb931e799
diff --git a/metadata/md5-cache/dev-python/libvirt-python-9999 b/metadata/md5-cache/dev-python/libvirt-python-9999
index 1cb158fc9c84..3fe7cbe8d345 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-9999
+++ b/metadata/md5-cache/dev-python/libvirt-python-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) test? ( app-emulation/libvirt:=[-python(-)] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) test? ( app-emulation/libvirt:= >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=libvirt Python bindings
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=distutils-r1 verify-sig git-r3
 IUSE=examples test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
 LICENSE=LGPL-2
 PROPERTIES=live
-RDEPEND=app-emulation/libvirt:=[-python(-)] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+RDEPEND=app-emulation/libvirt:= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=befca4618e634bfe065406cc5bd5af03
+_md5_=f856ee29eb94aefc288704aeb931e799
diff --git a/metadata/md5-cache/dev-python/parsedatetime-2.6-r1 b/metadata/md5-cache/dev-python/parsedatetime-2.6-r1
new file mode 100644
index 000000000000..0c539e90c92f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/parsedatetime-2.6-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Parse human-readable date/time strings
+EAPI=8
+HOMEPAGE=https://github.com/bear/parsedatetime
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/bear/parsedatetime/archive/v2.6.tar.gz -> parsedatetime-2.6.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=57b23358c2a07b5734ef9b78e2baa16a
diff --git a/metadata/md5-cache/dev-python/pyrfc3339-1.1-r1 b/metadata/md5-cache/dev-python/pyrfc3339-1.1-r1
new file mode 100644
index 000000000000..20e07b7037c5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyrfc3339-1.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Generates and parses RFC 3339 timestamps
+EAPI=8
+HOMEPAGE=https://github.com/kurtraschke/pyRFC3339
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/kurtraschke/pyRFC3339/archive/v1.1.tar.gz -> pyrfc3339-1.1.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=09ac68bd540ffa3dcfbb9f27ef920e21
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 8dddad196db1..f67cb5dc1e30 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/conan-1.53.0 b/metadata/md5-cache/dev-util/conan-1.53.0
new file mode 100644
index 000000000000..a6bee008d427
--- /dev/null
+++ b/metadata/md5-cache/dev-util/conan-1.53.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Distributed C/C++ package manager
+EAPI=8
+HOMEPAGE=https://conan.io/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/bottle-0.12.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/colorama-0.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/distro-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fasteners-0.14.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/node-semver-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/patch-ng-1.17.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pluginbase-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyjwt-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.25[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tqdm-4.28.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.26.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/conan-io/conan/archive/1.53.0.tar.gz -> conan-1.53.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=f16ffb90c5215814a892f132be50de44
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 323a88699870..400a434314d6 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0/16.0.0.9999
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	c9aa876ffe95eebd3b65090b8685ad01	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8f5d141838342b510a78cd837fe0b8a9
+_md5_=688e55c120b94b78bdf93e5439691646
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 22638a51a2c1..940066b31272 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/gtk-layer-shell-0.8.0 b/metadata/md5-cache/gui-libs/gtk-layer-shell-0.8.0
new file mode 100644
index 000000000000..cfc3f86c8efd
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/gtk-layer-shell-0.8.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/wayland-scanner virtual/pkgconfig x11-base/xorg-proto gtk-doc? ( dev-util/gtk-doc ) test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=x11-libs/gtk+-3.24.26:3[introspection?,wayland] >=dev-libs/wayland-1.10.0 >=dev-libs/wayland-protocols-1.16
+DESCRIPTION=Library to create desktop components for Wayland using the Layer Shell protocol
+EAPI=8
+HOMEPAGE=https://github.com/wmww/gtk-layer-shell
+INHERIT=vala meson python-any-r1
+IUSE=examples gtk-doc introspection test vala
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=MIT-with-advertising LGPL-3+
+RDEPEND=>=x11-libs/gtk+-3.24.26:3[introspection?,wayland] >=dev-libs/wayland-1.10.0 >=dev-libs/wayland-protocols-1.16
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/wmww/gtk-layer-shell/archive/refs/tags/v0.8.0.tar.gz -> gtk-layer-shell-0.8.0.tar.gz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61
+_md5_=86228ff0fab748571317f831c41058b4
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.16.0 b/metadata/md5-cache/gui-libs/wlroots-0.16.0
new file mode 100644
index 000000000000..364ea691e547
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/wlroots-0.16.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-libs/wayland-protocols-1.24 >=dev-util/meson-0.60.0 dev-util/wayland-scanner virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.24 media-libs/mesa[egl(+),gles2,gbm(+)] sys-auth/seatd:= virtual/libudev vulkan? ( dev-util/glslang:0= dev-util/vulkan-headers:0= media-libs/vulkan-loader:0= ) >=x11-libs/libdrm-2.4.109:0= x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
+DESCRIPTION=Pluggable, composable, unopinionated modules for building a Wayland compositor
+EAPI=8
+HOMEPAGE=https://gitlab.freedesktop.org/wlroots/wlroots
+INHERIT=meson
+IUSE=tinywl vulkan x11-backend X
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.24 media-libs/mesa[egl(+),gles2,gbm(+)] sys-auth/seatd:= virtual/libudev vulkan? ( dev-util/glslang:0= dev-util/vulkan-headers:0= media-libs/vulkan-loader:0= ) >=x11-libs/libdrm-2.4.109:0= x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
+SLOT=0/16
+SRC_URI=https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/0.16.0/wlroots-0.16.0.tar.gz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=441285c569359077afc491bfb7565c85
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 9c4a515a548e..f875f5e361c4 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/gmmlib-22.2.1 b/metadata/md5-cache/media-libs/gmmlib-22.2.1
index 339cb72ecca1..802dac592516 100644
--- a/metadata/md5-cache/media-libs/gmmlib-22.2.1
+++ b/metadata/md5-cache/media-libs/gmmlib-22.2.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/gmmlib
 INHERIT=cmake
 IUSE=+custom-cflags test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/12.2
 SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-22.2.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=80f384a81e48314e8d79ec90afc9651a
+_md5_=859410b174263b4e8533e442679dee64
diff --git a/metadata/md5-cache/media-libs/libva-2.16.0 b/metadata/md5-cache/media-libs/libva-2.16.0
index f0904057f377..69a3a4fbefab 100644
--- a/metadata/md5-cache/media-libs/libva-2.16.0
+++ b/metadata/md5-cache/media-libs/libva-2.16.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 INHERIT=meson-multilib optfeature
 IUSE=opengl wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.60[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=opengl? ( X )
 SLOT=0/2
 SRC_URI=https://github.com/intel/libva/archive/2.16.0.tar.gz -> libva-2.16.0.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3598e85a164d06741c1d304b349bd48c
+_md5_=cad13f72b822dbf400a6633c8cefe810
diff --git a/metadata/md5-cache/media-libs/libva-intel-driver-2.4.1-r4 b/metadata/md5-cache/media-libs/libva-intel-driver-2.4.1-r4
index 8b25643b2fa1..b20b2f8f7986 100644
--- a/metadata/md5-cache/media-libs/libva-intel-driver-2.4.1-r4
+++ b/metadata/md5-cache/media-libs/libva-intel-driver-2.4.1-r4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/intel/intel-vaapi-driver
 INHERIT=autotools multilib-minimal
 IUSE=hybrid wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.52[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libva-2.4.0:=[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] hybrid? ( >=media-libs/intel-hybrid-codec-driver-2.0.0[X?,wayland?] ) wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[egl(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/intel/intel-vaapi-driver/releases/download/2.4.1/intel-vaapi-driver-2.4.1.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=54e2af45acfa9e1e83ddec4e5a34cafa
+_md5_=8cebf1e8e855042f9f96579b804add87
diff --git a/metadata/md5-cache/media-libs/libva-intel-media-driver-22.5.4 b/metadata/md5-cache/media-libs/libva-intel-media-driver-22.5.4
index f1beb61d975e..43774540e14c 100644
--- a/metadata/md5-cache/media-libs/libva-intel-media-driver-22.5.4
+++ b/metadata/md5-cache/media-libs/libva-intel-media-driver-22.5.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/media-driver
 INHERIT=cmake
 IUSE=+redistributable test X
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT BSD redistributable? ( no-source-code )
 RDEPEND=>=media-libs/gmmlib-22.1.8:= >=media-libs/libva-2.14.0[X?]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intel/media-driver/archive/intel-media-22.5.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=099991138a4f2411725f7c65b6e934cf
+_md5_=9f6b8b0d6a464b9f6ad195e2c48b4e38
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 8efc61437446..3b9df2b6b673 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) vulkan? ( video_cards_radeonsi? ( dev-util/glslang ) ) vulkan-overlay? ( dev-util/glslang ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install pretend setup test unpack
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) video_cards_d3d12? ( dev-util/directx-headers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) video_cards_d3d12? ( dev-util/directx-headers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=8
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
@@ -8,9 +8,9 @@ INHERIT=llvm meson-multilib python-any-r1 linux-info git-r3
 IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
 REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) zink? ( vulkan )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=811e31f66874103cff40c0f9db29c332
+_md5_=621a17244994e5706bd077e995e5ef22
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 88e9a2922cec..63ec89eb4e72 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/libva-utils-2.16.0 b/metadata/md5-cache/media-video/libva-utils-2.16.0
index 00ae354900a7..635eab539f2f 100644
--- a/metadata/md5-cache/media-video/libva-utils-2.16.0
+++ b/metadata/md5-cache/media-video/libva-utils-2.16.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 INHERIT=meson
 IUSE=examples putsurface test +vainfo wayland X
-KEYWORDS=~amd64 ~arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libdrm wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libX11-1.6.2 ) >=media-libs/libva-2.16.0:=[drm(+),wayland?,X?]
 REQUIRED_USE=putsurface? ( || ( wayland X ) ) || ( examples putsurface test vainfo )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/intel/libva-utils/archive/2.16.0.tar.gz -> libva-utils-2.16.0.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4ddfba5a9931dff44717592e6ea36785
+_md5_=1253b738759ee2daf77406d3fd0f48db
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index d0279419c9a2..ee7769f9ea14 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=10fe69782aefcd5daa9c345f186dd00d
+_md5_=e12c34721e71fe35a8764dacd064709e
diff --git a/metadata/md5-cache/media-video/webcamoid-9.0.0 b/metadata/md5-cache/media-video/webcamoid-9.0.0
index 0f3525e0e9e3..ec778f3fdaf0 100644
--- a/metadata/md5-cache/media-video/webcamoid-9.0.0
+++ b/metadata/md5-cache/media-video/webcamoid-9.0.0
@@ -10,8 +10,7 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=media-libs/gstreamer-1.6.0 ) jack? ( virtual/jack ) libuvc? ( media-libs/libuvc ) pulseaudio? ( media-sound/pulseaudio ) qtaudio? ( dev-qt/qtmultimedia:5 ) v4l? ( media-libs/libv4l ) virtual/opengl
 REQUIRED_USE=v4lutils? ( v4l )
-RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/webcamoid/webcamoid/archive/refs/tags/9.0.0.tar.gz -> webcamoid-9.0.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=54cad793f57a973c51aa554146670b64
+_md5_=1629eff8e36003f3013f240c174b1c71
diff --git a/metadata/md5-cache/media-video/webcamoid-9999 b/metadata/md5-cache/media-video/webcamoid-9999
new file mode 100644
index 000000000000..85455fc78f4a
--- /dev/null
+++ b/metadata/md5-cache/media-video/webcamoid-9999
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=media-libs/gstreamer-1.6.0 ) jack? ( virtual/jack ) libuvc? ( media-libs/libuvc ) pulseaudio? ( media-sound/pulseaudio ) qtaudio? ( dev-qt/qtmultimedia:5 ) v4l? ( media-libs/libv4l ) >=sys-kernel/linux-headers-3.6
+DESCRIPTION=A full featured webcam capture application
+EAPI=8
+HOMEPAGE=https://webcamoid.github.io
+INHERIT=cmake xdg-utils git-r3
+IUSE=alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects debug headers v4l
+LICENSE=GPL-3
+PROPERTIES=live
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=media-libs/gstreamer-1.6.0 ) jack? ( virtual/jack ) libuvc? ( media-libs/libuvc ) pulseaudio? ( media-sound/pulseaudio ) qtaudio? ( dev-qt/qtmultimedia:5 ) v4l? ( media-libs/libv4l ) virtual/opengl
+REQUIRED_USE=v4lutils? ( v4l )
+RESTRICT=mirror
+SLOT=0
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8eaf3a79417a6408c245900d48643403
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 7a738a40003f..d4545c8fc506 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r9 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r9
index 40bc72ca1ae3..0bf6562dd426 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r9
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r9
@@ -13,4 +13,4 @@ REQUIRED_USE=mysql? ( !postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmail	64280dc99a248daf87f54f3b72d5bf1d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b7aaed9ebcbbb80e1b94b0d3c846dc30
+_md5_=ee76c18acf3a752c8b2f1ffecb691c5b
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 3f6dc6ace152..1dcca4ecd07a 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/nextcloud-client-3.6.2 b/metadata/md5-cache/net-misc/nextcloud-client-3.6.2
new file mode 100644
index 000000000000..1032845a135d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/nextcloud-client-3.6.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-qt/linguist-tools:5 dolphin? ( kde-frameworks/extra-cmake-modules ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] ) dev-qt/qtconcurrent:5 dev-qt/qtxml:5 || ( gnome-base/librsvg media-gfx/inkscape ) doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) test? ( dev-qt/qttest:5 dev-util/cmocka )
+DESCRIPTION=Desktop Syncing Client for Nextcloud
+EAPI=8
+HOMEPAGE=https://github.com/nextcloud/desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake virtualx xdg
+IUSE=doc dolphin nautilus test webengine test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC-BY-3.0 GPL-2
+RDEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nextcloud/desktop/archive/v3.6.2.tar.gz -> nextcloud-client-3.6.2.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=df1ca1f879b024c713d3bdaaf69764d1
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index cc534502d92a..787ee0683a11 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.12.17-r1 b/metadata/md5-cache/sys-apps/pkgcore-0.12.17-r2
index d4c8e828ef53..1130d1cf97e7 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.12.17-r1
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.12.17-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.12.17.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=363b301e1b993f788038ab071579441e
+_md5_=bb242d2c89146552aa48ab0d6ef08249
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 537f1591290c..a249f101572e 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0.9999 b/metadata/md5-cache/sys-devel/clang-16.0.0.9999
index 93440e6531ea..2128ed04f80d 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0.9999
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16.0.0.9999
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-r4.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	c9aa876ffe95eebd3b65090b8685ad01	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2e108fc4b4bae5c4927e5c48747403f5
+_md5_=dc03a7497c7ff1a327a1d7212291263a
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-16.0.0.9999 b/metadata/md5-cache/sys-devel/clang-runtime-16.0.0.9999
index b80ead93ecb1..05824b0a5627 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-runtime-16.0.0.9999
@@ -6,8 +6,8 @@ INHERIT=multilib-build toolchain-funcs
 IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=metapackage
 PROPERTIES=live
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-16.0.0.9999:16.0.0[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-16.0.0.9999:16.0.0[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-16.0.0.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-16.0.0.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-16.0.0.9999:16[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-16.0.0.9999:16[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-16.0.0.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-16.0.0.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=16.0.0
+SLOT=16
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1bf5514cb3521889cf5b307bfd71613c
+_md5_=082fdfb8aeaed8e32b6ce211c65bcba6
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 a8c02ea1f802..dcc0443bdedb 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0.9999
@@ -13,4 +13,4 @@ RDEPEND=~sys-devel/llvm-16.0.0.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16.0.0.9999
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	c9aa876ffe95eebd3b65090b8685ad01	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a1dfbd353292de657777382aefbc1145
+_md5_=3fa9fd9150393d3a8be081cc3c049c27
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 f5bcfe9578af..b652b1af5ca5 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
@@ -5,13 +5,13 @@ DESCRIPTION=Low Level Virtual Machine
 EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
-IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 zstd doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 zstd test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 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 )
 PROPERTIES=live
 RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16.0.0.9999
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	c9aa876ffe95eebd3b65090b8685ad01	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3b7e7b3a1b9585868aee22f098538db6
+_md5_=e814e02052a50c4afce04b17ccc5ca57
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index c0440bbe3189..c0afd670cfb0 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-20221109 b/metadata/md5-cache/sys-kernel/linux-firmware-20221109
new file mode 100644
index 000000000000..ec0780046f10
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20221109
@@ -0,0 +1,16 @@
+BDEPEND=initramfs? ( app-arch/cpio )
+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 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 no-source-code ) ) 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 )
+RESTRICT=binchecks strip test unknown-license? ( bindist )
+SLOT=0
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20221109.tar.xz
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=9a70b832fe65f871ad1548bee89cbf09
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index fae53f43d793..0a4f52692628 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0.9999
index bbd946cabca6..e88e2ffdcca9 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
@@ -9,7 +9,7 @@ IUSE=+abi_x86_32 abi_x86_64 +clang debug test
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=16.0.0
+SLOT=16
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	c9aa876ffe95eebd3b65090b8685ad01	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9ccbe2192a16eefa1b5960a39d3d5a6e
+_md5_=e1106f8b87059152a7f8c9659596d0af
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 e2cb49597219..ea015b0b3581 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
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !!<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/lit-15[python_targets_python3_8(-)] ) ) =sys-devel/clang-16.0.0*:16 sys-libs/compiler-rt:16.0.0 ) !test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !!<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/lit-15[python_targets_python3_8(-)] ) ) =sys-devel/clang-16.0.0*:16 sys-libs/compiler-rt:16 ) !test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=sys-devel/llvm:16 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
@@ -10,7 +10,7 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 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.0.0
+SLOT=16
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-9999-1.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	c9aa876ffe95eebd3b65090b8685ad01	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c8aca890f1ccb5beed1fb044a14a1074
+_md5_=efa8087317efa75703dca24852fa3d81
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 84223399e0bc..c8fa8f4280cf 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/nginx-unit-1.26.1 b/metadata/md5-cache/www-servers/nginx-unit-1.26.1
deleted file mode 100644
index d04be9ee13e3..000000000000
--- a/metadata/md5-cache/www-servers/nginx-unit-1.26.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare setup
-DEPEND=perl? ( dev-lang/perl:= ) php7-4? ( dev-lang/php:7.4[embed] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
-DESCRIPTION=Dynamic web and application server
-EAPI=8
-HOMEPAGE=https://unit.nginx.org
-INHERIT=flag-o-matic python-single-r1 systemd toolchain-funcs
-IUSE=perl python ruby php7-4 ssl python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=perl? ( dev-lang/perl:= ) php7-4? ( dev-lang/php:7.4[embed] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) ssl? ( dev-libs/openssl:0= ) virtual/libcrypt:0=
-REQUIRED_USE=|| ( perl python ruby php7-4 ssl ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=https://unit.nginx.org/download/unit-1.26.1.tar.gz -> nginx-unit-1.26.1.tar.gz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=62e73f9eb42fb0072f9272263d85e528
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index a8e22788713d..e3d0d9a14619 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-11-11T14:39:41Z
+TIMESTAMP 2022-11-11T20:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNuXq1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNusxRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAntA/9FMrBO3xDLfkavcPfKAdqbrZ4A/3xut7V1Y/DY5m/3gGQnNmCyIbyCWzU
-FJOmtq+Irn4YQG91a0cxO9UIoC1/FwSaHPaOh5smFJUEb1tpwxnK/kyT4xwMT8ZP
-yyLotPSKjH8tEc73/bB+DhxHzQMIy1M6jo5iBN506V29WRMHZPw9YJs4Y/Xh0NgS
-EP0mbrOuXAdv1V+tbWXZc4SeVHePqQYrvBT6vh0C1vazns/8u8qjQ1sFqRW8ymJr
-hbQqVs+kNWrFmQdJBEc5uPFq9aOt4nqWMOCMqnFzP/1W0fmgZFTuYttK82/1esh7
-MhY96B8tmeR8wRgTQEasTgCGd1tge4pzxjLmlT8bFK4rfmk0XDL2EsfxlI1kGsFj
-t03HmIvqR0aPxNQO4QDBkJMshQTLMgfMcodDXVEcT72rq4KrgCTdUhALzbhNY+Kh
-8GLqoD2l/QijE7sZlEfrLsRXTaatNNvhIH6X3msMmZSJgLQqjYG2nFSz5Wj7u7x1
-HlQ9Bx2lFzT4ihh2cnyW+A4C+IplXJN2kOk65dOHshvZPgKmhBxSNwpe5lNDwqaG
-RzLbpV4soyHLGl5m5qfmupg5tDC0I4U6hmMlX8J1zc5UOF+/R2tWZOs6Xj3FlLln
-j7LVE/+vglmcsl1g9d+PB4QbmyNbmSZCK2qCVWawgfA5GuWYs4E=
-=ENq+
+klCC9RAAqJMNvoZG7c1plG+DR6gzPxUjQbVLss5I6+htCVgTZJzyTQCYLdSyFad1
+3r5hghPyt5b7UQIoO+0Zx0Xm+oTgxjeLgzF9VO7iUQ33fj6LhpdIkjLv5qE+SJ5t
+5uGjmTYyeUzR+YQDTJ0TdYOQoTMDWOvavoCRn16+3Jl915llAV3V+lZMaiA9fr/K
+j3Z2pP93C5m1UW0+jx+f6CTSU948ebUk1CBftoMHw1NnjDpkiDXbyEaqbrw0MaFv
+UtMLGLPUKsiEDNRqkqQfhbEbtYY04Jh5Dw+iGwCR/SaaM2zyIvw26FEDiM/C0lml
+rOlc5/IR/TQrm9H5N5VrzkWTvaOCNsF9F2WmzthYdnLjs3kfBt8NHKybpYitk5wd
+ssOocBFWV4YnuLZQbwE+Lm/FUP5zNxuaSWc06oxIhcomIdOCk8MiXW2bkTY13jHV
+aO/pbXH9BR0/Yk9gfkEUiO6RyGIshteBS0bIdcgT0qET91CfG0Znx9v9pVbwT1h5
+vByiVARJznINatMxwq8zrwLnBxk18s6zImMjQ5/629R5YGK+E2V+NLAsydDJUupe
+WHED/x5YIitRk6FE0y4Q9U09GhWfjd4Ij+uAlR/VeuabNydQr9kFo3NjqNBeHI0W
+8Bi2gmuTdVPuh2Fckjmt0HlW6Pk7xH/v3afwbLiIT1RFlrBUVS0=
+=6Izc
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 610c700dbfbd..1619d54c5870 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 11 Nov 2022 14:39:38 +0000
+Fri, 11 Nov 2022 20:39:45 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 9d9df27cc6c3..75f96858f4ea 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Nov 11 02:39:38 PM UTC 2022
+Fri Nov 11 08:39:45 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4fd5b9c9ad80..8a4bf270a21b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 11 Nov 2022 14:45:01 +0000
+Fri, 11 Nov 2022 20:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index c9b73b6592c7..dcc5cc51fa8f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9fd2cab6eabf8b9b8309ea55b51d4ee27c5e0536 1668177112 2022-11-11T14:31:52+00:00
+6eab43f46a97276164c57448bdda31a1813b8a59 1668198757 2022-11-11T20:32:37+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index de3174b49397..a7d45782e647 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1668177601 Fri 11 Nov 2022 02:40:01 PM UTC
+1668199201 Fri 11 Nov 2022 08:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 610c700dbfbd..1619d54c5870 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 11 Nov 2022 14:39:38 +0000
+Fri, 11 Nov 2022 20:39:45 +0000
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 36c9c4a97812..9cae7f59fa54 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index c780b286eb87..f33334ddef31 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,4 +1,5 @@
 AUX 99vpopmail 64 BLAKE2B ab9b8b28494fa8093f1a72e582fc10787eb1f9814b860b1c03f4e336c6a8563b50b34fcc2c33d95e45703ebad5b8155d9575551c894af4e7c12b52748b526216 SHA512 8e9323006ddafae6e4ee8da2e0c9753ce11fd3f6e7c8bb6931ccc147ab6c9782c71d704222343be902f8784aa27a4425fd04a1f11cff5421dfc25fd76d3de953
+AUX vpopmail-5.4.33-avoid-duplicate-definitions-of-MYSQL_READ_-and-MYSQL.patch 1908 BLAKE2B aece1fc3b99dc3e0e9c811fa0d8e32aa111361e3f2ab1a6c5ed745fc599a89e099597de91b988f78603e3839e9e371e3af0b6d6537f982d728bf28ff2b504787 SHA512 375fb0a67b22bdb3605fe5a0044e30f237860c7a688fb700f5fe5fd0f4ca2e0af6b371e3fe82abd742b11c89c4f59094c89b220343b7eaffb3add69cbd1f19cf
 AUX vpopmail-5.4.33-check-crypt-return-value-for-NULL.patch 4034 BLAKE2B e45135fffe507f9c55fd2742ae68724694b9c29520059301c281f4a20ab5dbd26ac1f507166b6b4adef28f7435a71bc31de59eba171a7404e822acf5dd2dec41 SHA512 4f485c9ad927a92f7900545dcef7a875e151d403c14c22cb4fa5585aedc1effadf629df6e6cb0e5364cdf9451a71d3790c2297a0cc8a54518976adf1c50e421f
 AUX vpopmail-5.4.33-clean-up-calling-maildrop.patch 2382 BLAKE2B 06f7ab5f6fdbb0dbade353dce74b2be585ed5a3f1ea617491ee437838f80c38b90f9e2c1a3a89efa6f788f30228e8e7449d8fdaa9db59c26231b16b849ce3f80 SHA512 99053bf41e405b22a4594104d3fce6ed831c6f5b8f8870bde7eb0e780948990de36158d7af055d881639503be1b911106a91f1787d524fe9c84fd3ec5503b055
 AUX vpopmail-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch 3281 BLAKE2B 7eecc6c5dc2eef263d212ec6ca0534d0c00faeef04994e5410dbbff6e00beb7df249276fad928467b8cc87610d49666d9c63a629c87f8a07fb0ea5b35c298589 SHA512 1d170e611e914dc1ef5e7140b661558d93d2466fd310ebb50ecfcdadcb27cbfaa44b702ded5e02296835aea7c0a4c0d2de8ddf3cde236fe15a6fe0c37edb259a
@@ -15,5 +16,5 @@ AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107
 AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8d2c3fecb1d152e2f0e9585d78b9ce5b2314735de8b70710687e0a75358ef3029dd96eaa704941df00bd7 SHA512 794ef15920ac565073d871a946df53395afb0630d561343f4d164af3287d1665e115ad42d7a2218306cedb5dc795b10d9c15852b69fd649854ddb0c18dc0b2dd
 AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde240831176ae2152cc805809e5a87ecd8ce5c6791f4c4e53d2027393d158e28e9dbec49d0efd7c4c2d50c9eeb4cf10d SHA512 9f02f9f9ab186791fe071ee5cb27334144727e81f0bbd6b8f5ce472368f892f5396a225c6c1af9d5b7a66bf66e7be50aef146d7635132fab9d91f265b68af1d9
 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
-EBUILD vpopmail-5.4.33-r9.ebuild 7740 BLAKE2B 30229799e5b8fc43cf2cfad6c52f4abc64dcb5d08e9f99a208262f1f91cc7792fe32cdd010353a2ef26cc1c1c515e850c08b061ed4b08e60897593b92a6d5525 SHA512 69b4749a55dcd4cff53d70063860ac007e04ea8d6a1414579664995559aa96d6e4999a378f902da1adf2d906f468690037ce3cd84fb5eb89b7442622f494ff0e
+EBUILD vpopmail-5.4.33-r9.ebuild 7827 BLAKE2B 407a23fa4b0c9d1b1a5acb2e25c59a92d880eb1db23e73960df8cb6b0021c73d3836eaee5c2a9ebaaa38bd3bc01ef6a66a5786f68cd4303d34d38c655044cecb SHA512 bad8458845a2cd57aaaf6d4f5db1152699c46036b2ddf5ebf65ad988bfaf495c42e9b4a095e8d4782d70f4a0ebc2292b27d1a4439bcffdf7e32643e9e48d7079
 MISC metadata.xml 829 BLAKE2B d3038dec96c930fd0c198a002c721464a0d4eefec9e4a4c5a3ff8378e54ba9b711e828feff2fdf37b2f77919816846de7796e4887e2be17c918a4c7036c49f29 SHA512 7580b8cb9d985908df56be493add629de636f03ea7154872b06ae15599d9a71ca4637862d0331b792e1106ab64f73f212f8491676179b376e0f2c1fd894a1b41
diff --git a/net-mail/vpopmail/files/vpopmail-5.4.33-avoid-duplicate-definitions-of-MYSQL_READ_-and-MYSQL.patch b/net-mail/vpopmail/files/vpopmail-5.4.33-avoid-duplicate-definitions-of-MYSQL_READ_-and-MYSQL.patch
new file mode 100644
index 000000000000..0f82fe19ebc6
--- /dev/null
+++ b/net-mail/vpopmail/files/vpopmail-5.4.33-avoid-duplicate-definitions-of-MYSQL_READ_-and-MYSQL.patch
@@ -0,0 +1,71 @@
+From c56972e2059c80cb18c5da7fdfd0002135080fb6 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike@sf-mail.de>
+Date: Fri, 11 Nov 2022 06:41:58 +0100
+Subject: [PATCH] avoid duplicate definitions of MYSQL_READ_* and
+ MYSQL_UPDATE_*
+
+When built with gcc10 this causes errors as multiple instances of these
+variables are created. They are not used outside of vmysql.c, so instead of
+marking them extern I decided to just move them into the other file and mark
+them static.
+
+Bug: https://bugs.gentoo.org/880665
+---
+ vmysql.c | 14 ++++++++++++++
+ vmysql.h | 15 ---------------
+ 2 files changed, 14 insertions(+), 15 deletions(-)
+
+diff --git a/vmysql.c b/vmysql.c
+index 0c587d8..bb5fe31 100644
+--- a/vmysql.c
++++ b/vmysql.c
+@@ -96,6 +96,20 @@ void vcreate_valias_table();
+ void vcreate_lastauth_table();
+ #endif
+ 
++static char *MYSQL_READ_SERVER;
++static int MYSQL_READ_PORT;
++static char *MYSQL_READ_SOCKET;
++static char *MYSQL_READ_USER;
++static char *MYSQL_READ_PASSWD;
++static char *MYSQL_READ_DATABASE;
++
++static char *MYSQL_UPDATE_SERVER;
++static int MYSQL_UPDATE_PORT;
++static char *MYSQL_UPDATE_SOCKET;
++static char *MYSQL_UPDATE_USER;
++static char *MYSQL_UPDATE_PASSWD;
++static int MYSQL_UPDATE_VPORT;
++static char *MYSQL_UPDATE_DATABASE;
+ 
+ /************************************************************************/
+ /* 
+diff --git a/vmysql.h b/vmysql.h
+index e61186b..868f211 100644
+--- a/vmysql.h
++++ b/vmysql.h
+@@ -41,21 +41,6 @@
+    
+  */
+ 
+-char *MYSQL_READ_SERVER;
+-int MYSQL_READ_PORT;
+-char *MYSQL_READ_SOCKET;
+-char *MYSQL_READ_USER;
+-char *MYSQL_READ_PASSWD;
+-char *MYSQL_READ_DATABASE;
+-
+-char *MYSQL_UPDATE_SERVER;
+-int MYSQL_UPDATE_PORT;
+-char *MYSQL_UPDATE_SOCKET;
+-char *MYSQL_UPDATE_USER;
+-char *MYSQL_UPDATE_PASSWD;
+-int MYSQL_UPDATE_VPORT;
+-char *MYSQL_UPDATE_DATABASE;
+-
+ /* defaults - no need to change */
+ #define MYSQL_DEFAULT_TABLE "vpopmail"
+ #define MYSQL_DOT_CHAR '_'
+-- 
+2.35.3
+
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
index 3419bc0e552c..d186cf1de43e 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
@@ -41,6 +41,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch
 	"${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch
 	"${FILESDIR}"/${PN}-5.4.33-vpgsql-onchange.patch
+	"${FILESDIR}"/${PN}-5.4.33-avoid-duplicate-definitions-of-MYSQL_READ_-and-MYSQL.patch
 )
 DOCS=(
 	ChangeLog
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 57d314e0d9c9..3e163653d624 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index cc3a0149b884..5853a3006ed2 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -2,8 +2,10 @@ DIST nextcloud-client-3.5.2.tar.gz 15433543 BLAKE2B 082031ac34a644f0db09679ef342
 DIST nextcloud-client-3.5.4.tar.gz 15436558 BLAKE2B e95aac753e4fcc70093ba497022572d4ee2988ed943e09247a0ddec3b039d658e3f1f498c24f5b5a92c15bd50b14c7e5c71f420c35e8de4894c2f65d06563766 SHA512 7b8afe19acad7f7ca96184b0f925e0eb324605a11bc468ef5662e5a879cada16483b9185e12336471ca2a9debf2e00671d8245bdbae2f7be01af756b57225bae
 DIST nextcloud-client-3.6.0.tar.gz 15763538 BLAKE2B b37392f05b1c3d80a9e36fee21a755d2eaa91906a8cefe8c2096bd0be306a6a38d8660449235db67c774707b9722b1ceac6f177f6482cb5e662cfbc6ed22f750 SHA512 efaca6669b2da039b20026cbdc9cf4d3f1023b3c33e03c0ef6f2d0e1f1c20fd65fab80155356ec27562f93e450915a32bc2af96c4ac3b47355ec738bcd71ff61
 DIST nextcloud-client-3.6.1.tar.gz 15346135 BLAKE2B 116a2632ad1c653bb1dbf184c6156ebc469ed8c0bfe209282e8239d4113c46b761f4049daa6833d23d5179c0b2a3f9dd94f506e63c401775da419c92104a069f SHA512 444062440570efd82b8cd9acf85dcc5826552c86c31edc19ae2f87d9fdf23afa501aac03e4b8135bb037feb523fdcbc230339387acbf56c0ca6e5df3e7bae583
+DIST nextcloud-client-3.6.2.tar.gz 15406717 BLAKE2B 1408745e8adfd76507ffba63a20abfc34db155ef3d4f8cff1eb3736c8d1ede4cebc536cecf8f5a843ff0b22b1cf46ffd5e6cdf9c87b2e9960728e030f2f7ae66 SHA512 1baae103c08a981e86aee74550d31a195f639fef830d0a78213f7890b820ddf2cd39fa742b99c9222930a4ef9587acc820678c56527e98ca482689b3bffd14ff
 EBUILD nextcloud-client-3.5.2.ebuild 2325 BLAKE2B 210232aa19801f2eba06f956ebf725eaa7eef552167b6a4253354362f29f763d1633740683d7b05bc2fef46ed803688a77b896a7198c81724bdc23ea01132de7 SHA512 250fa76d1da6da6ba842c3e448747c8682bcc533ccb3063d659527900cbdd1d81ff184ee1e007c84cac6241a20d8e8e2ca84b4224cb4b0be02d79e1f25d7a6ea
 EBUILD nextcloud-client-3.5.4.ebuild 2325 BLAKE2B 210232aa19801f2eba06f956ebf725eaa7eef552167b6a4253354362f29f763d1633740683d7b05bc2fef46ed803688a77b896a7198c81724bdc23ea01132de7 SHA512 250fa76d1da6da6ba842c3e448747c8682bcc533ccb3063d659527900cbdd1d81ff184ee1e007c84cac6241a20d8e8e2ca84b4224cb4b0be02d79e1f25d7a6ea
 EBUILD nextcloud-client-3.6.0.ebuild 2327 BLAKE2B fa7770b9c8249bbfff50766d4b83f8b39288844ff5ee174412334d834705f5c20e3dcbc47d79ddef4b25ad1394ed067ac299aa9c604c9300cf165e752566b213 SHA512 fea8427b376b4701248ceb960ca9e69aa0cb97b6406b97dfd62d58fb6ccd1eac6d3e14d92a167abd262ffedbe9acc3b3a7791cd9d4c6a0708ea11bb20312fec3
 EBUILD nextcloud-client-3.6.1.ebuild 2327 BLAKE2B fa7770b9c8249bbfff50766d4b83f8b39288844ff5ee174412334d834705f5c20e3dcbc47d79ddef4b25ad1394ed067ac299aa9c604c9300cf165e752566b213 SHA512 fea8427b376b4701248ceb960ca9e69aa0cb97b6406b97dfd62d58fb6ccd1eac6d3e14d92a167abd262ffedbe9acc3b3a7791cd9d4c6a0708ea11bb20312fec3
+EBUILD nextcloud-client-3.6.2.ebuild 2327 BLAKE2B fa7770b9c8249bbfff50766d4b83f8b39288844ff5ee174412334d834705f5c20e3dcbc47d79ddef4b25ad1394ed067ac299aa9c604c9300cf165e752566b213 SHA512 fea8427b376b4701248ceb960ca9e69aa0cb97b6406b97dfd62d58fb6ccd1eac6d3e14d92a167abd262ffedbe9acc3b3a7791cd9d4c6a0708ea11bb20312fec3
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.6.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.6.2.ebuild
new file mode 100644
index 000000000000..5599ebda4bf3
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.6.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake virtualx xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/desktop-${PV/_/-}"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus test webengine"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-db/sqlite-3.34:3
+	>=dev-libs/openssl-1.1.0:0=
+	dev-libs/qtkeychain:=[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/qtxml:5
+	|| ( gnome-base/librsvg media-gfx/inkscape )
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	test? (
+		dev-qt/qttest:5
+		dev-util/cmocka
+	)
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+"
+
+src_prepare() {
+	# We do not package libcloudproviders
+	sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die
+
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DBUILD_UPDATER=OFF
+		$(cmake_use_find_package doc Sphinx)
+		$(cmake_use_find_package doc PdfLatex)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_compile() {
+	local compile_targets=(all)
+	if use doc; then
+		compile_targets+=(doc doc-man)
+	fi
+	cmake_src_compile ${compile_targets[@]}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index ffab931ce435..3a4b6e0f5e84 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 7f933c6c7e3e..4476441274c0 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,12 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Matt Turner <mattst88@gentoo.org> (2022-11-11)
+# xf86-video-nv relies on function no longer present in the Xserver since v1.20
+# (released May 2018), and no user has noticed.
+# Bug #875053
+video_cards_nv
+
 # Brian Evans <grknight@gentoo.org> (2022-09-30)
 # PHP 8.2 is in RC
 php_targets_php8-2
diff --git a/profiles/package.mask b/profiles/package.mask
index 3363b2a046f2..4dbbf7c627bb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner <mattst88@gentoo.org> (2022-11-11)
+# Relies on function no longer present in the Xserver since v1.20
+# (released May 2018), and no user has noticed. Use xf86-video-nouveau instead.
+# Bug #875053
+# Removal on 2022-12-11
+x11-drivers/xf86-video-nv
+
 # Sam James <sam@gentoo.org> (2022-11-11)
 # Causes memory corruption when building x11-misc/colord on x86
 # bug #880865
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 41a2639fd402..d33e4ce9f83c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index efe4b0de49f9..1e498b527e05 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,7 +1,8 @@
+AUX pkgcore-0.12.17-fix-extra-files.patch 1006 BLAKE2B 72de925e135d33f3cdf52382c4a9cf172f195301de467e01d4218f88b4037d6e7fc824f06401e1838c4a22d25e3132f0b0aace9047bc6b557e413ed65e6e6053 SHA512 1f09f215b544cdbc07935af405f94a5c69f4840a1c1570e9cea23a2a48cf8a4e71a9ac74f8b65cf7f3d391060fc2f8012761f4187e9a4446e4e9de42d6c316c9
 AUX pkgcore-0.12.17-fix-prefix.patch 731 BLAKE2B 4487c145393747415717f5bf4845a49741641eb509175d4bcf766ae56625513243f7f0a951ad749a1e5efcf5327e16b8b9d684a5e235a23b18a0af5256e4506c SHA512 edcaa570a6c7606437b3b35f684f9fcd9c1fc2bf493c5199ad209007dec0ae546b31fff3b6adcc9477cda3a7ad35764357107519d8429a254af52d56b3f0c3ee
 DIST pkgcore-0.12.16.tar.gz 623795 BLAKE2B b591aeaa5d780f0b273d446d1bdbdf33a44d085aa4975d3c5f394820a6f479c15da7850a699c92a56cb280ee028d922551c7226801dea6f4c34620bde3859c31 SHA512 acd7c478b342349e66dfda5ed1284663037b221e39b557215d1441e8a908c845fe26e274bcfd97b1879f5792fc017437cd0fbde1cdffc5ebc595a34fa56d2589
 DIST pkgcore-0.12.17.tar.gz 615375 BLAKE2B 9aabdeead2997e53ee3c966c908a231ff5e3b85422844538f47ff7bed03611459224ad7e931a9e94f0e376f221bd5c54f0f77f7883543cbd5b03c4dba6ba591b SHA512 9bad9b6e6177873b9187cff66b6b51c644a59a2d9f01b8ca110bc49006d6f0221c2c3b145d7cf5cec6f3c7526b6751100d56df13350b674a68ab5bbf19f10131
 EBUILD pkgcore-0.12.16-r1.ebuild 1449 BLAKE2B a4620deadd0c3e5c59a72b0eea28d15dab8d73449051d59f347a4d37b4a83c69ff8c84cae743b7d8f3344dbac5055c08e6a85282d3680900b9e873131ba9f842 SHA512 cd9676de9f17249a2c0aeb1b266b357c6a700f829a6fe8ba0b9cab5423312ef8874e2f407c29156f894a2c9b64e3a7e98d733f6abff082ec2a199870e629c1e2
-EBUILD pkgcore-0.12.17-r1.ebuild 1198 BLAKE2B e1d14fa3a8558a511dcb94715444b873fb4765ce79c55e61c0e322737fd5ce75bfd93e1be2b96f72352b7bac034f3f9d546b5cf8e7cc805467589132d7f9653b SHA512 70141dae9a3dc50d1f9dedfc6cf8e40e5b40f696f3956af97dda2bf078ca4b6b76455f2051e81e80d15fe94cfcc60ad3f7eaf198ccad62889bb7baf8b9f5e77a
+EBUILD pkgcore-0.12.17-r2.ebuild 1249 BLAKE2B 60b698ed2f0d15eb9e51626385417f37453b471937ebb7a5496e5242e74cbf1cd7320171b494a0977ab2c7987567f43ea1257f82533fcf5220729f06ba2b2968 SHA512 dc6f6eeec816c70cea571b1aaad91a82380e2393db4b462d1b7f0e3457e5210df2e646a033e07e9cf37ba38bfc7d29f918fff2cc4cdbfee0257bcdf397e45faf
 EBUILD pkgcore-9999.ebuild 1139 BLAKE2B 1030392abec3f120c6e588b7750cdf03b01cce418ed79c85d4b2de5d62e5474d2e0c690294c80f4f0e66d8b38208de409a41e7f0e4bc805424399935670c828c SHA512 cac9cdada2dc91a8e720d40af32dd61d0f4884766d581cf793c39757a43457c0e680abac4b44fe71975cc017e047b8bc79b1bd5586d45f203679814eb427af32
 MISC metadata.xml 392 BLAKE2B 98797b18321d3133dceaf79389bd35b26344a342c55c477b178359d731c46fa209adbdcf1d14eb009d57c8c20db8b898651dd45d5bcfc6bb3009ceffa1436650 SHA512 097710cc6c1df7455328a1d3feb223e324162ff20ef03964de4682eec7acf4e2d08fa64d3ac4946783f4c2587455d90ee5aa628f637f3a48386d9c9e6b7362e1
diff --git a/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch b/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch
new file mode 100644
index 000000000000..bc6b16ffc69f
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch
@@ -0,0 +1,29 @@
+--- a/tests/ebuild/test_eapi.py
++++ b/tests/ebuild/test_eapi.py
+@@ -1,6 +1,8 @@
++import shutil
+ from unittest import mock
+ 
+ import pytest
++from pkgcore.const import EBD_PATH
+ from pkgcore.ebuild import eapi
+ from pkgcore.ebuild.eapi import EAPI, eapi6, get_eapi
+ 
+@@ -19,13 +21,15 @@ def test_get_eapi():
+ 
+ class TestEAPI:
+ 
+-    def test_register(self):
++    def test_register(self, tmp_path):
+         # re-register known EAPI
+         with pytest.raises(ValueError):
+             EAPI.register(magic="0")
+ 
++        mock_ebd_temp = str(shutil.copytree(EBD_PATH, tmp_path / 'ebd'))
+         with mock.patch('pkgcore.ebuild.eapi.bash_version') as bash_version, \
+-                mock.patch.dict(eapi.EAPI.known_eapis):
++                mock.patch.dict(eapi.EAPI.known_eapis), \
++                mock.patch('pkgcore.ebuild.eapi.const.EBD_PATH', mock_ebd_temp):
+             # inadequate bash version
+             bash_version.return_value = '3.1'
+             with pytest.raises(SystemExit) as excinfo:
diff --git a/sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.12.17-r2.ebuild
index 9f732afa4d66..4c804c52bcce 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.17-r2.ebuild
@@ -40,6 +40,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.12.17-fix-prefix.patch"
+	"${FILESDIR}/${PN}-0.12.17-fix-extra-files.patch"
 )
 
 distutils_enable_tests pytest
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 62bbec0dd3ab..8ed417f0c89c 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index db39eb4a63ea..424034462fbb 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -3,6 +3,6 @@ EBUILD clang-runtime-14.0.6.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e710563096
 EBUILD clang-runtime-15.0.3.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e71056309690ad1c8e92543e64025bd5e009eac35018ec22b2c0f80c12f3a527cc7e0bfe4ec1bfcb2dd9dea54106abf46b13e5592 SHA512 580efee12fe0e53447f5644fad248ebded8ae6cd8cb5871cb38bb3148091886b6fb9a57ac712d3158d5c3fc38c043b0bfbf62fc550a609752a42c23e605b0ded
 EBUILD clang-runtime-15.0.4.9999.ebuild 700 BLAKE2B fc3ea6d50378cd569aa9a2a30cae69dfe59524f7c9edf5a4f6e39d5d07568224625ad286e857d7d852aef95903cfe9804f54e83aa093269ca2287f57fba2ebb2 SHA512 0b88353d5a7fda68a034017bac76c37ef36d8477b52f4446e81ff01861d50f1140933b54058ad3a3bfa5cade8d8ad2c86cfe5c580b682a9bb03f2e471d3e99ed
 EBUILD clang-runtime-15.0.4.ebuild 766 BLAKE2B db9c38e5d06c9e20d002696b879f61cf79cfe43059224f4a30d9e472a0ecd4a9298d03767e82ac29abcfba283754cb06c1b460e759763dcad130446323af4ff8 SHA512 475cd0538899a4d2a0132f79efbe7fd928a41e7e11798a35b5ba10b3bfcb9bff01b471af5a611f40d3981d2b9d9902fa1bc223199429685de475c38396ffa53e
-EBUILD clang-runtime-16.0.0.9999.ebuild 1374 BLAKE2B 9699c87947cae5b33b56d8d2edfc7eb1128f3f9355986f74874e4e8b481fb513e8a52523c8b97cf56db364dff311f7d07afa0acb04d37ba30be2918f24226a81 SHA512 cc6a00e72f472b8d1144dc61ec773b41268ed69fa56330e59185775d6fa242a3b884bc8cd539a80375deb22d42bbf53a30d0bf074e0afb706089e20a23c513f0
+EBUILD clang-runtime-16.0.0.9999.ebuild 1369 BLAKE2B a25d32189f78e993706138f339ad0645e3042bd283ddc26b4189c117ea2368d0a1c2b09c2f5f538112bcad65fc14dc0d29f16e4d6ff98e3401c3bdb74d59d750 SHA512 c37860675576d51047f5347400753a19469ea0e2e6ff49a3a5ba6e35f5b33372c06ee2ac1e82aa4a681f35e8c186a1ff8eb25a9eccd0ee35e5ab3d57873f40e0
 EBUILD clang-runtime-16.0.0_pre20221104.ebuild 1374 BLAKE2B 9699c87947cae5b33b56d8d2edfc7eb1128f3f9355986f74874e4e8b481fb513e8a52523c8b97cf56db364dff311f7d07afa0acb04d37ba30be2918f24226a81 SHA512 cc6a00e72f472b8d1144dc61ec773b41268ed69fa56330e59185775d6fa242a3b884bc8cd539a80375deb22d42bbf53a30d0bf074e0afb706089e20a23c513f0
 MISC metadata.xml 661 BLAKE2B 24688c511713ea102b83c71d226d519981b3aee0e05ef7a56d6a80be829efd843194e45cb4fd801f0bb976b6f1976386d6a2b05d2bc907fe2aa42b22b85b7d1f SHA512 2b5ab8783c90795f2e7d1673d876048ed9745f4911fb7a860df56deac13a6dfeba4581a84562eae54eff757c45042ca3fab75c7800313ae61df9ce69780a9294
diff --git a/sys-devel/clang-runtime/clang-runtime-16.0.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-16.0.0.9999.ebuild
index 3cb2769d40af..5eda72abae30 100644
--- a/sys-devel/clang-runtime/clang-runtime-16.0.0.9999.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-16.0.0.9999.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Meta-ebuild for clang runtime libraries"
 HOMEPAGE="https://clang.llvm.org/"
 
 LICENSE="metapackage"
-SLOT="$(ver_cut 1-3)"
+SLOT="${PV%%.*}"
 KEYWORDS=""
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 7822eab47659..ab13eb85624a 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -21,6 +21,6 @@ EBUILD clang-14.0.6-r1.ebuild 11719 BLAKE2B 743e26b68f15e8b4aa7acfe4f7abd095fe42
 EBUILD clang-15.0.3.ebuild 11818 BLAKE2B 0c440c4bfae4c39613afb186ca3ff325544b838803a03d6ae9d627a959505b42d5d30f6dd84751e38ff7097009a4e64b485362bcc8a0763ec450d42ed5c966b0 SHA512 8fcdfbe4fb3eb76c03f0fe5ce00f08553520b44fa3bd549445dc0b45dcfee49f6f0ef45797a79a30947b2670fa535766bebe86827c5ed653a64293cc22424b73
 EBUILD clang-15.0.4.9999.ebuild 11753 BLAKE2B ee5d7c5223f01c58267128213a5298c323ce83b4d4d864df69fd7452d8d5d481a441114734f5e315de3ddab390338d1bc0e3b1eb221a0b92f7bc2e25dde0ccc8 SHA512 ad6948948729c0ccbd44ae0a334731e48cfb5bd499883805628d44db8281ab06fbc8a5cffd9ee41ab6142039db5d107647a41e5c241d0d1f6f0dd09841e4f2b4
 EBUILD clang-15.0.4.ebuild 11824 BLAKE2B b4f8aa8452393d6c9e49655ae69c19f2ed83297562fb75f172dc4113216c0480a985d6a6c34644f8f84185802ab8706821435315755528c8cee4bdc12cd7094d SHA512 d5fab69868f017380d4062a05833329172e2db7489aea1a77ddf3d34d579a8a4b7bb16804a77eb25237be855894121b172eaa1afda1773dd60fee8890e244cb0
-EBUILD clang-16.0.0.9999.ebuild 11570 BLAKE2B ce7fe613d69d5b066b51b27cb07267483881ead8a8178db75d62604984eebf36c7c8c693d30680fd7c2bcc2319b28ee2ce2430595882306f9ae78f636a890f4a SHA512 99e8fdc81a0a5853243da108465084ff1b2fd00383fcc1365a72e91ac86f5bc79b5ee742c73aaff7c15b29fa344f97acc2f3a5dd36ef82afeb3f33e99d2cc765
+EBUILD clang-16.0.0.9999.ebuild 11515 BLAKE2B 073147cd7b93519093a95c9640c7fd65dba3f8f630e04242ce6d3030ed5d5c2252367f090864ef84e441ef91ee4a164d3d58d68cf0a63a3f2037f32c2bcf534d SHA512 1ac36088366e399e92e865b6d6cf9bc117dceab01df1fe484c82d57545c6903d1fb26ac8c0ae17a12c87c680fa6ceb40ce20a4401b908304679ce58973cecdd1
 EBUILD clang-16.0.0_pre20221104.ebuild 11570 BLAKE2B ce7fe613d69d5b066b51b27cb07267483881ead8a8178db75d62604984eebf36c7c8c693d30680fd7c2bcc2319b28ee2ce2430595882306f9ae78f636a890f4a SHA512 99e8fdc81a0a5853243da108465084ff1b2fd00383fcc1365a72e91ac86f5bc79b5ee742c73aaff7c15b29fa344f97acc2f3a5dd36ef82afeb3f33e99d2cc765
 MISC metadata.xml 1501 BLAKE2B 961072eb205cc00521eaffed8068733579b0c688454fa55034cbf9c271065653374d2a6c5db403e3930907ebd84a02e4c46a24dd3835406fbdafdb8ecfb9a20e SHA512 d7708ee293d78af52ad61a5a5e51a2a8047092dd837805f27622b2d4915aec65e10fdcf9ae744ab535af5b50b4483ba1ef84d1cc8701545f7c7f0500bbe15260
diff --git a/sys-devel/clang/clang-16.0.0.9999.ebuild b/sys-devel/clang/clang-16.0.0.9999.ebuild
index 4540835f97a0..cff08610ab49 100644
--- a/sys-devel/clang/clang-16.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-16.0.0.9999.ebuild
@@ -53,6 +53,7 @@ LLVM_MANPAGES=1
 LLVM_TEST_COMPONENTS=(
 	llvm/lib/Testing/Support
 	llvm/utils
+	third-party
 )
 LLVM_PATCHSET=9999-r4
 LLVM_USE_TARGETS=llvm
@@ -249,18 +250,15 @@ multilib_src_configure() {
 		-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_VERSION}"
+		-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
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 2326eeec7de5..4ff5887deb30 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -11,6 +11,6 @@ EBUILD lld-14.0.6-r1.ebuild 2009 BLAKE2B ba5b56979e55cdcc340294289ad31bcd1f331e4
 EBUILD lld-15.0.3.ebuild 2094 BLAKE2B 0346f444a9e76604151593a73bfb1c1d966baeffeee2874e21edb07119e1e8b40c11faeba13af65d1e266c57f29fc0b54e629b9e49160f410f74a6bbf22b2ba9 SHA512 96928bf4aca009b52b7e6fc7cf16b1c99f2eb70ffbb4555785b459c39d12dec0a67fc8029dfab9255241aaae67fe2e3aaf8d5dcd47419723da556735afb36cf1
 EBUILD lld-15.0.4.9999.ebuild 2057 BLAKE2B e41e0265a761f3ca21d7cbb32987b7f083f73979ab1ebdc4b76e98cc2415d2062783e46cc53b0cb6c21f2471df57f6f6209715d26e5baee01f20431a31c17b04 SHA512 8a4bab6ea39ff8bf25762658e6b1bf2df6523659049240390e9517c30a716b83823948b42b7aad22979e0a60b7dea2d6a5309938fb1810d07bc1566a2d903698
 EBUILD lld-15.0.4.ebuild 2099 BLAKE2B 5938071d1cd45bf62a0258851a844dac9d402d07902c25de92954f65ab281481a1112cac50be27d1a5ab0f335b73aeed0f095d299d49e67bfd6fe3aac0fa1cf1 SHA512 a1d7cff5d06714f488b741d09bb21d6e10dded8635d85792791cd23eb560e3b4ae7e59eb525f521b560c8eeae1a5845401d94a326fc52fb0f177d29abb9476b8
-EBUILD lld-16.0.0.9999.ebuild 2032 BLAKE2B 8c359c0d76e5ccb3ea0848a0d3c9ab9a9627f152cf982ad7efa67b1666693ed3c27494afaaace50650c94f0647461ec0d9aad1ae56b3e7205e1ddf065c7de224 SHA512 c2862c28c5b5f7ff31eb62d7e36fe7a2e9c413a6ece80cec8aa3e98c1cfb3c8fcf6f366bbf922775a2b232a89d9cb1a3daedb45dbd7d77a4e2e994b01aa34755
+EBUILD lld-16.0.0.9999.ebuild 2029 BLAKE2B 11f5ed949a1bee56186364445e5a64a64b7e4b51c10664cab20dfed1f22e3809ac10a474e1cf0991f38b1d0f47cee8dfbf601af5500480d928a8f186925b1db5 SHA512 7a92f13d78403f0e44781392446e63dd4cbab564872f5156fa53ba7b04eae6ddcb0f7c809e45080dff92bcaf6d1eff1ee8e6dd4991d51c1d6dc0a0c724f7b304
 EBUILD lld-16.0.0_pre20221104.ebuild 2032 BLAKE2B 8c359c0d76e5ccb3ea0848a0d3c9ab9a9627f152cf982ad7efa67b1666693ed3c27494afaaace50650c94f0647461ec0d9aad1ae56b3e7205e1ddf065c7de224 SHA512 c2862c28c5b5f7ff31eb62d7e36fe7a2e9c413a6ece80cec8aa3e98c1cfb3c8fcf6f366bbf922775a2b232a89d9cb1a3daedb45dbd7d77a4e2e994b01aa34755
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/lld/lld-16.0.0.9999.ebuild b/sys-devel/lld/lld-16.0.0.9999.ebuild
index 91b9130d52f8..8113bdadff2e 100644
--- a/sys-devel/lld/lld-16.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-16.0.0.9999.ebuild
@@ -35,7 +35,7 @@ PDEPEND="
 "
 
 LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+LLVM_TEST_COMPONENTS=( llvm/utils third-party )
 llvm.org_set_globals
 
 python_check_deps() {
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index ab8636e433ef..1cc5b4c02eaf 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -20,6 +20,6 @@ EBUILD llvm-14.0.6-r2.ebuild 12381 BLAKE2B 736afa7fbf7321ce4370e892075e716e6efb2
 EBUILD llvm-15.0.3.ebuild 12537 BLAKE2B dc235a62a560996459f33b6e8384de3631baa36d37ce600931f7c006904e3bd73cadf82edcb7dda352b830c49be474d5dc15e09ade7222829460797cb0e7b09d SHA512 c72386e944d069309c863fb7685a8cca19bb141866f03ec78846bb7f6840995224cc0a6cce14f387167f1c1eca7877a5b362a7160300b5732e845e63efc4a87e
 EBUILD llvm-15.0.4.9999.ebuild 12457 BLAKE2B 52496ac8ef1cb0d61f1f7c6dc5b3db0a0778d841ad67c983c140b0c7858125bd34bdbab31fd1862e5b6c6eca4554764dd1dd2422268ef485c6ee8ecf8fcf3c57 SHA512 0e4e356633dc5d9660e0d440f74ef709ebf88919cec1cb2f317c3744000e8db25e0036be3404a01dd8817ff8e77c64f95c38a27c8cd8e9445e7f037a0a8a5f7b
 EBUILD llvm-15.0.4.ebuild 12543 BLAKE2B 9dfa279e68956c4374ed3f7da1b0b025681adb074a79319b2b3df6b2ee273b7c29ba96a4f9262e8ed506e8edbbc1f7254359b519dac6111a819ea69bc278bd34 SHA512 7210feff1719c0c16c87239ab5ce4bb08f0e862d3e5bc67695f823c067c4cee625ed15250335e747e8d2de8eb3619334e701b856d591e53274f5b1c5c077809d
-EBUILD llvm-16.0.0.9999.ebuild 12491 BLAKE2B 4e72f28c9b2722e677c030222be16bfc9fc50f66d66d14eff431bb23a3606c77a07666bf7bb0e16edbe4d6d7ce2b68e18ec571c1427a9e0d72b749ed55a29869 SHA512 31cb358bd824bd5c16f9fd09113f3a4a604e61756308f84664710830c295f1d426261a1d0d376cbc577098262c686578781d9daec77e0e39edc1c23b11521ef3
+EBUILD llvm-16.0.0.9999.ebuild 12584 BLAKE2B 54adab5484a93dcea378220dbeea3cc461be770e5a6484bfae3c5bef0866ebb42c1c3996244a02789fa76ecd7fd9dcb81b6c186389cba34b6be584af47a4f98d SHA512 cb1d3a09c4d3745b18a718e3d497f72b563726db4badeaf24a87972c3ac8be5021a00be98ec1f49cac33ac0e4915386e2c62c614c37665d0d7109bed510a7cba
 EBUILD llvm-16.0.0_pre20221104.ebuild 12491 BLAKE2B 4e72f28c9b2722e677c030222be16bfc9fc50f66d66d14eff431bb23a3606c77a07666bf7bb0e16edbe4d6d7ce2b68e18ec571c1427a9e0d72b749ed55a29869 SHA512 31cb358bd824bd5c16f9fd09113f3a4a604e61756308f84664710830c295f1d426261a1d0d376cbc577098262c686578781d9daec77e0e39edc1c23b11521ef3
 MISC metadata.xml 2654 BLAKE2B c27983265b6c9b33200ee42565648f30a6cc9c51be53a1cb82a3353d7c1f7aa9c9501c58254280c2880ff2d4992b4834e4b5e2f1c9b1c60e9b21945f234b9973 SHA512 b331d9186908762907f5713b00e357785b62afbee83afefac8701beb1a20f7ebd68df4a030bb82c6f9164719d4ccfcaf16c189833ad40e9f5900c36247d9cff2
diff --git a/sys-devel/llvm/llvm-16.0.0.9999.ebuild b/sys-devel/llvm/llvm-16.0.0.9999.ebuild
index 6d002766d626..ce7bb47d6446 100644
--- a/sys-devel/llvm/llvm-16.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-16.0.0.9999.ebuild
@@ -68,7 +68,8 @@ PDEPEND="
 	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
 "
 
-LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_COMPONENTS=( llvm cmake )
+LLVM_TEST_COMPONENTS=( third-party )
 LLVM_MANPAGES=1
 LLVM_USE_TARGETS=provide
 llvm.org_set_globals
@@ -347,6 +348,8 @@ multilib_src_configure() {
 		# 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)
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index c0c235351507..840df7ccc7c8 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 139a8f03a5d3..33d35e1a2c77 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -8,6 +8,7 @@ DIST linux-firmware-20220708.tar.xz 242130176 BLAKE2B 7dce1bf1e13c1c59dd0de84853
 DIST linux-firmware-20220815.tar.xz 253238428 BLAKE2B 1de6998f1a993aa035e3eff76abc6cca49445ccff917b2a4d1e48b61087ec5bb15ff1efe7427735f766ae6a169d1c1ee2cede08d4c940362b73c37cae01aae44 SHA512 c8d4a7049fbb9d2b6e52272bded1f88cc49a27ac8a0f8cff57db5bd9f15e549724e140638667b1e60159f523039941c47dfeaa372cd5bcb206f35e9dee38ea73
 DIST linux-firmware-20220913.tar.xz 257803764 BLAKE2B 05248f897f653df73adcaefab759a7cbbfa6ac46f2a85a3ddd79539d48cf629b17df15dcea3fe00fd81b945aeeb51854f50ad386cac70f99631fd8d6f40e5fed SHA512 386f18d54c5979bf88c95b8cde4de4819faff4166cc4eee92ca397e86b3e6d408c078706c32c2ed0009402b7683dc985579ba53aa41234cf90d573ced1d7ece8
 DIST linux-firmware-20221012.tar.xz 258375804 BLAKE2B c6aba807fec1da7101af8301690b6cd7bc8192c72ddb8e05e1339f1d689d05ade143aec73052d8288ebfbf43be24360b0f826818f56d5efee9bd019367ae8ce8 SHA512 016d13c5df7b9877351634082f6e22530ebdcd8655e078cd3eeac3e5cd099f59eaf246f9bd2d0b7312ec9f62b236b9cf0ededeb998f4c6880d938502bcd80b13
+DIST linux-firmware-20221109.tar.xz 296376440 BLAKE2B af06fdee5b3a7ded60ee233e82b451f12508d2060581b50067c577fed100d30822459590fe1168b174c146bc1985cb058e8a3d3cfbbb9f24995e6108955ef33c SHA512 99a3d488bd5c4b8c1f2ea3f2eb40658d0de390baaf7584d487fefe1bef4c5e0b981ba7e2e8abf76795a5af3e00008e29f00931be66f3d14d10fe92c7a02a6161
 EBUILD linux-firmware-20211216.ebuild 9793 BLAKE2B 9c5c62aed977b89e0e654228bee6a89d99eb43b15de168be364d57c236725f3822488165bbb51405770f6f5f95122f9bd4e778328e050424d138888d12d5f50a SHA512 14bc8259f12fd506375fa5d1f2faf40be90430bcf23f30982c183535a07a899e86ff7a14381d643974babf36c7f8f224435edee9698cb31960b1af9ae2dedf51
 EBUILD linux-firmware-20220209.ebuild 9793 BLAKE2B 9c5c62aed977b89e0e654228bee6a89d99eb43b15de168be364d57c236725f3822488165bbb51405770f6f5f95122f9bd4e778328e050424d138888d12d5f50a SHA512 14bc8259f12fd506375fa5d1f2faf40be90430bcf23f30982c183535a07a899e86ff7a14381d643974babf36c7f8f224435edee9698cb31960b1af9ae2dedf51
 EBUILD linux-firmware-20220310.ebuild 9793 BLAKE2B 9c5c62aed977b89e0e654228bee6a89d99eb43b15de168be364d57c236725f3822488165bbb51405770f6f5f95122f9bd4e778328e050424d138888d12d5f50a SHA512 14bc8259f12fd506375fa5d1f2faf40be90430bcf23f30982c183535a07a899e86ff7a14381d643974babf36c7f8f224435edee9698cb31960b1af9ae2dedf51
@@ -19,5 +20,6 @@ EBUILD linux-firmware-20220815.ebuild 9735 BLAKE2B 6d233c4e2ceb85955d039a7b4323e
 EBUILD linux-firmware-20220913-r2.ebuild 9901 BLAKE2B 7c1def3ff8d49722abab2c298fafbd637df5b6f21cd5171b8a169149f752aca8415d8535b3068cd5433e8449d0465b5680fdd73a9796af5d1bb285b84ebefead SHA512 d99dcb62bd50a36895f64396fddb517483a6892c7930ae81af7aab273605402eb1006a649f8fa2419de6fe5e08d26aaf28cf50ae20d40b04128b4efc6f80be9f
 EBUILD linux-firmware-20221012-r1.ebuild 10389 BLAKE2B 974245aee6d4eef5d0753c769fbe883852f733882753da262679bd8bc938ed321d1dc5e882992238cb0a22b955a59eea5a02bfe6ac9947c5ca3ecb08036f3926 SHA512 51655006247935eaf92ef0bbe33f93cf59c80869ebb9625d6dd36687d1c6ef522ca900bd545abb929d2275e9960f69e1e285552a0adf64bba84caebcabcf36ce
 EBUILD linux-firmware-20221012.ebuild 9901 BLAKE2B 7c1def3ff8d49722abab2c298fafbd637df5b6f21cd5171b8a169149f752aca8415d8535b3068cd5433e8449d0465b5680fdd73a9796af5d1bb285b84ebefead SHA512 d99dcb62bd50a36895f64396fddb517483a6892c7930ae81af7aab273605402eb1006a649f8fa2419de6fe5e08d26aaf28cf50ae20d40b04128b4efc6f80be9f
+EBUILD linux-firmware-20221109.ebuild 10389 BLAKE2B 974245aee6d4eef5d0753c769fbe883852f733882753da262679bd8bc938ed321d1dc5e882992238cb0a22b955a59eea5a02bfe6ac9947c5ca3ecb08036f3926 SHA512 51655006247935eaf92ef0bbe33f93cf59c80869ebb9625d6dd36687d1c6ef522ca900bd545abb929d2275e9960f69e1e285552a0adf64bba84caebcabcf36ce
 EBUILD linux-firmware-99999999.ebuild 10389 BLAKE2B 974245aee6d4eef5d0753c769fbe883852f733882753da262679bd8bc938ed321d1dc5e882992238cb0a22b955a59eea5a02bfe6ac9947c5ca3ecb08036f3926 SHA512 51655006247935eaf92ef0bbe33f93cf59c80869ebb9625d6dd36687d1c6ef522ca900bd545abb929d2275e9960f69e1e285552a0adf64bba84caebcabcf36ce
 MISC metadata.xml 1078 BLAKE2B aa7843ce53c1cea1068a0dccef91a9c0e27887b3d2b3d1e440045808e9347b473b1cc3421f6237d934bf98168da4edf773ca0ed553e758f72cc102ac3ec754d2 SHA512 547ec53a88d603254b162e38ea6f9ab1c0179a12427417141d4cf1d62aaf9ad07823ce12a78fc49bca3a933f29f1b75cb9c0f056637ce3c533061935ce87deed
diff --git a/sys-kernel/linux-firmware/linux-firmware-20221109.ebuild b/sys-kernel/linux-firmware/linux-firmware-20221109.ebuild
new file mode 100644
index 000000000000..83806f04167f
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20221109.ebuild
@@ -0,0 +1,374 @@
+# Copyright 1999-2022 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 no-source-code ) )
+	unknown-license? ( all-rights-reserved )"
+SLOT="0"
+IUSE="compress initramfs +redistributable savedconfig unknown-license"
+REQUIRED_USE="initramfs? ( redistributable )"
+
+RESTRICT="binchecks strip test
+	unknown-license? ( bindist )"
+
+BDEPEND="initramfs? ( app-arch/cpio )"
+
+#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 ; then
+		return
+	fi
+
+	local CONFIG_CHECK="~FW_LOADER_COMPRESS"
+	linux-info_pkg_setup
+}
+
+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 ; then
+		while IFS= read -r -d '' f; do
+			target=$(readlink "${f}")
+			ln -sf "${target}".xz "${f}" || die
+			mv "${f}" "${f}".xz || die
+		done < <(find . -type l -print0) || die
+
+		find . -type f ! -path "./amd-ucode/*" -print0 | \
+			xargs -0 -P $(makeopts_jobs) -I'{}' xz -T1 -C crc32 '{}' || 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-libs/Manifest.gz b/sys-libs/Manifest.gz
index dd42ac722cb2..68c6a333848a 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 b52e02ba368c..9e9af8876752 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -16,6 +16,6 @@ EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6381 BLAKE2B 010ce621c56c1568eaddeb6
 EBUILD compiler-rt-sanitizers-15.0.3.ebuild 6433 BLAKE2B 25dfdd2696b3c861dce89b740c12a382e6eae2a726d6302b7d2ccb609721be4add79169e129a917a88e8396f90112b2ec96e77eb7e1f64f4e65395d54f964dc0 SHA512 8418f40cd19e862ecf69475aeb26aface57f1e548de75760f474d4e03d52d6df3926f7a68eb11460d369b1465580c01c7e47c59b8b3d08571b60f454e5cab46a
 EBUILD compiler-rt-sanitizers-15.0.4.9999.ebuild 6363 BLAKE2B 640625391bc73444ed357c25028b641351e5e4f2661271e2d762a9d0a8bbf70a916018c82ddabb25f95679121eea1f35726e011f12d99bb88f1aa6aafef9f5ba SHA512 0c9b3e50c61cb6129fcc20e2fc08f7d32fd2ee180d2bad3e6ed9c7b71819320af9c74457332afac8c14b476d18b47ce7a353813e7bb29e0a568771d314f9c46a
 EBUILD compiler-rt-sanitizers-15.0.4.ebuild 6438 BLAKE2B 365a74be34dd43bb83e1eb3be7e643899baea439b56fca5b497ca3e92e001343de9a03d592b956c279d4994c805a5d975601f5f7750c8d099e2d446ed7e8b2eb SHA512 7a3836f239bf8053a07b38e112056506e3e3da363874fcb70d7a74bc72bea6a0298f08e97f3a73b5d3c1c4af57fdb692567fdff7775e5bcdff01eabfd2f962cb
-EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6322 BLAKE2B a6c3057587f87750a2ef204d1504ef86e579bb1c8eccbb366563a4c5899ee9357ed211affe9190c44bfbe397ee54dc7b05622a693acae8aa32ea2b4ef36c33be SHA512 bdf5995cf3973ccf9f5d5dd4baa1a8424fa01d9f95cf44a4c656e66bb98e81359a794b95603f29532675c5247b3f472b1c1fdb79066dfde8e7a383ab5929bf13
+EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6296 BLAKE2B 2633a58f735a8fddd7a83c0fdc7f68800153c34034bf3f28ec758a89188b7ccf5403c9d3ac00b3d7fb664631b56f79528207da5ed536663ac6541dc86c56fa15 SHA512 82be981c99e2313032cd2a1bcc45fb859b65189a94e2ac2811c153fe459320bfebdd2c3649583f31318b0d7af29234e2dd43eea821e112308bcde2fc26ba0294
 EBUILD compiler-rt-sanitizers-16.0.0_pre20221104.ebuild 6322 BLAKE2B a6c3057587f87750a2ef204d1504ef86e579bb1c8eccbb366563a4c5899ee9357ed211affe9190c44bfbe397ee54dc7b05622a693acae8aa32ea2b4ef36c33be SHA512 bdf5995cf3973ccf9f5d5dd4baa1a8424fa01d9f95cf44a4c656e66bb98e81359a794b95603f29532675c5247b3f472b1c1fdb79066dfde8e7a383ab5929bf13
 MISC metadata.xml 1412 BLAKE2B 75675507000fa6a6b8182e6b45a08a2716ae7fb9a7e3428dc8420464e4c1d1bdb5bea62cc2f553c579de5a4faa752b35cb3529d980fb07a055ff4ddf6e752707 SHA512 f05ea5168b923db72f4f5b53e9b748ebbcdae9eff09d86323313055933b47fc0089e1b2d73cd997d73dcfb2dca032344955816425fbddc09d27ca751463aadbb
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild
index ca5ba940552f..b2d4ab2d467e 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
 HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_VERSION}"
+SLOT="${LLVM_MAJOR}"
 KEYWORDS=""
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
@@ -46,7 +46,7 @@ BDEPEND="
 		!!<sys-apps/sandbox-2.13
 		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
 		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${LLVM_VERSION}
+		sys-libs/compiler-rt:${LLVM_MAJOR}
 	)
 	!test? (
 		${PYTHON_DEPS}
@@ -54,7 +54,7 @@ BDEPEND="
 "
 
 LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
 LLVM_PATCHSET=9999-1
 llvm.org_set_globals
 
@@ -125,10 +125,10 @@ src_configure() {
 	done
 
 	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_VERSION}"
+		-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_VERSION}"
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
 
 		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
 		# builtins & crt installed by sys-libs/compiler-rt
@@ -185,19 +185,19 @@ src_configure() {
 	cmake_src_configure
 
 	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_VERSION}/lib/* )
+		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_VERSION}/include} || die
+		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_VERSION}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_VERSION}/include/ || 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_VERSION}/lib/${sys_dir##*/}/" || die
+			"${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 \
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 187b18c35b86..b69dec312ff3 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -16,6 +16,6 @@ EBUILD compiler-rt-14.0.6-r1.ebuild 4247 BLAKE2B 42673c116b115622e192ae5629e2711
 EBUILD compiler-rt-15.0.3.ebuild 4259 BLAKE2B b14a1d7d6d7d6ba021074ca6c22d6a0db1a61d2d9b16d7391a5321832f67237514d002cb269ea0cfcced8fe6992db96551c87fdf3e15975798c73283fcf92964 SHA512 43dd2e1f6687c6ab7a640ee68994f449aba5229e9e29d54f34afa5be006b2cc0a1768997be705ccf93209f2ec970ef9f47b61f364f5218baf5e0a8116b8855e4
 EBUILD compiler-rt-15.0.4.9999.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153
 EBUILD compiler-rt-15.0.4.ebuild 4264 BLAKE2B 7411477bbdf896d3cd8bd112b0aaf0fc92b21813b2808474571f90eb1b2bdcd1e617b6262267c3adb90c9993c7f0e5d326aac1430440873cbb2be1644499c156 SHA512 0dd3a2e968a4698bff0d617b710046e824fc219ce33998012cdf0bb62c56e2ff159122e39c0203a042e59c5f7f693dae8ea5dcccd4115871e0bd8b54f01469e0
-EBUILD compiler-rt-16.0.0.9999.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153
+EBUILD compiler-rt-16.0.0.9999.ebuild 4185 BLAKE2B 5fd8276217f6965247d77d953d37989833e11a5a08ebd11180dc12ea3745c89b2c90b016abd52ca7b0823f1ff198468aac8ad30bd4f1c8728e5028ca6d7a83b5 SHA512 d36c26715308dd2fee7aea19ca522a65356889eaf21ebd88dc83eead883b7b5d35864cb958fa97bd84c99cd178d39170308a4c411f188a5ee4801501f198d9a3
 EBUILD compiler-rt-16.0.0_pre20221104.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153
 MISC metadata.xml 416 BLAKE2B 79a58249c94b605ba57f346c4e05b43853cf6cfb8bb65a4f4e3c44039cccfdb83dd31bfaaaf398bcbdc393efabdfc7ed186fe775976c46227e74decf2c8f4fb2 SHA512 ce30c79a575e5933effb1fec36f9a4ef02d9f97f312feb39c55a88cbda9a1bae1d7af2ec4ad5f66212cbb2cdbfb26f1a436689f16f410153c9d65eb010264c48
diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild
index 957caa27a746..f2f66ffb0a25 100644
--- a/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-16.0.0.9999.ebuild
@@ -10,7 +10,7 @@ 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_VERSION}"
+SLOT="${LLVM_MAJOR}"
 KEYWORDS=""
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 RESTRICT="!test? ( test ) !clang? ( test )"
@@ -96,7 +96,7 @@ src_configure() {
 	fi
 
 	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_VERSION}"
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
 
 		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
 		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 9216f899e1b0..8dc89cd6bf34 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index f7c536fe9efc..284b18338a69 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1,7 +1,5 @@
 AUX nginx-unit.initd 291 BLAKE2B e0d8b4bbdd9d57214551f4257b95271210a942fed747797f102b7932323b9bcbe871d9fd7cd0e8dee81eca2b41f21d5118a7f4f31c3fe6cbe18c1df09b164be0 SHA512 1212b49a56e4318476d051f8a3a82c6bb65f55adadd2dc51e3e91100823f6bdd8f82f162041db92fbc4f1a777cdafd22c32efce121a57f5d6eb3f5883da1abaa
 AUX nginx-unit.service 237 BLAKE2B 7e8b373372b7908bee80f4a57718a6b9ef7fd99872057006377284fb3bda088a0b6720b0246e5a27b6853d6351244432482f12afe5758b0f36dbdd1c04cce118 SHA512 fdf7ec12f58064c9a9fbd431fc4f56699563ff6bbf8124195810ca7a2e0ed813dbfdc41e6e1455b12960bd8d96fcf0eb2b632243d71d6a3b74d93a263c11596d
-DIST nginx-unit-1.26.1.tar.gz 865811 BLAKE2B eb0b62e48a8d0f9199dfe77a2d6ec90a06ac24f83b362ae16fde83eea53e03923127be7b24da47a83cf51fc4ebe7930cba9a3ee7550a5243f242cc4bfba3a3b9 SHA512 1caadb35cb208067a5d437e1f649c9f9a833a39c4344b2c3a5ae94d9fcd811913e2f23114cf8d7886030306e036da18c55f09044b8a575c1616568321b8d84ec
 DIST nginx-unit-1.28.0.tar.gz 878878 BLAKE2B 91906e342e3fc1154c781481110a8e5496a74da010b2c0618c7c27d63cf0926d94f17fd6206d7868e9ad39f0fbbb476fb3410d46b4b7935e942653d8328af840 SHA512 7d2033be3d8e9d15db21b5431348be73a10fbc19bcab7e83d3c5a770e11e23a53967afe051ec53e236896ac9e021d9146501bc32b87254f9b25778b4bc5d1cbe
-EBUILD nginx-unit-1.26.1.ebuild 1995 BLAKE2B 06e29dfbb618e297ac0ed9880b8d756a1f3eea5b0f56e3e5a546a62c2d27673b0d53aa88c1d7987486c1d5ce291f7414f981bca5f0eb505b178799448809aa48 SHA512 4aada60599e66702edb9112556f87a5812186870698aace8d8dd68600336fc9ba401cd2040514f5b40f3a5930ca0738d42ff6d233a9b4b8a36bea6de4e120d7a
 EBUILD nginx-unit-1.28.0.ebuild 2084 BLAKE2B 09091628eed4815032fab3b8c83ba8be8a4f694b519af89d44f6751a08354d210482fe7af217fcc2dfe610a27601efdb3543547bdf05d4518524c37318c76fca SHA512 7b1e539f30dfa71a4bd67967be45385679b1b7fdb90b939596c0a3f9bf6551f0458a7ee8f738550f92ab2f10021bb5b176e94c95df9450abbac7fa0d7976c9ad
 MISC metadata.xml 830 BLAKE2B 9ff8b1d0525b28b0310f0de99abb99f1bff74a5effbc1bc3bf991e338a3f201a947fdc1687433ab0e9b6849c14feeaed2b5fdd8ba770fafa62f00f18158bbc60 SHA512 9fc506c23c1f5031774cb74823d8a5090dc8920f0e6e7e22bb2e46ae6df4e9705fa65033b57c5452310ba342ea520757a5f14bf9d1828b47101a2d5382ea1c57
diff --git a/www-servers/nginx-unit/nginx-unit-1.26.1.ebuild b/www-servers/nginx-unit/nginx-unit-1.26.1.ebuild
deleted file mode 100644
index a8f53d5b68c9..000000000000
--- a/www-servers/nginx-unit/nginx-unit-1.26.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit flag-o-matic python-single-r1 systemd toolchain-funcs
-
-MY_P="unit-${PV}"
-DESCRIPTION="Dynamic web and application server"
-HOMEPAGE="https://unit.nginx.org"
-SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-MY_USE="perl python ruby"
-MY_USE_PHP="php7-4"
-IUSE="${MY_USE} ${MY_USE_PHP} ssl"
-REQUIRED_USE="|| ( ${IUSE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="perl? ( dev-lang/perl:= )
-	php7-4? ( dev-lang/php:7.4[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		dev-lang/ruby:=
-		dev-ruby/rubygems:=
-	)
-	ssl? ( dev-libs/openssl:0= )
-	virtual/libcrypt:0="
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-	sed -i '/^CFLAGS/d' auto/make || die
-	default
-}
-
-src_configure() {
-	local opt=(
-		--control=unix:/run/${PN}.sock
-		--log=/var/log/${PN}
-		--modules=$(get_libdir)/${PN}
-		--pid=/run/${PN}.pid
-		--prefix=/usr
-		--state=/var/lib/${PN}
-	)
-
-	use ssl && opt+=( --openssl )
-	export AR="$(tc-getAR)"
-	export CC="$(tc-getCC)"
-	./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed"
-
-	# Modules require position-independent code
-	append-cflags $(test-flags-CC -fPIC)
-
-	for flag in ${MY_USE} ; do
-		if use ${flag} ; then
-			./configure ${flag} || die "Module configuration failed: ${flag}"
-		fi
-	done
-
-	for flag in ${MY_USE_PHP} ; do
-		if use ${flag} ; then
-			local php_slot="/usr/$(get_libdir)/${flag/-/.}"
-			./configure php \
-				--module=${flag} \
-				--config=${php_slot}/bin/php-config \
-				--lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
-		fi
-	done
-}
-
-src_install() {
-	default
-
-	diropts -m 0770
-	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index f27cd48412f4..211d041c2acb 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index 211a34826ae1..d4df7ac3ded9 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,3 +1,3 @@
 DIST libvdpau-1.5.tar.gz 152838 BLAKE2B c3d76c1e46b718d71daff74232f2de9efb989c496cef7fa1016ec76d751530be39b5b6ad6354819579043f23744a647492d5d52b5ab93cae89dd82fb17d08289 SHA512 cebe0e0d9411b87238fa2adec40516881c61a67f33f80c22372f514e672e2dff839687291ab0b01d47af811c254fa65da579f360fcded3f65e382720548d3ea5
 EBUILD libvdpau-1.5.ebuild 935 BLAKE2B 3dd6bbaa9a3bcf49416a532ecdd071f89c2dda70d83dea08f52376cb89e8f41d4e78f9044f80e0d243ea479b74b0debd317d8a0eec8b3725fc5c4c3eecaab610 SHA512 6a6bd6492b82d6fe68c3427e778bc0f5c9773229e74e36a821e5c5fa080dca501150e5d6550883e26cd18daf1fa4e31bf29011a577bc03267d47cb0bd8cbdd10
-MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
+MISC metadata.xml 337 BLAKE2B c6bc083b64631699a723efd637a7f46ab56be933d8e4f4d7f8ac2d9d1a71fff503befd5e7cd8eaae7b26254cdc6ff5892b19d086e1ca2ca467024ed105650c33 SHA512 f2a470023b756d043f16defa1fc0ab3f334ce4a2dfcbf648afb641a1dae43998ed37aeb195f69c7f8d218bad200267f198d532581f53e5e3eac67a709c625615
diff --git a/x11-libs/libvdpau/metadata.xml b/x11-libs/libvdpau/metadata.xml
index 06d84e396dc3..59d45dbb24bd 100644
--- a/x11-libs/libvdpau/metadata.xml
+++ b/x11-libs/libvdpau/metadata.xml
@@ -5,4 +5,7 @@
 		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="freedesktop-gitlab">vdpau/libvdpau</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index ee87beb58589..8b33809ca909 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index 5f74a299d304..ecb577989919 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1,3 +1,3 @@
 DIST vdpauinfo-1.5.tar.gz 12246 BLAKE2B 5673eb6d00e501234cab3434ee06ef428495f86cf18304eed628e41dd0b17f8fe25aff8ef3bb896f4f70eefe2121446eae740c638b48b3ae1bc3547de4cb3102 SHA512 f3d359242443de919803ae0b8d89809c71e94d59d8ee9994f8f315036b829ad24030b75d953346989c1d0ddf436107041491e299c3212b013ad1d2b3c0571e59
 EBUILD vdpauinfo-1.5-r1.ebuild 606 BLAKE2B 827e399afd8d24622e1b5650a7efc52c55bdc227fdcfe68ada8a831c5c4e922ae2573e1dbdbe62453f9884c6b664d772323a4e3e906bf8f867dc34b0f774eb9e SHA512 719f02f26bdccc92afc21bc8502d5fddd6e21d6004946113eaa6bb281ede40917eb551181bd9abac89249e01b634d8d8c9cd057e17e34475c17014278e2001e1
-MISC metadata.xml 246 BLAKE2B a512e6e8ffd8a998f89ea9dbf8a29dd4bb2d6db435e4ac0ef3182fc23996e04a6e87c1771975d835038ad86d6cb61e4a1aea8b80286666d64ad0b511c9d8f163 SHA512 d827f64596500d61c0f24c9d2a69fa3ca2f8b52e5f5815106d7db2837482172f0518d99677e6332a69fd4c34289ef817203a5047363ea7d2c10372b09f9e0618
+MISC metadata.xml 338 BLAKE2B 7298a6245d9ebdca8131c884ba50981200f2925520196d69d91ca5c4354227d94077609c5c639cf4157780fc5ae12605e43c0a00d81a1ad11be71a23efd9a481 SHA512 fef4e8a76eec429c6c5cfaada3b6dd48beb3707203937a027b8f0368e2f1159d0bc46e6eb6db0c20148306d29cbebca6e757d09318b28bb63c9d452bf9e2765c
diff --git a/x11-misc/vdpauinfo/metadata.xml b/x11-misc/vdpauinfo/metadata.xml
index 06d84e396dc3..d9f02a548258 100644
--- a/x11-misc/vdpauinfo/metadata.xml
+++ b/x11-misc/vdpauinfo/metadata.xml
@@ -5,4 +5,7 @@
 		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="freedesktop-gitlab">vdpau/vdpauinfo</remote-id>
+	</upstream>
 </pkgmetadata>