gentoo auto-resync : 27:01:2023 - 01:57:17

author: V3n3RiX <venerix@koprulu.sector> 2023-01-27 01:57:18 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-01-27 01:57:18 +0000
commit: 2db43213e5c343995f4b9fb977726fe42ebdac67 (patch)
tree: 6707366d284d46256ffc9490ab6d2940a83cd0ae
parent: 236302aac694377916670b7769f941e3f1dd0bbc (diff)
307 files changed, 2166 insertions, 2272 deletions
diff --git a/Manifest b/Manifest
index dcce45f5e0a1..edbb80b8a522 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29471 BLAKE2B b691d3d8ddad9370ee6bbf72dd52e6bc3d7a2ef29b6ecc627125c8ea2941fd5e917a2a1e59e3f0f84b6ea996895dbd1070873c524eac4ea129164122a3225e7e SHA512 ae926382332d52e2abc8ed9b393910170a10dcdaae6673b104c47e5d05918310fbcea763777816a9141350e363d449338a4ce4da60686137eeef88609e25c009
-TIMESTAMP 2023-01-26T18:39:50Z
+MANIFEST Manifest.files.gz 29492 BLAKE2B a74570e4cf77d63619e2ad80387b1f542f3b52535c3ff80715212bd23849be8bc9257944c700670a67d504290a4918269df08c3f05fda592ffd5df1266e95cbd SHA512 be911a2b6b0a67f06e5ba725313d6ff2b2520b367c31eaafc14ba79202e1eaf1c7edaf2a332c9f57370ecaa5d2832f5cdf3d95fcb89598ab53daa09d426938c3
+TIMESTAMP 2023-01-27T00:39:54Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPSyPZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPTHVpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDq3A/8CW4xMzmhj5ZNqj7vFxZ6amaW47/Cs28gSEjEOsFrlhQKv5MBKSgop4i4
-s3RsxN5maPFOnjzzrTUvWOb3ORfLg+5yzli+tXXkOSAB9ukEjkPme6he8oTPO/mI
-gMdqFOzzxFEyrFBIiDDU/iCjhl32Iid/e0pcjBFo/uVsSevfwaHLJw+lbn2Yl5zB
-lHZZthRE97K+xQiRbxedOcWxs9aZSp+v59Oeh+8fl8BdL1IEx+N+tXnz9thMs5Yb
-1+XkpHEjKywpKa3tZHGvYeRKbnzx0Qcv9Z6WC2EiJAlTLYMGQQigC+vAWBbYafjr
-hCKsFbMi9ujy3umcH731QEkTPMH4gxs5SDmUb18l1BJ5PK7kgrzzX7Npk+MAgIAn
-YiASvSyrAXj0gSS8d+/trAt/kuVZJ63dy07nQEKonGjpnaY4sVirpekB0TFlEAi3
-aG2M3cuBqUig125cri44i/cS1xt0JcCIli3o4gpGtwucnsM1X7H4vAvxTYm2gqRY
-MxQqskr/GTOowoESw9DWC32sRwULU+O1ccDn8JxQhV16s6FhftFBm7SXrBqd3ofV
-HxIxvVO1N28PzhPG/fIRoZm88pEnzk7tKPCnLbf9Fwy7N9A1qpd3zfbu/GbXutRN
-TXnjyxOwtOfF+mmeL+91Z/kstX8TQBtddl+JMaku4lWl0ti06xo=
-=yldP
+klBMJw//T3/IVeG+amFLoTx7Cpyj/5RsHLPW/d47eGGlmi78TYFTuIukvq4FiouI
+cYTq30Hst38RQ4TDpoGO/zRVaPeYgqSA8nNxJYohzFcRaYnhBfKQIRrqAbW3uHSV
+SOGG5GW/7YmIFzBPTzjJ2eNL2ybizBs7WcuLsuWJkM1Hmiq6RsSb4gsQc0W0xc9Z
+zJ0+bdwDRXHDg0bFzz1IPx6Q1SsYNJX4b2ghHbhcGpyeFWi7QeWMvCzkMlsqm2xo
+fCXH3tdIEHRWtV3WASJbf5l2DvdxlqFPmfRpcIg9toB+6kjuCME2jJVkw1/Jzndh
+8EC1769b8PgeuKuqGIYb+X+YnpptviUUEzwMrlkj3hh79ZaZEJkk2SDFlXqgudJO
+Wpn4OxUKgM8Ulb589Jiz4Hb8NkrXoBDtfDeQP2n0KwOhUEBbaslNLq4d84/feay+
+aN77MsdmFpHqqsyx9o+qo02Z542FGexT6wtSgDkZL82IJfLwrzSCBDC10oMteDRE
+BkOJmYWkFHN5Df6SYaDleAF/q6X/4f6tnNJTeWmy0OhoiByCH1CeACL1Kmk5ZcRD
+CygSmh3KuwLkOO5XBhaa2lnGjoFRELUV+609c/ptyhxOLA41dqpQUprrCSxHNVb2
+92YbbfjVnMfYSpwhEy3nKujrZs0k0PW24aVM6sw2IBFzpGRVQbY=
+=AF1n
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 5c74017bce5f..c32c74c0a56d 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index eef3a8957ecd..e613df478f2a 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 4e6f8c5456b5..2ccab29702c2 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -4,5 +4,5 @@ DIST ccid-1.4.36.tar.bz2 677047 BLAKE2B b3d48f1c51b64d260b7055251fb04aeea4a22cc5
 DIST ccid-1.5.0.tar.bz2 689961 BLAKE2B e5621f9af647028787cddd1b5a0d674420b4bf0c532a8527b4e10773bbd8af6f6600e7c40039e27f1ae182504d4b69b5e1e4aae509154ebd9653a34bd085f820 SHA512 fa2eac306066255fd89e8220e2b8d82811ce9e284baa155ea968b7afe0f113a94b1ee1898578d02fb8cde0634b6fe60ae8af956089ce5401c11bb90c3b334d5a
 EBUILD ccid-1.4.35.ebuild 1547 BLAKE2B f9c400087032250e51f1103a4ea19491fbc68b47f4a02ff9474a7182b7dcc7405f4e128d9f02663685e4e33bb565354e2550f27ad86a253181c2c63e31cc50ee SHA512 267e3b6d789a33ebc01d0586524c423cbf03434ff34040d39c1039be235f982546b39acad51b38d4deb779786a542d5c5f843f3464abe8d3d30712d156a35197
 EBUILD ccid-1.4.36.ebuild 1559 BLAKE2B 6b86ca4567944315a7657d089d24ad5fd43d57bc07ec57df76be6c76429af1b6d49d14fceb5a7ca03d91df56a53c43c6583e6ac1f7fa014ba0733f36a2a8b393 SHA512 35f30a6ee169905978a247f8c82b7ab2e26b27f004c6077137cc083efd5098cf44ebb3a39e1582abbb25d9024783eddf91ab2e072d5f5e87364ab8e7ac6a3d89
-EBUILD ccid-1.5.0.ebuild 1623 BLAKE2B b2f825e2c910b91e3cd506447782002a5086b833e159cc225e1166353658f006e935e5cba146ed05a84504a6f46960bc1f154f0656aab0919482fd30d3de3cdd SHA512 177ea8caae0312dac2709fdfdc2423e652dfcb39adc8819952949f1e9b9a9763f6b544bffcf84317938e83c4d6dca5e4698343fa6e0b27bd6da36029d8df7282
+EBUILD ccid-1.5.0.ebuild 1620 BLAKE2B 8e3bba27a7adca4032c28f6e4348ba0c0a99bf45a45187dc903f1fbda4898d512083a684bb1c19ac58e014f9be9ea6c84a3956554af7362ec0d00297d4bef20f SHA512 3498ad33188e9b45d3d7b13cdb819b5923cb1e13580c18dd3bcc6f9bfa9b10ebec863b8ad80e67a568040821694f79a201b039186fab2f3708d799f438362570
 MISC metadata.xml 410 BLAKE2B e62b5075deab55dab4f862dfe242085935f383cd51d35f3a61a7e2aeb4d913f3352980d28cdd7ff4ac41f5bf0adf44c763f8267a8e141908fd4371e4656cbc87 SHA512 aabb5b8462ef6146d0230a6d67656fbc8fb2e4a25036e72b4ce9fa3a7ffb29ea1ae0d7eb8bc474343ea654dec649d13749fa844516689ae3f3e33734e0a24d3a
diff --git a/app-crypt/ccid/ccid-1.5.0.ebuild b/app-crypt/ccid/ccid-1.5.0.ebuild
index f3f558b52749..d59c8acf74ec 100644
--- a/app-crypt/ccid/ccid-1.5.0.ebuild
+++ b/app-crypt/ccid/ccid-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="twinserial kobil-midentity +usb"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f6673d53bfca..2addc37933bb 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index dba814117e34..43b1108e9bce 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -17,6 +17,7 @@ DIST libvirt-8.9.0.tar.xz 8946352 BLAKE2B 537b6badb6171110e99561613fb13181449911
 DIST libvirt-8.9.0.tar.xz.asc 833 BLAKE2B a2054d0d9c8301aa0f8697253690b1ddd530a577bc789c7f38dc36a835134d0c8e5fc88536371c75da66afd9808540b9236e8d1247e4d7bd5f3a0aaf35c45f97 SHA512 087d5406ef23d6beee4a37e471d7d0aa433990b892f0beb7be76609fbdfcb69381acd59d63c62dcd2e2f9ccfcdefc35109cc175a0da4263e9b189981cb2baff1
 EBUILD libvirt-8.7.0-r1.ebuild 8892 BLAKE2B 0baaac63266a88c6cd480b71dcc2381f5bba6c24eaefbe142f30f20e0f6bb96ec6db5666a87375725c2f3943397a2ff5e4192a04398a8616fca410f5c6e03bec SHA512 db3df6515e86b638e9849bdd5f977e6663dce0582169c57b48b8687e2f6fb3055912a5391455e8238756a0e16d1db2a03033b574bab25601dd70e2052d0c98fd
 EBUILD libvirt-8.8.0-r1.ebuild 8897 BLAKE2B 82aa050128d4f569a93cc67312e39216df01e16639a247ce73201159e7d3f21248abfea5f906b7db6820d30e0ad0eb095048683c8c353d943b97489a71163d0a SHA512 c466a6dcd409bf69e650b712cee1040ee775df6e236f15b8e1368a8de03eee6af9eba8e8aa50c1bec2a5e5c9ed70308047ee7606b87ebcb6352fc283a6e4dcf0
+EBUILD libvirt-8.9.0-r1.ebuild 9044 BLAKE2B db353f5c64abf3838bf66e9a840f93fd04682dc5bc0470661270aee6aaa608ca5ff942bea9bcc69d89c6e3d7526f90b365913912ea1d719bf6ba3875726992ba SHA512 4287b7fd2328406e77fbaebd198923448a9ac83bc00a26b4f19c470de2b0db606c46a4c22d26dc988de389188c7b2aac61611ac22dc36ebbe7953d36a9a705c4
 EBUILD libvirt-8.9.0.ebuild 9020 BLAKE2B 04fe06635776b11842d4b050205c8a5e996d6175ca65f660d4ddd6060290f670101bf20c1e0644d095e56047c76d11d2e8532baceb049fd3d5396774be6d1c67 SHA512 92aec6a14e78b53e6827f961e970cc9beef8d687ca699f8bfedea040f64ef1eae6671c23a5aed5505fd1bee0309da68f738a0e8afe39e7f26a028b4f6c36f9b8
-EBUILD libvirt-9999.ebuild 9015 BLAKE2B d9a823782c494d6e5dc338396cbfb7f740e6bf866c45a945e27eb052aed3643ec7949602c447a03898735b9e8dfb5016d6a9ecda653dfd173b8123ec62f148ea SHA512 43184d4801b1a9c44299e9bab19e3b437daa9b6ceb4a9ebd097418518d1ae944d7b0196f21cc06af7c1bc458c4080cc853604f2edd436902b1cc8e333b0dfcd0
+EBUILD libvirt-9999.ebuild 9044 BLAKE2B db353f5c64abf3838bf66e9a840f93fd04682dc5bc0470661270aee6aaa608ca5ff942bea9bcc69d89c6e3d7526f90b365913912ea1d719bf6ba3875726992ba SHA512 4287b7fd2328406e77fbaebd198923448a9ac83bc00a26b4f19c470de2b0db606c46a4c22d26dc988de389188c7b2aac61611ac22dc36ebbe7953d36a9a705c4
 MISC metadata.xml 3729 BLAKE2B 2e68676afb3820c7b8cd3d76b0a5c42886e246fc6b440ce49c71cbe60c124cdccd4ed8fb97f7153529b758d56dfba98b6a98a31b2fbff7e738f52bce796a3476 SHA512 0dfe519af8b740de9d41b1e2c40133026718a782b654a261c54cbe22b5f694cda8b73036c59411317757b73c40acaea77f70d7ab86ae8325e78d61151e6c64f1
diff --git a/app-emulation/libvirt/libvirt-8.9.0-r1.ebuild b/app-emulation/libvirt/libvirt-8.9.0-r1.ebuild
new file mode 100644
index 000000000000..647a33c33de3
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-8.9.0-r1.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2023 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_{9..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 ~arm ~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.
+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 )"
+DEPEND="
+	${BDEPEND}
+	${RDEPEND}
+	${PYTHON_DEPS}
+"
+# The 'circular' dependency on dev-python/libvirt-python is because of
+# virt-qemu-qmp-proxy.
+PDEPEND="
+	qemu? ( dev-python/libvirt-python )
+"
+
+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 7f37dd30cfee..647a33c33de3 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
 		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="C toolkit to manipulate virtual machines"
@@ -61,8 +61,6 @@ BDEPEND="
 # 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
@@ -109,7 +107,6 @@ 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 )
@@ -132,9 +129,16 @@ RDEPEND="
 	)
 	zfs? ( sys-fs/zfs )
 	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="${BDEPEND}
+DEPEND="
+	${BDEPEND}
 	${RDEPEND}
-	${PYTHON_DEPS}"
+	${PYTHON_DEPS}
+"
+# The 'circular' dependency on dev-python/libvirt-python is because of
+# virt-qemu-qmp-proxy.
+PDEPEND="
+	qemu? ( dev-python/libvirt-python )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 4d7e3a4fef21..494ba8263788 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 8d3709dc917b..9a8eedccb5ce 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,7 +1,9 @@
 AUX pax-utils-1.3.5-man-reorder-xmlto-arguments.patch 921 BLAKE2B c97680a374985c23602c98227ad8045f2dbeedd5c5a23374b26f7ce30fe0dedc789077229c4fed4bd8cc18ecb8e9c61f9a13a768dfcb500165e120ef7a7a7d06 SHA512 74ff3095b188c4f88608952b7619297c385dec98df16b336a3ad7fcd2c2514542c4e0053664e81400a729a8183d6a84fd04202826e143c63a4e5aff133f6a071
 DIST pax-utils-1.3.5.tar.xz 119764 BLAKE2B 13bd4dbdadefb382133bf42a2b1e740e84ac11661595b082346c80ff05fc7423f5d75cc01ff8a651d921310ae66c2b39a862d0b9db5d7f18e11d393360627fcf SHA512 f2b1753e15907461cc395abffe033d7f7ab8eb15e296b874e2c9d00507458672347b32d7f2f05d3a8625fc3afbdbf0721543f84e062afce7181a726d967e4836
 DIST pax-utils-1.3.6.tar.xz 113816 BLAKE2B de33820acc5cbbace2f7e3f831dc1c4d2ead58e1b0418c96ef42694d7f0cc1d49a37764d6f8b60a00aaa25fd3d40ba64fb4cf1798e07b917936704738e6f1042 SHA512 94d6bdcac0109cc7218fc523594100b4bb5877e0709f5443903ae8aca96e8f3f45cf47b28b57ac146caf6713ad7895a6f67adf4364d9a14986c8b7e0399f3865
+DIST pax-utils-1.3.7.tar.xz 113740 BLAKE2B d801df9c426f318c871655f238fe27b53e656c2789ef8508019997c98bbc540987b611642d87e76ae9f76a95f6cce1acd0b10e3491a146d1e3b3f727a6f96bdc SHA512 f1b87a564573da838a02c4cc10e0d5f9754c3b004ecb172a6290b48a8179b30695ae556942457dfac3caf07b91dd56eb1d801475c35e9708e4d671aa507f9576
 EBUILD pax-utils-1.3.5.ebuild 1975 BLAKE2B 0593f409fa0840abea3be197f90612da92d867196847b6c70689f51c579be67254898cb98785b2018c9e0a65b2652b27707fb7c124e89ced75f8dadaf6501714 SHA512 75e4a7c7e25c9c9c69c9689a9b6d40ea8287e9f5125b5ec36a948b908436caaf0205efdaac06a57ccd277e5fe5d67763e9e1d364ecdcebb8c1938f4d783f237b
 EBUILD pax-utils-1.3.6-r1.ebuild 1913 BLAKE2B 39708c6576b99213cd0d45dbdfb3ee4071b612583ae39c98c678e0ff2873b823b333cf42fb4afd7a51e3715b7c0a1fc746566979f44329f1f7bc02b70ed09f34 SHA512 c14e3d107b5d73f938571b2eb25814933003eedb71331ac89d8357ba7f17f8a16184972d8c03b32afc7c28eabe90c6b443384feca0994b0a68134deb0cfd77c4
+EBUILD pax-utils-1.3.7.ebuild 1912 BLAKE2B 9d1a1efbdd36d30a0a494f5039f906ff96f0e73a8dc05d95a0654635129a2eb966accd0ce56b55d18fbb0d485b43dbef91ba4ea72a26251e211f8f0fe9be1b36 SHA512 f28f4cfea4b4299a30341e8d021448c44b055a71eca1ee501d4e7ef5cd6df9073df5bea9081b24fb1728b842aae5f75082dce9e903879ca3e87c24264e1f3a36
 EBUILD pax-utils-9999.ebuild 1913 BLAKE2B 39708c6576b99213cd0d45dbdfb3ee4071b612583ae39c98c678e0ff2873b823b333cf42fb4afd7a51e3715b7c0a1fc746566979f44329f1f7bc02b70ed09f34 SHA512 c14e3d107b5d73f938571b2eb25814933003eedb71331ac89d8357ba7f17f8a16184972d8c03b32afc7c28eabe90c6b443384feca0994b0a68134deb0cfd77c4
 MISC metadata.xml 780 BLAKE2B a1bd460e70b7a2a4bc0e5012fb28a31890ebe745e9d1d99ad427b0382d9df9ffb8363dbf8907aef9e35da0ee59e489b80f084dce205250040d437ccc229ce49c SHA512 61246256f126a5533829b7e0af50168e7a7395f98fc21a64abc970955892874bc690901a36f791bd73a36e7b659e3843b63c504a9f360c5e41f1ce3678b08b5e
diff --git a/app-misc/pax-utils/pax-utils-1.3.7.ebuild b/app-misc/pax-utils/pax-utils-1.3.7.ebuild
new file mode 100644
index 000000000000..7e3bea88cafd
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.3.7.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: if bumping pax-utils because of syscall changes in glibc, please
+# revbump glibc and update the dependency in its ebuild for the affected
+# versions.
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit meson python-single-r1
+
+DESCRIPTION="ELF utils that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pax-utils.git"
+	inherit git-r3
+else
+	SRC_URI="
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
+		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps man python seccomp test"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )
+"
+RESTRICT="!test? ( test )"
+
+MY_PYTHON_DEPS="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pyelftools[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="
+	caps? ( >=sys-libs/libcap-2.24 )
+	python? ( ${MY_PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	caps? ( virtual/pkgconfig )
+	man? ( app-text/xmlto )
+	python? ( ${MY_PYTHON_DEPS} )
+"
+
+pkg_setup() {
+	if use test || use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		"-Dlddtree_implementation=$(usex python python sh)"
+		$(meson_feature caps use_libcap)
+		$(meson_feature man build_manpages)
+		$(meson_use seccomp use_seccomp)
+		$(meson_use test tests)
+
+		# fuzzing is currently broken
+		-Duse_fuzzing=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
+}
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index dce2632bcc74..872b5d48b578 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -1,7 +1,9 @@
 DIST tmuxp-1.15.0.tar.gz 842727 BLAKE2B 7e0e68ae848fdefab46a936511f57a9927b28a220e1dadb8b2531cd26a2cb6cbb7f1fd3a3a279f624a3ac8cebfeb434582cf48803d3c8bbf14b1c6960b5f2ef7 SHA512 4c9c72ddeea283ee4d0595d099dfdc178b3fdd96691ae1b02e9867096f770b4339e1f60abea985a05b974d3d620addd8b571c05db7d2914e8736322e5cf19fb6
 DIST tmuxp-1.24.1.tar.gz 856989 BLAKE2B c809ecc13f29384a43097e10fe7cad15381f50e8962050e7cd8af46e69f422ecb0d4e714555779a85cb72a4be879ef21fdecc207f6321286664a1f81024a1574 SHA512 153505b2e4c2a357c8d73ef6dbd592225a77e32d42165ff1ff80a74b9f52b77cf2d3abe59e9065c3414ce40a32a8a22b63395c9ae958ed14e73a3c03ce1382fb
 DIST tmuxp-1.25.0.tar.gz 857012 BLAKE2B d472e0bc34b12f6aac87a0f608ec1e78f52bb54c9e068c5fec53fb8a9a0f70041831dc62a070b4d0f81788f8bd4a0d1f1cb3e45a2d744aa010bf3ecd988e2f6c SHA512 a18dfe4a1df22fc76fb70c7ff06bda6d55a3ffafb21eb26a5ff6fb131452d5a4e2677ca1c3f58c9c6b237b6a9791a3c904f6535a2fcd7dbc1dde28da8959a3fa
+DIST tmuxp-1.26.0.tar.gz 861185 BLAKE2B 348cb2f8dfa53f8e541df0fdd2f4cd51b7230485185000a3df5d66fba26adecb159421cd1b3553e433020334c8162b7325bd2ebe499dc8788cbdc5e21a468ee7 SHA512 68459379df6918651100ba5a6c183c46b2f354bed0c484415edf0137f118f74c4104677bbcf8ba1c2fdbae8ca4259ddf756282583ef8d1408e456a016ea9c174
 EBUILD tmuxp-1.15.0.ebuild 919 BLAKE2B a4a0c29455e38b0c2e51138d96fe90d3cc6b1d2601dd2356a6d322256894647002857bd518c875af3136eb87f2862dbac208a30a26772cb42cf443f6d63a9101 SHA512 975ec9f9118d59d4df42f6e41dceeec11f606997c1756724bb33a11bdf73d6e0f3200840852fc568281b62de342a4ae2700b72258d5d8d9a060a1ea23d0ded28
 EBUILD tmuxp-1.24.1.ebuild 883 BLAKE2B fa40378a1ba80e464cfbbb18b6a33d75d2cef5d2e7da224f5111d77a060b6b41c92dc1af21e695121cea2e5d89aceb75a0ff08df9592d04f45947ac2e89af800 SHA512 bd301531aac63c97b492662721eb4eb97f20853cce1fc860fd8f1bed5d546fb038cb3a19e66f26c181f1eb77c81be8b2648ab028750ad0728b4555e883c7cbf6
 EBUILD tmuxp-1.25.0.ebuild 883 BLAKE2B 72f339f347c3ffd56543596e441590545c812d779bb0c7be5cc23abf6d6b0f564f198ab1c19e9171c71d5f541456bc46ffffa24e96f62704a109f1454bb4eb88 SHA512 9f03e3ed3186e96dc3d7da33f54e9d52c9b05db34c3da29cc7f5eaa9e21da122a68e95d4512fba419f19cdf6e9b5ab97e9344cfc8ff76d23f8c5901cc1344eab
+EBUILD tmuxp-1.26.0.ebuild 1003 BLAKE2B 0e25b020edd649731c332d814d12f100c268a4b5310a6e781c5562d0003a65647ebdaf12b902699162df283308e4ead124ec5da9993d717e9ac0f2e4c0010bb2 SHA512 8d48ce9032f329864057ccdcc14db64c40ec384e56595b3de4f927e685dfc2f5ef9d0b6fc8e0cba1a17d9f9c8d00ad2f5561e4fea68286bdcae255e29736cde8
 MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611
diff --git a/app-misc/tmuxp/tmuxp-1.26.0.ebuild b/app-misc/tmuxp/tmuxp-1.26.0.ebuild
new file mode 100644
index 000000000000..ed443aed13c8
--- /dev/null
+++ b/app-misc/tmuxp/tmuxp-1.26.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=poetry
+inherit distutils-r1
+
+DESCRIPTION="tmux session manager. built on libtmux"
+HOMEPAGE="https://tmuxp.git-pull.com"
+SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=app-misc/tmux-3.0a
+	=dev-python/libtmux-0.20.0*[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
+		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+		!dev-python/flaky
+	)
+"
+
+EPYTEST_DESELECT=(
+	# test doesn't get along with sandbox
+	"tests/cli/test_load.py::test_load_zsh_autotitle_warning"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	SHELL="/bin/bash" epytest tests
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 4e1356f6541c..b8b64a42c8dc 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/editorconfig-core-c/Manifest b/app-text/editorconfig-core-c/Manifest
index 9aa1a3eb23d6..0dcb98ca9f06 100644
--- a/app-text/editorconfig-core-c/Manifest
+++ b/app-text/editorconfig-core-c/Manifest
@@ -1,5 +1,5 @@
 DIST editorconfig-core-c-0.12.4.tar.gz 72141 BLAKE2B bfbd7ab2eb3ac1c73d387447e16c0888b4dce1318f14f1a511cbf1e5c34aecb31921955fb51a6c07a8a991fb388995971ceed22b4e53c53b1c56fddbbcccfdfc SHA512 e275d4f77fddd31717a588be15a67a630e693efbddc5e1cf7e9b116b1c1a700fa9bafc1322733aa73a009c78519e00083b151bbc4a5ad55128df2c7360f9a163
 DIST editorconfig-core-c-0.12.5.tar.gz 72272 BLAKE2B 044723047f8bc6ed0a4b3c5defbc43a0192edd0997dbaf9e9be6027d47f0d09c2bf4ba8141dda67ba541657a6c462afb86bb575a0eee586cf9a45581a5ff2017 SHA512 7d54c8c1ade8ecef5dc8f35e006f0e226455b7ed9541442a846bbebc26765e92abbbb29b991748164015bcfaff8764a0ac007e4384e163678a2922f7ca6b2e03
 EBUILD editorconfig-core-c-0.12.4.ebuild 1018 BLAKE2B 4010d6ebf80a6c4065a2f8533976d6e89fcfcfbf9b7aba97b56ac045de878cb89ff5be64c728760dbe7dcf1a20bc0134b0042a4d2513fda5ecd9eac9477cc31a SHA512 e306e7345354fc0cf8dd33a818cd4387debe4c68518a3c363c3c0918b6a1731c89adf5a937daa3228c3f8ae711af81a4e08e06840d137e88ebc8981aeca30997
-EBUILD editorconfig-core-c-0.12.5.ebuild 1021 BLAKE2B 352102bb02208e9da6b9023475353641b901a12416a34c0434d81134c7a06895643d45bfcb2d15df70f370e3177d424db355553321bd0a22fc08ff14f9bb1377 SHA512 dc1f5ab07bcb604f6ccb3bba2b6152c763cc7eb3e4f528bc99142d4039ca84690cafca02ec3f03fcd12c93798245eb2630af4a4cacb004f823a014785592d2ab
+EBUILD editorconfig-core-c-0.12.5.ebuild 1018 BLAKE2B fca1b07ecabad9348a43faaff5709e985e1603bf2aed25509d9c4d8777573bf45b4c49fe86caea49c3fc9c19e3bed29533e7667708a3db99ef2e477e8a251a79 SHA512 f9cae76ac039246748a1028842e0d18a4114d483e09034a55f4f04a811ab476c5b33f7426ba78e9045628b0361a9307863eadd0bf2fb8c083ac466c7d4b541d7
 MISC metadata.xml 389 BLAKE2B 936516a5d13add9bcb0c94e20f3ea1eeb14119f2cae956c472848769907df123431f6dfa846bf82955a340a9c7f21bfe738203fe4a2bb6ea24ac22bf38d6e0e8 SHA512 5380c32b0d900044ce0d0562d6a71a0db840d01ebc48bdb34a5da2f61a8deff1a475fc03958796edb819d06f7e358a15c9fa4dcd20a91b64ca3c0e790746ad11
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.5.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.5.ebuild
index 3b07de5cbc46..ffaf17c1d50e 100644
--- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.5.ebuild
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="cli doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
index a3b166691e62..7b9185e75a22 100644
--- a/app-text/nuspell/Manifest
+++ b/app-text/nuspell/Manifest
@@ -3,5 +3,5 @@ DIST nuspell-5.1.1.tar.gz 370879 BLAKE2B b02126a00f266b0a4a2271a530ee1aeac3c42d8
 DIST nuspell-5.1.2.tar.gz 371092 BLAKE2B 720ff398ae34ff92884f4eec97e90d88082562a73046a7189f9fa0e93c3ca9de08033e06e27eae6e22ff027428dc904ea4d1e7870aacdaea45712ea2db1755c5 SHA512 138212ae5340836f0bc85d9d5327dc43ffdb1481ca72678b4619938b86c4c8e7c156eec1446f459636460a9015cd476031ad53d0979325e637ed97c19e2f87c8
 EBUILD nuspell-5.1.0.ebuild 1152 BLAKE2B cca4bd8e919f8ad347d086038e06bca191138832f1270560de0908747e6c3b41b946550b216d8441c3c466540bbe3bfc5687477f3554ce346abd854a4288ab33 SHA512 64fe145846f29008e58e6dd849a42268f5a7a17dbd7e91a31f891913a3c5f99293f713ef6586431d23b744d7233d025e7d4c4e24110a6eba97e8a29da4ec0048
 EBUILD nuspell-5.1.1.ebuild 1149 BLAKE2B d1028f747d33df3c33c7b81b521f5c013607889778c38704e7822ae2af6be1d9d556a7cfbc5a3d05c42929c3855f8ba0485ee97e06a54d7c071158e9757ab1d7 SHA512 cb94edb4f2d4499f0bf8a232bf7ad39149ef6af5ab1c9c74d1fd0e1fe3d36bb89e53111d35c669194001518b905a9e53f356dfa6df8abeb48e56aaf1328aa89c
-EBUILD nuspell-5.1.2.ebuild 1156 BLAKE2B 433f4832a93bad27e3183745b58cfaed6578c784c103b63f273f0a66752cfad639311d0d419f99c58fedb0d05a79dce22b8600ccd401e54d1e31bcd4d27fee67 SHA512 4e613ce0b10ddeb663d1f3494da672e75bc65f758b6e1fce235a58040bc80b8243748db83400b98856c31331b4cf859f11073177ca021c29666df113bb8ba0d9
+EBUILD nuspell-5.1.2.ebuild 1154 BLAKE2B 1db0fdb0040785cb17f5d00929ded892727cd09de6a3e670131fa3c71e3657e5a041ffe266cb66c8bed657ce42ed85612be488ec58e4c4e4a64073dacaf6c337 SHA512 3e78dc655f372836f7279d5f79f8bee4bfa8423620b2cde2596227ff242ab15e12c0d44475adbd9d5469cccb711766031a854557b752a0686b786e1e44b87640
 MISC metadata.xml 570 BLAKE2B 35d293be6eceb86ffb9b19a890b6fb280b0d81e29a9d3b648edddf35e4cc1f7986c04926ea570b6e3c6bba9b753bfccfa8728118da836b00633eaffe59fbd8f0 SHA512 08de4433355e1e8b059bcade466dbb8947b38700ee8cf96b7fd8c80d7fef9caf330a9294ba5a80b98dd986581e7b07bf6ae9b14d138477dbeca34d3dc8230edb
diff --git a/app-text/nuspell/nuspell-5.1.2.ebuild b/app-text/nuspell/nuspell-5.1.2.ebuild
index 4e9a4341315c..f77e3b1721ce 100644
--- a/app-text/nuspell/nuspell-5.1.2.ebuild
+++ b/app-text/nuspell/nuspell-5.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3+"
 SLOT="0/5"  # due to libnuspell.so.5
-KEYWORDS="~amd64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~loong ~riscv x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-libs/icu-60"
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 37e99b355991..40553707bd03 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/ada_language_server/Manifest b/dev-ada/ada_language_server/Manifest
index 3001f6fd621c..05c058d3b277 100644
--- a/dev-ada/ada_language_server/Manifest
+++ b/dev-ada/ada_language_server/Manifest
@@ -1,5 +1,5 @@
 DIST ada_language_server-22.0.0.tar.gz 791594 BLAKE2B 9effdf8376e00fe838be7b53c5756dc0d325e36eae780642d79483d6fcead9019cab41e228fe2313d6f31e06895e2d41feef194cb24ac50f02d6dd066774b642 SHA512 ef4bdf41315aad09750e85521657aefaaee419739aac4dec6e182691b8b5282face19481a113e710f7c4b21f6e6f51296d1872aaf5c1c3ab19b6774d142c021c
 DIST ada_language_server-23.0.10.tar.gz 1224074 BLAKE2B 100a0d042a6c638b1b3eb7c9c27a638f218a66e3f52a6f9be53fc42e764aff636c4fe7c1f532f2ba7ae6a811bf4cb8a8ce4a416fd1958c460ffb7f715a7166f5 SHA512 bc062d9e4b6c37a9add7a5665a44ee0ad06fd9ef12cb854b49ed52ed060dfe3582b54a47a4764f0f5b305c2ea697d180832ee4ed87dfcde37bcbc83cb2479299
 EBUILD ada_language_server-22.0.0.ebuild 2262 BLAKE2B 19fcd94fceb4d83f9c32678906878c31a135ed4482f738252e013152b1971d8fba22010038cc2a0a0b625222f8aea2af2e5515018c3260857034cbabfe1abcfd SHA512 c4f0ac9c5541d1543ada9692b658621711d2794eb765f8f9db07830b8c1500b94c8d7f027089d9918c887329c50467aa521318584b294f33d02edad585a19550
-EBUILD ada_language_server-23.0.10.ebuild 2333 BLAKE2B 6117681d98797f16bb28cfc3bd8be57a77eb9fce1b3e4e818b97fb93d0db69ff5b75696e10fb8e50de7fb9818ffe15caf25c868dc3131fc5c406dc0fd033c42f SHA512 2e0c1db1346ebbf7f467521d9c8a9ac51cb2c6af691380cae6bcf04b4038fb520dfeb89a227daa3f5cdc305d10756a6888b3f4ebe14fa7a4bc6765f2d00fcd78
+EBUILD ada_language_server-23.0.10-r1.ebuild 2351 BLAKE2B 7568826bf22a7475ed38bb9062323eaf4677d4dd561bed7597d98e3b9425c08ab2444dcc5fe8cb222b4f1c1ceebfe2fbdd15e0428434bdfbf0913bc4b6fb8b1d SHA512 fcf74900f1de2427d4c3321cf8b5ac64db8dc6245f51624a7f371667f3f20180d656846b37f2da3329c555c6448007f2b423311d9279087120426cefb897a588
 MISC metadata.xml 308 BLAKE2B 4793221c685a34d429fa0119a02d14432c984970ec5616d069cb55fa02e18757c9a8e48dc4df34507ea8c084097ff0a9bee0c317509c4f5c83fcdb318977869d SHA512 b65109a33128863f1f7b29a6645147b5064fa39be86d8d0632c703befeb00138900fed17709a752d17d4f03495af84a405306fd24d32b15b9242c839adb70db3
diff --git a/dev-ada/ada_language_server/ada_language_server-23.0.10.ebuild b/dev-ada/ada_language_server/ada_language_server-23.0.10-r1.ebuild
index 847ac15a3583..e77b0a69e58e 100644
--- a/dev-ada/ada_language_server/ada_language_server-23.0.10.ebuild
+++ b/dev-ada/ada_language_server/ada_language_server-23.0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,6 +19,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="${ADA_DEPS}
 	dev-ada/ada_libfswatch[${ADA_USEDEP}]
+	sys-fs/fswatch:=
 	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
 	dev-ada/gnatdoc[${ADA_USEDEP}]
 	dev-ada/gpr-unit-provider[${ADA_USEDEP}]
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index dd4db96cd9ca..5373334c9d5b 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index 2d33eadd7c55..b0db33ee0b08 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -3,5 +3,5 @@ DIST commons-daemon-1.3.1-src.tar.gz 287642 BLAKE2B 02e85a5534af7f804a0374789506
 DIST commons-daemon-1.3.3-src.tar.gz 290415 BLAKE2B c9c175ba52cef25ce6d1b56c7466aa5e775ed1ac3ca7c710c3519574c35e8a66ff5846313de8da594511ad411e802b7e0b647cbfd66a50abaaa0d39574a4e103 SHA512 ec246e2c05d66408374ba56b3715b13f8f24f89af11fa00c2381dc19c188f1b6228f19351c97d5774808a804b83fdbdfb8f537d099db062c39ffd281c142ee77
 DIST commons-daemon-1.3.3-src.tar.gz.asc 873 BLAKE2B 01fc7ec60393f2077a2bbf80aacb1a03b821cb52f88d87010f26a5811e2695d08b7c01193d00c2fb1a28bb875b63a5a0a935feadf7c1f00c4799aafa32592804 SHA512 c42b36acd45665daeda06a59006f05fd9846817e4e1065ef89dfedef060216ecce0316d06400437e4fb5138cf41c2fe52790cd5da9306c64e3000a3765bad2a2
 EBUILD commons-daemon-1.3.1.ebuild 1559 BLAKE2B fc04c3bff7ab689fafc90dcc7e90b3ae34a1d4662d7ee597ce9616a5191b628c4581e69df342970ddd3fb2e9a278d2bcb23a944fda72db3e045d192ca052433d SHA512 7518da1a0efa66f76d9f601429329e690f2447f60903d0c520de07be7a366045c282bc9998d0aa5d9443352702fff5549534cbbc70339dc0729f077a49f337ec
-EBUILD commons-daemon-1.3.3.ebuild 1614 BLAKE2B 40810f908334f1b8d6a29f77a2b35eb9178d18ed863a53f034d038d2408ee0d91bb3284d2506bd11a7dab2187bd79099a25ce3c0ec3646e67acc539b9a21e4d2 SHA512 df56703814d23eeaee47e4e767049a731633a13f30c5545070653131179ab41903010a53e15868b96f0c2e7b14cf46b5e5b0b7e380690b1fa3ac82c5b68e412e
+EBUILD commons-daemon-1.3.3.ebuild 1611 BLAKE2B e48d4e87cb120df6cd38e73f7b3d5029106d6b6b4f5de505b2b86ae0bfdf2815dcc492f0cfc8927e1bd798f5259982452ef1f743a0594b686b2cad501f7aaabc SHA512 2ee0975cd3af3b20627bd10c36fe18791045eeb01d2e433aa87052d0d51b29106d1378874960814805b194af42d6bffe0f9a1c8cd6e110a54a3fba0cc0b0c85e
 MISC metadata.xml 693 BLAKE2B 327524cf8db429b89ebf8e16745b6125fdfef850402000b1ddefa96254aa827a1fa8a2bd61af3ac219b26f0fd14f7c6d9718462f095ef1264b6119ccbc21f9be SHA512 ab8232bbc9d93e5c3f056f3230f3cf4bd095dbf8985a25094b8ba541679814d4dc10e3a211537397577f30d3d84d3335a0d512b26ca82b14a58f3994b6954810
diff --git a/dev-java/commons-daemon/commons-daemon-1.3.3.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.3.ebuild
index e56c204daa6d..f4bbf1fb0a24 100644
--- a/dev-java/commons-daemon/commons-daemon-1.3.3.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -19,7 +19,7 @@ SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index 4122facf0bc0..8d24fba7bf90 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -6,5 +6,5 @@ DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f
 DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
 DIST pdfbox-2.0.27-src.zip 15770627 BLAKE2B 9f93d597141ff3da39b69da3ce989a0cc7f4020071e5cb1609a8b86d0f12a3219037cb4c7b276acf58ee6b07d842b6d7c76e14fdf79e9efdeac401048e345f89 SHA512 59a5675f5d1d34f092adc019679f7d10e7e93c0f554a002ac29d48cbffcaa600d930309fa94a92191c01ead8da905cbb37ce5e233dcc9b8732a881d4abf75def
 EBUILD fontbox-2.0.26.ebuild 1959 BLAKE2B aec4115a79052a22fdf2c82604a75c9af57e01aaf10dc4fcb640f9959f8553f68775c25d15ff16a18a907b13765fe4f405e086c99627c72918d05a3b507221de SHA512 e09fdd42a7ef24a11a6714c11717f65e80f5329b4b9073928fbc4cf91f2bbd240ce8959f087e59dd741f8b4d0dcd7cfab8e436ad6fe6100a206f16f65a7d085b
-EBUILD fontbox-2.0.27.ebuild 1993 BLAKE2B b83a00ce58219689c6e7dcdc8eea6026d8c49cc1a96916c500b79fab9957f58fd6c4316be57bd47b18b62fc0df9e7fe0458224b1fd1d4ab2882a6657f4eb8865 SHA512 0f5f9347f7a7150b399e0b93708d9b086594322cc3e69c33624df0128d8db8e5aa40774da6dc7f37482fcfcdd0852a91baee2ace086226bd446a10870a65e1ba
+EBUILD fontbox-2.0.27.ebuild 1989 BLAKE2B b3835819318f95235327f4a3267e7a385b8c50d24353c480432a7bc3880bd8f49aa7f74ad5ea101780ea7f4262985bd081c054c4e26cc738cf660c1b2a5e0d97 SHA512 3e3119f4e49971f7e2c06e180167c7399d009e252c83a02094e68d18118647e73782915421fb32e113bf1f2b75abab40f897d27c5212c5898ca6ed26e9779abe
 MISC metadata.xml 571 BLAKE2B 1ffa3f19fb3e5035c5a73503ce6abbeb02de7ea42fb74e21eecb30aa3827085802644b797f197f35d9001d86ec969b0cc6cbdaa634ab0d003fa65bd03c3d09ab SHA512 e1b958bb3eff6c3428581dd3851b8857048e81df192b87ad91fc61d3074a4ebf88dfecf6310ac96a3da6ba6b96d476ef1e258781e36b8f0c5cbf3110d5608f8e
diff --git a/dev-java/fontbox/fontbox-2.0.27.ebuild b/dev-java/fontbox/fontbox-2.0.27.ebuild
index 64b56398d12a..98a6bc644ba5 100644
--- a/dev-java/fontbox/fontbox-2.0.27.ebuild
+++ b/dev-java/fontbox/fontbox-2.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -25,7 +25,7 @@ SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/log4j-12-api/Manifest b/dev-java/log4j-12-api/Manifest
index 66e5014ba015..6a66af3cfaf1 100644
--- a/dev-java/log4j-12-api/Manifest
+++ b/dev-java/log4j-12-api/Manifest
@@ -1,5 +1,5 @@
 DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
 DIST apache-log4j-2.19.0-src.tar.gz 11764795 BLAKE2B 02ec7c5c825cabe9994a2f50d6761110f87a19ff46874c00d46986da7338c32148f3b6c3551c95721aaf94b71d1d5ce8bcea32462e11fa3fe0c3cbbc0cf5f887 SHA512 c72859c415e701921497bb4f02047fa022083f66b4d21b1dbae28361bd73498b2eae335b9a1ac2d7f796df734a6d54db2701ae5ebf999197597e9e2ad064c271
 EBUILD log4j-12-api-2.18.0.ebuild 3316 BLAKE2B c675a6ad27275209484176ecdf25761ced841c600121f1175cd78f8c0649899df8e8de64e40863d69853289a47f51e3296ae455cbd0014dcd7d0bec7b3029e57 SHA512 f4f0bfe344ce508b2e3ebade246bbff3122f5701949e6e0fd11557cbe531c52ba6b688eeb3103f8838a69769a499c9b279a53bad2b857c794ca8a9013b3186c8
-EBUILD log4j-12-api-2.19.0.ebuild 3522 BLAKE2B 19089e0102081b91862693b5264485cabe7108c9db8b21e63f7b9f9f4d6bfc33c70e4224350b75f2a1987708a451cecf790b9ef06b7f6d6a9feef263089c7e84 SHA512 aa206074ce5205834100939727ab516daf2e036f3f5674843ee6d46449d95535bff584cdb6ced14badfedc8a579116084381d61d0fd8fbe594e0d3f48df641d7
+EBUILD log4j-12-api-2.19.0.ebuild 3518 BLAKE2B f297a7ea6f112fca913b3608be99c41482be54db3cc9b198aa0c6b19a6449aee004cf9f0f2d0a818a379f3e1ab5c084866bba76583057a4983994d3b1c4f9cad SHA512 a6ec7b0fd763713a1345e0065ae0d58218319eb8559192faa69d8e0a29d4e14030bb96b68922a48b0afe756085604889640e6195850cc1fbc079ce1beb95b9b7
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-12-api/log4j-12-api-2.19.0.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.19.0.ebuild
index a4ef4006cd13..eb4baf392fe0 100644
--- a/dev-java/log4j-12-api/log4j-12-api-2.19.0.ebuild
+++ b/dev-java/log4j-12-api/log4j-12-api-2.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
diff --git a/dev-java/log4j-api/Manifest b/dev-java/log4j-api/Manifest
index 1e8f0807e146..0c6fd1122977 100644
--- a/dev-java/log4j-api/Manifest
+++ b/dev-java/log4j-api/Manifest
@@ -2,5 +2,5 @@ DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962
 DIST apache-log4j-2.19.0-src.tar.gz 11764795 BLAKE2B 02ec7c5c825cabe9994a2f50d6761110f87a19ff46874c00d46986da7338c32148f3b6c3551c95721aaf94b71d1d5ce8bcea32462e11fa3fe0c3cbbc0cf5f887 SHA512 c72859c415e701921497bb4f02047fa022083f66b4d21b1dbae28361bd73498b2eae335b9a1ac2d7f796df734a6d54db2701ae5ebf999197597e9e2ad064c271
 DIST apache-log4j-2.19.0-src.tar.gz.asc 858 BLAKE2B 36cefcd5f016919d18a7d74121bbd913be65e32daa38cef312c167be5c4a0e722aac1c2c802f95792c7c7e8e455a755cd3c5a737b34c36ffa061c60eb6488775 SHA512 0de52ad15d593330631cd26feb4827f1dadc4858c16e33c33099efe27cddf854c5c4ed7f0cde4c6593bc74e573b6378e7f993477d02215295ec7992b81d0b338
 EBUILD log4j-api-2.18.0.ebuild 3007 BLAKE2B 5a40542111a3afd18b3814622d370bcab1fa8eb908335b9464f9f4d8545e1080aa1ef43022bb06847b4f2ed0b10b08c8151278db08ee7002a2e3528b2916a787 SHA512 1b447d0637decee4783728d4e562def111869ef0e7990e09d0c1f3547247317a1dfea3934c4024428b42fc2c6ba524af14d79188001d2fa2c64db2d62776408c
-EBUILD log4j-api-2.19.0.ebuild 3321 BLAKE2B 34c4966c869f33c29b355343beaacf7c335725ba5fdedc47f129a175094d063708b41d2149e9410a04d29487fbab35b57ae0dfc688b5b494903053c5e3428010 SHA512 95f69ae6ef5f401e008d3e098977e6af615c2312a1de6a42248d858ade9ba9120831dd1618e329ba734a17b6b9e20b03a79a76c0542a3fe6bfc7d7cd02a31164
+EBUILD log4j-api-2.19.0.ebuild 3317 BLAKE2B 0a2ccf1611911f5b4af691bd913725113064c2a239ad26aecf07a67e320055b39964c54b93b6a80aa8113905811929ca0507835227c1e0dd579c34786d5d2c73 SHA512 50ffe684dcb6dd5df4464b132c7f07cda6564847aac26846230323ade55468a70bc8b0579df0cd64e65072545189a70da695904628def6a306f5ac2c677ba340
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-api/log4j-api-2.19.0.ebuild b/dev-java/log4j-api/log4j-api-2.19.0.ebuild
index 57eab31a5966..61fcd0bec604 100644
--- a/dev-java/log4j-api/log4j-api-2.19.0.ebuild
+++ b/dev-java/log4j-api/log4j-api-2.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -19,7 +19,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # junit-{jupiter,vintage} is not available in ::gentoo
 RESTRICT="test"
diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
index 768f209ed743..56d9307caed6 100644
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@@ -1,5 +1,5 @@
 DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
 DIST apache-log4j-2.19.0-src.tar.gz 11764795 BLAKE2B 02ec7c5c825cabe9994a2f50d6761110f87a19ff46874c00d46986da7338c32148f3b6c3551c95721aaf94b71d1d5ce8bcea32462e11fa3fe0c3cbbc0cf5f887 SHA512 c72859c415e701921497bb4f02047fa022083f66b4d21b1dbae28361bd73498b2eae335b9a1ac2d7f796df734a6d54db2701ae5ebf999197597e9e2ad064c271
 EBUILD log4j-core-2.18.0-r1.ebuild 8527 BLAKE2B af5aac4dc73b2b44b8c81b43b99b70ebba8b2893044516cffb97adcce4a98cfd314d0ee0ff0ddbc9276cc6c05c69f0fdefb89af4bdfc962ee8888002220079c7 SHA512 6ac65512701fb4a655257a9844f995bd0cdf91bb170e7a192f772b027662806edfd548c4174628c0c69ea82083b2d0d167533de5b90e71552c04747fd34b11c1
-EBUILD log4j-core-2.19.0.ebuild 8758 BLAKE2B 5fe046a7bf3232b37d12bff51fa5de9bd3a40ffef4b0ca5580a11ea87b166be9eda550d1e33e7b369c882f08b3d2f8eabd4de6624a4a60efa5f65075b6214626 SHA512 9199e9f3dec56d4e85e666f5fb13ce479aaa48244ab16af581639ad8f7880af2401bc836b6c6cded2d66ba704adadd6d446226c88b525e22f60966451515d797
+EBUILD log4j-core-2.19.0.ebuild 8754 BLAKE2B adf025c108c73f92e864c7b2d738fcdef3d78b85eca63845cecf14bd580ff3b4b794a7060d717e2904036a914cce2934f52f07b5072062a4ee1e9c732d6ca6f1 SHA512 95177eb4e946e4b4e26a86bb5caeb651af60c5efc6cae61931f441261ae0b5f6b84a01d50fb05fd58ea6f3d01271ac0befa65ddef7328c57a14a478c2138986b
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-core/log4j-core-2.19.0.ebuild b/dev-java/log4j-core/log4j-core-2.19.0.ebuild
index 5c0b63067b1d..1ef9298c2298 100644
--- a/dev-java/log4j-core/log4j-core-2.19.0.ebuild
+++ b/dev-java/log4j-core/log4j-core-2.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # We don't have junit-vintage and junit-jupiter
 RESTRICT="test"
diff --git a/dev-java/pdfbox/Manifest b/dev-java/pdfbox/Manifest
index d67eb5962c62..659e99f364e6 100644
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@@ -42,5 +42,5 @@ DIST n019003l.pfb 79155 BLAKE2B 2995cd6e35de2d49cc6d4a5f6c7461396b23e14c6403cd7a
 DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
 DIST pdfbox-2.0.27-src.zip 15770627 BLAKE2B 9f93d597141ff3da39b69da3ce989a0cc7f4020071e5cb1609a8b86d0f12a3219037cb4c7b276acf58ee6b07d842b6d7c76e14fdf79e9efdeac401048e345f89 SHA512 59a5675f5d1d34f092adc019679f7d10e7e93c0f554a002ac29d48cbffcaa600d930309fa94a92191c01ead8da905cbb37ce5e233dcc9b8732a881d4abf75def
 EBUILD pdfbox-2.0.26.ebuild 10949 BLAKE2B 49db375f1f781700a9e2df91dca92d1ddd72362380b23e864fe2be798abca98e9b8b15e148c4b968a1992252b7914fa843f11ee25b39214b97042ec81568ac11 SHA512 3e3f68c8eae5058863ba3f3e873c15bce59c5c28a542fb0486a4014fbded704eab14db04fecbcba7d10e7f61d7a061ebfc7b873880b0b45b2ec991ff0ab2c9ab
-EBUILD pdfbox-2.0.27.ebuild 11031 BLAKE2B 19ef15ecdc992ec1e6e5ca8e79b0bb2dd076c9527c77e063ae82a89a97d0d89ec99c287f836aefdec2b0d190f246aaaadecf41bca4bd77379156d906ec91a104 SHA512 9f34a9a18d3235f706d4a16800db999e7ca97d693e7f2c19eb1dcf613e9632089980e7a750e347eca68c2a1e3af29f1e1d23cb2e778ebe9599a58d71cf16f33f
+EBUILD pdfbox-2.0.27.ebuild 11027 BLAKE2B f44e3dbc3b5b6bc65a27a53f826a1eee50f10c2df9329e0e6cff1381844cc041e81c7f06b87c1387b6933dd9c50a81b730726b178ad4234b2accf0cfd9791ed7 SHA512 9e4509481e9d39f12056f5a1ac487bfaf9b607379914d5b02971458975c2e60692d94f699d1858ef721bbff4e9a53616f9a89d5f78c6dee1c79161d57d2f58c3
 MISC metadata.xml 782 BLAKE2B 96e76863aeaf1791f4a7a44aeb49df8b5a9bf91ac0d8d69e5642128df590456a2d38c64c84e8b50c917d3361bbaeb880a1b7744b994db9eee5ca8d250d765d6a SHA512 d7d47cc9eb182780424161f2a136cdec74bbe0cf4d63f52bfc77df8ad4fadc2bb9f3bd7b1ccff667d25928b4e0bc4a979b725ce77f1dff244585713ca40f88cc
diff --git a/dev-java/pdfbox/pdfbox-2.0.27.ebuild b/dev-java/pdfbox/pdfbox-2.0.27.ebuild
index 8059ebe7e015..3bb1b8e0c5bd 100644
--- a/dev-java/pdfbox/pdfbox-2.0.27.ebuild
+++ b/dev-java/pdfbox/pdfbox-2.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -60,7 +60,7 @@ SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="+tools"
 
 PROPERTIES="test_network"
diff --git a/dev-java/xmpbox/Manifest b/dev-java/xmpbox/Manifest
index 89a86746beea..e547af034822 100644
--- a/dev-java/xmpbox/Manifest
+++ b/dev-java/xmpbox/Manifest
@@ -1,5 +1,5 @@
 DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
 DIST pdfbox-2.0.27-src.zip 15770627 BLAKE2B 9f93d597141ff3da39b69da3ce989a0cc7f4020071e5cb1609a8b86d0f12a3219037cb4c7b276acf58ee6b07d842b6d7c76e14fdf79e9efdeac401048e345f89 SHA512 59a5675f5d1d34f092adc019679f7d10e7e93c0f554a002ac29d48cbffcaa600d930309fa94a92191c01ead8da905cbb37ce5e233dcc9b8732a881d4abf75def
 EBUILD xmpbox-2.0.26.ebuild 1707 BLAKE2B 775bfd44df6055da28f3256d411035d98de8d247199ad3c0b3e63f2a030937dde311e08bc24433c21a6aa8e6e1856b15bf302f175190f06ee60559751938d31c SHA512 600198cbc3142f6e29ceb07843016d29863c4d98de95aafd1dc72480b6c36aedd655b7002311c05d4e7a4d985373ddbf9da5dbc2a3281cc3f1b9a4f9bbcfb9f3
-EBUILD xmpbox-2.0.27.ebuild 1621 BLAKE2B b76b54c3e169055a1d1f717927f1cab99b95e45ac3ffc8cbb524b28b3db770bb121979a5146f73c622be545cbfe2fad42d7208a17f7ddec0a1956c5304706cd1 SHA512 ec627d8e44c641e1e851242f50272ce85844740070ccc39a9e384f7f1316f03d7a0668516ec9feb8dcac5ebf1dfabeb6732450d76958c85e8f7b861c5b55b4dc
+EBUILD xmpbox-2.0.27.ebuild 1617 BLAKE2B 768a66165f403000c657e8c1d00e1efb1a9d967ec641558b5e56164047585e1440371ed3e7c6c4daa21c89ef9617ccb075f23c1ce421a0fa51b27fe0228195d7 SHA512 3cf69b46e86e5b6e313e97304d38443b00f1f74fa94b68b4488926eb6e0bde4a7da7032bfe316014004ce2c97c0556433439d3a71056973f0f68866e16efe0d2
 MISC metadata.xml 597 BLAKE2B af69fd45c044a79514701234978475dbd127d305667a831a88ef2ba2fc2e8fe903c77ddfa7e179466e004467da1002cc56f310628c1e69adbcfa40fbe485110b SHA512 baf1c43dc731ac2cc2f5a6e099b4334f06d352d1324e78b1cea4b3d839c55ca36cf368b6cf4f6b5bb41fb0be9c35e1c41546ff93141e7316d84ff9f94074efa9
diff --git a/dev-java/xmpbox/xmpbox-2.0.27.ebuild b/dev-java/xmpbox/xmpbox-2.0.27.ebuild
index c78fe6340798..e76bea27a1e5 100644
--- a/dev-java/xmpbox/xmpbox-2.0.27.ebuild
+++ b/dev-java/xmpbox/xmpbox-2.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index a87a2fd4449d..1e07a4ed8123 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index bdcbd8fecbe9..1d152350834f 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1,7 +1,5 @@
 AUX ispc-1.18.0-curses-cmake.patch 597 BLAKE2B 083a949e99a00819b1eed3ecb4276c7018f914a4902ea4c41dbd2a10c934d908ef2bc29a45e869ce290d5e787a7642de1ed630bc697b02e07267bb4e848fa1fc SHA512 6ba529e8dd4ce1483149e51a9a8ed28b476f604fcec263f806be7f9ec1b55decf8603126ea70600dce3d6947a328d907d046d25cc401847f6701cc9741d6cd14
 AUX ispc-1.18.0-llvm.patch 1410 BLAKE2B 77027da9032fa230c72d8608c2a6cd63c33601e17acab0260101c64dbb50a0aa3cc30702c4480ae5d63e95ec3e962e28bdbbd90cd72f4e91d30dc364b82367b6 SHA512 116078d5ab99c849584cc4ece8dc3ebc817221a2377e26083071e206b5e83c4f3ed594f84b86c9659ef86a497bd3cd058ee32138238e12e6aa9dac0f11cf1440
-DIST ispc-1.17.0.tar.gz 19436681 BLAKE2B 11af6e22c4c297a2fbd0ae1bfe2a37ce2f836607b2caf42634cff0b0fe1116542e71f056de12e3472724db04f1c5174c0deb47c2bd64fb756b4bdaef48935707 SHA512 b1c67381bb8b71d268c6e68c95cc5e2d64411ce351506de96d31850b879f7777fbc1cb33f3761437f84e52ae726fabbb794ebba9cf05d5200acaca07a2ebf0ac
 DIST ispc-1.18.0.tar.gz 19469764 BLAKE2B dd95ec177120899066d5539add0f35685d73f65512e8be1cc42cf6725741d7f307fbecefc22c4944d9be0e3659d511546b15506213f3dbb97829953507996283 SHA512 350b43876d6885ab4c5c0d49c5b44323fd258d5cf7c68fcdea774baa92589542f2caeea93c347a37f0dab3dcf14e7b3e685973b41694f08ce7a2da64dc81bf06
-EBUILD ispc-1.17.0-r2.ebuild 1649 BLAKE2B 3c993b43e7503ea7702f3cb586cc1a784b54e88c2eaad671f00d44ca1e3dcc36672c92888fc892be779d216ef3034bf12945d96c6de7182032803b074bd01a68 SHA512 144d3c00aedd19b79649a2f7bec60faeb911bc5f088af90bb289cdaf9b2a33cdda57ad36062cffff975a037e0706dfbc1cc261cb07b844a9187d88f85d1dc678
 EBUILD ispc-1.18.0.ebuild 1759 BLAKE2B 7464b2b45781585e1b985bd47be67688b0757535e9f3b28fdbdfb85a7f331c2403cc6e0bcbc53e7b5b6798b5ea1dd056dccd04250e49fde1149df3028982c02f SHA512 2c0358dbfa198df04286c623fa7696b3914cda377ef207c32a39307d24cd18b76c239c5972b7e1fa23e90c81f2ba9aae67cb616a77064338c89b4476de46f7c9
 MISC metadata.xml 242 BLAKE2B ec655bbb26e5d545a7b25a9906e315b54a18cca56613207ce76c9e002fb8968e269627e75639053d7da3c46d8ba34296129458adcad9a561414628e8957d2d9e SHA512 7702a5b2bfe0d81904e069fa097af3c739a21ffad9b03cf9931e398dc904d10501854cc2605fb34415f3f13e58a990b7ff8c3aa803f981889c53b25cc23c6115
diff --git a/dev-lang/ispc/ispc-1.17.0-r2.ebuild b/dev-lang/ispc/ispc-1.17.0-r2.ebuild
deleted file mode 100644
index e61bd13adf34..000000000000
--- a/dev-lang/ispc/ispc-1.17.0-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-LLVM_MAX_SLOT=14
-inherit cmake python-any-r1 llvm
-
-DESCRIPTION="Intel SPMD Program Compiler"
-HOMEPAGE="https://ispc.github.io/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ispc/ispc.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="BSD BSD-2 UoI-NCSA"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	${PYTHON_DEPS}
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.18.0-llvm.patch"
-)
-
-CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use amd64; then
-		# On amd64 systems, build system enables x86/i686 build too.
-		# This ebuild doesn't even have multilib support, nor need it.
-		# https://bugs.gentoo.org/730062
-		ewarn "Removing auto-x86 build on amd64"
-		sed -i -e 's:set(target_arch "i686"):return():' cmake/GenerateBuiltins.cmake || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DARM_ENABLED=$(usex arm)
-		-DCMAKE_SKIP_RPATH=ON
-		-DISPC_NO_DUMPS=ON
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# Inject path to prevent using system ispc
-	PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} ./run_tests.py || die "Testing failed under ${EPYTHON}"
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/bin/ispc
-	einstalldocs
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0279c37a21e2..1c9ae26954b3 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 642d4943cb96..a259429ece79 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -7,7 +7,7 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B b355a93d63ee4beb5f3782cda8514aa02f16e71563f66bac6fc7a5e3beae40efa1bdbe098f3d83ce775d0458118f19fceb7225f2b5511823c8e56cabdae4f2d8 SHA512 488e5c278fe4b48ec8ce6ccd76d489cf08251ce6e8f8bd417048a80a10e4a5cf72f20462aa8115f72afe1a40dbee02d936680d516dd1c940fd52fe6f55402e69
 EBUILD libclc-15.0.6.ebuild 1667 BLAKE2B 496db7dddd88d6aba0a9bf96b9b874022da60073993b456316fd391b9c0ed76134fa4af3cae20df64af47884755aa68ea586fe4410d5a4eeea86b51a99566dd7 SHA512 155adf1cacc694b7a1c4d54b60ead79158796f56b5437109f7f6262c8d40d79181c2d78ec3a2028b5159973ae42da6ca85e159fb95818dfdfb6e384be7fdc25f
-EBUILD libclc-15.0.7.ebuild 1668 BLAKE2B 471ee0b6aa833aa46c70721015bf4a35a95d9e709856840a4d126555ad81d473648532161c37d4c83034ac7debe48144f8a0b7935e2498642eab57cba1b45e02 SHA512 ef39e154926aedf2efca58df974abbd654b9e12b173104c8f38be060827d82a73a1fcadea2f21725686f6a0d9eeb8b05a55bcb76263db19adb91b00517a6d1d3
+EBUILD libclc-15.0.7.ebuild 1667 BLAKE2B 496db7dddd88d6aba0a9bf96b9b874022da60073993b456316fd391b9c0ed76134fa4af3cae20df64af47884755aa68ea586fe4410d5a4eeea86b51a99566dd7 SHA512 155adf1cacc694b7a1c4d54b60ead79158796f56b5437109f7f6262c8d40d79181c2d78ec3a2028b5159973ae42da6ca85e159fb95818dfdfb6e384be7fdc25f
 EBUILD libclc-16.0.0.9999.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca
 EBUILD libclc-16.0.0_pre20230107.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca
 EBUILD libclc-17.0.0.9999.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca
diff --git a/dev-libs/libclc/libclc-15.0.7.ebuild b/dev-libs/libclc/libclc-15.0.7.ebuild
index 583102064ded..6e24b29779b1 100644
--- a/dev-libs/libclc/libclc-15.0.7.ebuild
+++ b/dev-libs/libclc/libclc-15.0.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://libclc.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 
 LLVM_MAX_SLOT=15
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index e7041fedd4a6..5c96bc0dd7aa 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,5 +1,8 @@
 AUX libfido2-1.11.0-regress-tests.patch 2545 BLAKE2B deed72f2a6237515200371b6f1b066fda27df6ce00325086adcb1065a3c9a70f4f1ce94640dc46b620db716c870f3fab8d6481df5c2a690f039a084665be3e8e SHA512 acca7ae882c4e3715c30161c1ebfdf02428b8749f4ef884f9b66d654b1b943d36edde5578e416d673eb3eae79dc15082526acf6f31c1ceb55fc84be4bc51229f
+AUX libfido2-1.12.0-cmakelists.patch 982 BLAKE2B 58787219654244cc0d45e7529835c36a5c08beadd5c062da35a17019eca845445a3f612831557dfa43afe9cce685b6eef78f3717a152460db5ed6bff318931d8 SHA512 ba8cda657d5665e4053c3e2ba41c5404dcbfb8af9f8c16ecb70e8d8017f5a904b057ecbdc044bcd2bc4145731c7c5af9a981d9461b3a5b4e9b6eae3fda238504
 AUX libfido2-1.7.0-cmakelists.patch 867 BLAKE2B ce559f70b1bc22731b16ddfd30b4a0be1e9c87e9b79dcfbf6fae3179ef618d0ed39a65c89f9d5b89f723bff87e72f2d1fdb1558aeb7946933ec35e6c2c99d247 SHA512 6c4338d82d51b66aa6d16ce6cf74f7101e1529ee6038517300e32c9f50965d029dcb8243f37643afeff9bdbc92032b80a4da24bf98d5bf2565a5c9ae95da1f41
 DIST libfido2-1.11.0.tar.gz 624148 BLAKE2B ac123145f22260922e1d83653ba5781c5f41b410760f2c26b7cab7cb0871079aed66a8d9747393843738e4c2ed7ba8ba0292075516ef0354fd4328df967b7a6d SHA512 d9644453d67b84ec8385dfb63796adb3eae2d7f7cb47fbb1bcf9ca7f5cce400623738cc3317d629c2f0af630424cb2788217f8c7f20d1b52b7369c729052d572
+DIST libfido2-1.12.0.tar.gz 652326 BLAKE2B e206c9c76e27037c49d3b0e842487b0711559483eb9ae638590bb7175761251c6f60dae6c6dc6cc8b13e49b9f32432ce4368e709b4aacf71f43b760092e3b00d SHA512 ae8c716fe9b2fa52f191c4b3fe61442ba0b7a364a23c6c3a29afdba4f47c5eff89cb1d6c9fcacaefd7d4ebce641d35600527ee33934786c2096ac97f78e9418f
 EBUILD libfido2-1.11.0.ebuild 1079 BLAKE2B 92af2b2246a9d3fd3f90d684cfd1f57f87b6c3ed8bc4262cf91dd88c39698f184d28a54e743280ddeb206971dcaf1acd9d2f222dd4767f96fa149c86c27dabf5 SHA512 575639ed512a85fd5354350e550d678b20aa981a1099dcdfaa87e281df83a7d143580b71e6d7ffba70046b2b5701300cc2b07e2b48980a76268c69c875d51bc7
+EBUILD libfido2-1.12.0.ebuild 1081 BLAKE2B 13ccac1431aa9b22ddd4f0e8a50722b16352c1474d0ca242a46967bc74282ffbff10c8b05fd63730105934c6a2cea76ad95efe228050a6fed6fc876c9d8b1e78 SHA512 5eb43fff2394253cfaf196b5ec54ab539aeb6c6de843433090d726798cf6af4ac4caf6e3465756d04c063462ebf1d3ef43cb613d75b5de2fc866524d4f0e3c39
 MISC metadata.xml 411 BLAKE2B 3b2e2850f194b8518267bb8125401bf7049f1b63158bdb28e63e63c03f1c50c918164911a7899790f12c2a207eee88970663a57ebdaf26fa601d77da299a0797 SHA512 dd6d40f9827d7dfb35548c201f90571cec364fe89e4b1811b37f34c1435d05c078585ed8254884370fe575a6fb58c4fb271b87007915c38dae8f945735c0b2ed
diff --git a/dev-libs/libfido2/files/libfido2-1.12.0-cmakelists.patch b/dev-libs/libfido2/files/libfido2-1.12.0-cmakelists.patch
new file mode 100644
index 000000000000..48dac6268342
--- /dev/null
+++ b/dev-libs/libfido2/files/libfido2-1.12.0-cmakelists.patch
@@ -0,0 +1,35 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dc31cc0..81528d9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -272,7 +272,6 @@ else()
+ 
+ 	add_compile_options(-Wall)
+ 	add_compile_options(-Wextra)
+-	add_compile_options(-Werror)
+ 	add_compile_options(-Wshadow)
+ 	add_compile_options(-Wcast-qual)
+ 	add_compile_options(-Wwrite-strings)
+@@ -280,7 +279,6 @@ else()
+ 	add_compile_options(-Wbad-function-cast)
+ 	add_compile_options(-Wimplicit-fallthrough)
+ 	add_compile_options(-pedantic)
+-	add_compile_options(-pedantic-errors)
+ 
+ 	set(EXTRA_CFLAGS "-Wconversion -Wsign-conversion")
+ 
+diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
+index cf32a3a..4aa6005 100644
+--- a/man/CMakeLists.txt
++++ b/man/CMakeLists.txt
+@@ -4,10 +4,8 @@
+ # SPDX-License-Identifier: BSD-2-Clause
+ 
+ find_program(MANDOC_PATH mandoc)
+-find_program(GZIP_PATH gzip)
+ 
+ message(STATUS "MANDOC_PATH: ${MANDOC_PATH}")
+-message(STATUS "GZIP_PATH: ${GZIP_PATH}")
+ 
+ list(APPEND MAN_SOURCES
+ 	eddsa_pk_new.3
diff --git a/dev-libs/libfido2/libfido2-1.12.0.ebuild b/dev-libs/libfido2/libfido2-1.12.0.ebuild
new file mode 100644
index 000000000000..5fba80836f19
--- /dev/null
+++ b/dev-libs/libfido2/libfido2-1.12.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev linux-info
+
+DESCRIPTION="Provides library functionality for FIDO 2.0"
+HOMEPAGE="https://github.com/Yubico/libfido2"
+SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="nfc static-libs"
+
+DEPEND="
+	dev-libs/libcbor:=
+	dev-libs/openssl:=
+	sys-libs/zlib:=
+	virtual/libudev:=
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/plugdev
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.0-cmakelists.patch
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~USB_HID
+		~HIDRAW
+	"
+
+	check_extra_config
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_STATIC_LIBS=$(usex static-libs ON OFF)
+		-DNFC_LINUX=$(usex nfc ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 406e75956275..cbb239b342f3 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -3,17 +3,9 @@ AUX simdjson-1.0.0-dont-bundle-cxxopts.patch 611 BLAKE2B 65671f33b25e9569de8a938
 AUX simdjson-1.0.0-dont-fetch-data-tarball.patch 658 BLAKE2B e15a9d8186f422f14e66bd42f07b72441f69b6d6c1caf2536f08f56445f3b869f3a97d49e96e12536e5e86fb1f886233724abcad723ccd19e7563c9d5450fe79 SHA512 5e6aabff62a58274ae058ff8f0057569048578207914c9a983ce0c51bd23eb77e272d0c2f92ff7b164a592569fbd677327f83955700967b71e8ada7f1d103646
 AUX simdjson-1.0.0-install-tools.patch 933 BLAKE2B 1464f6eba0bc747dc24fc94ceebefdf52fbdd147293fce80a2d3612c0130a4c0a68bbc7dcad5ac1dbe2f1bbd4b6030ade7dd78717c80be74e497872fd66f0037 SHA512 ba399139793ac9b8be76eba69844d74c931c9edaa20adf42f21353bb242ec9d5e093c9cb26e36542b7b8cb12f75a5a8906992b6569c990af77af189318c67ba7
 AUX simdjson-1.0.0-tests.patch 383 BLAKE2B dc3dcbc08ec78608a94e5d04ff217a774e1c41d45f8c0c0135a52bdb2e217bf15cf9b16b35f9dbf77fc84353f904bdeaa25bf7068e93a452203dd7e9b3e40932 SHA512 95e6d933c0b673b26496aada4bca7dddd386617733dc23b15e6bd7f8275a24c206d149e95159985941257b49ae633dc8c340bec034595f3f781ed81accc5f9d9
-DIST simdjson-1.0.2.tar.gz 1551616 BLAKE2B 534e312de977b82604595ccf889348545ed355fb9cfb6f618d42236122578f6102ce7bcd31204c3013dbeeff17c35effaff62531a7e17e5e83ac07150b1456ab SHA512 04a3bee2d847680aa1f55115007ceec01652bebb8d5187cfbca0af81bedff355cbac949862a82e3060071da1a58b62d5b028bcd91562b962756aa5cab614f073
-DIST simdjson-1.1.0.tar.gz 1555845 BLAKE2B 6dfd4e938b9f1f6a6314f39929b74a7e822fbb37510914eb3db0660b9bbf68ef0b2fb4c45aa2e1246f6530d3848d0055220d4c5ead3093f97956a6154b22a899 SHA512 f8718bd039e1a25f0b95880b957c43e6eba6eada6bb7f58cedde37669a46b15b3ff9f4c4ea775e1cf949657642ef0472fa8bac5bdc98882df63e7f292fb5a723
-DIST simdjson-2.0.4.gh.tar.gz 1612055 BLAKE2B af60f4ae6780eb4068ac85c2d6784539b14fad6b7871c091f2ec3dc4f8cc9add8510f4d92a8db6ea305a1c2cc6919c8f8604d31d4e939677f3ed121b53891c24 SHA512 5d993939aece8555dc7fc5d63be14103af4ca164fb0cd53ac96578ed8a9fac61f974c247544ad007710c7a710bfaea7ad94098a143c713097237cd47c7792463
-DIST simdjson-2.1.0.gh.tar.gz 1618798 BLAKE2B 019e04ae5c5d0e43bf81734edb72d969d95fa4325f2e9aa51258d71587a6d71e4f26edd9beb2797fbf420ee4d7434985e7d960943dacedfab3a6afe616ca20b9 SHA512 6689349195ac4f0f94d47915f90b69663b6a010523fcf58fbe8bb3815db946c65208104c6f1e5d97e42cc1e1b883e5488c059df0afcc7f6e648e2ab3eb97af13
-DIST simdjson-2.2.2.gh.tar.gz 1623231 BLAKE2B 1caea4b5224194770af5b43c82110faf9fd17450935af67e3f9e6d3da164ffd3d40a4cca49a4d1b3007549835ecb838b6788e97059548dfa86b206ce240bdbd9 SHA512 a11698491d12aac3b92dae0fd994d0809910cf5c88550058c84035aa3bec02ab4541ab99e12db6605581f6ba61d7951a2cf3988fc20a467f4993f35d24cf2a76
 DIST simdjson-3.0.0.gh.tar.gz 1628275 BLAKE2B eef18be927c50527885f6e042ef22317b7e6da6a77d652a4415b98ec7fda227a1b3b798774c12b587a1a011b16c4011a0656f1bf1a20886432796e64076f4775 SHA512 4ea58cd4d059f5e83734f8f084056a58a587529e13df5c47fbb42b141052688f8517ab4e7d6cd4581c6b560f8804968fa0c9c7184b1d8d54e45c280302a069ec
+DIST simdjson-3.1.0.gh.tar.gz 1632837 BLAKE2B c7df7d500753c0fc23637b81e5fa2b01617d1ed24b388054b94cd877d4b9a21cc7495f3a98910600aa9e659a3d734ed6abcc9ba2f6f1f497cbadae313af02d9b SHA512 839b96c17c40274080b2543a78845bae6e7784a53374c0935674e52283ba1cda9dc55ac910641644eb55b8413b02156205153d95619a06ed8bb054429b992051
 DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
-EBUILD simdjson-1.0.2.ebuild 1839 BLAKE2B fc2bc3413800226d36441303e86ef41cda386973c1fe14715a19e882edc2b62d747ed0f7c82f701576e187b9e6084bcad6a1bf3c7ebbfd6c27c399795e1697cd SHA512 e74e183c513bc86f5ea1220a3263c3c56f8d3fc88f571cc19228da0ae47ab795348975321da4d7c3ccbd1cda6b68aa400fa7e645ed0cba69b915df55592cceaa
-EBUILD simdjson-1.1.0.ebuild 1840 BLAKE2B fc07d21ada13362809c103c3a26bdf94d7d10f8e4fcfad777eb87dea8ad8afedfbc01a5a3fd196b9190ff87993c189d380e02f251447e531ac07146b400c1577 SHA512 ea79f39b24c464a001e5267903a79dd2319c69be7b31c8adaa93a97245ce8fc49ccbf421a8ad0ac6d9b759e15dc060a9d34a33a25bb3e79273f647d69512da4d
-EBUILD simdjson-2.0.4.ebuild 1843 BLAKE2B 90704b2bcebe4c080fe0040b9a9c3f81603cb45672f8fc3aeb481db90a14afbc9ae50e88d42fc6c8f3438fec2815745330ce90b4f26924534a317dacddcd7b55 SHA512 6dbdedb80be6df26a7e46919dd76a24ada3c379a7373f478604a7994a0ce8c04e844f6e306ad96184c165781529217f576f2a1bcaf790aa38095c26c906f6842
-EBUILD simdjson-2.1.0-r1.ebuild 1844 BLAKE2B aa90bacd942a5db753dbf8275603d02d73147e9f71811972b8605b59a8a5456c36e8f03a951788ac897260f1bb1a13edbe1de1e9fcef1ca3afb957a08e30ae6c SHA512 66b2f5ecf1acc3506729651484c226d5c26940a69e73cf5d59b17a05bbc3674d376f0047a85b3603899a78c1bb2d9f191304a953267de90489d19a8d415d89f0
-EBUILD simdjson-2.2.2.ebuild 1945 BLAKE2B 2d7bb2b2da38dc6c923d395bc4feb2cff237e1b01afd18bdbe941cc56e2f6bb4cf4e0cfe4fe68c80b976008ab1e86481b3248eb60563c5f8b945fc7d8143cffc SHA512 a1ea8f1c3319bb27d0cd48f73958d2c62da7900a2bfa80ff569a5c515b19249eb712045bc8d487249d772b9c1623b2e8bc568579f26e257c21df06fcbea4b40c
 EBUILD simdjson-3.0.0.ebuild 1963 BLAKE2B a05d5f1aa3b2cc2b0275c591436eab6ffc22940d02a6f23444880f4b6904aae69fc6b2a0f712991cc54c66270bb525c80fa35216314c6acac134349170c764b3 SHA512 0da58455e1442d1753e5502f32e352a825a6f27f1303e6641e7f1f5a4d96efbf9d0445d659143df8ed05e0ca57f0be01d5df92a2f9b8823d9a7375395d8d484a
+EBUILD simdjson-3.1.0.ebuild 1964 BLAKE2B 6780f23d612f127d7e0cb9a08f6563968425167a728678c59a400e69fa1834aef8d911b8629f1ddbeb6c6e0e86456326919a140f892e45a79bd303d5421a7a5f SHA512 3664b50dfd7dbd2ddd137a8078b8f181c1d67dad964f2240784fa2ff94c47e73024ecc3db5c1d8075edec04005b4d3a590dc2b57ff07c7b1324f93cc4065c2cd
 MISC metadata.xml 336 BLAKE2B e734f879a36d4e77dade86545e210039d032a5b9a909b414c63855f62d9015122305496eb7faeb752a6bc96cc7c6287164da29ab9442faf13e3d261e0329b299 SHA512 fdc9e0f98c2d9f7e7e5997f2922d9ad7be2defa93ca3b30e29e7a458147a32fe9e02cda9fe9df4035bde0a077372d7f109337a08a4dea1b898a0444082c858c0
diff --git a/dev-libs/simdjson/simdjson-1.0.2.ebuild b/dev-libs/simdjson/simdjson-1.0.2.ebuild
deleted file mode 100644
index e4fbf9055959..000000000000
--- a/dev-libs/simdjson/simdjson-1.0.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs cmake
-
-DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
-"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/9"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/grep
-"
-DEPEND="
-	tools? ( dev-libs/cxxopts:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
-	"${FILESDIR}/simdjson-0.9.0-tests.patch"
-	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
-	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
-	"${FILESDIR}/simdjson-1.0.0-tests.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die
-	fi
-
-	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
-	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
-	mv tools/{,simd}jsonpointer.cpp || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS=ON
-	)
-	use test && mycmakeargs+=(
-		-DSIMDJSON_TESTS=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=ON
-			-DSIMDJSON_ALLOW_DOWNLOADS=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-			-DSIMDJSON_COMPETITION=OFF
-			-DSIMDJSON_TOOLS=ON
-		)
-	elif ! use test; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/simdjson/simdjson-1.1.0.ebuild b/dev-libs/simdjson/simdjson-1.1.0.ebuild
deleted file mode 100644
index 65bd48189585..000000000000
--- a/dev-libs/simdjson/simdjson-1.1.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs cmake
-
-DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
-"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/grep
-"
-DEPEND="
-	tools? ( dev-libs/cxxopts:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
-	"${FILESDIR}/simdjson-0.9.0-tests.patch"
-	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
-	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
-	"${FILESDIR}/simdjson-1.0.0-tests.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die
-	fi
-
-	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
-	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
-	mv tools/{,simd}jsonpointer.cpp || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS=ON
-	)
-	use test && mycmakeargs+=(
-		-DSIMDJSON_TESTS=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=ON
-			-DSIMDJSON_ALLOW_DOWNLOADS=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-			-DSIMDJSON_COMPETITION=OFF
-			-DSIMDJSON_TOOLS=ON
-		)
-	elif ! use test; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/simdjson/simdjson-2.0.4.ebuild b/dev-libs/simdjson/simdjson-2.0.4.ebuild
deleted file mode 100644
index e10cd8aa1dc0..000000000000
--- a/dev-libs/simdjson/simdjson-2.0.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs cmake
-
-DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
-"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/grep
-"
-DEPEND="
-	tools? ( dev-libs/cxxopts:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
-	"${FILESDIR}/simdjson-0.9.0-tests.patch"
-	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
-	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
-	"${FILESDIR}/simdjson-1.0.0-tests.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die
-	fi
-
-	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
-	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
-	mv tools/{,simd}jsonpointer.cpp || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS=ON
-	)
-	use test && mycmakeargs+=(
-		-DSIMDJSON_TESTS=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=ON
-			-DSIMDJSON_ALLOW_DOWNLOADS=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-			-DSIMDJSON_COMPETITION=OFF
-			-DSIMDJSON_TOOLS=ON
-		)
-	elif ! use test; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/simdjson/simdjson-2.1.0-r1.ebuild b/dev-libs/simdjson/simdjson-2.1.0-r1.ebuild
deleted file mode 100644
index a0cc3eba3666..000000000000
--- a/dev-libs/simdjson/simdjson-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs cmake
-
-DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
-"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/grep
-"
-DEPEND="
-	tools? ( dev-libs/cxxopts:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
-	"${FILESDIR}/simdjson-0.9.0-tests.patch"
-	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
-	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
-	"${FILESDIR}/simdjson-1.0.0-tests.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die
-	fi
-
-	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
-	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
-	mv tools/{,simd}jsonpointer.cpp || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS=ON
-	)
-	use test && mycmakeargs+=(
-		-DSIMDJSON_TESTS=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=ON
-			-DSIMDJSON_ALLOW_DOWNLOADS=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-			-DSIMDJSON_COMPETITION=OFF
-			-DSIMDJSON_TOOLS=ON
-		)
-	elif ! use test; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/dev-libs/simdjson/simdjson-2.2.2.ebuild b/dev-libs/simdjson/simdjson-3.1.0.ebuild
index 39d05eeab9e9..8ccb08ef4676 100644
--- a/dev-libs/simdjson/simdjson-2.2.2.ebuild
+++ b/dev-libs/simdjson/simdjson-3.1.0.ebuild
@@ -17,13 +17,14 @@ SRC_URI="
 "
 
 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/13"
+SLOT="0/15"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test tools"
 
 BDEPEND="
 	sys-apps/file
 	sys-apps/grep
+	virtual/pkgconfig
 "
 DEPEND="
 	tools? ( dev-libs/cxxopts:= )
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 69cf3a8be959..c1aedc8a1a88 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
index 19dc10554c23..a46e492024f8 100644
--- a/dev-ml/alcotest/Manifest
+++ b/dev-ml/alcotest/Manifest
@@ -6,5 +6,5 @@ DIST alcotest-1.6.0.tar.gz 288586 BLAKE2B 6e7ab4618d899346de3d8ef63c1b81f92d9cdc
 EBUILD alcotest-1.2.3-r3.ebuild 690 BLAKE2B 1535a3c750d25790caa16161acce1d7e4f67edced9f2b93b752d8316cfb9fa5c9bb81f548f1a46718798aaabb719d964a0167f39e1edd28049c0039857b27ad9 SHA512 c688fda34a8eaca0589e568bfdc52add557654abfa3b49606aa7cc71c091155f08e0b12f3454ab32de880e3091fa4725f37a39f7e20ca92a2b7316a98bb5daed
 EBUILD alcotest-1.4.0.ebuild 683 BLAKE2B 8a68c40e09420a5f356c90e68aee270613a1add05f3af589bb9baed08106e044b6a391473c60792c9b59d270fa75aac35ceead3639381a3c0413383b36c0b30f SHA512 5dae076efb87b7b2d02d270c50b20dff8c06b5c4d074b33b5371a0dbd1fb2ba5fc5fce4f7b932e88fa5ca29ac1ee6f2f3dd4054076692043adb8f6f0800c2e90
 EBUILD alcotest-1.5.0-r2.ebuild 935 BLAKE2B 3a3235d2f1e61b3f5e165d97409967b8031dea18bc5e8c30edd86bb4c8f48d66c04ae92c1e993a4992c077b125c2888882e23dbf4977f85ce1c5e97b4d4c23e9 SHA512 28e8960e599f9a430764915457862e88376e3f63529785812efd8ae5f366a4719473472beb4701dfb2f6e012c163d17a07e3185f9ea38187e2d1fd9d063aa71a
-EBUILD alcotest-1.6.0-r1.ebuild 795 BLAKE2B 45bd70b8e567d482128419c1302b1025146dcf6d3f8bd3736e199f7fa1dce1b56d66fb6fdfaaec8094f3ce01fd9681bde0a11650a56d6ddb9d4da32a59843f4f SHA512 7b1f48f7112e28c10ccfa1f8ffbb1397c700031312e44fa21c9ea98cfb242de1b91642f14dedfc97b40a3115f0eaee8f0133e55d781ab6325411e721a66027ae
+EBUILD alcotest-1.6.0-r1.ebuild 759 BLAKE2B f17cecc0894f00832273b2884bac0771a1db87c09befc11e9225de9c199315caae51aec78a476aab89dac2715af737887d1bebdd19b69c61f84e8720d75a0c50 SHA512 bc38123e6b17f2445e4f2088060f1d9d39cc37ba9def28c5c48a8635a2f217e3882cbdd7aeef24b96b715a8f3937dfdfa423116af73c2b3bc1e73a326809246a
 MISC metadata.xml 313 BLAKE2B 8f2a0fe29ed0694a9f3b13a3c093cec830ed9bdfc482cfcb78019fa7621f5982f4f158fd8d1505dc7972a9fd4386629433f679ed216a006176444bca75313911 SHA512 72de033c1529758f63f093c39f71336490bf8628cdd51f3c0d40fcafa4602d2a877601bd316851db15097747bf1342840f150d390cd093c843767f6785cdb3f2
diff --git a/dev-ml/alcotest/alcotest-1.6.0-r1.ebuild b/dev-ml/alcotest/alcotest-1.6.0-r1.ebuild
index f241b544a2a3..89083e049067 100644
--- a/dev-ml/alcotest/alcotest-1.6.0-r1.ebuild
+++ b/dev-ml/alcotest/alcotest-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/async_kernel/Manifest b/dev-ml/async_kernel/Manifest
index 83272dd3b218..adb7102c753a 100644
--- a/dev-ml/async_kernel/Manifest
+++ b/dev-ml/async_kernel/Manifest
@@ -1,5 +1,5 @@
 DIST async_kernel-0.14.0.tar.gz 138191 BLAKE2B 0f8096eb1cfabcdb4b3148f8d2cb3d5f8c858da74986ac107e7592195dab6e6563c0adb8f39f22a8d3b279b994c937e345b6c56d03a5767672913c7316ecd1fb SHA512 9324f17527311e3c112203b7caa2b0b7dfea15bdb30d02d7218c7b8d8c930d4893d83043016ad064265cedc191985400dbaf2d0af448f840c98ef98326aac8ff
 DIST async_kernel-0.15.0.tar.gz 148527 BLAKE2B 535a64a204332bcc41e6c4ef5ff78fa81ec785bb29404b278ba93e093452354b045aacde98b0f2e6598bcd5fe29a86ee476f2f48f018c69acb7d217d4ba9a60b SHA512 35bf6561b0dfcfd1bfd786de9f47a78deee5718fb449de648f9b1cfd2568c00cd7044b33dce12ce48d1ed704e61fefe3f2d2b1681c9f73c6fced0aefb0423b63
 EBUILD async_kernel-0.14.0.ebuild 508 BLAKE2B 216bf5e5292aaaeb4013f0033f713fe3d5f31145b8df65b48c6c5489bcb23ddb60d66dd8efef1835061fee37498435e4803f2d0d9a36f819e10c89358c7fd7c3 SHA512 914de6610883bcb0589b07a7a89e6b15ce7279594822a5d3bc28f4b78f3f5c1d6654ab57153c7c09e43b254beab06fb1239a07c54c2eca6edc28767a1918a6e5
-EBUILD async_kernel-0.15.0.ebuild 506 BLAKE2B 0124e711c1924cdc02ff165f724c3c1898244fd3e00c2b3fb93c5694a75804feb9593082712c282cea101c216a353eae061758bb784c52cf7bd6c67a7afbeaea SHA512 af782504dd72170c7fffed9870f4a2b30fb1d75ce86e910e58743281298c418ae5d30a4a1cbe7b9acdc8800676afb9a10e57dc185e2e88903c86e8961e29ca7a
+EBUILD async_kernel-0.15.0.ebuild 470 BLAKE2B 0de4f320e0cc00475641a464bc13b1d7287bb048bb2b4f911d77935f97607438933d1aec907ecabc210568df8739b46262b05d42d10040b0a4abb8aef399f192 SHA512 93f1451e79e8207a62832f357d8dcabb3c225aa331a9d71369e9474c6597fedb0a4b5410cfa243a7847dfa2a9bba65db50e475c0dea3a290255600531f7ea90a
 MISC metadata.xml 321 BLAKE2B fd8db9f53c6506db9ed49966b039aa07734345b6e0983e009e6fb9bee82fd7dd4e15ecdbb791503ce7f4ec3fd9fac2751f02626dca8a86e2fdac640919918d67 SHA512 a64a7d3dcef7d139eaa027b590915e6d4171daedfb4ae2d83ebac996edfc107e2b345bbcbed096629a23ef6f6d923497e09b5a3e3004160d33160c2b7d16d658
diff --git a/dev-ml/async_kernel/async_kernel-0.15.0.ebuild b/dev-ml/async_kernel/async_kernel-0.15.0.ebuild
index 133ca6500abd..883d793c80cd 100644
--- a/dev-ml/async_kernel/async_kernel-0.15.0.ebuild
+++ b/dev-ml/async_kernel/async_kernel-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-ml/core_kernel:${SLOT}"
diff --git a/dev-ml/async_unix/Manifest b/dev-ml/async_unix/Manifest
index b70d39069c2b..65dca0b9845f 100644
--- a/dev-ml/async_unix/Manifest
+++ b/dev-ml/async_unix/Manifest
@@ -1,5 +1,5 @@
 DIST async_unix-0.14.0.tar.gz 171624 BLAKE2B 4c55b6c8ba8cd59ede4b214ec84d8689700e46b918a96e145f94ebd011c32de6c2ab40c35a4c821ac58872259740b752e045eb2ac7954ecb0b988ceaf1b75ff2 SHA512 d90713d1d35445a648392e9104eedd25d4c7e6a10a46d0442539c1521349dcbee4118e852cc8335c8c03ba4d1050f199eb91a6e3c3c827dca8eee59501f379be
 DIST async_unix-0.15.0.tar.gz 178320 BLAKE2B 825efe071ecfb39ff0d5586cd8981c31a4692ee5b44727fdb22d68bfc08f9f1e296a363b87c308bef7cdd557dc9124da21bd1e772fe47dcde917b6bc5024500d SHA512 d6bb561ca06b3232c11c10bfe9dbd689020d52dc90f13f01751abf31f968649c7c8664f5f58de95c89f012de00c789efa9c0ca230ba32b9105c609d1afca2a51
 EBUILD async_unix-0.14.0.ebuild 551 BLAKE2B c59ea8b7c9535557833075fe634714810091bbd47782478b4366a8b58328e6f05a02db9ab57f5b29fae6e2433b04c18136130300c90320ae333c216328b96b74 SHA512 61ef35b1b2bff250c8aec54797bfcfcae6a4d48f5e329fe0b9d7db90b5910794e751a3ab5d0b80e3c4a961ec22ab051a056d9d09485f7bcb71bca0d2c6fd1313
-EBUILD async_unix-0.15.0.ebuild 534 BLAKE2B 9d6ea6c56458fef117460d18de76356845e957a5cb9e62b94a34ff978c00bcc6c41c408b9ee01b5d818af8ddb8a2f652173d3a98c73344794c8f676a0687eed5 SHA512 4d07ebebb3d004aea8433c8810e9687fe18be7e9078ea2c5952184f09d363c968d83432f7e50d5a8c928ac7751966d28b5d5f273bc298cd7c0424259307ab8b5
+EBUILD async_unix-0.15.0.ebuild 498 BLAKE2B d9dc13db869c3b83c2d75729955678462e168594c9573af3da2dc0040abba68531b6d982ae4a2eabb6138aa15a058348b13983e5fd898998e92e096eb4d08513 SHA512 5407e723dbc0e6fd187488a787ebf882ccb5a0d686f3bea1c74d7fe3e59b9f3787ec90a54117992fa9b42454dd7913504fb0c6852054bb6d4c2ecff01148eaaa
 MISC metadata.xml 319 BLAKE2B 057719c234859791c2afb0f8e286a8050ad1373cb0318c0d0fbd9ff9906e65131871ecd0cc0f01993c58abaae60eab700b2ba5fc8fe56487150de4aea9e50aad SHA512 5a813d9ff6adc78e1ef4e8dd30b670313bdd15a191ba3ca12c5f4ad2a9dd9d23d69003bcf1805a8490006c46440674db701275c51351b05bcb05902199ae7072
diff --git a/dev-ml/async_unix/async_unix-0.15.0.ebuild b/dev-ml/async_unix/async_unix-0.15.0.ebuild
index 16e04b7a7169..489078b6accf 100644
--- a/dev-ml/async_unix/async_unix-0.15.0.ebuild
+++ b/dev-ml/async_unix/async_unix-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/base_bigstring/Manifest b/dev-ml/base_bigstring/Manifest
index d2b730578a97..f30a715ba001 100644
--- a/dev-ml/base_bigstring/Manifest
+++ b/dev-ml/base_bigstring/Manifest
@@ -1,5 +1,5 @@
 DIST base_bigstring-0.14.0.tar.gz 16579 BLAKE2B 4708fc425b9a4fb534b10b3536eca11bfd4ed8374319f9be09aa981d1a2a24433a25b62cb3faae459a0a633a2ebe6c15a28c2c15251f2ec9505c35528715de16 SHA512 d60bfd1989a29e4c1359722d4c0e2ec382c6d4f3c763b9b80980f38b51419bdf9d30bd9f8ca9cfbc33064458415e227c9f4077d9746ffc13cb4cd5ec8e221fc4
 DIST base_bigstring-0.15.0.tar.gz 17266 BLAKE2B f557fd8d46ad33afb89f50f914c76b287b19c8ee33a620c6a1def5379d59dd7f73b531c4077a3c7ce9e2cefbf6f71c7e49b3dd21213c68507bd19b0c90c44bf5 SHA512 d8311312ea1b3dc3a1a30c87ba4984438ca2c81f8da9cbb7f111dd74fb9b16ad8226166ae2fc2b572a989af15099b07294a667646b0ab22130de4406da53230b
 EBUILD base_bigstring-0.14.0.ebuild 1001 BLAKE2B bdf7a42226a6d53ee3f05f8ff43b5a1a1651e8eb550a6cb6f3431f62ab14c436c5c2cb9c8ac019e497b0bdb5426c4e8aebb95363b44e13f5a8bb2148dfa2783f SHA512 5293036194feec3af8861c581117740c96e6630d7561c6999a62863818ea37a1c1c4e43966add9d9527f88b2d645ab132c769912a8e4c9656fecb3aba63c96d4
-EBUILD base_bigstring-0.15.0.ebuild 505 BLAKE2B 5145ab4b7aa4be0039f37dbb48438da26c3b7b674292d6d787ed52b13f7a64bee4775ce86f46ad1d9c1f9dfeded44c3ecc8d55acfcdd6d538f001abc52dfcfb8 SHA512 f93c712dc7a991e9952d384e7a9c2eb0c9b6abbf489f3cddd6b5be58f0508e2cdb2805d5a7c8a1f91297c2ab4cd15dec8cff5f4cf02c065d53ba84a9788cc141
+EBUILD base_bigstring-0.15.0.ebuild 469 BLAKE2B 5c9d98d85af387c1acce0eada15a5dfb8bea3117b35b4980b90909bddf18dd23af123d582a49648edcd40b3ee6e9bb7b678b52a16478b598f53116d1d2999806 SHA512 b4450b6b5d34f200644910e39440d5f6ac83dd2d5dcb6887da89f2456981b5233a8feef33a776f4b079ced64a21ac0e691428863a8e9df5e51af4deebff9bed9
 MISC metadata.xml 323 BLAKE2B 3729ce1b400ce788ad528fc85ab4c404b3a02a35051f1d73059878ca255fccdbca77cecc62dd1f1172452c4879b5dfa633acc4e5cfdfa3275f7fc4eab80db3e1 SHA512 a1f3fde83f77f720641d14178a1711ce34bae7e4de33a40aa26dd2d56042722019bb5f71011a6a516874013fd7925407fbf2f60ace38b006e00bf45b54c75f13
diff --git a/dev-ml/base_bigstring/base_bigstring-0.15.0.ebuild b/dev-ml/base_bigstring/base_bigstring-0.15.0.ebuild
index 60c915d00330..613685115a2e 100644
--- a/dev-ml/base_bigstring/base_bigstring-0.15.0.ebuild
+++ b/dev-ml/base_bigstring/base_bigstring-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 DEPEND="dev-ml/int_repr:${SLOT}"
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest
index a11fa703cc0f..6a161332ba34 100644
--- a/dev-ml/core/Manifest
+++ b/dev-ml/core/Manifest
@@ -3,5 +3,5 @@ DIST core-0.14.1.tar.gz 361679 BLAKE2B ca43016c760e620f9073defd84a07bacaa0557d42
 DIST core-0.15.0.tar.gz 522984 BLAKE2B b6fdc9d7fe133c504f89ba492e63d090e2ca4e413e96eb8c216213ea358d84ae89ef1d372525b53f701e8076e4e0670ea3535f399f3f735b3b7da383901def09 SHA512 a73a3c1c6f0ade9a9e49917bb896e62afc4fda44dd90ffa99ef9ba24debe7166b4fe1b374500a044cad8318d12f250de7fe2dd935015efde379cf91a2241f51b
 EBUILD core-0.14.0-r4.ebuild 688 BLAKE2B 0236d0a340235aa8b2dd9a03fcdcb137dfb18daf160953852bed23f5b29471f8664db40618e744631c92648f73fc23c11e2b5309d8dd64a5ddf50710bb000e8b SHA512 87276c8dfdc8b2fce059a3dd4100d31b131582af46d054521bb496e207fec897b63ec8abdc900c66bb7e93a9e605100194239e8e61394c8df34b06c483b72444
 EBUILD core-0.14.1-r1.ebuild 747 BLAKE2B 6944e4b04b458ff2ffce30cbd4b27c0b86f0aad00ac3596c042ba4c1a1c74918fad2606e521651e6676e054639fa7231042d1d8918b58383d02ea7caf8d58d9e SHA512 5659a08e8d772ad14528ff703e1ad4a39b82216e000bcab8e2da1b93bab921da4268c135cdb5800017e5d790c468fd802e173faf765de15496228a13e233ba23
-EBUILD core-0.15.0.ebuild 573 BLAKE2B d8edc78f6b6a7452ca863c5d092e206e98c8ea3500dac040a628715384659d68f9160f1e0ec77972e6becef35aeae5829b92906013e41ee1dc86f1fa2fe3bbb1 SHA512 2b40763542588aa169e942d507030c86feb4fffc872edab134fb46e753e6fd60a99cb48e58dd4e7af12d06ab00b2ed5d1dc60e776e48dc762095109b315505c2
+EBUILD core-0.15.0.ebuild 537 BLAKE2B 1009f951e121d88893a36c3f6e14b79b468feae3169a6e315f165322198d10ba19711e7d0d5e5d6628c90b984f34ec5942232a4da9a0db35c569244168566462 SHA512 8f6f276d341083f229a92f3e41bc8201c6a1b41c3ede0b96d4d13d6672648a0a2e923f6d003221d6b8874e867dfbd528826991e40a943d0644b1424ed0a24138
 MISC metadata.xml 710 BLAKE2B 368091778c4347e69ea5398a3f6013d1741bc9fb20acacc861de152c8afd90d9647ef7b31143c26c7e50e0285b52f2a8688b7203821473004a9b237e65585dd7 SHA512 3d29e7a8c748a4849421fb73a1f1225f6480d032d8eb8bd70870567c8f2ac50ef1504c368204f6f063f71f5c984daff98a1109e81674abc8faca10c5a3414efe
diff --git a/dev-ml/core/core-0.15.0.ebuild b/dev-ml/core/core-0.15.0.ebuild
index c3dd438a91e0..0540bcd6def8 100644
--- a/dev-ml/core/core-0.15.0.ebuild
+++ b/dev-ml/core/core-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 # TODO: Wants quickcheck_deprecated?
diff --git a/dev-ml/core_bench/Manifest b/dev-ml/core_bench/Manifest
index 9444722036cd..1f83cd9a96ef 100644
--- a/dev-ml/core_bench/Manifest
+++ b/dev-ml/core_bench/Manifest
@@ -1,5 +1,5 @@
 DIST core_bench-0.14.0.tar.gz 42972 BLAKE2B a65585d2cae5080e23d9b8897d15f7ac6e42c36280a06ff21b5f46d5532f3265b672f7d6373573826b80f5f6dc93343b3e93bf8c3d5b471e6717162e9fac4025 SHA512 e86a04c12832ba281669139d74e942ab1ff8d7dc799ea1687cf57a50ef1c7b031191aa1cc44c50586fcfca8e83c3c6f1a8b1aeb40c724fbaaa0e0568c393d75a
 DIST core_bench-0.15.0.tar.gz 46920 BLAKE2B 44ca0845abc8a593c5685305e2175b04dff32219488945f5ca7c00a6b139d9cf99bcdb865259b17625decb865916ef04eef4feff2d4ae8299986097ad7ec9d27 SHA512 eb8574d3f1444f4aad0ce73da372d6283a7d03aa636dc47fb6e918c1a2c47241fcffe52a6015e93b7ebd98f59e00a3d61f97fb7222400f4ca59f60a7ba430ec2
 EBUILD core_bench-0.14.0.ebuild 565 BLAKE2B 717a3bf0e112fe61764e3e5de4b33a46f52a420dbd677013dac60017ebb4dc9cc93ba28860b3ec6f6dcc1aa552cd3e40a7b9c95480f1f33df0af5f15103d0d16 SHA512 55dab1511d335ef61a2721c83d89304f32621430b388da7158db6cc7226099cb5543b758296370828eca612def3afe53af6efbd084b75fcd2cb450c2d51200f1
-EBUILD core_bench-0.15.0.ebuild 478 BLAKE2B 21168347f9a03a1301d67e54e8d9b2bbfe979677cf152cec2e467cdb737687285bdacb24fb7e30f213273904ececa878f5a4286cf2a9878f1108f239dfd29ca7 SHA512 fcb6c2ffcb621b378d90a6206ebbafa92207ee608a3f006f04c0568ce592081e5802fa8940cc39db11086203032aef3e74a5d0c00618f4d59f59db8024fa5af0
+EBUILD core_bench-0.15.0.ebuild 442 BLAKE2B 0c24a347a8f972809b1dd53a6e2dfd8770dcc231b9971512221a2e6cdf1d485de9ede4bb31da44cde830ab97f52bf99231e049cb28a662175f5b2b02b5022640 SHA512 f06b48ccf1b1b3bcd2c674677e5ff75a461f28a05c7a3091c777972d45a3c4c6e402e442c6f4f786c41f8cb953e3f5f49cc1b57e2c5602286b1af63820cb2522
 MISC metadata.xml 319 BLAKE2B e07f2c98a308c50d4037dd942b1a82a4b4a8c71d4be94f96611d8e2955b22c0b78a7bb729030a6ed595fc4ed65f6072bc536f03db4a8a08b43af9d75a65432f6 SHA512 32d64cd410459106199ad3d57a2ddce9651bf95be3b8334632235f9ba3963a0a3fe24142f523889ccd591fa0536b90574e9129fc594c7a7905588978b3aa886d
diff --git a/dev-ml/core_bench/core_bench-0.15.0.ebuild b/dev-ml/core_bench/core_bench-0.15.0.ebuild
index 9aa2ce3d12cc..8fe47396ea90 100644
--- a/dev-ml/core_bench/core_bench-0.15.0.ebuild
+++ b/dev-ml/core_bench/core_bench-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 DEPEND="dev-ml/textutils:${SLOT}"
diff --git a/dev-ml/core_kernel/Manifest b/dev-ml/core_kernel/Manifest
index 4295fdc6fffe..52da2951fa9f 100644
--- a/dev-ml/core_kernel/Manifest
+++ b/dev-ml/core_kernel/Manifest
@@ -3,5 +3,5 @@ DIST core_kernel-0.14.2.tar.gz 701911 BLAKE2B e784d6d8f53df03ffb56075a43bdfc82d5
 DIST core_kernel-0.15.0.tar.gz 265183 BLAKE2B b1e67e8a84e1abbb23ccfb65c8320e36b3b2f91be3c2aa02e73b53c411e80da65c34b69d538d027417a52fd1dbb1a2217b9020d86ae00237ebaf3e7c06b35e42 SHA512 da28f11374fda2e869b5ef3f7131461c6d896b52413654f2aeb7c74bc77ba4a8e2a25830eb3e3ef393e0bbae903db20f54773b356c53cab75c1bba1b9ce265bc
 EBUILD core_kernel-0.14.1-r3.ebuild 1032 BLAKE2B 50eb6684ab6cd15aa6b2e328d11c19f9b8a641e7952584b08add5ad98296e46052066973007b811da43f75d0cfa44c6cc645a1a2126725b3446cebd66f0ec4b0 SHA512 39fd1af966e29654d3f37c141a6e72d8cd8bf7379cfb568186fba00c710ac1817178e2311909c169c1b687688a844f53d9365ad7523d561f51a208cc3fd20091
 EBUILD core_kernel-0.14.2-r1.ebuild 1075 BLAKE2B 0a88db73c4a3a93e948d624e235d72ba70fc5e960ae68c3472881a537ff0fa5d0690861824fd7e501e9ac384b9a93b6c3b17c600686221a83d1be73d4b1dd8d9 SHA512 b4d1ddd8a0f1e8762786c6b23fafcb388c20e7fcd842e51a876204993942b90a328f8ef36f7f81a9cf981d64f4a2d5d93f436642fb93be761d103da062737224
-EBUILD core_kernel-0.15.0.ebuild 581 BLAKE2B 2333aa98090f65136b984d4887f5e5309f3999cee4cbd221bdeb1d3c5e4ed4cb6b518097cfe0aee758210eb13a35c7d2b24932d8608e3b9e6724a2176cfcda24 SHA512 a22b95ee15cfabdf6abb5e288b0b5be25e463797dd93019a73c27174b37a9307647b4d9aaae893e040ae1bba346d3a1edc4398f90ff313af9d46062f9d7ffb79
+EBUILD core_kernel-0.15.0.ebuild 545 BLAKE2B 738b11737b4a2af9c3e21add8f68ec8d466834ac60fabd3a58abeebdc9cca1d48381012dd1c9e235cd2e46a83223e690acdf788fe0f752498ee01a3718489b71 SHA512 3b9310db4919bac5fa6a9778c010c57b0fdfa78b9d7e35777ee3d9ade06768fe485e960f5edea9d8b9578c2b78fd70e82e9dda48d3162873d68a6fcd03402012
 MISC metadata.xml 640 BLAKE2B 411246c9f2ad1ba00a0475e8195d3b54a0ffd9b7c6804c10b482540e6c27d683451ed63d65f48e2dcab87a53a69fa6215590c8b2f8bb951266697df6226e44a9 SHA512 7854d4748ccc7833d4a029e8ee0fdef9d91c2552d916d77bfe171590a1de6c9e547675e04c886afe9b5b6de8c34e200f6e52a193213ae00ce70f5823fa363292
diff --git a/dev-ml/core_kernel/core_kernel-0.15.0.ebuild b/dev-ml/core_kernel/core_kernel-0.15.0.ebuild
index ca705633bcf6..490e12a62333 100644
--- a/dev-ml/core_kernel/core_kernel-0.15.0.ebuild
+++ b/dev-ml/core_kernel/core_kernel-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 # Wants quickcheck_deprecated for now
diff --git a/dev-ml/patience_diff/Manifest b/dev-ml/patience_diff/Manifest
index ffb4330d4b1a..00996e01f3c7 100644
--- a/dev-ml/patience_diff/Manifest
+++ b/dev-ml/patience_diff/Manifest
@@ -1,5 +1,5 @@
 DIST patience_diff-0.14.0.tar.gz 20060 BLAKE2B d47d9a93ef0a7eeada7f050aec0427f8352343609da1332de59d6b3ced41e9942556e1d61e12ab2075bc15cf29afc60191f48da43c1a4358d414352eb6efd044 SHA512 d253488402e515d56ed9d83ef45edfce378d6ad5148d80f8d81341cff28d19115350d72cc057ecd6c14b907888eca8e6bce1b8e71c7a978149979a16a5512fd2
 DIST patience_diff-0.15.0.tar.gz 20434 BLAKE2B 52e0f1d3437f97d384224cd06035802376fe2af97c085e183f99934f6f8238270723505cda7c617b7847fa4d5f51abbfaa58cd25aac5f0eeb56b42559e91421a SHA512 d3cbf2b2fb8618cd3342abcb7beea110a93b0e8f6984f3becdf9066c717f6f7832f86a8fb72ac56c587cbd6e5abecf07c0b98d9ec1cb7a40bfb9d4a5b1de12ba
 EBUILD patience_diff-0.14.0.ebuild 480 BLAKE2B cfecfbfd5e870548741aa7f4f4159a33cd942f8afdeb68e1781ddfd576dba068efbc997e9dd97979f6ed292a4194350b7ca8768512cc57d8655a9de17e2beb27 SHA512 fe9061dc3bbacd9cb3394bcc832065ba5dc04db7a5b2ed749ca3752edc0b8896e6ebbf6355d8a7607208b955308ae3e1791de4ebffcefa9cf60e3504f97a6d28
-EBUILD patience_diff-0.15.0.ebuild 442 BLAKE2B 9b5e658f6f6f717fac617f20db6cebb902a1f4bd8e0dee2bfa3c9c668b51afca8d0bbb75d1a4de24fe8399dca964826bcebcfb666e622fc8a6d443bc1ae5e997 SHA512 76b4107f2ed0510a1ec1a9279e54dfaa6c7eafcb9b1bfc174496186b86f7051308552b70a9bd4748d1fc9ae82186f603bf86a1d7edb4a622f3846f49ddfd11cf
+EBUILD patience_diff-0.15.0.ebuild 435 BLAKE2B 2baa8ec2981481ab3c2d49f9f4a85eb9bb6ee5feb5f43d3a36d471de0764b5a36ef93c883ffb62664d7dcb58a630ede5d2fde9cd903378f60f2b78cef1cfb160 SHA512 5e5090abb2fba53c817ca2f139f5d4df01b3c1d7be7c5aa1106ac67cf79b005d583d5ac204f12ca0cfdfbac888ca32e55fb01dc39ba937b79a4e777190d141d0
 MISC metadata.xml 322 BLAKE2B e9510a525c3c5f6cd79ecb521914bebe4b0793cd02ed3bbc881d6915503bfb4167499e412376c8ac5f870dcd6bd57721fe7efa82c0c0fc8c0c20e180371aa431 SHA512 3fca89751f8d8ebe30ebdf89ef8629ea1f8667cbb9259fa4b3a53d3e911719babad516ad4320e9abd88f5246a46072833f55f5110ca80bc17098b5e474017fe7
diff --git a/dev-ml/patience_diff/patience_diff-0.15.0.ebuild b/dev-ml/patience_diff/patience_diff-0.15.0.ebuild
index 00760fb0e14f..8d612eb0d5f3 100644
--- a/dev-ml/patience_diff/patience_diff-0.15.0.ebuild
+++ b/dev-ml/patience_diff/patience_diff-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-ml/core:${SLOT}"
diff --git a/dev-ml/ppx_jane/Manifest b/dev-ml/ppx_jane/Manifest
index cd3de1bf8b5b..343a2dedee79 100644
--- a/dev-ml/ppx_jane/Manifest
+++ b/dev-ml/ppx_jane/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_jane-0.14.0.tar.gz 4593 BLAKE2B 787fc0701ba0361446cb210c23469881da8fbab28460262a7bdca8723af158ed8deeb4597a31c8d89a4d44e5263c74e0ebc504b83827e0a34870a503b2ea9053 SHA512 b51bef2330ebb8d361b3f856a0526a5290664b68fa56a02de7020b0e27aaf5a378f1b22fc9a24007bfc812af67eb79343b2bdc3ca550108393323b99e29c623d
 DIST ppx_jane-0.15.0.tar.gz 4647 BLAKE2B c8916e7327301a2dc54b36cc29ad61f3ef016aac2f07dd8c1421a84b144b406e9b189e229680f700efaf2138c508f30e0d132dcf726165ac60ad3120f67549d7 SHA512 e594a0caea66e0f976615b2a1db50aad89389888678d9ec7c023b2adb3211817a841a5065de9a65956bde0cb6088ce1b0b3afed6b57b618b9b50e5c07684e3fa
 EBUILD ppx_jane-0.14.0.ebuild 1215 BLAKE2B fdebce6e9ba624aba1868cc9dcac1dede1b29a966cdc4c964519c709a12f39075682ce695f1299f596310216cbf68ebf83b76499dc3b1a4c78e55822c26804c6 SHA512 d0916b659619b7274e8b5d49f9d912bda2d4fcd5bf0e5f493a0ee06e928bc9520dc0497d6296766030218a9df864fea3c13ac05e0374399aea24c2e7bb18f4cc
-EBUILD ppx_jane-0.15.0.ebuild 869 BLAKE2B 7d2a73cfa0d3668a3d1d33f72e5e055a0375826508cee6a07b04c32362f595c97a12b77f37fdd4837f68e51dbb1c22b953e3c08c135613d279d0b438760cfae0 SHA512 5d8fbf195e43b512fdb0c0ce9a9de9a9f96a074283c1c43c045442cce0dbc63ea7882ac2d7cb666d99de9512fa6e90246014aa174aee361036c9233c7fdc866e
+EBUILD ppx_jane-0.15.0.ebuild 833 BLAKE2B 8b5868d78dace6e86ae85af4173b8e4c3c9ee8820fbc7d768f0a640dc1a81f476a95652dad29215c73a27f979977d51d853eb0af1a980aba382433e71837281d SHA512 00f0d79ea2fa7f01a21d8d6ef06c8edd3f3727080258dc9da968d8020d1940214d4ce2a9925f618249c5a0933620509b32c4b53916887ee6c47fea3e6b0f8657
 MISC metadata.xml 422 BLAKE2B 8f12580d0fe5fa2b0b225ee0d6b1bce1bbac590ccee469f07bfa01c337d7211c00d14d7d22a7e3c7601913f4fda2c0beeab853d80be71b988ce04e9553ca2aff SHA512 64e2d501e8957929ec015ef2ab95a5d910a906e80ff204b5d7ab60aa435d04cd74845beadb82bd9f1e111b3c209b7ff17ee91251172177c5aaf7596824f6b250
diff --git a/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild b/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild
index c20798f7d4e8..79ebd744d0bb 100644
--- a/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild
+++ b/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/textutils/Manifest b/dev-ml/textutils/Manifest
index 3c77fcf3fda1..12d7e3fadc29 100644
--- a/dev-ml/textutils/Manifest
+++ b/dev-ml/textutils/Manifest
@@ -1,5 +1,5 @@
 DIST textutils-0.14.0.tar.gz 13261 BLAKE2B f4e1f364e72af47d70d1b674399c923672a780aefa1a2de731e786ef6a5fe03789d5605d326e883b9b37b0ac6fd98246b243980b16c25a4cc8baed29a2142cf9 SHA512 e8dca3f0f5c096846201a4fddf06e7bd3ad721a21df054189d0a7316a8d5be73df6633b045f7027d03b8023448f017aab14dbfc13985a11b5a2b58e5498b6de3
 DIST textutils-0.15.0.tar.gz 15477 BLAKE2B ceb8482f8c76323bdd08c9c065220868dcc5405e4461d2b787e78e458ac0f7872519955a3c8247217517b12ec4450dd4452d7ae4d5a851151aa4e47f655f009b SHA512 d45dd57a3490330ab800cd06903bba760e89fc46b1209d3ad91395a729f999fec1af62f3c74c08d0270fb7a89de115f1cc08bdaf77d74a043183e629fc367e1b
 EBUILD textutils-0.14.0.ebuild 497 BLAKE2B 8e3a80f13a44a12929cbb0510960d78f325969259237577d7f3cc03983053580c53e7cdf18f9f97d40bca50cfdea99417b108d65300b7efc37387a0da5d1f908 SHA512 e05ac6828e85c8e1472f1b89b45f3e5feffbe20da48d3fdc37e2b84d25d8e5f0767e413c6e1a32b4084cdb848b24fd20fd2c0dca9a7c7a12ba5f3b6dffbf595e
-EBUILD textutils-0.15.0.ebuild 499 BLAKE2B f4c738be72243fc4f730dbd832905e4d3df71a5d10bd420cdb6d2fa133c391be4b58e1bafd23a15c2e4f7af911344f5a07632546cbd0dc49c6534bc0f971dfba SHA512 1c560c7a4992233c5ccd82a2108987c99b518b8acca1872d625aac710670b63b413d8fb6b26165b2b3e20eae22cc28aeb2faa40b89f1bbd7033db1d3ba1a1b01
+EBUILD textutils-0.15.0.ebuild 463 BLAKE2B 310e1d8598d473e19ad003a411f5aa7e6cb2dd07d55eecf0238ad9923a641ee016793e3208bd719b680ebf9f968ec70c905fa3b96d277b6f894fb84ccc81258e SHA512 5e885233ba0cedccf20c0d63d1da08428eada6a34f2f1dd135e93e18b0eabfc26b470975e168b4a1ba361d8097ae4db8654c41fad7ddc295f88baa1598227068
 MISC metadata.xml 328 BLAKE2B a428cf4bcf6772e5a555ab899e3f160ab30963ff3faa22b6a90ab5ac95853d82a052c1de5b2f459975a31434267fb4356fcef6f523d97341f5557af994ad4af3 SHA512 abb9fc53236fc132e341924fb63cebe843168669f5447d7392843ee6fb14c0466d0c1e4641f72ab0550b02e216706f84f9e3f72af0fdf5c4fe55b9a518126925
diff --git a/dev-ml/textutils/textutils-0.15.0.ebuild b/dev-ml/textutils/textutils-0.15.0.ebuild
index 18d2948c2b90..aa7d2f9396c8 100644
--- a/dev-ml/textutils/textutils-0.15.0.ebuild
+++ b/dev-ml/textutils/textutils-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/timezone/Manifest b/dev-ml/timezone/Manifest
index 5f26eda604f9..5a3c89833929 100644
--- a/dev-ml/timezone/Manifest
+++ b/dev-ml/timezone/Manifest
@@ -1,5 +1,5 @@
 DIST timezone-0.14.0.tar.gz 9480 BLAKE2B d9f65420671d8a0607d16f91c6b10b48def78a813a87ecbbc3e036367a2084d53a256c698521f10b407dac0606208e1f5f2cd56c475e0a173cfc0a3e5a5cdede SHA512 39abb7ebc9e08520a9c969da948bd3de0dc9dc01c75d5ca324afacf231671edca3eadd6992ef3037cc23218990af8061419e5580d9ab246a43d31c5788599cc5
 DIST timezone-0.15.0.tar.gz 9480 BLAKE2B a47fd0efcd659e2bd3adcb07776a4ca25ef65fc5ba4af87ef361cd4aa2c45e3641e9f240b033f50c0e6108868deca7bf57eba6e8a753947ef7b14f03c74b911c SHA512 d50cd1e8f116f9121383b2d20d5dcbf99b5388a2fed915302f0566c6f2d93bdf1480c2f998fac6b81a636be52b601b38981b3083adaaf405a1154b63c0b0d6da
 EBUILD timezone-0.14.0.ebuild 489 BLAKE2B 11dac57aad8d5a65501534c86b3a3bda04e6e6aa180afc6bed4f9677261cedf73e181cd1d449b8994a1a13420737445384cfa692451ab2a94f9859aaa5e937be SHA512 7f35a0b8797c0017cc8864c409a82bda853584ebfc622691c95e052f266a21ab1d8fea655d3feda2188e80c90978be388ef2837964726b59b3d9ba1595724528
-EBUILD timezone-0.15.0.ebuild 464 BLAKE2B d40f37afc6b1636e2bd60cd47d8bfb56769aafe0fd696e171967da40d6fdf5bb72968ec26b245bae8afa07e7782d6e063013dadb39dbee6bb3398b8c06ccd9a5 SHA512 d23ce3d9291a7afe65e4ee9a104ac0abe98cc48decb1e800ccf55b1a949e3d3d9a5cdd88e441af51e2864277a0b96d81c8d3ce6e78b7f4d47b74da9767998d33
+EBUILD timezone-0.15.0.ebuild 428 BLAKE2B 6f326bb71a6d1a9b572cecf75354afba75070d24b1f0f3318ab65d4564da344c193d5484a1f757d9707395514ce1b28c36c822c178f5353d715d2056182db209 SHA512 da15a19c26d66a6eb73af911cf285752a84fa122f4996113bee3e5a2d754382b60ffb1d9f2899262e94d1d4534d8a3d158d54777cd3cd568ad4e3db9b78a3386
 MISC metadata.xml 317 BLAKE2B 2c8122e72010c3adb8e6f58fb7e3f30c7c790110e35d371cc7339670f58088a695f441559f194d85781a0f28fb1bb52c6388cb59b9fe55f942540815accc8928 SHA512 3f6edd5919bc0c36f2339b3af3fc36884a1c7c646eb521c4be1b14a017835a6aa9a10fa6d9952bfd310cba1e9dc1ed81ad51b5b2fee99d6363e37e6f86d3c17b
diff --git a/dev-ml/timezone/timezone-0.15.0.ebuild b/dev-ml/timezone/timezone-0.15.0.ebuild
index 33f265cc1758..6ed035120625 100644
--- a/dev-ml/timezone/timezone-0.15.0.ebuild
+++ b/dev-ml/timezone/timezone-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-ml/core:${SLOT}"
diff --git a/dev-python/Levenshtein/Levenshtein-0.20.9.ebuild b/dev-python/Levenshtein/Levenshtein-0.20.9.ebuild
index 555f5eaca810..ed97153de754 100644
--- a/dev-python/Levenshtein/Levenshtein-0.20.9.ebuild
+++ b/dev-python/Levenshtein/Levenshtein-0.20.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 DEPEND="
 	>=dev-cpp/rapidfuzz-cpp-1.7.0
diff --git a/dev-python/Levenshtein/Manifest b/dev-python/Levenshtein/Manifest
index 875f00a79e1f..9a0cb251b057 100644
--- a/dev-python/Levenshtein/Manifest
+++ b/dev-python/Levenshtein/Manifest
@@ -3,5 +3,5 @@ DIST Levenshtein-0.20.9.gh.tar.gz 36617 BLAKE2B 8e995f1c1648c81bea20844f7afc3c5d
 DIST python-Levenshtein-0.12.2.tar.gz 50502 BLAKE2B d8992d30639e36aac1b85fada8f5273ed867aa3019208ffeb9972e999dad783d4ee16e1f6988c9306eb80f622b61fcf3a0a937b380c7a5acf50223268ed8de1d SHA512 97eac9d19121758af7620ad3963846e48434ceabb5376a83f28452015adf1a620620bfb53edb1c4f60b0fc8ec2b0faf35a105d7e2a0fc5df7a45fce81ba0dcdb
 EBUILD Levenshtein-0.12.2.ebuild 630 BLAKE2B 7f74159f1e57e0b9040b8b0a6af3c52d1c64661639b2f3ef1a569b5ad91d36a939c044ec3e4ba499158e57930285b8a81cf8a48e89b5b330966cefaffd015c4e SHA512 8ce08ce36977336487a1b870c2e474bc257f05db1b14b39cdcd56d5f0bb3cb14ab768ba6e13a79804f99578ff6dc841b7e19186b9ce6e1b529b4c7ac2a636b0a
 EBUILD Levenshtein-0.20.8.ebuild 1032 BLAKE2B 3418e5b30bb3ca69600a49347437bab509af14eb86d07178d04ff977098177efdefa242a239223aed97b60927f2bfeacc23862931a3580a31c5a019ed7f9fbf4 SHA512 ef06dd27672bcc49c2b5739933a3964b942ba1146ffe21aa0e1b0216780b9cbb7183c0736242f3a11ada7d34d6304fab72b8cb440bb1e2e0fa6ad1f17739f567
-EBUILD Levenshtein-0.20.9.ebuild 1039 BLAKE2B 6f098a9857606afc79c11b69dcc482f47c7af8f00beff1db5d2a0867be3161b7ae5dbf8751b77ec530222b52cc2400776f9cece774de3271c39bcf956b1c28a6 SHA512 2e8e975c01ca6659c0b7ec2bca5891e1c30eccabff5b40263ff9de7c233b9c13d89ce216d2828ef8d04c466778a83a20507714b58e168c95928bc56a56e8f3af
+EBUILD Levenshtein-0.20.9.ebuild 1032 BLAKE2B 3418e5b30bb3ca69600a49347437bab509af14eb86d07178d04ff977098177efdefa242a239223aed97b60927f2bfeacc23862931a3580a31c5a019ed7f9fbf4 SHA512 ef06dd27672bcc49c2b5739933a3964b942ba1146ffe21aa0e1b0216780b9cbb7183c0736242f3a11ada7d34d6304fab72b8cb440bb1e2e0fa6ad1f17739f567
 MISC metadata.xml 378 BLAKE2B 59900a9f2532c274a220466ff9bd5db4a4830b221119a95a0fdf82928b90c64b458b16c26257b69093ac08346bafbe54189bdb873bb8f119753a4f2243973eb9 SHA512 26b3ddc5d3843122a47941cb1e388e41f6a3f98e3f8d2f5108f50240b5c9005edb2b1e2df55c9046d48a8b4e07941f8ccd4fdee129f4ac948a47a6207b73c7ba
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 71f35748d9c7..d1399cca1740 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 35bf479a8b9b..71c016878e22 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -2,5 +2,5 @@ DIST PyPDF2-2.12.1.gh.tar.gz 6581775 BLAKE2B b65a8a82c1d20036705a3a7564a03bc70df
 DIST PyPDF2-3.0.0.gh.tar.gz 6608776 BLAKE2B 636be14b5f3912824703dbfd6137f1ea7b97f4405cb9d6d14f9b02feff6900936f8148424e75c3aa733e144bbd13602404051b2c3c6b63b92c246205b6204b8a SHA512 417a401d1dfaf96e07bf196f53cfe12af50d45d812c48d57db576e596ad8cd029c5b03f801180a12b31c34f9acbb65d5f802b428792cfdb5a18c013ec87c5e37
 DIST PyPDF2-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz 9027166 BLAKE2B 912bb9fbd632bd0ad2cc2e865a1e6870ad7064aa2cf4d6f96217f63ac685e9a511f0bb20c22d48ae970a2eb171b27a0fa680fa42892425531f69735840cf741b SHA512 07a71a3566dabcea5dc8a549949d0f0c0f9483d5d9f85851d6e4e702dd374b348469a80e5300d18983e560ee9a44d0639b55eb338023b9ebbdb26c6f8c455e07
 EBUILD PyPDF2-2.12.1.ebuild 1252 BLAKE2B 9506713d7b711e6fdc90ff0e9523553aa58d8952d55a085df5c8489571d7f3495370286654fc8e79530d0cfcee1b6798f86965f2ee82711284d6ec1ec610a6b9 SHA512 33cdbd5b3c51af75da7f07c47325c023f6bbd624ae038eceb4b2409cac12d5c9e32d23fab4c37169400797d9af64c4ad03fedfcc0c99e233a62056acc067a0f5
-EBUILD PyPDF2-3.0.0.ebuild 1279 BLAKE2B 0bc806bba5de6c2d5aad7480e28373a29019061b0282fa2d09b8c22f6833aad27b2f420b0362b2b0de51849f54f3b1c36dde99806e386af2a503ad2ce65e1f0a SHA512 12a7e769d72e68f65a0f39ce75645ede2b5ef784e5d172ce48eab7d62859f6db64ddaea624245b4ec8e0d8da2af455b48ab2e1e33aac36e61cd9dc2a00822a91
+EBUILD PyPDF2-3.0.0.ebuild 1277 BLAKE2B 7ec2ab3abebf6df5115313c86aff43cfc1bbe6bf94ebf346132b3785e4be3b3eae675fa542fb3d6d8bcfedf4c30749afdc081af164823363ce741157704aa66b SHA512 195f5d3d2ec29fef458c9c7b64ce43b92df5823a97aa4232efb04ca6b353c56630c0e8f468a0ae40700d8c5e73417a1f1080f57fcdd01d908452baca1f85bce0
 MISC metadata.xml 375 BLAKE2B 2493f7d2ef79342af0ef890e3683fa55255d869c684bba7224ab3afab61e77a239e323c8e63138ce4fea23c32348458cd27a0c58a3b6640854ec27b26cdb40cb SHA512 5e0d6e18e0005e4f323468b8fbfa26dc7ba33d26a94d5fda11c40f62ece84578c1f08843c9f0cf96f0d918d22063f494d486a6d692cecb5b407efaaf92aa9b8b
diff --git a/dev-python/PyPDF2/PyPDF2-3.0.0.ebuild b/dev-python/PyPDF2/PyPDF2-3.0.0.ebuild
index f19131e78902..eb02789f09d2 100644
--- a/dev-python/PyPDF2/PyPDF2-3.0.0.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-3.0.0.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/pypdf-${PV}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 RESTRICT="test"
 # 150+ tests require network, too many to deselect
 PROPERTIES="test_network"
diff --git a/dev-python/exceptiongroup/Manifest b/dev-python/exceptiongroup/Manifest
index 1c4a64640122..d265b783b5b7 100644
--- a/dev-python/exceptiongroup/Manifest
+++ b/dev-python/exceptiongroup/Manifest
@@ -1,5 +1,3 @@
-DIST exceptiongroup-1.0.4.gh.tar.gz 22529 BLAKE2B bdf58d36ea59cc7bed17947e4671c92058e7036b20c91df434625d8627db41d646dd0b90ea397c25674753e3ba09654f5978c22220e13007d0af8b1fe659540d SHA512 18f207cb028f1b9ab1073c2859b4aeff357706c3d4c9f05fbe8739f3e19852dd91da5be9c9e18b14b16bd494fc8bf1bd26d058e925084da8c00eac5ad057e2be
 DIST exceptiongroup-1.1.0.gh.tar.gz 22724 BLAKE2B 2de748494fe1356353b7f70d3afc7be7ecb8df4166f57461459c7f463bc5c22340c9073b0b0e032a52680560e37e4004c754fb4ddcc1a5a70f8dd0e973b1d8a9 SHA512 588b4ec3cae01a64140aac191cbdf8d0631eb614d430bbdbd02d17d8ff43aad9d233c3545694c6fffb622a2b3c38a289e20f1b8db6bf0e9b8819d668e38a87e3
-EBUILD exceptiongroup-1.0.4.ebuild 774 BLAKE2B 019d538b5f362ad08c5238307b73e34cc93462c5d93a6144ef1b57531981be679b141517db504efa3d33ea617146cf981369473d2812e5867e79fd92d7f21ae5 SHA512 005f29aefc604aba23037b06737135bc8f3193f305eff7ab363b9e10e7c2fe6bb2b95f22fa29b3726bc3e29aa0ae6c898a6f3f3f0a0467516c1af30e503ce8ee
-EBUILD exceptiongroup-1.1.0.ebuild 782 BLAKE2B b6560f516ffd85f11a114d67d621b85a507762a58b814f666a13453729d344130984328fe4127bbbff6c911dd521f2d108e24eaa3b426cd0da6a965024d9c8c6 SHA512 9c1dbcc547b1121c9b98c35b36af5a8e9fad0b3fbbcfe316bdc8a7cc8129d09b6c37cc75ce355edf44fb81ee89a7d9c3c9b10d931edb627008962fc74bf1347e
+EBUILD exceptiongroup-1.1.0.ebuild 774 BLAKE2B 019d538b5f362ad08c5238307b73e34cc93462c5d93a6144ef1b57531981be679b141517db504efa3d33ea617146cf981369473d2812e5867e79fd92d7f21ae5 SHA512 005f29aefc604aba23037b06737135bc8f3193f305eff7ab363b9e10e7c2fe6bb2b95f22fa29b3726bc3e29aa0ae6c898a6f3f3f0a0467516c1af30e503ce8ee
 MISC metadata.xml 384 BLAKE2B 248abcb5fc08c91396cdbff52e5c3e4f6cce2aa273cfd52b48ee13de9ccdaecd09e9a436ed79f258d15d8d4583fe5995e054010c909a522f47e6866e55b3458f SHA512 c631c69438059cb2a6c80e595e45fac904d32dfb53f8be183142f1195d3a3b9bc14bc240f0808e14f47d31beb1887ad82ee79c5f1847c8e6b59dbfeea7913c8b
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.4.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.4.ebuild
deleted file mode 100644
index aee11e3afdae..000000000000
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit_scm
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Backport of PEP 654 (exception groups)"
-HOMEPAGE="
-	https://github.com/agronholm/exceptiongroup/
-	https://pypi.org/project/exceptiongroup/
-"
-SRC_URI="
-	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT PSF-2.4"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.1.0.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.1.0.ebuild
index 40efb5037fa8..aee11e3afdae 100644
--- a/dev-python/exceptiongroup/exceptiongroup-1.1.0.ebuild
+++ b/dev-python/exceptiongroup/exceptiongroup-1.1.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT PSF-2.4"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index acafbcc316d7..eb58d2477351 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,7 +1,5 @@
-DIST fakeredis-py-2.2.0.gh.tar.gz 128817 BLAKE2B 8666427966e6a93cd33f521fbc38ecb9bb99e1c1a23506437d48bc6113f272aa89a465dc794b5130ef6dfa584f75f159fce0e3b6a50e5cb89b3bfe43ebcd89cd SHA512 857033a6362a6088cec715571d74a9aa1eb3eb8356ed904b10831540ce5be62d798a211d52fb3d8effab253e50fdb3f2a530d39bd722d8be357426f53fb41fe7
 DIST fakeredis-py-2.4.0.gh.tar.gz 132163 BLAKE2B fc3858eb364c63d776c81d715cbfb218dc0e763d568c97b0d1dafb0716aaf87e928f9b81bd49d28fcc235f4285277446945595d42ff1d440e5c8491b78abb6c3 SHA512 5fba3e84d0506b52e1561f750e045b6227ea21387ddb3a89b8a61e9698fc0e9ec80c4a7048d9426fb0d8e9f2acd808e7e07fcb11d14d6852d9b057fec86d6e6a
 DIST fakeredis-py-2.5.0.gh.tar.gz 139911 BLAKE2B 4e9c616b0066012e1ed681d06e73390fb670969c15fa57689244147a0175dbb14ff1c312066ffdc6eb2c647f884c351a98eebfb2c1ba0e6c1bbe1e6c3553808a SHA512 aff5a8679763d4cf1717f790c7c384aa8e5056e5f175c306626f3a1671fe27aa3caf24368831033c9cf5bffa2e3e6be1104b183f3912eadf34fd6f37ea0c63e8
-EBUILD fakeredis-2.2.0.ebuild 2000 BLAKE2B f7948d36200ff88c5f996c79939a3a9c204929aac2ea9ba5d54ff47f66f6873f976d20423bebf1ce6b9c814b3c37cb2eb7adac6ff8e76fe9e249304a9bdc5f01 SHA512 cd10a46e35236e07289487829bc17b8026526ee99f41c35c9a56dd8a8bfe2999979bb515f4005a18aa8ec86f718d291b86781b174bd9b7bf691542d4bf6e5f2e
-EBUILD fakeredis-2.4.0.ebuild 2084 BLAKE2B 4591f6e8d91b0327225bfc6a2c792eab83298682c4f713786204e570bdca3b166d37616e7729e15f8bcbaf46b2a241ebcf25ce4f3146bdba451750941d6c461f SHA512 fab3b715ef33a7ca5fed697032c74237e52c23e1ca741e03109849a992d397f58705d36f476f0d8873fe47138781d84e29a62d180b9e8715044c72f1b432303c
+EBUILD fakeredis-2.4.0.ebuild 2080 BLAKE2B 8a72bc144e8edf9b1f8d55b65776364084f319b5522935665739984552f1e7622f34e15f9c1e0f9d3b7387d8f1408120bdf616fc3175c9d136cdc89270a75e3f SHA512 6e2da686bf464f1c67cfa63888c233908b27bf2d6ce84d8e99d4de23c134d456b397aec24fb235673173fae0e48e6ef0d3f156f9f02aebf2647c58e02f61e167
 EBUILD fakeredis-2.5.0.ebuild 2084 BLAKE2B 4591f6e8d91b0327225bfc6a2c792eab83298682c4f713786204e570bdca3b166d37616e7729e15f8bcbaf46b2a241ebcf25ce4f3146bdba451750941d6c461f SHA512 fab3b715ef33a7ca5fed697032c74237e52c23e1ca741e03109849a992d397f58705d36f476f0d8873fe47138781d84e29a62d180b9e8715044c72f1b432303c
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-2.2.0.ebuild b/dev-python/fakeredis/fakeredis-2.2.0.ebuild
deleted file mode 100644
index 6e28a6be536a..000000000000
--- a/dev-python/fakeredis/fakeredis-2.2.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=fakeredis-py-${PV}
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-SRC_URI="
-	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
-	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin redis
-	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/fakeredis/fakeredis-2.4.0.ebuild b/dev-python/fakeredis/fakeredis-2.4.0.ebuild
index 4186af5980d2..407a0ae4ef68 100644
--- a/dev-python/fakeredis/fakeredis-2.4.0.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.4.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index c75b7c5cb01d..2e8b308b644d 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,7 +1,9 @@
 DIST libtmux-0.15.10.gh.tar.gz 240378 BLAKE2B 81841a25b01bb26d2c612a14cd4518c48b12162d4aafa280fe0d6de269d149bddaffe72f4ce2c735e41b00cd2bfec19773d7cd3b9fd927c892f11f0cdf8e8a88 SHA512 8ee870c94bd3e3a9fffc19854f978d4faad747ea395e53c3576adc9cc2dcdd3cbdedeeb589a2dc11b0ac836931ffbdcea06a4a850b2ead163235dda2334defb5
 DIST libtmux-0.18.3.gh.tar.gz 261540 BLAKE2B be98707101d7481b6787694795eb05dbe1070a0eed0b7408af1714be01f4870c51223559d1edc3a3fb7b60e02496a413e92c0734031223bca9d521604cb6e65e SHA512 67173c4f2f45f1236e7a1a5ce0895c53bfd6316aa7017382f97b87f84cbc6a23a6ef0f2574a276b7b064da9e4982804fb2004d31ddb1237f97ca835fafdf9ccb
 DIST libtmux-0.19.1.gh.tar.gz 262280 BLAKE2B 9d1a2c74b49011e66df6ed2012096b0df6c6731e258078f8ce2b4fef38d21513488b195e3fdb722478ae5f829ba77bd09c152569d73cab83bfa6e4a360346b39 SHA512 b9f3b29de7c8ca86e8495843aa04e2dedfaea749bd57095a9d7a2f638111de7474500c3dbd892f0c580c613c796fece8da47d6c099b8b78056fbd242451eb129
+DIST libtmux-0.20.0.gh.tar.gz 266849 BLAKE2B 51840c4cf5aecb077c7c5205a33e6a620b68aed3f61bf52f4c376b257896c907a0e9117c35f70493464d4a3e136e9bd81e0d2ed6cd8a9f4a7c80276dc1461568 SHA512 1e8b49898aeb622aca6160c9ed99c7714d75f716baae5109e278baf5b70d0211d3ac4ed89c3755823b203add1fe4198ceb9e16ad03941eed2cbd2407fd46f0d2
 EBUILD libtmux-0.15.10.ebuild 1224 BLAKE2B 0c19dc33639ef451cfe4659aab6b3b1e38d96cb6899f6dbb85aa655a99010be3174ad43c7c7522d3c2d8e597e789048ae8feddc03836d4ab60fd9c5333c9b665 SHA512 9c9e4c7aa82223e54b12bfdd3c088954221f5794723d4766988654d99e3a349eb1928c664cd590021f1a30fc3a854e0811e8f993ffe431394c0fee3839a54b19
 EBUILD libtmux-0.18.3.ebuild 1226 BLAKE2B 33869818384b647487e2b595316882f800a75a819ae93e1744273347f1b020cb96d03d83546ecb48b76f1c4627335db6d84b46e6aad92eced8a8cc2bd3121cba SHA512 ff6dd7967eb642106ef4a5ec353d405b814df2c7d3a90d31b085bb3789155cfe0b92704268c8b3d5a82dde6dbcf700d71182d5b3f63ba7ae346d9f76d3ba769e
 EBUILD libtmux-0.19.1.ebuild 1226 BLAKE2B 33869818384b647487e2b595316882f800a75a819ae93e1744273347f1b020cb96d03d83546ecb48b76f1c4627335db6d84b46e6aad92eced8a8cc2bd3121cba SHA512 ff6dd7967eb642106ef4a5ec353d405b814df2c7d3a90d31b085bb3789155cfe0b92704268c8b3d5a82dde6dbcf700d71182d5b3f63ba7ae346d9f76d3ba769e
+EBUILD libtmux-0.20.0.ebuild 1226 BLAKE2B 33869818384b647487e2b595316882f800a75a819ae93e1744273347f1b020cb96d03d83546ecb48b76f1c4627335db6d84b46e6aad92eced8a8cc2bd3121cba SHA512 ff6dd7967eb642106ef4a5ec353d405b814df2c7d3a90d31b085bb3789155cfe0b92704268c8b3d5a82dde6dbcf700d71182d5b3f63ba7ae346d9f76d3ba769e
 MISC metadata.xml 403 BLAKE2B 68af7251349c8999bbdbfb7b55ca4632f8752468d7e478fd985097af86d00afe93b231667a25e3c997a3bc86b708d4e6d6ef5c35a783871cdc83519fc1db1ab1 SHA512 2a88df695e94f1da966bb72f7e90d00f2e343e40fe1924837f8c087dfc9a9a84fe0b2909a98f2f41ba72f6ba01796888a80cbac3f1bf9f05984a06385037d977
diff --git a/dev-python/libtmux/libtmux-0.20.0.ebuild b/dev-python/libtmux/libtmux-0.20.0.ebuild
new file mode 100644
index 000000000000..499498389f30
--- /dev/null
+++ b/dev-python/libtmux/libtmux-0.20.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python API for tmux"
+HOMEPAGE="
+	https://libtmux.git-pull.com/
+	https://github.com/tmux-python/libtmux/
+	https://pypi.org/project/libtmux/
+"
+SRC_URI="
+	https://github.com/tmux-python/libtmux/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=app-misc/tmux-3.0a
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/twine[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	libtmux/pane.py::libtmux.pane.Pane.send_keys
+)
+
+python_prepare_all() {
+	local issues="https://github.com/tmux-python/libtmux/issues/"
+	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
+	rm requirements/doc.txt || die
+
+	# increase timeouts for tests
+	sed -e 's/0.01/0.1/' -i tests/test_test.py || die
+
+	sed -e '/addopts/s:--doctest-docutils-modules::' \
+		-e '/README\.md/d' \
+		-i setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index dfe51081584b..347a634318e5 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -9,7 +9,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 466b161d1ab30326cfc1cb4b52293a1a8483176deb2fed65b04a70d0b92b84b82ee98e475c84ab5ab94a6c6411da7f7a86f4aaa676ec0311492d77357f67272d SHA512 320f5675b1b73356beeb3a2a71f6591780905f02264ef13c8d0ba77743a975accd50d854b0f16e770047e46e601f4ebd03b46b7756157c98cb6e08d9caa29899
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B ff939004df0d10a698e942c99ecf3bb11fe8e0c035e3dfb0ac495f2368d83bb89cccb11de0878b3555c4047b8d0e4b969e5cec8aef8891aabf2d16a550696870 SHA512 7be9e5f983bffabf30c954e45ede8fb6b30013b84cbd50f66fa3a2185b0223b4ede7466d40376453283e9ca806da1ae80afe6e6fee001ede95b78226bcc7267d
 EBUILD lit-15.0.6.ebuild 914 BLAKE2B 5ec2a2dc492bcd56b0f4461b5f2b9eb2a948327027b98b9afd8dc022dcdb8b99012c91710b69432384e96cbceb1bb5351e259b02f0191aacda74edf07046b736 SHA512 46c55b6eed3ad82d459c3a1c52623ee928169401f56745b436904af6ad58959bc4b503d1fd0fe7bcf4cf1846db0f386a25ad9ccca46a0e1a61fb2a925b5073de
-EBUILD lit-15.0.7.ebuild 917 BLAKE2B 9a97d29b7add5590a502adf18125342456d2d7ed51e31c0c184fd4ea828c42b7f498823160d7af0f40be21bfd390b7d5b481a0ea9708a62da120a52c2aec9cd4 SHA512 ea60a8b05b65d03b81c31b479ce074296af22d9108a6ac41b7367420bfe2c8a579fb77fe1025775f87bddadb31759bcabd9711aaecc40ec7e5a63433785a32c1
+EBUILD lit-15.0.7.ebuild 914 BLAKE2B 5ec2a2dc492bcd56b0f4461b5f2b9eb2a948327027b98b9afd8dc022dcdb8b99012c91710b69432384e96cbceb1bb5351e259b02f0191aacda74edf07046b736 SHA512 46c55b6eed3ad82d459c3a1c52623ee928169401f56745b436904af6ad58959bc4b503d1fd0fe7bcf4cf1846db0f386a25ad9ccca46a0e1a61fb2a925b5073de
 EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-16.0.0_pre20230107.ebuild 877 BLAKE2B e0fb3eb26a481420f154c6c7306824e929cbea060ec0e28c28991c39f86f756ee5d004abf6c76775975e053a588df73b2fd121a55617621c8a179899adecb41d SHA512 9799e40aa5ad07879a049777666963e225ffc97618fdae22869e8c8a648b0e33554859c525fad2307e23b96616bf24847c1ad7aa3e69353927c03f975b3bcbb8
 EBUILD lit-17.0.0.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
diff --git a/dev-python/lit/lit-15.0.7.ebuild b/dev-python/lit/lit-15.0.7.ebuild
index ced72b97fca9..800c8de63435 100644
--- a/dev-python/lit/lit-15.0.7.ebuild
+++ b/dev-python/lit/lit-15.0.7.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/seedir/Manifest b/dev-python/seedir/Manifest
index 70678a75cfac..17501ebfbca6 100644
--- a/dev-python/seedir/Manifest
+++ b/dev-python/seedir/Manifest
@@ -1,3 +1,3 @@
 DIST seedir-0.4.2.gh.tar.gz 3096194 BLAKE2B daabdf1f5bb202ab454bea376c6e14dab2eb9c964a3bf87349c3ac6075bb8ed201b66082518aff01cb4515e89026a02c662da5e9a5f43c5d0ea21556cda07e90 SHA512 8d16ae1ba020268f9587742cacbc55ecc1d218f36955c625f64829940396c908d0498ee6bf50d560f87b10488dc6daa5698681e10e1699d20d958b3cd58f14c4
-EBUILD seedir-0.4.2.ebuild 606 BLAKE2B 83093f49a96cfab8039710faa65182c0353d2997cc1909652ecc55c9e899d541081d682a9e4e9c629c873ad62a31d161ac2ddb5186deaeb1f742ee72c77dcc10 SHA512 98ff8078c82f197dbd083d17d768ad81dea77c572f64d8412eb447597193ca05aecbf4e8c4496dd062c43f32caba6030372b27d10aef05b3a4880c92d0013eb3
+EBUILD seedir-0.4.2.ebuild 604 BLAKE2B 671317dee290fc079adf8c8fa1f6df525356bae0562c5654bbfae4b0d781326cea8eba1d8098d16cb65e0cc7942c24589ecd6460fd63e05cbed6daf487932617 SHA512 f0ba5d79d1ceef061925b827735ce392ccca34a29d400627e1677792e505083e89dfae7914d5768c48348a09ff52a90fa0dfa9b806eed07c1e33f429c9179d90
 MISC metadata.xml 393 BLAKE2B fa479c17b0ecb4807f85e82e871d8f3690c7b0aab9a6c53b3609c84771d3d5a0e8b0769ec35ee51d533764440bffaaa679fda6401a95813ab7c76f81d6f84897 SHA512 913ba255b6ae25b437d99ced1bd8aef70f8dcc17b947be4d1ce10738a88c6ab35cce66dfdc2193d73881011f1e5e976e7b43c1faaedf312a429401e02f0dd9f7
diff --git a/dev-python/seedir/seedir-0.4.2.ebuild b/dev-python/seedir/seedir-0.4.2.ebuild
index b4f48093dc35..3e06c52ed197 100644
--- a/dev-python/seedir/seedir-0.4.2.ebuild
+++ b/dev-python/seedir/seedir-0.4.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/natsort[${PYTHON_USEDEP}]
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index 17c7d3fa96fa..b656e97611f2 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,5 +1,5 @@
 DIST sybil-3.0.1.tar.gz 38265 BLAKE2B 3a9dd8d85a5a6228944f104d255826b4dfee80f5a349da3a0fa69edcfa0953145378f002c1bf834e21c0d382fc96a993b927bdc92bb3e9a84d34998ad6ade62f SHA512 312c57f0de646b1e7a3b992806362c1020b2d567c805d248e94ab22a336a8fc77704234e123e1ec74987bfea620b2f8c4d3714d32aee03587c615d3d90fe5558
 DIST sybil-4.0.0.gh.tar.gz 50845 BLAKE2B 5c7144ad1dd131f98c48f18cf6770782529a3c86a3f976461f032c9024ef93dc2de3c8bc327421a55a3f505982608e15cdcfe022f964c4fd871bd9de61205d68 SHA512 6cf0422ba856a85ba5dd105481cb2d06eb2ff196aee263a36e7ab44c7d45185df022bd859afc92b3b42dc418142e441f377adda82c0b5b0d1410697b563db994
 EBUILD sybil-3.0.1.ebuild 466 BLAKE2B a12ef06e65777de3b1720660b1c831c8905af25cf5e61db69ce33f2bbeda56437d6aa5b35a2f25e761b2c4dd9c17a81adc31c4491f64e2fff0d0ff20d712329f SHA512 b2daa82377ef3ab7d6b36c5988dbd3f3519f0eb12ab0b60f2795b690d8c64baa2259936c5bbdeba6e74ec27732506f5b56229527bb3e46092d38aa7b102c8ab2
-EBUILD sybil-4.0.0.ebuild 682 BLAKE2B 1cd8a8ee6173e1a852fa92af3cf04bba64bdd6d79900a2b54c81661da69204e6fa43545bfd80afa9cc25fdb2b605cbca530a6088bee9e11e96ff43768519b820 SHA512 8e5812e851ac51e72cffff9a38babd5b6c838bf01949e3a220460e7422fe8fc46238b66a7ff1d9f63d6b009bc0aa662c8238a82e365aadc25ccaf2ed7bc94fc8
+EBUILD sybil-4.0.0.ebuild 680 BLAKE2B 6815c77136310c4a887ab296707b967f98c757b92dc2dc9124fb61ac4b7efadf0ab9e0dc656cc701aab5db61033b236c964f7ce66463154a120e47e71ac72a0d SHA512 3af1889abc67662ded5cae3013a289f6df29ea663a83ef9a5f48fd84cb46555910862e8b40c5c78efcf099801795092d071d208b2dea27dc25b45a0e6c4ebf8a
 MISC metadata.xml 402 BLAKE2B 3fcce3ac9ff731e24a3f6e761da2d840b3a7c9107b3d9a46afe00fed61b475d1400580b4ccf49dd71f6a1ab8098dc2aaf895e529a723cd96301d1400ee211edf SHA512 138106c714dc33871ccf535cc47d669580b665c842adfea5442a03067fe507236d8fde4158f006e1188003abe53c9c25db98632dadd1cfa0e41efd1755c2c75c
diff --git a/dev-python/sybil/sybil-4.0.0.ebuild b/dev-python/sybil/sybil-4.0.0.ebuild
index 399d0e56bd19..547ce4766e3b 100644
--- a/dev-python/sybil/sybil-4.0.0.ebuild
+++ b/dev-python/sybil/sybil-4.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index d2f37d183552..b8643504a78e 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,5 +1,3 @@
 DIST towncrier-22.12.0.gh.tar.gz 54670 BLAKE2B b6baf6970cc8a5f798f378ae7c0637184a869c3c72907205c6493786353f1a5f26e1bca0faa7f4685236e3a1fc9d4b2cfe6632f01d36926ae9e74cb188460674 SHA512 6fad515b2368f2c1ee27673080607460949d6651d3c9b9ab106b8e7f0298d0748a4ec1424f73bb7bf8a81eef5b0fa74de6a0b7295f02f02f354f20a99eb30814
-DIST towncrier-22.8.0.gh.tar.gz 47182 BLAKE2B 87674c49dc101d4e90ff3ec93b417a5e7fdc3b8b1c4adb76829789d2ee6271e2963306f3fbb2695e102f941afc0d3fcc57735b3f106eb3d9c2d1da49cb1af199 SHA512 4b404fdc7083de4807bb3a910c62a44cabde09b19807f46c255c935e8e1d5313f328785c14c845be168085bbaf9d54e3f589c6883c8a0bd2434ae46add3f6bff
-EBUILD towncrier-22.12.0.ebuild 1071 BLAKE2B 8be8355f7e3c12e01a081093a36b1c80a1213619cbe036612e8e90865319456781cee3bbd28b0767d8c306516aa17e65239aa0625bb79d2b9d08ec3771d4f16f SHA512 24ebc0271648373daead791562bd87399624d7cd078fd9552d7cc8edf2b8d0450e7cec2ae5742a08c538f2dad6a56e8cefa5626f3148aecb348d1a584478f921
-EBUILD towncrier-22.8.0.ebuild 1063 BLAKE2B 2ecea094218efc1af0d823641cb179e458275a90e8a1e2fed90c756043624666c8cb819700497c2e2c8d2dbaad11f0dca7fd372f6e431687f1d31b43c5b4974e SHA512 383de227f9c88ed062d20f96a0aa6a533418c33c7432e8988259968a64f41abe15b19e0e68ba761ea39a4ed8fc7835091274c3813b24cbd73c95ee3a1308b0a9
+EBUILD towncrier-22.12.0.ebuild 1063 BLAKE2B 2ecea094218efc1af0d823641cb179e458275a90e8a1e2fed90c756043624666c8cb819700497c2e2c8d2dbaad11f0dca7fd372f6e431687f1d31b43c5b4974e SHA512 383de227f9c88ed062d20f96a0aa6a533418c33c7432e8988259968a64f41abe15b19e0e68ba761ea39a4ed8fc7835091274c3813b24cbd73c95ee3a1308b0a9
 MISC metadata.xml 394 BLAKE2B 52e7e94b46ca173b3bcb91b6a5733304c367783f45fb60beaf775a35cfbd3e1f3a7558de3c79fa96681b684998c9a9d51ba064839824f8e35ff7d86e32dcd477 SHA512 23aa7a3a20c418e6a6b06502cfc2c6a8c8a0556118a6c4a995ea3c95e49c6ef31ec8daf6ad66e69471f1e7eaba1607b8bd0a0950c70efdd735d2141be852fee3
diff --git a/dev-python/towncrier/towncrier-22.12.0.ebuild b/dev-python/towncrier/towncrier-22.12.0.ebuild
index 6d0a0a11885b..30a541d1ca58 100644
--- a/dev-python/towncrier/towncrier-22.12.0.ebuild
+++ b/dev-python/towncrier/towncrier-22.12.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/towncrier/towncrier-22.8.0.ebuild b/dev-python/towncrier/towncrier-22.8.0.ebuild
deleted file mode 100644
index 30a541d1ca58..000000000000
--- a/dev-python/towncrier/towncrier-22.8.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Building newsfiles for your project"
-HOMEPAGE="
-	https://github.com/twisted/towncrier/
-	https://pypi.org/project/towncrier/
-"
-SRC_URI="
-	https://github.com/twisted/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-default-group[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/incremental[${PYTHON_USEDEP}]
-	test? (
-		dev-vcs/git
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial towncrier ||
-		die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index da5e69c779a2..ffdc54e6ad9a 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -2,6 +2,6 @@ DIST xcffib-0.12.1.tar.gz 85272 BLAKE2B 6db2f19caf13d406297198c3829456cb45b5195e
 DIST xcffib-1.1.2.tar.gz 87303 BLAKE2B 0727c1c4c49692d8daff79d77487cfd2780a4279fa2bd49b45d87f48186e9ba0ee3ea46841dc259e7a3b5e301caacdee764762efe96217e138e6f8cedb2a986f SHA512 21606034bd0be2e1cf87b20904b006f7eb6eecbd835eff778f064ecb2bc16d17f48a6acce0eb1a30ca9bd98d810b4b1674bdadc9f6e42c5effee777f7bd138aa
 DIST xcffib-1.2.0.tar.gz 88972 BLAKE2B a8d9be7c3149f696d06474aab85e9f7605d45e9861151192dbb7b51e48483f75adb721e17531432294d19d8d6498b66ba312702ea011e8470c3ac42ac0cd6e23 SHA512 7012833f2877edea92cdc15030543883e2a848264c034a81222626ad48a69fcdac8a88cec2e07e61a80102640baa7fbdf29bbf25e08e59fc896aada08533bb77
 EBUILD xcffib-0.12.1.ebuild 796 BLAKE2B fe839be5ebb472d0df21a19f36d3873e2bceca0a5e4dc0cdf23497e269b0f0c58dd5f39c5fb250aff222223a4fd8691556c1e8f3b6328a3d2b81004555db4860 SHA512 9ab12f6954417dfde34c8c08f19a6eacae34f6ab1789de3a1e428a73199d7e2b6bd9f17e71622b2618238268ea29eaef27b3e7f57c03eba16e041f1f4b68a63d
-EBUILD xcffib-1.1.2.ebuild 803 BLAKE2B 5e3670028e2b741975c529dee0cea07d7b317051bb002f4f1242bf2a8acc01f7b6b885cbe984554cf03be9c68ab33e14ea6b0b7cdf4e4df1c2037c3acb2093a6 SHA512 678dc3673815b79831bf7d055212c4fff9554b2a77f092baa7100546a7ab8673a0f91b688b26b476a50dd519b51284bf6a109742e7e5df7d0469b1538402d373
+EBUILD xcffib-1.1.2.ebuild 796 BLAKE2B fe839be5ebb472d0df21a19f36d3873e2bceca0a5e4dc0cdf23497e269b0f0c58dd5f39c5fb250aff222223a4fd8691556c1e8f3b6328a3d2b81004555db4860 SHA512 9ab12f6954417dfde34c8c08f19a6eacae34f6ab1789de3a1e428a73199d7e2b6bd9f17e71622b2618238268ea29eaef27b3e7f57c03eba16e041f1f4b68a63d
 EBUILD xcffib-1.2.0.ebuild 853 BLAKE2B 4b7de928b8efc570a2613613c8c215d9a30ba617982cfb4997541d742aab9223da73e739c78dd5e77bc61b2c0b2912e632ea3b669da656f1cc340219137204e6 SHA512 4ca5f1670ace1407c6fb027b99e42545c9f294b4a2e3879237584717fe5dc023d7ed2f0b5cbba740373ad122e1938d74eb747e8cef7a5740181934df0a6a56de
 MISC metadata.xml 374 BLAKE2B 7f2845d0839dff2568de08f86ce6b8387e76ff450467e14b5c291ad1f55256cb9eff1ff318973e54846ad394b56a3e1e6aa8574fcc0bc39a1c9f7d3b42a1109d SHA512 9403d3d706b5281d6abe2d2fca33b1a70983c7c205f8a5899ad0469fe9a1cd0ceb6c9b27916e1e152467d029d86fc9e6dc28f967bc108499ed901582ad1bbd00
diff --git a/dev-python/xcffib/xcffib-1.1.2.ebuild b/dev-python/xcffib/xcffib-1.1.2.ebuild
index 0c9cfd0bdb30..def4be81f2b4 100644
--- a/dev-python/xcffib/xcffib-1.1.2.ebuild
+++ b/dev-python/xcffib/xcffib-1.1.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="
 	x11-libs/libxcb
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index e69fa2eefb57..09600f13179c 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 4a81e7d59bef..344f667722f7 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
 DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B 115814a4d90ac286540cf6e50bd2b57baa8e0e327fc73c3ab06fe43ecd95e1e3739faecee5db112d95d17e4fb84494ad5557e70251f2c60142166715294bf366 SHA512 d50b0f02476ded9f053093ec15c5204a0ec664794dcc324996685f09400a2cbc76dc3fd0ebfc247ebd42fbe203b7d4c904e975fc985bf7928e43c6cd65f04f34
+DIST qtbase-5.15.8-gentoo-kde-4.tar.xz 789072 BLAKE2B bc781da32e7ad917fcbe3ec6fbf1ad17b5128f994e96f38590305b792b288b5c63ba8f71740bb2bb84bbf62386d154aa643cf162d0c5804a626f6c57682d7713 SHA512 1a65c40a82a2ae8cdfcb06ed6d0267f7c6257ed6e0637e17c8ca342702834d19c8ee12c02128754f41c7c4744e44cbc647982b2f8f215e36401b0eb47334a9bd
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 EBUILD qtgui-5.15.8-r1.ebuild 3836 BLAKE2B a5216fc2e7a1ee2c146a89c79de2ea69f1300025740ba34fd076da437416c0e4a6b761e4e85699ec60b9a266482147b79f8e0874acf064af6685998b62b45072 SHA512 54409e756b9362237bc50b40f73d00da5b3d859002036ffb32ab59de9f29c05349300b1a386313738c7a99c6336fab1d920e714c93e94aad67d3de45ac2a84e3
+EBUILD qtgui-5.15.8-r2.ebuild 3842 BLAKE2B 504ec9c9caff125035fab7cd8f45eeaae1e9d881cb127728742a778a87f15ef652bd2877f7e0ec330696aa2afb065cdb2550c49d99d47092d1977f3b0a17e492 SHA512 71d67bf48cfdb5863fecf451a8361d1edb425fde98ae459044d4732ace99e5717b695269fc613886ad63e0e2e2575f508213d25e4e9340774dd231dd1ebfefa9
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.8-r2.ebuild b/dev-qt/qtgui/qtgui-5.15.8-r2.ebuild
new file mode 100644
index 000000000000..c7b0d5ead51a
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.15.8-r2.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	QT5_KDEPATCHSET_REV=4
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+
+SLOT=5/${QT5_PV} # bug 707658
+IUSE="accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput
+	linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
+REQUIRED_USE="
+	|| ( eglfs linuxfb vnc X )
+	accessibility? ( dbus X )
+	eglfs? ( egl )
+	ibus? ( dbus )
+	libinput? ( udev )
+	X? ( gles2-only? ( egl ) )
+"
+
+RDEPEND="
+	dev-libs/glib:2
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	dev-util/gtk-update-icon-cache
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/harfbuzz:=
+	sys-libs/zlib:=
+	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
+	eglfs? (
+		media-libs/mesa[gbm(+)]
+		x11-libs/libdrm
+	)
+	evdev? ( sys-libs/mtdev )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	gles2-only? ( media-libs/libglvnd )
+	!gles2-only? ( media-libs/libglvnd[X] )
+	libinput? (
+		dev-libs/libinput:=
+		x11-libs/libxkbcommon
+	)
+	png? ( media-libs/libpng:= )
+	tslib? ( >=x11-libs/tslib-1.21 )
+	tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
+	udev? ( virtual/libudev:= )
+	vnc? ( =dev-qt/qtnetwork-${QT5_PV}* )
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libxkbcommon[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${RDEPEND}
+	evdev? ( sys-kernel/linux-headers )
+	linuxfb? ( sys-kernel/linux-headers )
+	udev? ( sys-kernel/linux-headers )
+"
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+	wayland? ( =dev-qt/qtwayland-${QT5_PV}* )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/qvkgen
+	src/gui
+	src/openglextensions
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+	src/plugins/platforminputcontexts
+)
+
+QT5_GENTOO_CONFIG=(
+	accessibility:accessibility-atspi-bridge
+	egl:egl:
+	eglfs:eglfs:
+	eglfs:eglfs_egldevice:
+	eglfs:eglfs_gbm:
+	evdev:evdev:
+	evdev:mtdev:
+	:fontconfig:
+	:system-freetype:FREETYPE
+	!:no-freetype:
+	gles2-only::OPENGL_ES
+	gles2-only:opengles2:OPENGL_ES_2
+	!:no-gui:
+	:system-harfbuzz:
+	!:no-harfbuzz:
+	jpeg:system-jpeg:IMAGEFORMAT_JPEG
+	!jpeg:no-jpeg:
+	libinput
+	libinput:xkbcommon:
+	:opengl
+	png:png:
+	png:system-png:IMAGEFORMAT_PNG
+	!png:no-png:
+	tslib:tslib:
+	udev:libudev:
+	vulkan:vulkan:
+	X:xcb:
+	X:xcb-glx:
+	X:xcb-plugin:
+	X:xcb-render:
+	X:xcb-sm:
+	X:xcb-xlib:
+	X:xcb-xinput:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:gui
+)
+
+src_prepare() {
+	# don't add -O3 to CXXFLAGS, bug 549140
+	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
+
+	# egl_x11 is activated when both egl and X are enabled
+	use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
+
+	qt_use_disable_config dbus dbus \
+		src/platformsupport/themes/genericunix/genericunix.pri
+
+	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+		src/plugins/platforms/platforms.pro || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		$(usev dbus -dbus-linked)
+		$(qt_use egl)
+		$(qt_use eglfs)
+		$(usev eglfs '-gbm -kms')
+		$(qt_use evdev)
+		$(qt_use evdev mtdev)
+		-fontconfig
+		-system-freetype
+		-gui
+		-system-harfbuzz
+		$(qt_use jpeg libjpeg system)
+		$(qt_use libinput)
+		$(qt_use linuxfb)
+		-opengl $(usex gles2-only es2 desktop)
+		$(qt_use png libpng system)
+		$(qt_use tslib)
+		$(qt_use udev libudev)
+		$(qt_use vulkan)
+		$(qt_use X xcb)
+		$(usev X '-xcb-xlib')
+	)
+	if use libinput || use X; then
+		myconf+=( -xkbcommon )
+	fi
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 72ddf5880643..26a4c5cda00f 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -2,6 +2,7 @@ DIST qtimageformats-5.15.8-gentoo-kde-1.tar.xz 5000 BLAKE2B 1d1a5054267bf8e28051
 DIST qtimageformats-everywhere-opensource-src-5.15.8.tar.xz 1843016 BLAKE2B 55f4a0b212e63483d23a8a962ffafd826994088e00025291a502d371540e2d88217f5caeea03d40347ff756033b47ffa71e1e250673b977013b7dd5d190b0e7c SHA512 e601a1ebd0881e59c1f87df748faf63df12f552fe668d16af27a58421848ba4de822b4dc3fc54f23c17b818408b6af2edbfb0b59c29e7da8a272d25ac51d7cdd
 DIST qtimageformats-everywhere-src-6.4.0.tar.xz 1861400 BLAKE2B be2d99999a29b5876981d0768d63dab6a70181a1643be73e83cb7bf6771bd35462165e1a848206d4f69018c3388118f4bd94a336ff28ab19dbc75973eb86463b SHA512 3a7302cfbe9187ffb753c7171c62bbf43223c9c876bb0df20de8b593d51ef775bffeff124d269ed8d4ce7e1fb3d55790acd75bce0b5d5bfa223e5e83dfb41f01
 DIST qtimageformats-everywhere-src-6.4.2.tar.xz 1938812 BLAKE2B 65d1e5e7c415397cb411acc60fdb7ba316e986de30eb23a14c92f4fa6d3280bbb7aab2e592fd6d360052ba757472e8fd0aa35212fa3be545e07a4714bfe93ac7 SHA512 2bda0001295d1a27ee3018d7a7236525ee41f7de33d58805a71277b5a7d8f9506687a7bb9d6630e32cbcb89e340048591e9f9d29833a3bb4d8168c4779dc5320
+EBUILD qtimageformats-5.15.8-r1.ebuild 702 BLAKE2B 886af5f9b38be2bc82f5e81f121fba46687807ab77b34809158b767e592177466350a0f9110011e7998961132f6da54ca1dda0fabfda12ae0fea71b1d73137ae SHA512 3be583ce27469d7b5e5a21f75f05bf3e1acbc27bac6c12d86dfcb1fecd6046a0c6f2acf6b9b99e5a6092feeb400b598c4bf0ad1adebe789ee1b80350d5bdce3a
 EBUILD qtimageformats-5.15.8.ebuild 698 BLAKE2B ad1a859438729b83988a8ca0a97b2e75b295f0f077a8cc93b2157f828238623e16d60fd4de835ce1b93851d55c4cfb308868ea76cd61ba5db04f733f11c61f76 SHA512 a74183f207d9008a88b0fc9140349c56f555d613ae6c12b9c0615c440ce982ad7739ae61bc079352a14f66198d00dc7d04abe5e5bf6dd4b358cc45ea71f8af43
 EBUILD qtimageformats-6.4.0-r1.ebuild 633 BLAKE2B 1d17b7e376cdab0291450c0fce5da50f5ce7882670f3a6e02b4660ba2f6ffdfba8e4c8df51f15cd77ca8567e0fb01ab56af6f1772ec6d36a96cf5f20ffa0c227 SHA512 47d854a16b2af5c5fe487a8d4ca8052c49f3e5fbb4ffeccea85bec59d2926d640812e15aeab89d0ee807a8efa5c2e2aa85e1e089ed48568f827fb167ee8665d3
 EBUILD qtimageformats-6.4.2.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild
new file mode 100644
index 000000000000..1fc71ebd4a6d
--- /dev/null
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.8-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	QT5_KDEPATCHSET_REV=1
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit qt5-build
+
+DESCRIPTION="Additional format plugins for the Qt image I/O system"
+
+IUSE="mng"
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
+	media-libs/libwebp:=
+	media-libs/tiff:=
+	mng? ( media-libs/libmng:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	sed -e 's/qtConfig(jasper)/false:/' \
+		-i src/plugins/imageformats/imageformats.pro || die
+	qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 5f1112f31212..15c5dedb5bcb 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
 DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016
+DIST qtbase-5.15.8-gentoo-kde-4.tar.xz 789072 BLAKE2B bc781da32e7ad917fcbe3ec6fbf1ad17b5128f994e96f38590305b792b288b5c63ba8f71740bb2bb84bbf62386d154aa643cf162d0c5804a626f6c57682d7713 SHA512 1a65c40a82a2ae8cdfcb06ed6d0267f7c6257ed6e0637e17c8ca342702834d19c8ee12c02128754f41c7c4744e44cbc647982b2f8f215e36401b0eb47334a9bd
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
+EBUILD qtwidgets-5.15.8-r1.ebuild 1206 BLAKE2B 073672cf8e9da7c0f092397468c0e41a0a364bb9f8312359510e9fdc4df1ea396c2aae8641d77fe6922ebdc02c576a335c1f2c508d5f179bb11662bfe5f11c41 SHA512 e5e3918e84147aa1488053f51990cec089b2b02740e2272c1ffc8272ddfbebe7d549a4ac69c62c858036eb8651195b7d3b75ecef087b7882e032ebb9e22a15a4
 EBUILD qtwidgets-5.15.8.ebuild 1200 BLAKE2B 2bc1142dc7261140c06366e41c370464735ec597938eb5fe82176546733e14ab7f8b413ed7f2d3315d2b69d7d9e3b6d3741139ca684b8705a0fce71feca290b2 SHA512 ffa0a95e59423a680a9a4a7761c5bd391ef84b1ca718203175185185f3bde56516acaad6f852280ff8f06590f1ba6a7f3d94537014c84a50fdcd5868a203463d
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r1.ebuild
new file mode 100644
index 000000000000..fbbc45ae8079
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.8-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	QT5_KDEPATCHSET_REV=4
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
+
+# keep IUSE defaults in sync with qtgui
+IUSE="dbus gles2-only gtk +png +X"
+REQUIRED_USE="gtk? ( dbus )"
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?]
+	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
+	gtk? (
+		dev-libs/glib:2
+		=dev-qt/qtgui-${QT5_PV}*:5=[dbus]
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/uic
+	src/widgets
+	src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+	dbus:xdgdesktopportal:
+	gtk:gtk3:
+	::widgets
+	!:no-widgets:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:widgets
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2-only es2 desktop)
+		$(usev dbus -dbus-linked)
+		$(qt_use gtk)
+		-gui
+		$(qt_use png libpng system)
+		-widgets
+		$(qt_use X xcb)
+		$(usev X '-xcb-xlib -xkbcommon')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 950143f2fc3d..1cd73539c327 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 6232a7d6bd27..96f77dc68b17 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -5,9 +5,11 @@ AUX bpftrace-0.15.0-dont-compress-man.patch 1885 BLAKE2B 89a327cef68fa838d5c04b3
 AUX bpftrace-0.15.0-install-libs.patch 8206 BLAKE2B 9d8b193f422b0ee64301b7ea12791afdd5111cde487b904ec35750e6189fdd6faca9af36b8956058c820c2398bcabc7dcee6d26b93c55ff1e591b3259a682a27 SHA512 9721d8f3812855d7a9155d8e5ecac305dedb5c8326ccf8ea679048f920ca58a774576840c1b0bc2864a26c66c89bf0c81ed1a1ab30fb571a6cfaebc5b499c2b7
 AUX bpftrace-0.15.0-llvm-15-pointers.patch 1023 BLAKE2B fc66196f11e9384878921309d09e3f205674a88041c93b0b353bf38ff345b4192b83cd1c80a15258b97710624b3341c9ed19b60beff38c163f677d644843ff54 SHA512 8282aa82eb867eed3378adc4ff2b73c6427d4f979cfb5268444bf122126c758229d680985e4ede7e8d011a14d4a122d6742650f57ee0e0759e3b1bfb9ba9458f
 AUX bpftrace-0.16.0-install-libs.patch 8507 BLAKE2B 84842c5c400e2921d40f32ccd27ec06174c517e35b3a413907231e128d636e7c4711d131682d3fbc75a861bf3cd0cf83de2ca1c4bfbf2606e69d32f898fbd3a4 SHA512 93341eca7566d1328cbd670685859803cc76869be2eb3d52d38e3956f30d28f63d73ba32ae7f111dfd01ccb95899be6e1834fe7e1f1ee3794a0b796b8f52574e
+AUX bpftrace-0.16.0-opaquepointer.patch 20038 BLAKE2B beeda98ded230a8bb22d2a32dd0e839f138ca9c9fec10402d039f4385016b4330ce94756641e4f24a5a1e294ce08d282cbf4f7e01ef0c817dda21d2324f7cf60 SHA512 4b61fe7d21a42493590e5e6bc7507852d6a1f0d685d78958d6aa2c1602211d99bbccced25a2c118ecdedd802ccfdd009b940ccb81573b28b010a476952bd1da7
 DIST bpftrace-0.14.1-llvm14.patch.gz 7377 BLAKE2B 69b3b74bce74a8d4d8d9cc74de352dc33875ae905d8a88c776bbe80862a4f4ac2d450bcb6190da8be880bcc8fb751e3b8172df5454f31dc4bcd3e41edb02e396 SHA512 3269132981a7d2c0263fe9003bbcd2348e186ca0cdc95ada368331fc6e2495ae126c7bd68676438ccb575aafdafa3d17604a28fdc11d8b629eeaee130c1fd614
 DIST bpftrace-0.15.0.tar.gz 1006735 BLAKE2B 3ef4bb5f13aa6dea5140b5362e6fc3de21baa1192e2218307895bf29ddeba8d69543e32c2b769bf3456076095ba661b66e1625f2696631d22628311d7f6ec1a4 SHA512 916e9afeab301e62472e570ef77a3b9b27b43251880b64f1c5f151583c59a6c61e9ede50f3607044b27c5a6ce1a654f290153bf3f9237ebc0a823b5e6356187a
 DIST bpftrace-0.16.0.gh.tar.gz 1023480 BLAKE2B 20fa877adeaada655462004142a80f107f82a3fa73fd7a7675a477d45ecd3a28115af5d612da2b06e2d760cfa3e574583e4cc4d62f4175c49ecc9d9b3fcceb6e SHA512 52ca4fea4e2f8d2cbf0f9f1bc69af0ee3408201f019006dd2e838b9458cfc01761eba3df24c39e05cf93220d85d0cecc69bb44ec72f9f44cec0eb94479bff734
 EBUILD bpftrace-0.15.0-r2.ebuild 2008 BLAKE2B c947ed7d7ffe63e6d8f67b8de5a62ff5053aa3ffeffde602c32aac7dace1916d9ec288c3f1a3077cf6833b8ff32459f6c4e2879bf6f8e392535d3527029a4660 SHA512 f1ca5e2650bb0caa191f65af578fe52126777080ce852cefc21af513ae77103c9ef555902eda60675234e7632651621ff4c8f68fcb4b83491c411834014d9875
 EBUILD bpftrace-0.16.0-r1.ebuild 1740 BLAKE2B b798c92e0e80396c069d83b1f9d55d019382a4f3615c4a064d9b0c196c010c4399d488c41ef403702a5e3ccdff14d1cd4466a8b0d6cdb25902b48498197120b7 SHA512 0b252876bcd309520eb3daa4216cf21e1d8b1eb2ea0e33f5abe3b5d48cf32e8c5e5739f46c395f4678c64e39841e87093b829269563eadd51bdb10acf0b51d3c
+EBUILD bpftrace-0.16.0-r2.ebuild 1791 BLAKE2B bd0db18452f6d36ea37658b477219fc10edb329b17aa0fb6f26bce4578c9ddba88915e0a026fd190fcb5eba8bf005d930d6fcda590da623725a8254e8f224f30 SHA512 569974b254bd1ffc50018bc66edac49bb0f2c07a8990caded28fdf24f5728b16df08cc20157f07e248eb960291ecf9c8f5782bc4e1701ce2e8631f0abcbd8164
 MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce
diff --git a/dev-util/bpftrace/bpftrace-0.16.0-r2.ebuild b/dev-util/bpftrace/bpftrace-0.16.0-r2.ebuild
new file mode 100644
index 000000000000..dca9044e1ff0
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.16.0-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=16
+
+inherit llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace"
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# remove keywords until build works:
+# https://github.com/iovisor/bpftrace/issues/2349
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="fuzzing test"
+
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libbpf-1.0:=
+	>=dev-util/bcc-0.25.0:=
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
+	sys-libs/binutils-libs:=
+	virtual/libelf:=
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/cereal:=
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+QA_DT_NEEDED="
+	/usr/lib.*/libbpftraceresources.so
+	/usr/lib.*/libcxxdemangler_llvm.so
+"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.16.0-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch"
+	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+	"${FILESDIR}/bpftrace-0.16.0-opaquepointer.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="
+		~BPF
+		~BPF_EVENTS
+		~BPF_JIT
+		~BPF_SYSCALL
+		~FTRACE_SYSCALLS
+		~HAVE_EBPF_JIT
+	"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSTATIC_LINKING:BOOL=OFF
+		# bug 809362, 754648
+		-DBUILD_TESTING:BOOL=$(usex test)
+		-DBUILD_FUZZ:BOOL=$(usex fuzzing)
+		-DENABLE_MAN:BOOL=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# bug 809362
+	dostrip -x /usr/bin/bpftrace
+	doman man/man8/*.?
+}
diff --git a/dev-util/bpftrace/files/bpftrace-0.16.0-opaquepointer.patch b/dev-util/bpftrace/files/bpftrace-0.16.0-opaquepointer.patch
new file mode 100644
index 000000000000..656bf0f6a639
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.16.0-opaquepointer.patch
@@ -0,0 +1,450 @@
+commit a8665b2ef3199e82fd2ad076c1f07f1af2ec9272
+Author: Viktor Malik <viktor.malik@gmail.com>
+Date:   Mon Oct 10 14:26:38 2022 +0200
+
+    IR builder: get rid of getPointerElementType calls
+    
+    Usage of Value::getPointerElementType is deprecated and will be dropped
+    in LLVM 16 [1].
+    
+    There are several places where we use this method:
+    - function (value) calls - the called function type is usually
+      available, so just pass it to createCall, the only exception is
+      CreateProbeReadStr which must have been refactored
+    - getting the type of alloca instruction - there is a dedicated
+      AllocaInst::getAllocatedType method that can be used instead
+    - strncmp - pass sizes of the strings to CreateStrncmp to be able to get
+      the correct string type (which is array of uint8)
+    
+    [1] https://llvm.org/docs/OpaquePointers.html
+
+diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp
+index 09ae1c5e..da120ba1 100644
+--- a/src/ast/irbuilderbpf.cpp
++++ b/src/ast/irbuilderbpf.cpp
+@@ -291,17 +291,16 @@ CallInst *IRBuilderBPF::CreateHelperCall(libbpf::bpf_func_id func_id,
+   Constant *helper_func = ConstantExpr::getCast(Instruction::IntToPtr,
+                                                 getInt64(func_id),
+                                                 helper_ptr_type);
+-  return createCall(helper_func, args, Name);
++  return createCall(helper_type, helper_func, args, Name);
+ }
+ 
+-CallInst *IRBuilderBPF::createCall(Value *callee,
++CallInst *IRBuilderBPF::createCall(FunctionType *callee_type,
++                                   Value *callee,
+                                    ArrayRef<Value *> args,
+                                    const Twine &Name)
+ {
+ #if LLVM_VERSION_MAJOR >= 11
+-  auto *calleePtrType = cast<PointerType>(callee->getType());
+-  auto *calleeType = cast<FunctionType>(calleePtrType->getPointerElementType());
+-  return CreateCall(calleeType, callee, args, Name);
++  return CreateCall(callee_type, callee, args, Name);
+ #else
+   return CreateCall(callee, args, Name);
+ #endif
+@@ -310,7 +309,7 @@ CallInst *IRBuilderBPF::createCall(Value *callee,
+ CallInst *IRBuilderBPF::CreateBpfPseudoCallId(int mapid)
+ {
+   Function *pseudo_func = module_.getFunction("llvm.bpf.pseudo");
+-  return createCall(pseudo_func,
++  return CreateCall(pseudo_func,
+                     { getInt64(BPF_PSEUDO_MAP_FD), getInt64(mapid) },
+                     "pseudo");
+ }
+@@ -349,7 +348,8 @@ CallInst *IRBuilderBPF::createMapLookup(int mapid, Value *key)
+       Instruction::IntToPtr,
+       getInt64(libbpf::BPF_FUNC_map_lookup_elem),
+       lookup_func_ptr_type);
+-  return createCall(lookup_func, { map_ptr, key }, "lookup_elem");
++  return createCall(
++      lookup_func_type, lookup_func, { map_ptr, key }, "lookup_elem");
+ }
+ 
+ CallInst *IRBuilderBPF::CreateGetJoinMap(Value *ctx, const location &loc)
+@@ -400,8 +400,7 @@ Value *IRBuilderBPF::CreateMapLookupElem(Value *ctx,
+     CREATE_MEMCPY(value, call, type.GetSize(), 1);
+   else
+   {
+-    assert(value->getType()->isPointerTy() &&
+-           (value->getType()->getPointerElementType() == getInt64Ty()));
++    assert(value->getAllocatedType() == getInt64Ty());
+     // createMapLookup  returns an u8*
+     auto *cast = CreatePointerCast(call, value->getType(), "cast");
+     CreateStore(CreateLoad(getInt64Ty(), cast), value);
+@@ -451,7 +450,8 @@ void IRBuilderBPF::CreateMapUpdateElem(Value *ctx,
+       Instruction::IntToPtr,
+       getInt64(libbpf::BPF_FUNC_map_update_elem),
+       update_func_ptr_type);
+-  CallInst *call = createCall(update_func,
++  CallInst *call = createCall(update_func_type,
++                              update_func,
+                               { map_ptr, key, val, flags },
+                               "update_elem");
+   CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_map_update_elem, loc);
+@@ -475,7 +475,8 @@ void IRBuilderBPF::CreateMapDeleteElem(Value *ctx,
+       Instruction::IntToPtr,
+       getInt64(libbpf::BPF_FUNC_map_delete_elem),
+       delete_func_ptr_type);
+-  CallInst *call = createCall(delete_func, { map_ptr, key }, "delete_elem");
++  CallInst *call = createCall(
++      delete_func_type, delete_func, { map_ptr, key }, "delete_elem");
+   CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_map_delete_elem, loc);
+ }
+ 
+@@ -501,72 +502,53 @@ void IRBuilderBPF::CreateProbeRead(Value *ctx,
+   Constant *proberead_func = ConstantExpr::getCast(Instruction::IntToPtr,
+                                                    getInt64(read_fn),
+                                                    proberead_func_ptr_type);
+-  CallInst *call = createCall(proberead_func,
++  CallInst *call = createCall(proberead_func_type,
++                              proberead_func,
+                               { dst, size, src },
+                               probeReadHelperName(read_fn));
+   CreateHelperErrorCond(ctx, call, read_fn, loc);
+ }
+ 
+-Constant *IRBuilderBPF::createProbeReadStrFn(llvm::Type *dst,
+-                                             llvm::Type *src,
+-                                             AddrSpace as)
+-{
+-  assert(src && (src->isIntegerTy() || src->isPointerTy()));
+-  // int bpf_probe_read_str(void *dst, int size, const void *unsafe_ptr)
+-  FunctionType *probereadstr_func_type = FunctionType::get(
+-      getInt64Ty(), { dst, getInt32Ty(), src }, false);
+-  PointerType *probereadstr_func_ptr_type = PointerType::get(
+-      probereadstr_func_type, 0);
+-  return ConstantExpr::getCast(Instruction::IntToPtr,
+-                               getInt64(selectProbeReadHelper(as, true)),
+-                               probereadstr_func_ptr_type);
+-}
+-
+ CallInst *IRBuilderBPF::CreateProbeReadStr(Value *ctx,
+-                                           AllocaInst *dst,
++                                           Value *dst,
+                                            size_t size,
+                                            Value *src,
+                                            AddrSpace as,
+                                            const location &loc)
+ {
+-  assert(ctx && ctx->getType() == getInt8PtrTy());
+   return CreateProbeReadStr(ctx, dst, getInt32(size), src, as, loc);
+ }
+ 
+ CallInst *IRBuilderBPF::CreateProbeReadStr(Value *ctx,
+                                            Value *dst,
+-                                           size_t size,
+-                                           Value *src,
+-                                           AddrSpace as,
+-                                           const location &loc)
+-{
+-  assert(ctx && ctx->getType() == getInt8PtrTy());
+-  Constant *fn = createProbeReadStrFn(dst->getType(), src->getType(), as);
+-  auto read_fn = selectProbeReadHelper(as, true);
+-  CallInst *call = createCall(fn,
+-                              { dst, getInt32(size), src },
+-                              probeReadHelperName(read_fn));
+-  CreateHelperErrorCond(ctx, call, read_fn, loc);
+-  return call;
+-}
+-
+-CallInst *IRBuilderBPF::CreateProbeReadStr(Value *ctx,
+-                                           AllocaInst *dst,
+                                            llvm::Value *size,
+                                            Value *src,
+                                            AddrSpace as,
+                                            const location &loc)
+ {
+   assert(ctx && ctx->getType() == getInt8PtrTy());
+-  assert(dst && dst->getAllocatedType()->isArrayTy() &&
+-         dst->getAllocatedType()->getArrayElementType() == getInt8Ty());
+   assert(size && size->getType()->isIntegerTy());
++  if (auto *dst_alloca = dyn_cast<AllocaInst>(dst))
++  {
++    assert(dst_alloca->getAllocatedType()->isArrayTy() &&
++           dst_alloca->getAllocatedType()->getArrayElementType() ==
++               getInt8Ty());
++  }
+ 
+-  auto *size_i32 = CreateIntCast(size, getInt32Ty(), false);
++  auto *size_i32 = size;
++  if (size_i32->getType()->getScalarSizeInBits() != 32)
++    size_i32 = CreateIntCast(size_i32, getInt32Ty(), false);
+ 
+-  Constant *fn = createProbeReadStrFn(dst->getType(), src->getType(), as);
+   auto read_fn = selectProbeReadHelper(as, true);
+-  CallInst *call = createCall(fn,
++  // int bpf_probe_read_str(void *dst, int size, const void *unsafe_ptr)
++  FunctionType *probereadstr_func_type = FunctionType::get(
++      getInt64Ty(), { dst->getType(), getInt32Ty(), src->getType() }, false);
++  PointerType *probereadstr_func_ptr_type = PointerType::get(
++      probereadstr_func_type, 0);
++  Constant *probereadstr_callee = ConstantExpr::getCast(
++      Instruction::IntToPtr, getInt64(read_fn), probereadstr_func_ptr_type);
++  CallInst *call = createCall(probereadstr_func_type,
++                              probereadstr_callee,
+                               { dst, size_i32, src },
+                               probeReadHelperName(read_fn));
+   CreateHelperErrorCond(ctx, call, read_fn, loc);
+@@ -725,8 +707,10 @@ Value *IRBuilderBPF::CreateUSDTReadArgument(Value *ctx,
+   return result;
+ }
+ 
+-Value *IRBuilderBPF::CreateStrncmp(Value *val1,
+-                                   Value *val2,
++Value *IRBuilderBPF::CreateStrncmp(Value *str1,
++                                   uint64_t str1_size,
++                                   Value *str2,
++                                   uint64_t str2_size,
+                                    uint64_t n,
+                                    bool inverse)
+ {
+@@ -755,40 +739,21 @@ Value *IRBuilderBPF::CreateStrncmp(Value *val1,
+   // Check if the compared strings are literals.
+   // If so, we can avoid storing the literal in memory.
+   std::optional<std::string> literal1;
+-  if (auto constString1 = dyn_cast<ConstantDataArray>(val1))
++  if (auto constString1 = dyn_cast<ConstantDataArray>(str1))
+     literal1 = constString1->getAsString();
+-  else if (isa<ConstantAggregateZero>(val1))
++  else if (isa<ConstantAggregateZero>(str1))
+     literal1 = "";
+   else
+     literal1 = std::nullopt;
+ 
+   std::optional<std::string> literal2;
+-  if (auto constString2 = dyn_cast<ConstantDataArray>(val2))
++  if (auto constString2 = dyn_cast<ConstantDataArray>(str2))
+     literal2 = constString2->getAsString();
+-  else if (isa<ConstantAggregateZero>(val2))
++  else if (isa<ConstantAggregateZero>(str2))
+     literal2 = "";
+   else
+     literal2 = std::nullopt;
+ 
+-  auto *val1p = dyn_cast<PointerType>(val1->getType());
+-  auto *val2p = dyn_cast<PointerType>(val2->getType());
+-#ifndef NDEBUG
+-  if (!literal1)
+-  {
+-    assert(val1p);
+-    assert(val1p->getPointerElementType()->isArrayTy() &&
+-           val1p->getPointerElementType()->getArrayElementType() ==
+-               getInt8Ty());
+-  }
+-  if (!literal2)
+-  {
+-    assert(val2p);
+-    assert(val2p->getPointerElementType()->isArrayTy() &&
+-           val2p->getPointerElementType()->getArrayElementType() ==
+-               getInt8Ty());
+-  }
+-#endif
+-
+   Function *parent = GetInsertBlock()->getParent();
+   AllocaInst *store = CreateAllocaBPF(getInt1Ty(), "strcmp.result");
+   BasicBlock *str_ne = BasicBlock::Create(module_.getContext(),
+@@ -815,8 +780,8 @@ Value *IRBuilderBPF::CreateStrncmp(Value *val1,
+       l = getInt8(literal1->c_str()[i]);
+     else
+     {
+-      auto *ptr_l = CreateGEP(val1p->getPointerElementType(),
+-                              val1,
++      auto *ptr_l = CreateGEP(ArrayType::get(getInt8Ty(), str1_size),
++                              str1,
+                               { getInt32(0), getInt32(i) });
+       l = CreateLoad(getInt8Ty(), ptr_l);
+     }
+@@ -826,8 +791,8 @@ Value *IRBuilderBPF::CreateStrncmp(Value *val1,
+       r = getInt8(literal2->c_str()[i]);
+     else
+     {
+-      auto *ptr_r = CreateGEP(val2p->getPointerElementType(),
+-                              val2,
++      auto *ptr_r = CreateGEP(ArrayType::get(getInt8Ty(), str2_size),
++                              str2,
+                               { getInt32(0), getInt32(i) });
+       r = CreateLoad(getInt8Ty(), ptr_r);
+     }
+@@ -987,11 +952,9 @@ void IRBuilderBPF::CreateGetCurrentComm(Value *ctx,
+                                         size_t size,
+                                         const location &loc)
+ {
+-  assert(buf->getType()->getPointerElementType()->isArrayTy() &&
+-         buf->getType()->getPointerElementType()->getArrayNumElements() >=
+-             size &&
+-         buf->getType()->getPointerElementType()->getArrayElementType() ==
+-             getInt8Ty());
++  assert(buf->getAllocatedType()->isArrayTy() &&
++         buf->getAllocatedType()->getArrayNumElements() >= size &&
++         buf->getAllocatedType()->getArrayElementType() == getInt8Ty());
+ 
+   // long bpf_get_current_comm(char *buf, int size_of_buf)
+   // Return: 0 on success or negative error
+@@ -1070,7 +1033,7 @@ void IRBuilderBPF::CreateSignal(Value *ctx, Value *sig, const location &loc)
+       Instruction::IntToPtr,
+       getInt64(libbpf::BPF_FUNC_send_signal),
+       signal_func_ptr_type);
+-  CallInst *call = createCall(signal_func, { sig }, "signal");
++  CallInst *call = createCall(signal_func_type, signal_func, { sig }, "signal");
+   CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_send_signal, loc);
+ }
+ 
+@@ -1084,7 +1047,7 @@ void IRBuilderBPF::CreateOverrideReturn(Value *ctx, Value *rc)
+   Constant *override_func = ConstantExpr::getCast(Instruction::IntToPtr,
+       getInt64(libbpf::BPF_FUNC_override_return),
+       override_func_ptr_type);
+-  createCall(override_func, { ctx, rc }, "override");
++  createCall(override_func_type, override_func, { ctx, rc }, "override");
+ }
+ 
+ CallInst *IRBuilderBPF::CreateSkbOutput(Value *skb,
+@@ -1119,7 +1082,8 @@ CallInst *IRBuilderBPF::CreateSkbOutput(Value *skb,
+       Instruction::IntToPtr,
+       getInt64(libbpf::BPF_FUNC_skb_output),
+       skb_output_func_ptr_type);
+-  CallInst *call = createCall(skb_output_func,
++  CallInst *call = createCall(skb_output_func_type,
++                              skb_output_func,
+                               { skb, map_ptr, flags, data, size_val },
+                               "skb_output");
+   return call;
+@@ -1328,7 +1292,8 @@ void IRBuilderBPF::CreateSeqPrintf(Value *ctx,
+                           CreateGEP(getInt64Ty(), meta, getInt64(0)),
+                           "seq");
+ 
+-  CallInst *call = createCall(seq_printf_func,
++  CallInst *call = createCall(seq_printf_func_type,
++                              seq_printf_func,
+                               { seq, fmt, fmt_size, data, data_len },
+                               "seq_printf");
+   CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_seq_printf, loc);
+diff --git a/src/ast/irbuilderbpf.h b/src/ast/irbuilderbpf.h
+index b6a06778..19b28180 100644
+--- a/src/ast/irbuilderbpf.h
++++ b/src/ast/irbuilderbpf.h
+@@ -106,17 +106,11 @@ public:
+       bool isVolatile = false,
+       std::optional<AddrSpace> addrSpace = std::nullopt);
+   CallInst *CreateProbeReadStr(Value *ctx,
+-                               AllocaInst *dst,
++                               Value *dst,
+                                llvm::Value *size,
+                                Value *src,
+                                AddrSpace as,
+                                const location &loc);
+-  CallInst *CreateProbeReadStr(Value *ctx,
+-                               AllocaInst *dst,
+-                               size_t size,
+-                               Value *src,
+-                               AddrSpace as,
+-                               const location &loc);
+   CallInst *CreateProbeReadStr(Value *ctx,
+                                Value *dst,
+                                size_t size,
+@@ -131,7 +125,12 @@ public:
+                                 pid_t pid,
+                                 AddrSpace as,
+                                 const location &loc);
+-  Value *CreateStrncmp(Value *val1, Value *val2, uint64_t n, bool inverse);
++  Value *CreateStrncmp(Value *str1,
++                       uint64_t str1_size,
++                       Value *str2,
++                       uint64_t str2_size,
++                       uint64_t n,
++                       bool inverse);
+   CallInst *CreateGetNs(bool boot_time, const location &loc);
+   CallInst *CreateGetPidTgid(const location &loc);
+   CallInst *CreateGetCurrentCgroupId(const location &loc);
+@@ -147,7 +146,10 @@ public:
+                              ArrayRef<Value *> args,
+                              const Twine &Name,
+                              const location *loc = nullptr);
+-  CallInst   *createCall(Value *callee, ArrayRef<Value *> args, const Twine &Name);
++  CallInst *createCall(FunctionType *callee_type,
++                       Value *callee,
++                       ArrayRef<Value *> args,
++                       const Twine &Name);
+   void        CreateGetCurrentComm(Value *ctx, AllocaInst *buf, size_t size, const location& loc);
+   void CreatePerfEventOutput(Value *ctx,
+                              Value *data,
+@@ -205,9 +207,6 @@ private:
+                                 AddrSpace as,
+                                 const location &loc);
+   CallInst *createMapLookup(int mapid, Value *key);
+-  Constant *createProbeReadStrFn(llvm::Type *dst,
+-                                 llvm::Type *src,
+-                                 AddrSpace as);
+   libbpf::bpf_func_id selectProbeReadHelper(AddrSpace as, bool str);
+ 
+   llvm::Type *getKernelPointerStorageTy();
+diff --git a/src/ast/passes/codegen_llvm.cpp b/src/ast/passes/codegen_llvm.cpp
+index d4a5e1c7..0703d196 100644
+--- a/src/ast/passes/codegen_llvm.cpp
++++ b/src/ast/passes/codegen_llvm.cpp
+@@ -1152,8 +1152,12 @@ void CodegenLLVM::visit(Call &call)
+     auto left_string = getString(left_arg);
+     auto right_string = getString(right_arg);
+ 
+-    expr_ = b_.CreateStrncmp(
+-        left_string.first, right_string.first, size, false);
++    expr_ = b_.CreateStrncmp(left_string.first,
++                             left_string.second,
++                             right_string.first,
++                             right_string.second,
++                             size,
++                             false);
+   }
+   else if (call.func == "override")
+   {
+@@ -1284,8 +1288,7 @@ void CodegenLLVM::visit(Variable &var)
+   else
+   {
+     auto *var_alloca = variables_[var.ident];
+-    expr_ = b_.CreateLoad(var_alloca->getType()->getPointerElementType(),
+-                          var_alloca);
++    expr_ = b_.CreateLoad(var_alloca->getAllocatedType(), var_alloca);
+   }
+ }
+ 
+@@ -1325,7 +1328,12 @@ void CodegenLLVM::binop_string(Binop &binop)
+   auto right_string = getString(binop.right);
+ 
+   size_t len = std::min(left_string.second, right_string.second);
+-  expr_ = b_.CreateStrncmp(left_string.first, right_string.first, len, inverse);
++  expr_ = b_.CreateStrncmp(left_string.first,
++                           left_string.second,
++                           right_string.first,
++                           right_string.second,
++                           len,
++                           inverse);
+ }
+ 
+ void CodegenLLVM::binop_buf(Binop &binop)
+@@ -1349,7 +1357,12 @@ void CodegenLLVM::binop_buf(Binop &binop)
+ 
+   size_t len = std::min(binop.left->type.GetSize(),
+                         binop.right->type.GetSize());
+-  expr_ = b_.CreateStrncmp(left_string, right_string, len, inverse);
++  expr_ = b_.CreateStrncmp(left_string,
++                           binop.left->type.GetSize(),
++                           right_string,
++                           binop.right->type.GetSize(),
++                           len,
++                           inverse);
+ }
+ 
+ void CodegenLLVM::binop_int(Binop &binop)
+@@ -3498,9 +3511,8 @@ void CodegenLLVM::createIncDec(Unop &unop)
+   else if (unop.expr->is_variable)
+   {
+     Variable &var = static_cast<Variable &>(*unop.expr);
+-    Value *oldval = b_.CreateLoad(
+-        variables_[var.ident]->getType()->getPointerElementType(),
+-        variables_[var.ident]);
++    Value *oldval = b_.CreateLoad(variables_[var.ident]->getAllocatedType(),
++                                  variables_[var.ident]);
+     Value *newval;
+     if (is_increment)
+       newval = b_.CreateAdd(oldval, b_.GetIntSameSize(step, oldval));
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 0064d0cfa4b9..0b66a3ad3b64 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -9,7 +9,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD lldb-13.0.1.ebuild 2587 BLAKE2B e71ae0f087f5490352932e4ed8daed99377a7579f93fb325c01b39faebd3000ebe8c73e9875dc609dda168649d5ca6e092fa9cdad8e847cbf01b1ddf95d1be2e SHA512 9ed40d4927f116f6c18a8c2d38287fb386c280d0f8ec40514c886b1298b5f19fae5f4102f715284e00503401df96e0ecb6cc23378c23e91d2baa383a76488ee3
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 57d0c4810421eff9d3fab976f16d8ad92e67764aaa9c72154a793c7783d98e835789df2cdd2c64f44c035f85e29652e5e50b72ceb161d4dc0dc803983234c08f SHA512 54120a86d7655cc53bb0ee858561959e112f415e9f23e4d56cd0d7716147b2563bdcb3800005eebd8311c237659319f735176072547a7f2162fc9b4f641dfdf0
 EBUILD lldb-15.0.6.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
-EBUILD lldb-15.0.7.ebuild 2718 BLAKE2B 650531d52ae06d2cc3bef2341494fecdd07144a56fecba957ff62451919159054a7cd2ff003383a796fdd7ef046c3f784831217dda736e80225de327414edf4f SHA512 299c40195ffa4f87c543112c6407a0f0b404aa344fd4f4235eb79ff06f3d66449b0e36c3294125385f50c4850fb77e83ece1d98c3d34f4ac129650d2b0774a03
+EBUILD lldb-15.0.7.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
 EBUILD lldb-16.0.0.9999.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-16.0.0_pre20230107.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-17.0.0.9999.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
diff --git a/dev-util/lldb/lldb-15.0.7.ebuild b/dev-util/lldb/lldb-15.0.7.ebuild
index bdd2015ac3b2..37c23ed60fb5 100644
--- a/dev-util/lldb/lldb-15.0.7.ebuild
+++ b/dev-util/lldb/lldb-15.0.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="debug +libedit lzma ncurses +python test +xml"
 RESTRICT="test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/patdiff/Manifest b/dev-util/patdiff/Manifest
index da2adf538746..09fae2c6f891 100644
--- a/dev-util/patdiff/Manifest
+++ b/dev-util/patdiff/Manifest
@@ -1,5 +1,5 @@
 DIST patdiff-0.14.0.tar.gz 220013 BLAKE2B 274d3590fc2ce8b72eb80d5c2dd07578729e9d1bcbdf7d4f94f35248f854a6a242cd0298dce4574ed53e4cdf279e3586fb8a1b543e84c2c6b682f604dc3cb468 SHA512 2f326cbd4c2d153b3e64dd1bc4b514a9ca00292bf80835290fbe7d74e211261c043c002ff929971d65cf24825a42e0c1662fe5c5a1c8acbb8babad796f339601
 DIST patdiff-0.15.0.tar.gz 223538 BLAKE2B 1b73275f5c2f27441e62a03f1b3215f991302a20a4d4385a0795fb657e77d97bfeee0ed8bba54fac0b1136e02d29b4f3c689b2a03b0f80292deb787c33f235bc SHA512 f301e0133447f8284b565fd821db79239fff0401511ecfcef303fc79a3073b2cec527c7a357617541d5f149096c3f8977b717620893e53e2a407db1c3ea68924
 EBUILD patdiff-0.14.0-r1.ebuild 595 BLAKE2B c4078f5af191ff5239983bf424a091cc7b2017de995af43d9c9657d03e6e2ba358612c11295be781726f79553199ff3939cd63b48f3003289a08d3d73b522f29 SHA512 ece157234b02d170c9e640639cfb1e181f0beb053d039c962fe558153f999ad16a5a3c74b6140dc4f104fea653990f23de55aede37eeca58e20faabcaadcdcdd
-EBUILD patdiff-0.15.0.ebuild 523 BLAKE2B 624d5d3b8b1db25dd3043b255a89d061e21ddaabcde4453a2fd02fe3aab5a2c0dcf01ac564a78018587d8c13674207f381e3b7fd8678df7d78301c701738fcff SHA512 d465ca06248f1870cddeefd9fe17bab09e98356bdeb2b1ae4b2339b7805777a335c3f3d80803a62796085b9ab08759fa449a3efbbb8a598e421cd4dbe857e905
+EBUILD patdiff-0.15.0.ebuild 516 BLAKE2B 5a8a8228bd18b55fe2e440f5ac97380e79b50437f471c9b2113b016f353190e2eacbe36619a6505e2d35628e2e63a28350568e078e8a0e5aa7b60f588489ffe6 SHA512 b19ebf96695db55a237da79c50dcbf8bcdf625cc152a929f6eeec6b8fcade296fb3e422e0762898e98a71428cd208da1817ee8e9a71d1f494c4fb92aacd295f4
 MISC metadata.xml 316 BLAKE2B bc8a138519832163ad938dccce7225738b19ac893e077c245ee0f921f6f476ca153a1eb3026d5f69b5960fd4e746b1150ca514728625ef4eac151bcd4ed5798b SHA512 554123d49add147becf9ac14260c0400fd368a4cf7800a2e9732a71fe0f6b309acbf3d3256e2598d289f2616de294cbe159a8818ae59b24acebb7299feee0914
diff --git a/dev-util/patdiff/patdiff-0.15.0.ebuild b/dev-util/patdiff/patdiff-0.15.0.ebuild
index 8a8584db976a..f10b7a3ff52a 100644
--- a/dev-util/patdiff/patdiff-0.15.0.ebuild
+++ b/dev-util/patdiff/patdiff-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/patdiff/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 65c01e8a9344..84e91e00ea58 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
index d2613d06c078..3f137d00de80 100644
--- a/games-arcade/performous/Manifest
+++ b/games-arcade/performous/Manifest
@@ -1,18 +1,9 @@
-AUX performous-1.1-boost-1.70.patch 1693 BLAKE2B 80c9d9d0f90cd43730ddb1bed8594533a028e06d935e45203a8db1aa448f9af2d8c5a0aa96ca9d1d797aac1075e577ae7ee36dabf424757ca063b6c4c63478c4 SHA512 d6cddff13a981911cbb689f589351782d7bead2fe5d10a4e115302771b1bbc1b80bb678185ae104d6f90d89979bd70c876b7da99fc14010ca3bab3ccf0688515
-AUX performous-1.1-boost-1.73.patch 457 BLAKE2B f6a2848b3d878b77ff87dc536ce0c23db1a3f64df1702528f4ee8735c08473cccd6188d3bcb1da9141991c17a060be3280775f5a466bece487d6e8afc77d9f4a SHA512 d95b3d1f6a9252252feea255417e6fe5ff0ff0ed79fa9eaa906b6f5bff5fecc298090c6a67d2e71fde1fab5a7c67bc40393bfb5fac026cf1229d46e58995b2e4
-AUX performous-1.1-gentoo.patch 474 BLAKE2B ff4bdbc43a1129bb4b2d44ac5e818f3f6dccd35ca743345f0934b3cfce66c25c914daf93a4463fa0a30622410737a5983602d1d19fa172bd41e01f3a321ac77a SHA512 b00f13c16dd87645ae3baea80a7430bc0ce46d827ef72ecad21ddac8318f4356bffffd24bd03710a529ca215f20b924f27bc69dd2b3e4870ae19388c8b857338
-AUX performous-1.1-jpeg-9c.patch 591 BLAKE2B 72aac804251366cbaa97c34cdcf9c87d55321059feba00fdc691f7134d9dd47ebf2396072329880bacd6d8e21c3697a2912e93469ba0c98049c0bab0c89622b7 SHA512 1952b59638ed5c0a20f1f4aa9abfd8fce98b7f39d597716c7901593c60fe7efa077ff93a0ad307febf1ac0b3aa88d74559899d511a137a62a77741fd421cfb61
-AUX performous-1.1-linguas.patch 1033 BLAKE2B b7fd8f8560d9e9dd1fb6120f8d0e72c11529f226fecaf482dc3ae351d28977b196816e8c84db0c9ab1c724b78bc4a757d6b1f854dffbc9ebb3aaea1a05eaaf80 SHA512 d3ca1b7fb271618ea1866328aedb7a49a92ea08b4e3d1d4f3755e0868dc380b97462158cda19c8d1e2e2dd4afb59a6db533a12510699c2082f4e4ff31b069597
-AUX performous-1.1-nomancompress.patch 2368 BLAKE2B e75377ade59604f8dbf2bbe38493d511db8c3b2cae870883881c3108538accc42d42a91334a668b8ab0dd4aa21bf85b024799d4e2edb849cd13f3e21dc4cb460 SHA512 a116b25974426931b3099b502fc8713acac0a5a39f3c0ad12ce76e71d95062970bb05dbd1b01611cb16c3a912e857d668e96b709b4d61f95f38d364fc30d1ad9
-AUX performous-1.1-pango-use-pkgconfig.patch 3594 BLAKE2B 7944704c25c03ecc94c699dd37f202c5d015d80726fe8ac964bf35f7cee2d1c410d8ccbdcb83f3fba659ff4d742647d0c6cebafe466551d4fb00d5ed2a1455c7 SHA512 afe353247fbd8c58b7aa9b7a7bf24477c90470dd47db3c019421b91c1e3ba29c0620eb3bd4dc38206a6dd6067033109a42e1131eb50c7b55294e8ad4680b2771
 AUX performous-1.2.0-ffmpeg5.patch 1000 BLAKE2B 50eefb89771457ef5e8ec67487d179c6114ddcfdf2d33dd60c6577ccefb832222539e7e8eb733285aed3ac9071025cd72aab885252d02e96a40fadde9f434d81 SHA512 044202b1ae8461da1bc999449890aa81ea5235b5c6aa89dd902b9d5a44fc822deb083903239dbf874fe83d7ff0f74dd8f8dca74051e2e041135de7a1ec5fe662
-DIST performous-1.1.tar.gz 3965473 BLAKE2B 021660aa785d0535396a75e8c4cc5cc368ba5745b67fae527e7901ef6601d95887206aae7f74b52bf6b3da3e827bfbd3094e8a393917b9936af266b54766b0b2 SHA512 6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1
 DIST performous-1.2.0.tar.gz 7240476 BLAKE2B c5c27fc02fe0a17261ad6549492ccc88c7ad213df08f6ec68d86bad9116a2f83eae8ab4b85fc19f63d260b28864fad84c19d55befa81dde7aabedb1c50fef89f SHA512 a8fbbe3768f46915eacb65adcc1592295e4c6a84775ca55def01ebcff2218b1860daee0d4d5fcccc407d8df71da1ac25da667b47dd4a17239041a3d5fbfa1c56
 DIST performous-ced-9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e.tar.gz 221300 BLAKE2B 1aa7027c8543725c812e6a066a2a707fa19a79ae2f36c49bc8eaf0d3d6549ae11b365a76b47c1fc851a3c0d1bbafc3ff739fa32c1599a1f1853033de78b27d0c SHA512 6721ae5936a58b8298d175f3875675bfb8249208642eaf2766dc6a62c7db96454d4f95d8c39de0ca862aa3edc741de535af69242f0d2d0b8f7527408ab673089
 DIST ultrastar-songs-jc-1.zip 242698201 BLAKE2B 39c37160c1ce305252c7b94910aae4ed930d6762716b985f35d64b502bcb8c0310ff830384a652bb1b8a72dea5dd08eebbfd89ae047861bd88e2fc983a863d84 SHA512 2f1b8416990c39617269cd6bb7271abdd4ebae65a9bac3dbb3f37cca26876bb7c79460a37597943a10a2d8bfcb5d2d9e2bf24084fe517a418e69f5c6111f6aea
 DIST ultrastar-songs-libre-3.zip 5289866 BLAKE2B 2c3fc640ad808b12987e9b50510df644ab8dd1ae41a4b9e5056950c7aa1823678a4b568a60a260b93a4bdf06f199fac1b99bd22e4e39301bf34f337c08d68b69 SHA512 820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66
 DIST ultrastar-songs-restricted-3.zip 10242651 BLAKE2B de923f72bdd3081f2870457fd734ae2f8c11a84a74344af165aa5c6cf7b812c98fd53b3ab18ac9ac51f488fbf3fe274289205724c9f8547a31245536bea3c6b1 SHA512 70b987fec3705d6610625c1f30a7ff683a51bb6b7ee3174609c80dc31c1bccdb23dcb2c6ae8154e1b1d9ef115b914e27e73925878a3c5460b997fdde813456b8
 DIST ultrastar-songs-shearer-1.zip 50411551 BLAKE2B b91896197b6750dce6998ad309a9aca42aaf11b48c92bd1c30a67befcaf4ac64b6c5207f492e0f8588b986033d297a37bc8c9e505baea809591aa3255034fed4 SHA512 add9df22b78967fd6f19699e8569f976423e931a32ea7a62cfec2f94470b9120f05832560215a000ecec8dd65508b057fac8ac90efd3a768ed74ddced186a73b
-EBUILD performous-1.1-r3.ebuild 2448 BLAKE2B 26e121e367340e5ab21705128a474a3e26eece244dbb2ca13a9ffbb43833418f5da00f1ede30bbfe658c7cbe76842668bc0dcdb6ebca0ea7bfe552cb423da372 SHA512 ad13a021eaba62d5f5e5425401d0548e7ea7490e75ef47ec06d2ab91fc781a0f0eeeb8c22b3b359dac9586c6f4926c0d690df424a6d11943df8060f2b365f852
 EBUILD performous-1.2.0.ebuild 2542 BLAKE2B de6478d3a078906e258dfdc34bc6bf95da197f58b263f00e8d1db54817aefaff669bf8d1c65262098273d26a25a8bb04cc68ee6612c83e575c3413f80ffb2398 SHA512 00233aa5b60869dca91ff5c3b20ec96cefde47c165424c9023e39cd38fcb8626cef30579267191c91e70d4e00b5a1b7159ae19248196cb287b2537d211923480
-MISC metadata.xml 857 BLAKE2B e7316ca1dcec3ae5e0bcc55434ea9a004dbdda2c9595cfa0645bbd505824155ee2383d1d3d53d72eb0facc90573330cc27a381e65eed56557076db6b647cca32 SHA512 aa2e6a0da467eeb23563983e177427a19fed5da772d637ec6882201d3a848517a8453fefd8eddadaf205dabe1fb44284ab3c0d229fb14eb1ae678cbb23236ca1
+MISC metadata.xml 755 BLAKE2B a0d219e30adbcfa6a2a7a29cd7ffcb7eec20354398218d584f4c3a529c39cfcf33cf60811658c3ede6c4f4412b90bfe80257597d3f528df0fc52fdf5e4933d47 SHA512 c66e25e1fb7430c231e8d807a40e30fb917b425b1337c607a85aa859820267fceaaf6bbe5b93867dc8aaf8c05fe11049f0b9cfdf55452f7750693859f5d331df
diff --git a/games-arcade/performous/files/performous-1.1-boost-1.70.patch b/games-arcade/performous/files/performous-1.1-boost-1.70.patch
deleted file mode 100644
index d868e1279659..000000000000
--- a/games-arcade/performous/files/performous-1.1-boost-1.70.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://bugs.gentoo.org/671594
-
---- a/game/audio.cc
-+++ b/game/audio.cc
-@@ -77,7 +77,7 @@
- 	static ptime getTime() { return microsec_clock::universal_time(); }
- 	// Conversion helpers
- 	static double getSeconds(time_duration t) { return 1e-6 * t.total_microseconds(); }
--	static time_duration getDuration(double seconds) { return microseconds(1e6 * seconds); }
-+	static time_duration getDuration(double seconds) { return microseconds(static_cast<long long>(1e6 * seconds)); }
- 
- 	mutable boost::mutex m_mutex;
- 	ptime m_baseTime; ///< A reference time (corresponds to m_basePos)
-@@ -149,7 +149,7 @@
- 	int64_t m_pos; ///< Current sample position
- 	bool m_preview;
- 	AudioClock m_clock;
--	time_duration durationOf(int64_t samples) const { return microseconds(1e6 * samples / srate / 2.0); }
-+	time_duration durationOf(int64_t samples) const { return microseconds(static_cast<long long>(1e6 * samples / srate / 2.0)); }
- public:
- 	bool suppressCenterChannel;
- 	double fadeLevel;
---- a/game/backgrounds.hh
-+++ b/game/backgrounds.hh
-@@ -7,6 +7,7 @@
- #include <boost/scoped_ptr.hpp>
- #include <boost/thread/mutex.hpp>
- #include <boost/thread/thread.hpp>
-+#include <boost/noncopyable.hpp>
- #include <vector>
- 
- /// songs class for songs screen
---- a/game/songs.hh
-+++ b/game/songs.hh
-@@ -6,6 +6,7 @@
- #include <boost/scoped_ptr.hpp>
- #include <boost/thread/mutex.hpp>
- #include <boost/thread/thread.hpp>
-+#include <boost/noncopyable.hpp>
- #include <set>
- #include <sstream>
- #include <vector>
---- a/game/svg.cc
-+++ b/game/svg.cc
-@@ -4,6 +4,7 @@
- #include "configuration.hh"
- #include "../common/image.hh"
- 
-+#include <boost/smart_ptr/shared_ptr.hpp>
- #include <librsvg/rsvg.h>
- #include <iostream>
- 
diff --git a/games-arcade/performous/files/performous-1.1-boost-1.73.patch b/games-arcade/performous/files/performous-1.1-boost-1.73.patch
deleted file mode 100644
index 3d7147a5170f..000000000000
--- a/games-arcade/performous/files/performous-1.1-boost-1.73.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/game/surface.cc	2021-01-18 14:22:05.876604740 +0300
-+++ b/game/surface.cc	2021-01-18 14:23:08.908716258 +0300
-@@ -135,7 +135,7 @@
- 	bitmap.resize(1, 1);
- 	target->load(bitmap);
- 	// Ask the loader to retrieve the image
--	ldr->push(target, Job(name, boost::bind(&T::load, target, _1)));
-+	ldr->push(target, Job(name, boost::bind(&T::load, target, boost::placeholders::_1)));
- }
- 
- Surface::Surface(fs::path const& filename) { loader(this, filename); }
diff --git a/games-arcade/performous/files/performous-1.1-gentoo.patch b/games-arcade/performous/files/performous-1.1-gentoo.patch
deleted file mode 100644
index a73663a88c41..000000000000
--- a/games-arcade/performous/files/performous-1.1-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru performous-1.0.orig/game/CMakeLists.txt performous-1.0/game/CMakeLists.txt
---- performous-1.0.orig/game/CMakeLists.txt	2014-10-28 19:11:45.000000000 -0400
-+++ performous-1.0/game/CMakeLists.txt	2015-03-31 03:01:30.806061643 -0400
-@@ -141,7 +141,7 @@
- 	set(BIN_INSTALL .)  # Straight to Program Files/Performous with no bin subfolder.
- 	set(SUBSYSTEM_WIN32 WIN32)
- else()
--	set(BIN_INSTALL bin)
-+	set(BIN_INSTALL @GENTOO_BINDIR@)
- endif()
- 
- # Build main executable
diff --git a/games-arcade/performous/files/performous-1.1-jpeg-9c.patch b/games-arcade/performous/files/performous-1.1-jpeg-9c.patch
deleted file mode 100644
index d878cec07f51..000000000000
--- a/games-arcade/performous/files/performous-1.1-jpeg-9c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/common/image.cc
-+++ b/common/image.cc
-@@ -180,7 +180,7 @@
- 	}
- 	jpeg_create_decompress(&cinfo);
- 	jpeg_mem_src(&cinfo, data.data(), data.size());
--	if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK) throw std::runtime_error("Cannot read header of " + filename.string());
-+	if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK) throw std::runtime_error("Cannot read header of " + filename.string());
- 	jpeg_start_decompress(&cinfo);
- 	bitmap.resize(cinfo.output_width, cinfo.output_height);
- 	unsigned stride = (bitmap.width * 3 + 3) & ~3;  // Number of bytes per row (word-aligned)
diff --git a/games-arcade/performous/files/performous-1.1-linguas.patch b/games-arcade/performous/files/performous-1.1-linguas.patch
deleted file mode 100644
index f8f1349ea3b9..000000000000
--- a/games-arcade/performous/files/performous-1.1-linguas.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ru performous-1.0.orig/lang/CMakeLists.txt performous-1.0/lang/CMakeLists.txt
---- performous-1.0.orig/lang/CMakeLists.txt	2014-10-28 19:11:45.000000000 -0400
-+++ performous-1.0/lang/CMakeLists.txt	2015-02-22 04:25:40.502252942 -0500
-@@ -9,5 +9,13 @@
- 	file(MAKE_DIRECTORY "${mobuild}")
- 	add_custom_command(OUTPUT "${mofile}" COMMAND "${Msgfmt_BIN}" -v "${pofile}" -o "${mofile}" MAIN_DEPENDENCY "${pofile}" COMMENT "Building ${language} locale" VERBATIM)
- 	add_custom_target("locale_${language}" ALL DEPENDS "${mofile}")  # Make sure the mofiles are always built
--	install(FILES "${mofile}" DESTINATION "${LOCALE_DIR}/${language}/LC_MESSAGES")
- endforeach(language)
-+foreach(language $ENV{LINGUAS})
-+       set(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po)
-+       if (EXISTS ${pofile})
-+               set(mofile ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo)
-+               install(FILES ${mofile} DESTINATION
-+{LOCALE_DIR}/${language}/LC_MESSAGES RENAME ${CMAKE_PROJECT_NAME}.mo)
-+       endif()
-+endforeach(language)
-+
diff --git a/games-arcade/performous/files/performous-1.1-nomancompress.patch b/games-arcade/performous/files/performous-1.1-nomancompress.patch
deleted file mode 100644
index fd21f9b70343..000000000000
--- a/games-arcade/performous/files/performous-1.1-nomancompress.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/docs/man/CMakeLists.txt	2018-10-14 19:57:14.924572577 +0200
-+++ b/docs/man/CMakeLists.txt	2018-10-14 20:11:13.250717230 +0200
-@@ -1,14 +1,12 @@
- find_program(HELP2MAN help2man DOC "Location of the help2man program")
--find_program(GZIP gzip DOC "Location of the gzip program")
- mark_as_advanced(HELP2MAN)
--mark_as_advanced(GZIP)
--if(HELP2MAN AND GZIP)
--	set(MANFILE ${CMAKE_CURRENT_BINARY_DIR}/performous.6.gz)
-+if(HELP2MAN)
-+	set(MANFILE ${CMAKE_CURRENT_BINARY_DIR}/performous.6)
- 	set(H2MFILE ${CMAKE_CURRENT_SOURCE_DIR}/performous.h2m)
- 	set(PERFORMOUS_EXEC ${CMAKE_BINARY_DIR}/performous)
- 	add_custom_command(
- 		OUTPUT ${MANFILE}
--		COMMAND ${HELP2MAN} ${PERFORMOUS_EXEC} -s 6 -i ${H2MFILE} -N | ${GZIP} > ${MANFILE}
-+		COMMAND ${HELP2MAN} ${PERFORMOUS_EXEC} -s 6 -i ${H2MFILE} -N > ${MANFILE}
- 		MAIN_DEPENDENCY ${H2MFILE}
- 		DEPENDS ${PERFORMOUS_EXEC}
- 		COMMENT "Building Performous man page"
-@@ -17,13 +15,13 @@
- 	add_custom_target(manpage ALL DEPENDS ${MANFILE})
- 	iF (APPLE)
- 	    install(FILES ${MANFILE} DESTINATION Resources/man/man6)
--	else(APPLE)
-+	else()
-     	install(FILES ${MANFILE} DESTINATION share/man/man6)
- 	endif()
--else(HELP2MAN AND GZIP)
--	message("WARNING: One of the following is missing: help2man, gzip; performous man page will not be generated")
--endif(HELP2MAN AND GZIP)
--if(ENABLE_TOOLS AND GZIP)
-+else()
-+	message("WARNING: help2man is missing; performous man page will not be generated")
-+endif()
-+if(ENABLE_TOOLS)
- 	set(TOOLS 
- 		"ss_pak_extract" "ss_extract" "ss_cover_conv"
- 		"ss_adpcm_decode" "ss_ipu_conv" "ss_chc_decode"
-@@ -31,15 +29,7 @@
- 	set(MAN_SECTION "1")
- 	foreach(TOOL ${TOOLS})
- 		set(TOOL_MANFILE ${CMAKE_CURRENT_SOURCE_DIR}/${TOOL}.${MAN_SECTION})
--		set(TOOL_MANFILE_GZ ${CMAKE_CURRENT_BINARY_DIR}/${TOOL}.${MAN_SECTION}.gz)
--		add_custom_command(
--			OUTPUT ${TOOL_MANFILE_GZ}
--			COMMAND ${GZIP} -c ${TOOL_MANFILE} > ${TOOL_MANFILE_GZ}
--			MAIN_DEPENDENCY ${TOOL_MANFILE}
--			COMMENT "Building ${TOOL} man page"
--			VERBATIM
--		)
--		add_custom_target(${TOOL}.${MAN_SECTION} ALL DEPENDS ${TOOL_MANFILE_GZ})
--		install(FILES ${TOOL_MANFILE_GZ} DESTINATION share/man/man${MAN_SECTION})
--	endforeach(TOOL)
--endif(ENABLE_TOOLS AND GZIP)
-+		add_custom_target(${TOOL}.${MAN_SECTION} ALL DEPENDS ${TOOL_MANFILE})
-+		install(FILES ${TOOL_MANFILE} DESTINATION share/man/man${MAN_SECTION})
-+	endforeach()
-+endif()
diff --git a/games-arcade/performous/files/performous-1.1-pango-use-pkgconfig.patch b/games-arcade/performous/files/performous-1.1-pango-use-pkgconfig.patch
deleted file mode 100644
index 9019183206d6..000000000000
--- a/games-arcade/performous/files/performous-1.1-pango-use-pkgconfig.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From caea553262e1d40bf9caec84223b5d25989464c0 Mon Sep 17 00:00:00 2001
-From: Orivej Desh <orivej@gmx.fr>
-Date: Wed, 25 Mar 2020 14:17:06 +0000
-Subject: [PATCH] Rely on pkg-config to find Pango
-
-Fixes build with pango that needs -I/usr/include/harfbuzz (as specified in its
-pkg config).
-
-PkgConfig results can be overridded by setting e.g. Pango_PKGCONF_INCLUDEDIR,
-Pango_PKGCONF_LDFLAGS (see FindPkgConfig documentation).
-
-IMPORTED_TARGET was added in CMake 3.6.
-
-Fixes #490
-Closes #493
----
- CMakeLists.txt                     |  2 +-
- cmake/Modules/FindPango.cmake      | 25 ++---------------------
- cmake/Modules/FindPangoCairo.cmake | 32 ++++--------------------------
- 3 files changed, 7 insertions(+), 52 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f6e72942d..ca7ae4e92 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 2.8)
-+cmake_minimum_required(VERSION 3.6)
- project(Performous CXX C)
- 
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
-diff --git a/cmake/Modules/FindPango.cmake b/cmake/Modules/FindPango.cmake
-index bdddb9e03..42cb199cc 100644
---- a/cmake/Modules/FindPango.cmake
-+++ b/cmake/Modules/FindPango.cmake
-@@ -2,31 +2,10 @@
- # Once done, this will define
- #
- #  Pango_FOUND - system has Pango
--#  Pango_INCLUDE_DIRS - the Pango include directories
- #  Pango_LIBRARIES - link these to use Pango
- 
- include(LibFindMacros)
- 
--# Dependencies
--libfind_package(Pango Freetype)
--libfind_package(Pango Glib)
--libfind_package(Pango GObject)
--
--# Use pkg-config to get hints about paths
--libfind_pkg_check_modules(Pango_PKGCONF pango)
--
--# Include dir
--find_path(Pango_INCLUDE_DIR
--  NAMES pango/pango.h
--  HINTS ${Pango_PKGCONF_INCLUDE_DIRS}
--  PATH_SUFFIXES pango-1.0
--)
--
--# Finally the library itself
--find_library(Pango_LIBRARY
--  NAMES pango-1.0
--  HINTS ${Pango_PKGCONF_LIBRARY_DIRS}
--)
--
-+libfind_pkg_check_modules(Pango_PKGCONF IMPORTED_TARGET pango)
-+set(Pango_LIBRARY PkgConfig::Pango_PKGCONF)
- libfind_process(Pango)
--
-diff --git a/cmake/Modules/FindPangoCairo.cmake b/cmake/Modules/FindPangoCairo.cmake
-index a26f83bd0..1c1a9e843 100644
---- a/cmake/Modules/FindPangoCairo.cmake
-+++ b/cmake/Modules/FindPangoCairo.cmake
-@@ -1,35 +1,11 @@
- # - Try to find PangoCairo
- # Once done, this will define
- #
--#  PangoCairo_FOUND - system has Pango
--#  PangoCairo_INCLUDE_DIRS - the Pango include directories
--#  PangoCairo_LIBRARIES - link these to use Pango
-+#  PangoCairo_FOUND - system has PangoCairo
-+#  PangoCairo_LIBRARIES - link these to use PangoCairo
- 
- include(LibFindMacros)
- 
--# Dependencies
--libfind_package(PangoCairo Pango)
--libfind_package(PangoCairo Cairo)
--
--# Use pkg-config to get hints about paths
--libfind_pkg_check_modules(PangoCairo_PKGCONF pangocairo)
--
--# Include dir
--find_path(PangoCairo_INCLUDE_DIR
--  NAMES pango/pangocairo.h
--  HINTS ${PangoCairo_PKGCONF_INCLUDE_DIRS}
--  PATH_SUFFIXES pango-1.0
--)
--
--# Finally the library itself
--find_library(PangoCairo_LIBRARY
--  NAMES pangocairo-1.0
--  HINTS ${PangoCairo_PKGCONF_LIBRARY_DIRS}
--)
--
--# Set the include dir variables and the libraries and let libfind_process do the rest.
--# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
--set(PangoCairo_PROCESS_INCLUDES PangoCairo_INCLUDE_DIR Pango_INCLUDE_DIR Cairo_INCLUDE_DIR)
--set(PangoCairo_PROCESS_LIBS PangoCairo_LIBRARY Pango_LIBRARY Cairo_LIBRARY)
-+libfind_pkg_check_modules(PangoCairo_PKGCONF IMPORTED_TARGET pangocairo)
-+set(PangoCairo_LIBRARY PkgConfig::PangoCairo_PKGCONF)
- libfind_process(PangoCairo)
--
diff --git a/games-arcade/performous/metadata.xml b/games-arcade/performous/metadata.xml
index 2696a7ec7172..b6be9a656e3d 100644
--- a/games-arcade/performous/metadata.xml
+++ b/games-arcade/performous/metadata.xml
@@ -11,7 +11,6 @@
 	<use>
 		<flag name="midi">Enable MIDI I/O support</flag>
 		<flag name="songs">Install a few demo songs</flag>
-		<flag name="tools">Enable building of song extraction utilities for SingStar and Guitar Hero</flag>
 		<flag name="webcam">Enable Webcam support</flag>
 	</use>
 	<upstream>
diff --git a/games-arcade/performous/performous-1.1-r3.ebuild b/games-arcade/performous/performous-1.1-r3.ebuild
deleted file mode 100644
index 554820c1b01d..000000000000
--- a/games-arcade/performous/performous-1.1-r3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_REMOVE_MODULES_LIST=( FindALSA FindBoost FindFreetype FindGettext FindJpeg FindPng FindTiff FindZ )
-inherit cmake desktop xdg-utils
-
-DESCRIPTION="SingStar GPL clone"
-HOMEPAGE="https://performous.org/"
-
-SONGS_PN="ultrastar-songs"
-SRC_URI="https://github.com/performous/performous/archive/${PV}.tar.gz -> ${P}.tar.gz
-	songs? (
-		mirror://sourceforge/performous/${SONGS_PN}-restricted-3.zip
-		mirror://sourceforge/performous/${SONGS_PN}-jc-1.zip
-		mirror://sourceforge/performous/${SONGS_PN}-libre-3.zip
-		mirror://sourceforge/performous/${SONGS_PN}-shearer-1.zip
-	)
-"
-
-LICENSE="GPL-2 songs? ( CC-BY-NC-SA-2.5 CC-BY-NC-ND-2.5 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="midi songs tools webcam"
-
-RDEPEND="
-	dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	dev-libs/boost:=
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	gnome-base/librsvg:2
-	media-gfx/imagemagick:0=
-	media-libs/libepoxy
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick,video]
-	media-libs/portaudio
-	sys-libs/zlib
-	media-video/ffmpeg
-	virtual/glu
-	virtual/jpeg:0
-	virtual/libintl
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	midi? ( media-libs/portmidi )
-	webcam? ( media-libs/opencv )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-apps/help2man
-	sys-devel/gettext
-	songs? ( app-arch/unzip )
-"
-
-DOCS=( docs/{Authors,instruments}.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-linguas.patch
-	"${FILESDIR}"/${P}-nomancompress.patch
-	"${FILESDIR}"/${P}-jpeg-9c.patch
-	"${FILESDIR}"/${P}-boost-1.70.patch
-	"${FILESDIR}"/${P}-boost-1.73.patch
-	"${FILESDIR}"/${P}-pango-use-pkgconfig.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i \
-		-e "s:@GENTOO_BINDIR@:/usr/bin:" \
-		-e '/ Z /s/ Z/ ZLIB/g' \
-		-e 's/Z_FOUND/ZLIB_FOUND/g' \
-		-e 's/Z_LIBRARIES/ZLIB_LIBRARIES/g' \
-		-e 's/Jpeg/JPEG/' \
-		-e 's/Png/PNG/' \
-		{game,tools}/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TOOLS=$(usex tools)
-		-DENABLE_WEBCAM=$(usex webcam)
-		-DENABLE_MIDI=$(usex midi)
-		-DCMAKE_VERBOSE_MAKEFILE=TRUE
-		-DSHARE_INSTALL="/usr/share/${PN}"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	if use songs ; then
-		insinto "/usr/share/${PN}"
-		doins -r "${WORKDIR}/songs"
-	fi
-
-	newicon -s scalable data/themes/default/icon.svg ${PN}.svg
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index fe89ae3ae1e5..031a14fb312d 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index db7591c0aec2..4e2e004e11fe 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -10,5 +10,5 @@ DIST SDL2-2.26.2.tar.gz 8084120 BLAKE2B 84a972c634a084350173fcc5da69cc9b402f83b9
 EBUILD libsdl2-2.24.0-r2.ebuild 6525 BLAKE2B 6643135d04b333c6837736b50cd0a4367dc8982886e76fb1830c58df1b2bcd0649cf7e2870c5b638f89d9839710d5feb68d647d7e08602995c7a7fbbcd7e6666 SHA512 5d019cd23df2edb4a4906520040d1aa81477f9860cdcb867e7393549a33bb0685f7f8918ae19550d7a44fb6aa5de37b654b4439f4810be6d6b85b4abcf3c59bd
 EBUILD libsdl2-2.24.2.ebuild 6435 BLAKE2B 97824c177ba5283e4aa4a76df8b08e5ce1b76e328bcabd94e55f2c6dbac4a9992e2f2d2e6a63554746a8101b4435cd4ea31930c0c3e992a393c3e48794d0bb01 SHA512 bc2c3a8833b68ee6f4504ccb319cc389f72ab5ec92a125669d42f0ea83e1ffb254f1e412e25b55432df370440b7ba38904f895bdec38ffb8431ac95445e2cf56
 EBUILD libsdl2-2.26.0.ebuild 6496 BLAKE2B 4efe9b4a44056e23aad1d1d5eb11887b8773451869c2332123b6d8bbb91d3324501cb52841b1d8d4c86fd5783e113ed3f55e953c3bcdd5a6ba25f12f01536044 SHA512 a735efb376e357093e0b530e88d04ff35c44c4fed386e12e2334f6d5dc7d125963fc0de55b047b76318a111a0d06d068bc9b957943c0a4ad10957f351416077c
-EBUILD libsdl2-2.26.2.ebuild 6462 BLAKE2B a121f982cefc81f7f1531ca10f93d77da636cb306f62dc7a2884aecc3e6cb920f4ed64098493bfafa1b25e7a8dbc64e3437dac8d7a46e5516b729773c4a81e89 SHA512 54df550b8b14b9570a3f79a0766bc53fdcdb4aef8128b028e85307c833f0d424a6c460b5f25cb0b08cbcdfdca95c7b4be084011bf7ec1feccaf6a7ce03e8c9e6
+EBUILD libsdl2-2.26.2.ebuild 6457 BLAKE2B ddd3310d52ee8357b1892981f33ed27625c70d00730cd76e2495d00f1327088650f300a679e92f685f626fe12755bf9e67a8baaf1c30929a64940d57cdd75a19 SHA512 e68f890b22cc291b71e7f174845df7723e24e9767bcc2248db628903847ac87ee945d36795b9941d492b4255616d88c1bb330f5b4645bed90c4f00de25ee6624
 MISC metadata.xml 2054 BLAKE2B 611185e0b090bc8865c6ef61cf0dfab07a1806fd2db9fc50f2e3eaefba6ccb26127a51d61afd0a96c520d3d11be5a1a789631554705d7aa36270626d69ddfe89 SHA512 3a9bcecb9e0a8bc74ff8eb36d9dc4e8c1f7bf892428b3f6edd91b97082dd16e591117d45ee3d4558fc1b8137f16b54d01703b9c9c7c24cc149856ccc14bed2c1
diff --git a/media-libs/libsdl2/libsdl2-2.26.2.ebuild b/media-libs/libsdl2/libsdl2-2.26.2.ebuild
index c442077bf23e..a341817217a4 100644
--- a/media-libs/libsdl2/libsdl2-2.26.2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.26.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 
 IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 5852cfc93995..69771b4e7a95 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -9,6 +9,6 @@ DIST netpbm-10.86.35.tar.xz 3699944 BLAKE2B 754b695ab25ba2c3ff0cdc8d3810a3df7af9
 DIST netpbm-10.86.36.tar.xz 3700660 BLAKE2B c5f0acd0147f2ad66f69ae2ade56fcbb5286faddc7f8f3387e2269fd20ea2586a29d7e7dc96bd715fe12896eef47803b826031087e6be8166183ba7cf82aebf4 SHA512 b05df76760629881047c44799a905a491fb4c139a9af909d77cc4238fc82dfac37ba174df4f81cb1177716ad38a37b26eadcc3889d2c2057ff9d850697fad3c6
 DIST netpbm-11.1.0.tar.xz 3771676 BLAKE2B 0f377dc36b03b99a174c2d5a09d62aea8a813f9eb501a59630c4f083247cc3c82e3fee88085ec686f4d787d67104b834a511b4ef1f7d75eda7b10fed3281d9e5 SHA512 77528e2508d7a2d348de339d57b677fd1a061bb2902273d536ea09c34033af03a75bb723bcc7e87551406f47f115085a60691b3fda4ae672372b8473528370de
 EBUILD netpbm-10.86.35-r1.ebuild 6868 BLAKE2B 6671fe735c84396edf72a5946e9de2514080d143508dcf274838c2480cd8d5218788ae5d01ab024d9a21f05deaca8f718a8129b696801cf793fc7021fd3d90f8 SHA512 a6aebe77131a72863e88dc3917d1b1301c4f8ddf2322acf77c7fe823231ff0c7e9bcb8cf19107cb1a1a629e9ccb41e1048d6c771cfa688bbd90e1656d8ee303e
-EBUILD netpbm-10.86.36.ebuild 6779 BLAKE2B 3957a83f53892c2f43e2a0a087b01f2e8674cc9de130bc5f51767ed7bf46c0dd45463495487084610f09c75028b30b2d054dc42204075535a2816aa2fa8fa1e0 SHA512 55a47205afce3be64893e271562bc40fca19f70fcf95bbb8fc5558bffc1366b228fd1e12d71f2a757517515ae0708be8c974ae7e414fa91776068392641fe7b1
+EBUILD netpbm-10.86.36.ebuild 6773 BLAKE2B 91a2b416853970e268f2c796e5a3a87735a2611b2da241dbc23fcc245fa876ce3ed357e295ebcd070bec963a7466539d4b092d7f1f045b80d5e436507d33dd85 SHA512 070cc16c1ecae2a3bd34894544f1ca33c1c67f339dd8e69fe572209503297c6b75d16c35bdb0162287e92c0d89196db749bc530d2959bca40da94a2ade00c0f4
 EBUILD netpbm-11.1.0-r2.ebuild 6968 BLAKE2B e3deb3af629c1addd0a3db814088af4ae11a453c62500b79463e246afaee6059dcd77d9d477af9a6eca51fc8783deed96c698fbb8c4398b44940cf72d36871b6 SHA512 0e0941d1c0d62595f4d0a119c4e139a289e26d1193534d37c27b09e9122f104a89d3fc5da46c00c94cc9548550ac15442fedb8deb1057379de40de5989be2197
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-10.86.36.ebuild b/media-libs/netpbm/netpbm-10.86.36.ebuild
index 93595c05411f..0c3eb24b2c22 100644
--- a/media-libs/netpbm/netpbm-10.86.36.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz"
 
 LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain"
 SLOT="0/stable"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
 
 # app-text/ghostscript-gpl is really needed for postscript
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f9c58d0de45d..26c1f36f65d6 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4e4f35779613..4d50e00150bb 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 26 Jan 2023 18:39:47 +0000
+Fri, 27 Jan 2023 00:39:50 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 2df90efdcdc5..c937f0bafebf 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-01-26T18:39:49Z
+TIMESTAMP 2023-01-27T00:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPSyPVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPTHVlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAbQxAAjhPpG2Qtf0+DA9fvJHaMPrWJo2H8SSJmV79sOgnygX4TI0HSQO8Yfz1C
-UkL7JWBxSyzH6o6kNwCRf+fy+4LJy3TbsryXZcZMe9ulAnNo+nSEfXTVMjXu3MfL
-3phEEiwGv5QNOe3ps16WU7mFcXzNy3vNl1wViKL7olonvvIdODon9w40TyQb2xN1
-dHnwZOzwm3HfCKmMxQz4ZLQk4EEt6I9X26jmvnOudbws+D8qnbK/BqTbI0+clq/g
-ipKrRPtn9DVgi/EE/PDdohlOXb8a64gxkmnAbHy8fMRpw/lhLSo8ZIvZkZFhiVs1
-QmGfWC7421e5bRPZao6jP+kYPjfM/3U7saQmb0huif6DAey7jF9EEJEt/Km55deL
-13cBbR+XN/kZaiNQGDPy7B9S7C12THCr1G3BgZ+agLNWyfR5cPS+nWm4IJxvrgY9
-e/Bk3PsO99Uw0TOv29SvSPgB6wtz2hsnqU/yfweko9ADvf1NU2RRY93oxc7CoDNP
-QQXdnIT2o32Sw5uc2UHG8YS4D1Iqfv72oobBWZDFzeGId0SD5WgLXuTjRUPEyvWp
-pBfkJYyQtzXQDZ2IzjoF0o3Fp3bIY1YmuCDKwAmB3g9v/SgZY6MQ1ZPXyZ1FjHMX
-mWOtqJPxCeoXP8oPoPzYX89DRfTCz3IxfUOZWvAdROE0dYP3X0Q=
-=qi2i
+klD9Zw//bxjziMj9SUlsc6Crqe24/OIBawrI23dytdH9FGMhcUd8PkMOc0aN3ePx
+C00oDWPW2ldAVPbX5fs32bmVxDnxIH3HwwbxZUF2AatoCScUt12j8n8FdThkPA37
+gk5DhcsfgYhIq5BT7FKJJaAR/AloWUds5sa2kzn5PfHo0OjWFjcHft2bJF9lXXLM
+dv56LUYbw0taRpW548J9RuG/lRDi2FWHUG25/DYNBLLVLpjT440F1clxHY0KntYc
+DLwEfqY4R58Nc2piunZ2wWFo9HoxJAKS8HhYcosmugJdPd/v8WFtQQh0jRUo0+MV
+S1hrZyYYDFcUtwN7oYXWjCL8vCYhcvLO+9LRMfA5lv2kg6s02sDBpAer+Luf4KN4
+OffcE3ACCjCMlzDlL99apFltQOncEgKqmEhhqCKSGgfaZ3335aWSRCpBp6oyvkyA
+uIh/hJ8Ye6OFhZk/KmWuGtffyoFtt/P2LA95eUt8AcIkpGcb6EdEWikFWkE2Hju/
+I4T9su4OjbJ4JYQtgOblloQGzteAaS52rrS+KMEYX8Co5M5o1iNEBCPSVEC7KNuD
+epOJxRVBbOklv0TR9+0E576aPu+H8vv3XYt/a3jyT4g4btp7hhJunqrN/HwpV7Bz
+Vpm207GwKkhTeQYaiSeGYFaKt2NlriCduRXE8KxezogeuHfHvZw=
+=Zo3k
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 4e4f35779613..4d50e00150bb 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 26 Jan 2023 18:39:47 +0000
+Fri, 27 Jan 2023 00:39:50 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 3b3e8ca4be3f..61276013f5bc 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index a3b470d7add3..8448ba7cbe5f 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/ccid-1.5.0 b/metadata/md5-cache/app-crypt/ccid-1.5.0
index 38c9e1bf4238..26cf114ffd57 100644
--- a/metadata/md5-cache/app-crypt/ccid-1.5.0
+++ b/metadata/md5-cache/app-crypt/ccid-1.5.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID
 INHERIT=toolchain-funcs udev
 IUSE=twinserial kobil-midentity +usb
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
 SLOT=0
 SRC_URI=https://ccid.apdu.fr/files/ccid-1.5.0.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=bcab0b9c25c12f87f98e753467a4f894
+_md5_=b0c4a12a93f0aed06f6f49affd37e3b2
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 65730f2864d0..f4b226f45d0b 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-r1 b/metadata/md5-cache/app-emulation/libvirt-8.9.0-r1
new file mode 100644
index 000000000000..48de12ff362f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libvirt-8.9.0-r1
@@ -0,0 +1,17 @@
+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:= ) 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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 )
+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 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+PDEPEND=qemu? ( dev-python/libvirt-python )
+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
+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	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=de172c1c85c43c9445074fdb9c725ce2
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index a99a0c12b2b4..a915bd371f15 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -1,15 +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 ) >=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:= 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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 )
+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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 )
 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 git-r3
 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
+PDEPEND=qemu? ( dev-python/libvirt-python )
 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:= 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
+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
 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	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=1dd70f3058e68760c6fc00eba916da08
+_md5_=de172c1c85c43c9445074fdb9c725ce2
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 66e0f173161a..44a0e8360baf 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.3.7 b/metadata/md5-cache/app-misc/pax-utils-1.3.7
new file mode 100644
index 000000000000..38036058de09
--- /dev/null
+++ b/metadata/md5-cache/app-misc/pax-utils-1.3.7
@@ -0,0 +1,17 @@
+BDEPEND=caps? ( virtual/pkgconfig ) man? ( app-text/xmlto ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyelftools[python_targets_python3_11(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyelftools[python_targets_python3_11(-)] ) )
+DESCRIPTION=ELF utils that can check files for security relevant properties
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
+INHERIT=meson python-single-r1
+IUSE=caps man python seccomp test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyelftools[python_targets_python3_11(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) test? ( python )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/app-misc/pax-utils/pax-utils-1.3.7.tar.xz https://dev.gentoo.org/~vapier/dist/pax-utils-1.3.7.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=87dd9485562521d0383e06585a1ce6ed
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.26.0 b/metadata/md5-cache/app-misc/tmuxp-1.26.0
new file mode 100644
index 000000000000..48afe07afc6e
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tmuxp-1.26.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-rerunfailures-4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/flaky ) test? ( >=app-misc/tmux-3.0a =dev-python/libtmux-0.20.0*[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.3.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=tmux session manager. built on libtmux
+EAPI=8
+HOMEPAGE=https://tmuxp.git-pull.com
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=app-misc/tmux-3.0a =dev-python/libtmux-0.20.0*[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.3.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.26.0.tar.gz -> tmuxp-1.26.0.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=e07e3f8046f1a3946664799f911b6441
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 07aa8e87a950..f8d3b44045ef 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.5 b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.5
index 4bfca1c6f62c..c1348266d271 100644
--- a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.5
+++ b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/editorconfig/editorconfig-core-c/
 INHERIT=cmake
 IUSE=cli doc
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libpcre2:= cli? ( !dev-python/editorconfig-core-py[cli] )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-core-c/archive/v0.12.5.tar.gz -> editorconfig-core-c-0.12.5.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=03fd28e2ae052d1d15313804c93ce5c4
+_md5_=db2f36b1086963a957fc9f71dc0f6107
diff --git a/metadata/md5-cache/app-text/nuspell-5.1.2 b/metadata/md5-cache/app-text/nuspell-5.1.2
index b8cd4fc81d32..dd49829e8210 100644
--- a/metadata/md5-cache/app-text/nuspell-5.1.2
+++ b/metadata/md5-cache/app-text/nuspell-5.1.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://nuspell.github.io/ https://github.com/nuspell/nuspell
 INHERIT=cmake
 IUSE=doc test
-KEYWORDS=~amd64 ~loong ~riscv ~x86
+KEYWORDS=amd64 ~loong ~riscv x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/icu-60
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/nuspell/nuspell/archive/v5.1.2.tar.gz -> nuspell-5.1.2.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a16e1af19f5d1a792d9eb69db2ad67ca
+_md5_=edd12fe2cd7241cbb2ec94e5b1142919
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index a09f5800509f..b8437d48711f 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/ada_language_server-23.0.10 b/metadata/md5-cache/dev-ada/ada_language_server-23.0.10
deleted file mode 100644
index f235e16aa99e..000000000000
--- a/metadata/md5-cache/dev-ada/ada_language_server-23.0.10
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] test? ( dev-ada/e3-testsuite )
-DEFINED_PHASES=compile install prepare setup
-DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/ada_libfswatch[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] dev-ada/gnatcoll-core[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared] dev-ada/gnatdoc[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] dev-ada/gpr-unit-provider[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] dev-ada/libadalang[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] >=dev-ada/libadalang-tools-23[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared] dev-ada/spawn[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared,glib] dev-ada/VSS[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
-DESCRIPTION=an implementation of the Microsoft Language Server Protocol for Ada/SPARK
-EAPI=7
-HOMEPAGE=https://github.com/AdaCore/ada_language_server
-INHERIT=ada multiprocessing toolchain-funcs
-IUSE=test ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/ada_libfswatch[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] dev-ada/gnatcoll-core[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared] dev-ada/gnatdoc[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] dev-ada/gpr-unit-provider[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] dev-ada/libadalang[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] >=dev-ada/libadalang-tools-23[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared] dev-ada/spawn[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared,glib] dev-ada/VSS[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
-REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/AdaCore/ada_language_server/archive/refs/tags/23.0.10.tar.gz -> ada_language_server-23.0.10.tar.gz
-_eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=15244424260b0e08a40c4139ee3ebc16
diff --git a/metadata/md5-cache/dev-ada/ada_language_server-23.0.10-r1 b/metadata/md5-cache/dev-ada/ada_language_server-23.0.10-r1
new file mode 100644
index 000000000000..140a10899367
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/ada_language_server-23.0.10-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] test? ( dev-ada/e3-testsuite )
+DEFINED_PHASES=compile install prepare setup
+DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/ada_libfswatch[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] sys-fs/fswatch:= dev-ada/gnatcoll-core[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared] dev-ada/gnatdoc[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] dev-ada/gpr-unit-provider[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] dev-ada/libadalang[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] >=dev-ada/libadalang-tools-23[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared] dev-ada/spawn[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared,glib] dev-ada/VSS[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
+DESCRIPTION=an implementation of the Microsoft Language Server Protocol for Ada/SPARK
+EAPI=7
+HOMEPAGE=https://github.com/AdaCore/ada_language_server
+INHERIT=ada multiprocessing toolchain-funcs
+IUSE=test ada_target_gnat_2021 ada_target_gcc_12_2_0
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/ada_libfswatch[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] sys-fs/fswatch:= dev-ada/gnatcoll-core[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared] dev-ada/gnatdoc[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] dev-ada/gpr-unit-provider[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] dev-ada/libadalang[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?] >=dev-ada/libadalang-tools-23[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared] dev-ada/spawn[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared,glib] dev-ada/VSS[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
+REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/AdaCore/ada_language_server/archive/refs/tags/23.0.10.tar.gz -> ada_language_server-23.0.10.tar.gz
+_eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=361923733531c4bc19f967f4f336cc1e
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 3f3138ac62a0..ba4975dcc8eb 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.3.3 b/metadata/md5-cache/dev-java/commons-daemon-1.3.3
index c823cd6021c7..3757556e8efd 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.3.3
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.3.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-daemon/
 INHERIT=java-pkg-2 java-pkg-simple toolchain-funcs verify-sig
 IUSE=doc source verify-sig
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.3.3-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/daemon/source/commons-daemon-1.3.3-src.tar.gz.asc )
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=ddb285e8367a61f2e098e1eb379a8606
+_md5_=7902829c493349f239b87ed827604b4a
diff --git a/metadata/md5-cache/dev-java/fontbox-2.0.27 b/metadata/md5-cache/dev-java/fontbox-2.0.27
index fa0786dee940..cb17e9155d56 100644
--- a/metadata/md5-cache/dev-java/fontbox-2.0.27
+++ b/metadata/md5-cache/dev-java/fontbox-2.0.27
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pdfbox.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-logging:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf https://issues.apache.org/jira/secure/attachment/13036376/NotoSansSC-Regular.otf https://mirrors.ctan.org/fonts/opensans/type1/OpenSans-Regular.pfb )
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=bfac2f41f9284aad1a0c4a6039576cb0
+_md5_=beabd835debe0df66cdc641ad9f639b3
diff --git a/metadata/md5-cache/dev-java/log4j-12-api-2.19.0 b/metadata/md5-cache/dev-java/log4j-12-api-2.19.0
index 00ccc502f675..b49b18098e34 100644
--- a/metadata/md5-cache/dev-java/log4j-12-api-2.19.0
+++ b/metadata/md5-cache/dev-java/log4j-12-api-2.19.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://logging.apache.org/log4j/2.x/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=~dev-java/log4j-api-2.19.0:2 ~dev-java/log4j-core-2.19.0:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=3f90da88f9e065b3c4896141a1cd7ad5
+_md5_=1f9446a990e19064b14a6d76721a9620
diff --git a/metadata/md5-cache/dev-java/log4j-api-2.19.0 b/metadata/md5-cache/dev-java/log4j-api-2.19.0
index fe1b6f9673e3..a37b46c9e25b 100644
--- a/metadata/md5-cache/dev-java/log4j-api-2.19.0
+++ b/metadata/md5-cache/dev-java/log4j-api-2.19.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://logging.apache.org/log4j/2.x/
 INHERIT=java-pkg-2 java-pkg-simple verify-sig
 IUSE=doc source test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz verify-sig? ( https://www.apache.org/dist/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz.asc )
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=be3e194c0db8069f03f7b69084cbd830
+_md5_=27aa05fa1790c2623c6d60c4cd05d99b
diff --git a/metadata/md5-cache/dev-java/log4j-core-2.19.0 b/metadata/md5-cache/dev-java/log4j-core-2.19.0
index cc00ce26a05e..daa057e7e601 100644
--- a/metadata/md5-cache/dev-java/log4j-core-2.19.0
+++ b/metadata/md5-cache/dev-java/log4j-core-2.19.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://logging.apache.org/log4j/2.x/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:3 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.19.0:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=ca46c1b0936b30760d58073d5ffd4d19
+_md5_=9d8ca8868613ba66dd901fcdb5c11444
diff --git a/metadata/md5-cache/dev-java/pdfbox-2.0.27 b/metadata/md5-cache/dev-java/pdfbox-2.0.27
index eb75134242ab..42872aa46e5c 100644
--- a/metadata/md5-cache/dev-java/pdfbox-2.0.27
+++ b/metadata/md5-cache/dev-java/pdfbox-2.0.27
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pdfbox.apache.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=+tools doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=Apache-2.0
 PROPERTIES=test_network
 RDEPEND=dev-java/bcmail:0 dev-java/bcprov:0 dev-java/commons-logging:0 ~dev-java/fontbox-2.0.27:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip test? ( https://issues.apache.org/jira/secure/attachment/12481683/1.pdf -> PDFBOX-1031-1.pdf https://issues.apache.org/jira/secure/attachment/12481684/2.pdf -> PDFBOX-1031-2.pdf https://issues.apache.org/jira/secure/attachment/12486525/1_testfile1.pdf -> PDFBOX-1065-1.pdf https://issues.apache.org/jira/secure/attachment/12486526/2_testfile1.pdf -> PDFBOX-1065-2.pdf https://issues.apache.org/jira/secure/attachment/12490774/a.pdf -> PDFBOX-1100-1.pdf https://issues.apache.org/jira/secure/attachment/12490775/b.pdf -> PDFBOX-1100-2.pdf https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf -> PDFBOX-3656.pdf https://issues.apache.org/jira/secure/attachment/12852207/test.pdf -> PDFBOX-3682.pdf https://issues.apache.org/jira/secure/attachment/12888957/079977.pdf -> PDFBOX-3940-079977.pdf https://issues.apache.org/jira/secure/attachment/12867113/202097.pdf -> PDFBOX-3785-202097.pdf https://issues.apache.org/jira/secure/attachment/12890031/670064.pdf -> PDFBOX-3947-670064.pdf https://issues.apache.org/jira/secure/attachment/12890034/EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf -> PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf https://issues.apache.org/jira/secure/attachment/12890037/MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf -> PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf https://issues.apache.org/jira/secure/attachment/12890042/23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf -> PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf https://issues.apache.org/jira/secure/attachment/12890047/FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf -> PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf https://issues.apache.org/jira/secure/attachment/12892097/c687766d68ac766be3f02aaec5e0d713_2.pdf -> PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf https://issues.apache.org/jira/secure/attachment/12893582/63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf -> PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf https://issues.apache.org/jira/secure/attachment/12896905/GeneralForbearance.pdf -> PDFBOX-3999-GeneralForbearance.pdf https://issues.apache.org/jira/secure/attachment/12919726/sample.pdf -> PDFBOX-4197.pdf https://issues.apache.org/jira/secure/attachment/12938094/Quelldatei.pdf -> PDFBOX-4308.pdf https://issues.apache.org/jira/secure/attachment/12952086/form.pdf -> PDFBOX-4408.pdf https://issues.apache.org/jira/secure/attachment/12953423/000314.pdf -> PDFBOX-4418-000314.pdf https://issues.apache.org/jira/secure/attachment/12953421/000671.pdf -> PDFBOX-4418-000671.pdf https://issues.apache.org/jira/secure/attachment/12953866/000746.pdf -> PDFBOX-4423-000746.pdf https://issues.apache.org/jira/secure/attachment/12966453/cryptfilter.pdf -> PDFBOX-4517-cryptfilter.pdf https://issues.apache.org/jira/secure/attachment/12991833/PDFBOX-4750-test.pdf -> PDFBOX-4750.pdf https://issues.apache.org/jira/secure/attachment/12914331/WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf -> PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf https://issues.apache.org/jira/secure/attachment/12962991/NeS1078.pdf -> PDFBOX-4490.pdf https://issues.apache.org/jira/secure/attachment/12784025/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf https://issues.apache.org/jira/secure/attachment/12867102/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf https://issues.apache.org/jira/secure/attachment/12929821/16bit.png -> PDFBOX-4184-16bit.png https://issues.apache.org/jira/secure/attachment/12943502/ArrayIndexOutOfBoundsException%20COSParser -> PDFBOX-4338.pdf https://issues.apache.org/jira/secure/attachment/12943503/NullPointerException%20COSParser -> PDFBOX-4339.pdf https://issues.apache.org/jira/secure/attachment/12867433/genko_oc_shiryo1.pdf https://moji.or.jp/wp-content/ipafont/IPAfont/ipag00303.zip https://moji.or.jp/wp-content/ipafont/IPAfont/ipagp00303.zip https://issues.apache.org/jira/secure/attachment/12911053/n019003l.pfb https://issues.apache.org/jira/secure/attachment/12949710/032163.jpg -> PDFBOX-4184-032163.jpg https://issues.apache.org/jira/secure/attachment/13025718/lotus.jpg -> PDFBOX-5196-lotus.jpg https://issues.apache.org/jira/secure/attachment/13002695/13._Korona_szallo_vegzes_13.09.26.eredeti.pdf -> PDFBOX-4831.pdf )
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=22a5871793e38d3d464158bc368407cb
+_md5_=24274850be687a530ffdbff6cb6971a6
diff --git a/metadata/md5-cache/dev-java/xmpbox-2.0.27 b/metadata/md5-cache/dev-java/xmpbox-2.0.27
index dde4a045c7c0..168aeadf8221 100644
--- a/metadata/md5-cache/dev-java/xmpbox-2.0.27
+++ b/metadata/md5-cache/dev-java/xmpbox-2.0.27
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pdfbox.apache.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jaxb-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/pdfbox/2.0.27/pdfbox-2.0.27-src.zip
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=d1d8f39148d095f8b2237e641a591e5f
+_md5_=62031f511db190b6effb65117fcb0f55
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 18b4e873fdfb..5065292f4751 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/ispc-1.17.0-r2 b/metadata/md5-cache/dev-lang/ispc-1.17.0-r2
deleted file mode 100644
index 459773398781..000000000000
--- a/metadata/md5-cache/dev-lang/ispc-1.17.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex || ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=<sys-devel/clang-15:= !!sys-devel/llvm:0
-DESCRIPTION=Intel SPMD Program Compiler
-EAPI=7
-HOMEPAGE=https://ispc.github.io/
-INHERIT=cmake python-any-r1 llvm
-IUSE=examples
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=BSD BSD-2 UoI-NCSA
-RDEPEND=<sys-devel/clang-15:=
-SLOT=0
-SRC_URI=https://github.com/ispc/ispc/archive/v1.17.0.tar.gz -> ispc-1.17.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b36767e90f1868717722594c33bec959
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index d24407653743..98b1b9d6b421 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libclc-15.0.7 b/metadata/md5-cache/dev-libs/libclc-15.0.7
index fcccca1513dd..60dbeb1b0c21 100644
--- a/metadata/md5-cache/dev-libs/libclc-15.0.7
+++ b/metadata/md5-cache/dev-libs/libclc-15.0.7
@@ -6,9 +6,9 @@ EAPI=8
 HOMEPAGE=https://libclc.llvm.org/
 INHERIT=cmake llvm llvm.org python-any-r1
 IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7024335b3be9091ff4a463b6df6f9d11
+_md5_=1d1c104375d7a3406edd39028898ffef
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.12.0 b/metadata/md5-cache/dev-libs/libfido2-1.12.0
new file mode 100644
index 000000000000..df61ea3bcf29
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfido2-1.12.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=dev-libs/libcbor:= dev-libs/openssl:= sys-libs/zlib:= virtual/libudev:=
+DESCRIPTION=Provides library functionality for FIDO 2.0
+EAPI=7
+HOMEPAGE=https://github.com/Yubico/libfido2
+INHERIT=cmake udev linux-info
+IUSE=nfc static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=dev-libs/libcbor:= dev-libs/openssl:= sys-libs/zlib:= virtual/libudev:= acct-group/plugdev
+SLOT=0/1
+SRC_URI=https://github.com/Yubico/libfido2/archive/1.12.0.tar.gz -> libfido2-1.12.0.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f60385fd68b1ec579c98a1dc9ed5f9c0
diff --git a/metadata/md5-cache/dev-libs/simdjson-1.0.2 b/metadata/md5-cache/dev-libs/simdjson-1.0.2
deleted file mode 100644
index 074eabd3a92a..000000000000
--- a/metadata/md5-cache/dev-libs/simdjson-1.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-apps/file sys-apps/grep >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=tools? ( dev-libs/cxxopts:= )
-DESCRIPTION=SIMD accelerated C++ JSON library
-EAPI=7
-HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
-INHERIT=toolchain-funcs cmake
-IUSE=test tools
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0 Boost-1.0 BSD MIT
-REQUIRED_USE=test? ( tools )
-RESTRICT=!test? ( test )
-SLOT=0/9
-SRC_URI=https://github.com/simdjson/simdjson/archive/v1.0.2.tar.gz -> simdjson-1.0.2.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9a8cb145240c0151817bc471ff762c80
diff --git a/metadata/md5-cache/dev-libs/simdjson-1.1.0 b/metadata/md5-cache/dev-libs/simdjson-1.1.0
deleted file mode 100644
index 91563d18dbf5..000000000000
--- a/metadata/md5-cache/dev-libs/simdjson-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-apps/file sys-apps/grep >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=tools? ( dev-libs/cxxopts:= )
-DESCRIPTION=SIMD accelerated C++ JSON library
-EAPI=8
-HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
-INHERIT=toolchain-funcs cmake
-IUSE=test tools
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0 Boost-1.0 BSD MIT
-REQUIRED_USE=test? ( tools )
-RESTRICT=!test? ( test )
-SLOT=0/9
-SRC_URI=https://github.com/simdjson/simdjson/archive/v1.1.0.tar.gz -> simdjson-1.1.0.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=592579e6bd2ba978daac9a9e1eea93ff
diff --git a/metadata/md5-cache/dev-libs/simdjson-2.1.0-r1 b/metadata/md5-cache/dev-libs/simdjson-2.1.0-r1
deleted file mode 100644
index d5f955856ebe..000000000000
--- a/metadata/md5-cache/dev-libs/simdjson-2.1.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-apps/file sys-apps/grep >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=tools? ( dev-libs/cxxopts:= )
-DESCRIPTION=SIMD accelerated C++ JSON library
-EAPI=8
-HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
-INHERIT=toolchain-funcs cmake
-IUSE=test tools
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0 Boost-1.0 BSD MIT
-REQUIRED_USE=test? ( tools )
-RESTRICT=!test? ( test )
-SLOT=0/11
-SRC_URI=https://github.com/simdjson/simdjson/archive/v2.1.0.tar.gz -> simdjson-2.1.0.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cc8c91e302e502a0e4fab12781d97532
diff --git a/metadata/md5-cache/dev-libs/simdjson-2.2.2 b/metadata/md5-cache/dev-libs/simdjson-2.2.2
deleted file mode 100644
index ce29662e30d5..000000000000
--- a/metadata/md5-cache/dev-libs/simdjson-2.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-apps/file sys-apps/grep >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=tools? ( dev-libs/cxxopts:= )
-DESCRIPTION=SIMD accelerated C++ JSON library
-EAPI=8
-HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
-INHERIT=toolchain-funcs cmake
-IUSE=test tools
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0 Boost-1.0 BSD MIT
-REQUIRED_USE=test? ( tools )
-RESTRICT=!test? ( test )
-SLOT=0/13
-SRC_URI=https://github.com/simdjson/simdjson/archive/v2.2.2.tar.gz -> simdjson-2.2.2.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=75dfa312c85fae30135a7423f59bd854
diff --git a/metadata/md5-cache/dev-libs/simdjson-2.0.4 b/metadata/md5-cache/dev-libs/simdjson-3.1.0
index f383cb2966c0..084a1e5498f3 100644
--- a/metadata/md5-cache/dev-libs/simdjson-2.0.4
+++ b/metadata/md5-cache/dev-libs/simdjson-3.1.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-apps/file sys-apps/grep >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=sys-apps/file sys-apps/grep virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=tools? ( dev-libs/cxxopts:= )
 DESCRIPTION=SIMD accelerated C++ JSON library
@@ -10,7 +10,7 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 Boost-1.0 BSD MIT
 REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
-SLOT=0/9
-SRC_URI=https://github.com/simdjson/simdjson/archive/v2.0.4.tar.gz -> simdjson-2.0.4.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
+SLOT=0/15
+SRC_URI=https://github.com/simdjson/simdjson/archive/v3.1.0.tar.gz -> simdjson-3.1.0.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b9a5a2203adab3c6222d85fb6051d935
+_md5_=c52b9c7ab594f63eafa16ee47a28cee3
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index c79005135124..03a854b051f6 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/alcotest-1.6.0-r1 b/metadata/md5-cache/dev-ml/alcotest-1.6.0-r1
index fff0e1662485..0c3be28885f1 100644
--- a/metadata/md5-cache/dev-ml/alcotest-1.6.0-r1
+++ b/metadata/md5-cache/dev-ml/alcotest-1.6.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/mirage/alcotest/
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=>=dev-ml/dune-2.8:= dev-ml/astring:= dev-ml/async_kernel:= dev-ml/async:= >=dev-ml/async_unix-0.15.0:= dev-ml/base:= dev-ml/cmdliner:= >=dev-ml/core-0.15.0:= >=dev-ml/core_unix-0.15.0:= dev-ml/duration:= >=dev-ml/fmt-0.8.9:= dev-ml/lwt:= dev-ml/mirage-clock:= dev-ml/re:= dev-ml/result:= dev-ml/logs:= dev-ml/uutf:= dev-ml/uuidm:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.6.0
 SRC_URI=https://github.com/mirage/alcotest/archive/1.6.0.tar.gz -> alcotest-1.6.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=219c440f2b1838cfee15484cf67284cf
+_md5_=8ebf1cdb5f2daee665f076799f5de4ea
diff --git a/metadata/md5-cache/dev-ml/async_kernel-0.15.0 b/metadata/md5-cache/dev-ml/async_kernel-0.15.0
index 60c5e270bce2..d6f05cf3b04e 100644
--- a/metadata/md5-cache/dev-ml/async_kernel-0.15.0
+++ b/metadata/md5-cache/dev-ml/async_kernel-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/async_kernel
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-ml/core_kernel:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/async_kernel/archive/v0.15.0.tar.gz -> async_kernel-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=672ded12112a9469ed4562efa9194cd2
+_md5_=60499e2d629b956162009672d0659073
diff --git a/metadata/md5-cache/dev-ml/async_unix-0.15.0 b/metadata/md5-cache/dev-ml/async_unix-0.15.0
index 9c8f6526669c..c680f1f619eb 100644
--- a/metadata/md5-cache/dev-ml/async_unix-0.15.0
+++ b/metadata/md5-cache/dev-ml/async_unix-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/async_unix
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-ml/async_kernel:0/0.15 dev-ml/core_unix:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/async_unix/archive/v0.15.0.tar.gz -> async_unix-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=a43c3de132eb4fc89af5e923afd87210
+_md5_=413ba33f026c00b7de14412265abb8f0
diff --git a/metadata/md5-cache/dev-ml/base_bigstring-0.15.0 b/metadata/md5-cache/dev-ml/base_bigstring-0.15.0
index 238e2058255b..fe19834b99a6 100644
--- a/metadata/md5-cache/dev-ml/base_bigstring-0.15.0
+++ b/metadata/md5-cache/dev-ml/base_bigstring-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/base_bigstring
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-ml/int_repr:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/base_bigstring/archive/v0.15.0.tar.gz -> base_bigstring-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=f4069095a8f6b65bb78e0f593eeb118f
+_md5_=52d0896fa2d0f872a038d21491e4508b
diff --git a/metadata/md5-cache/dev-ml/core-0.15.0 b/metadata/md5-cache/dev-ml/core-0.15.0
index 117432e45be3..948b73801faa 100644
--- a/metadata/md5-cache/dev-ml/core-0.15.0
+++ b/metadata/md5-cache/dev-ml/core-0.15.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/core
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-ml/base_bigstring:0/0.15 dev-ml/ppx_jane:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/core/archive/v0.15.0.tar.gz -> core-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=707f22bceef1a30f2c850336b5dcd29e
+_md5_=537d9d933b6860c01fea7e59e41a3410
diff --git a/metadata/md5-cache/dev-ml/core_bench-0.15.0 b/metadata/md5-cache/dev-ml/core_bench-0.15.0
index 64f0be49dca2..81e611cdc9b5 100644
--- a/metadata/md5-cache/dev-ml/core_bench-0.15.0
+++ b/metadata/md5-cache/dev-ml/core_bench-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/core_bench
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-ml/textutils:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/core_bench/archive/v0.15.0.tar.gz -> core_bench-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=e39e48f89dba6e5d01b2252c9e095310
+_md5_=3c547558d238af8b8a72f7c5487b57ff
diff --git a/metadata/md5-cache/dev-ml/core_kernel-0.15.0 b/metadata/md5-cache/dev-ml/core_kernel-0.15.0
index 5f19e1d21300..d459d88a64f3 100644
--- a/metadata/md5-cache/dev-ml/core_kernel-0.15.0
+++ b/metadata/md5-cache/dev-ml/core_kernel-0.15.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/core_kernel
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/core:0/0.15 dev-ml/int_repr:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/core_kernel/archive/v0.15.0.tar.gz -> core_kernel-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=a6cb26bdc3a21d7af1c374c626e204b4
+_md5_=ff9622f769524422cdc3aaa7993cd95f
diff --git a/metadata/md5-cache/dev-ml/patience_diff-0.15.0 b/metadata/md5-cache/dev-ml/patience_diff-0.15.0
index bc5288895837..4390e4d79f77 100644
--- a/metadata/md5-cache/dev-ml/patience_diff-0.15.0
+++ b/metadata/md5-cache/dev-ml/patience_diff-0.15.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/janestreet/patience_diff
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/core:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/patience_diff/archive/v0.15.0.tar.gz -> patience_diff-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=d73aabea8f9da24d9faba694e76d9b52
+_md5_=86be9f5b95d132e7e0279b825e3ffb79
diff --git a/metadata/md5-cache/dev-ml/ppx_jane-0.15.0 b/metadata/md5-cache/dev-ml/ppx_jane-0.15.0
index d702f983e466..faddb7c21d2b 100644
--- a/metadata/md5-cache/dev-ml/ppx_jane-0.15.0
+++ b/metadata/md5-cache/dev-ml/ppx_jane-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_jane
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/base_quickcheck:0/0.15 dev-ml/ppx_bin_prot:0/0.15 dev-ml/ppx_disable_unused_warnings:0/0.15 dev-ml/ppx_expect:0/0.15 dev-ml/ppx_fixed_literal:0/0.15 dev-ml/ppx_ignore_instrumentation:0/0.15 dev-ml/ppx_log:0/0.15 dev-ml/ppx_module_timer:0/0.15 dev-ml/ppx_optional:0/0.15 dev-ml/ppx_pipebang:0/0.15 dev-ml/ppx_stable:0/0.15 dev-ml/ppx_string:0/0.15 dev-ml/ppx_typerep_conv:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/ppx_jane/archive/v0.15.0.tar.gz -> ppx_jane-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=5402d5d4a24c307619b3007b2ef53e5a
+_md5_=17fed87208f7aa5b81f2c4490c07e399
diff --git a/metadata/md5-cache/dev-ml/textutils-0.15.0 b/metadata/md5-cache/dev-ml/textutils-0.15.0
index 991f6ddd889b..8e9319a8630f 100644
--- a/metadata/md5-cache/dev-ml/textutils-0.15.0
+++ b/metadata/md5-cache/dev-ml/textutils-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/textutils
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-ml/core_unix:0/0.15 dev-ml/textutils_kernel:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/textutils/archive/v0.15.0.tar.gz -> textutils-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=0f8df2256dfe946962503277f4f3fe69
+_md5_=59fbf30e21006bc14ae8d7512ab6202d
diff --git a/metadata/md5-cache/dev-ml/timezone-0.15.0 b/metadata/md5-cache/dev-ml/timezone-0.15.0
index 020ef4f4a216..c9f6a9a84810 100644
--- a/metadata/md5-cache/dev-ml/timezone-0.15.0
+++ b/metadata/md5-cache/dev-ml/timezone-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/timezone
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-ml/core:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/timezone/archive/v0.15.0.tar.gz -> timezone-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=a1afa1dfb3ca3c673ff565115100ca33
+_md5_=addc371c7200ec3b1254395e5259812e
diff --git a/metadata/md5-cache/dev-python/Levenshtein-0.20.9 b/metadata/md5-cache/dev-python/Levenshtein-0.20.9
index 68b3c32b76db..5a57e9bba990 100644
--- a/metadata/md5-cache/dev-python/Levenshtein-0.20.9
+++ b/metadata/md5-cache/dev-python/Levenshtein-0.20.9
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/Levenshtein/ https://github.com/maxbachmann/Levenshtein/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2+
 RDEPEND=<dev-python/rapidfuzz-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxbachmann/Levenshtein/archive/v0.20.9.tar.gz -> Levenshtein-0.20.9.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=945f4d824fcb46baaee90e3bda8bcdd3
+_md5_=d5abd6d7373990fa0ebb91b5421b181c
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 5d13310ae17e..c6a19196bdb4 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/PyPDF2-3.0.0 b/metadata/md5-cache/dev-python/PyPDF2-3.0.0
index 118639c228ad..eaa0c6214c29 100644
--- a/metadata/md5-cache/dev-python/PyPDF2-3.0.0
+++ b/metadata/md5-cache/dev-python/PyPDF2-3.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/py-pdf/PyPDF2/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=BSD-2
 PROPERTIES=test_network
 RDEPEND=python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/py-pdf/PyPDF2/archive/3.0.0.tar.gz -> PyPDF2-3.0.0.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/0fe84b30ed33ff3daa9293e44349b8618f135699.tar.gz -> PyPDF2-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz )
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c2c2d777baf8554c296bd7971ebd3121
+_md5_=14514541a36133687b208f1738bdc230
diff --git a/metadata/md5-cache/dev-python/exceptiongroup-1.0.4 b/metadata/md5-cache/dev-python/exceptiongroup-1.0.4
deleted file mode 100644
index cd2b258e39c3..000000000000
--- a/metadata/md5-cache/dev-python/exceptiongroup-1.0.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_scm-1.7.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Backport of PEP 654 (exception groups)
-EAPI=8
-HOMEPAGE=https://github.com/agronholm/exceptiongroup/ https://pypi.org/project/exceptiongroup/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT PSF-2.4
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/agronholm/exceptiongroup/archive/1.0.4.tar.gz -> exceptiongroup-1.0.4.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ed216f7a52ba3a1167b556929a181e2b
diff --git a/metadata/md5-cache/dev-python/exceptiongroup-1.1.0 b/metadata/md5-cache/dev-python/exceptiongroup-1.1.0
index 4c77387e5109..c32bb2b77258 100644
--- a/metadata/md5-cache/dev-python/exceptiongroup-1.1.0
+++ b/metadata/md5-cache/dev-python/exceptiongroup-1.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/agronholm/exceptiongroup/ https://pypi.org/project/exceptiongroup/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT PSF-2.4
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/agronholm/exceptiongroup/archive/1.1.0.tar.gz -> exceptiongroup-1.1.0.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=90504364666e93ccd781a5d80a6f57f7
+_md5_=ed216f7a52ba3a1167b556929a181e2b
diff --git a/metadata/md5-cache/dev-python/fakeredis-2.2.0 b/metadata/md5-cache/dev-python/fakeredis-2.2.0
deleted file mode 100644
index 37dc26f059db..000000000000
--- a/metadata/md5-cache/dev-python/fakeredis-2.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-db/redis dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/redis-py-4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/redis-py-4.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Fake implementation of redis API for testing purposes
-EAPI=8
-HOMEPAGE=https://github.com/cunla/fakeredis-py/ https://pypi.org/project/fakeredis/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/redis-py-4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/redis-py-4.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cunla/fakeredis-py/archive/v2.2.0.tar.gz -> fakeredis-py-2.2.0.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=a24a3d74100abeba25a80acc4b1f471f
diff --git a/metadata/md5-cache/dev-python/fakeredis-2.4.0 b/metadata/md5-cache/dev-python/fakeredis-2.4.0
index 66b20aa401a1..fae0886ce7fd 100644
--- a/metadata/md5-cache/dev-python/fakeredis-2.4.0
+++ b/metadata/md5-cache/dev-python/fakeredis-2.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/cunla/fakeredis-py/ https://pypi.org/project/fakeredis/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/redis-py-4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/redis-py-4.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cunla/fakeredis-py/archive/v2.4.0.tar.gz -> fakeredis-py-2.4.0.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=eb1f9893542938a4dd5a2e0feec609ef
+_md5_=6165c1ec0dcbcb76f533a0b3a8f05bdb
diff --git a/metadata/md5-cache/dev-python/libtmux-0.20.0 b/metadata/md5-cache/dev-python/libtmux-0.20.0
new file mode 100644
index 000000000000..dbdde7f0e7d0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libtmux-0.20.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-rerunfailures[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twine[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-misc/tmux-3.0a >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python API for tmux
+EAPI=8
+HOMEPAGE=https://libtmux.git-pull.com/ https://github.com/tmux-python/libtmux/ https://pypi.org/project/libtmux/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=app-misc/tmux-3.0a python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tmux-python/libtmux/archive/v0.20.0.tar.gz -> libtmux-0.20.0.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=7742f70c41fff01cc64ce44c6aaa11f1
diff --git a/metadata/md5-cache/dev-python/lit-15.0.7 b/metadata/md5-cache/dev-python/lit-15.0.7
index f4e6d4ebbcae..1293fda59880 100644
--- a/metadata/md5-cache/dev-python/lit-15.0.7
+++ b/metadata/md5-cache/dev-python/lit-15.0.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=distutils-r1 llvm.org
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=6a9d7b68ca910abb4219c01a1db32d35
+_md5_=45d97da77128f8228ae4f1e1e46544ca
diff --git a/metadata/md5-cache/dev-python/seedir-0.4.2 b/metadata/md5-cache/dev-python/seedir-0.4.2
index e26dfb90d8d3..0f5eb546a6bc 100644
--- a/metadata/md5-cache/dev-python/seedir-0.4.2
+++ b/metadata/md5-cache/dev-python/seedir-0.4.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/earnestt1234/seedir/ https://pypi.org/project/seedir/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/natsort[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/earnestt1234/seedir/archive/v0.4.2.tar.gz -> seedir-0.4.2.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ba5c7ad743293e9a44501140d10ffebc
+_md5_=0a8b3b6a49daeb9e1fe20f1b394a5782
diff --git a/metadata/md5-cache/dev-python/sybil-4.0.0 b/metadata/md5-cache/dev-python/sybil-4.0.0
index 12f4be132ac5..99c890b3883d 100644
--- a/metadata/md5-cache/dev-python/sybil-4.0.0
+++ b/metadata/md5-cache/dev-python/sybil-4.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/simplistix/sybil/ https://pypi.org/project/sybil/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/simplistix/sybil/archive/4.0.0.tar.gz -> sybil-4.0.0.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=83548613ca6edb9e3f2889dea8f46103
+_md5_=cb8f33edad1afee7f0872eb0eaae1fc0
diff --git a/metadata/md5-cache/dev-python/towncrier-22.12.0 b/metadata/md5-cache/dev-python/towncrier-22.12.0
index 4c927008010b..6f530f95f505 100644
--- a/metadata/md5-cache/dev-python/towncrier-22.12.0
+++ b/metadata/md5-cache/dev-python/towncrier-22.12.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/twisted/towncrier/ https://pypi.org/project/towncrier/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click-default-group[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/incremental[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twisted/towncrier/archive/22.12.0.tar.gz -> towncrier-22.12.0.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=0fe60ae79516ff9941db0d649f0fa89a
+_md5_=5bd08e728a9bae683e7723fa4f4b31e8
diff --git a/metadata/md5-cache/dev-python/towncrier-22.8.0 b/metadata/md5-cache/dev-python/towncrier-22.8.0
deleted file mode 100644
index 5e3c8de068ec..000000000000
--- a/metadata/md5-cache/dev-python/towncrier-22.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/incremental[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-vcs/git dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-16.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Building newsfiles for your project
-EAPI=8
-HOMEPAGE=https://github.com/twisted/towncrier/ https://pypi.org/project/towncrier/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click-default-group[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/incremental[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/twisted/towncrier/archive/22.8.0.tar.gz -> towncrier-22.8.0.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=5bd08e728a9bae683e7723fa4f4b31e8
diff --git a/metadata/md5-cache/dev-python/xcffib-1.1.2 b/metadata/md5-cache/dev-python/xcffib-1.1.2
index f8d8ad803061..3cf7872adc1c 100644
--- a/metadata/md5-cache/dev-python/xcffib-1.1.2
+++ b/metadata/md5-cache/dev-python/xcffib-1.1.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tych0/xcffib/ https://pypi.org/project/xcffib/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_9? ( >=dev-python/cffi-1.1:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/libxcb python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-1.1.2.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=396fde75dbe9e1f9c7d8cd7972870901
+_md5_=407953201271fc6629dfcb57b6534d96
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 96c02ffeae97..a2a760d65eb2 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.8-r2 b/metadata/md5-cache/dev-qt/qtgui-5.15.8-r2
new file mode 100644
index 000000000000..9229e83f5847
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.8-r2
@@ -0,0 +1,18 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.8*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.8* ) eglfs? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( media-libs/libjpeg-turbo:= ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.8* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.8* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) linuxfb? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) test? ( =dev-qt/qttest-5.15.8* )
+DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
+INHERIT=qt5-build
+IUSE=accessibility dbus egl eglfs evdev gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( =dev-qt/qtwayland-5.15.8* )
+RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.8*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.8* ) eglfs? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( media-libs/libjpeg-turbo:= ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.8* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.8* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
+REQUIRED_USE=|| ( eglfs linuxfb vnc X ) accessibility? ( dbus X ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) X? ( gles2-only? ( egl ) )
+RESTRICT=test
+SLOT=5/5.15.8
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=d5128de375dce9c0d31d2ca95c5c714c
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.8-r1 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.8-r1
new file mode 100644
index 000000000000..74fbf575cced
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.8-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-qt/qtcore-5.15.8* =dev-qt/qtgui-5.15.8* media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= ) test? ( =dev-qt/qttest-5.15.8* )
+DESCRIPTION=Additional format plugins for the Qt image I/O system
+EAPI=8
+HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtimageformats https://community.kde.org/Qt5PatchCollection
+INHERIT=qt5-build
+IUSE=mng debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtcore-5.15.8* =dev-qt/qtgui-5.15.8* media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
+RESTRICT=test
+SLOT=5
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtimageformats-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtimageformats-5.15.8-gentoo-kde-1.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=93d2e234d374a017bfcc45375c11522b
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.8-r1 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.8-r1
new file mode 100644
index 000000000000..e4a8049868a6
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.8-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-qt/qtcore-5.15.8*:5= =dev-qt/qtgui-5.15.8*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.8* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.8*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) test? ( =dev-qt/qttest-5.15.8* )
+DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
+INHERIT=qt5-build
+IUSE=dbus gles2-only gtk +png +X debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtcore-5.15.8*:5= =dev-qt/qtgui-5.15.8*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.8* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.8*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango )
+REQUIRED_USE=gtk? ( dbus )
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtbase-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.8-gentoo-kde-4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-3.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=a9664342c120e67c12613ea915f457b8
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 7bddd2bcd27a..0a3798d31786 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/bpftrace-0.16.0-r2 b/metadata/md5-cache/dev-util/bpftrace-0.16.0-r2
new file mode 100644
index 000000000000..ee7fe579a797
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bpftrace-0.16.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils sys-devel/flex sys-devel/bison virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-libs/cereal:= test? ( dev-cpp/gtest ) !!sys-devel/llvm:0
+DESCRIPTION=High-level tracing language for eBPF
+EAPI=8
+HOMEPAGE=https://github.com/iovisor/bpftrace
+INHERIT=llvm linux-info cmake
+IUSE=fuzzing test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/libbpf-1.0:= >=dev-util/bcc-0.25.0:= <sys-devel/clang-17:= <sys-devel/llvm-17:=[llvm_targets_BPF(+)] sys-libs/binutils-libs:= virtual/libelf:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.16.0.tar.gz -> bpftrace-0.16.0.gh.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=51b4f4b8c7bb1a0bdca3c5df2dc37009
diff --git a/metadata/md5-cache/dev-util/lldb-15.0.7 b/metadata/md5-cache/dev-util/lldb-15.0.7
index c3efb81061b9..fdf16db03ba0 100644
--- a/metadata/md5-cache/dev-util/lldb-15.0.7
+++ b/metadata/md5-cache/dev-util/lldb-15.0.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake llvm llvm.org python-single-r1
 IUSE=debug +libedit lzma ncurses +python test +xml test verify-sig python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm arm64 ~x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-15.0.7 ~sys-devel/llvm-15.0.7 python? ( python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0c3d7406de5b9aa051143b444265f588
+_md5_=6f8c56176a914b9a0329aa2acd261b13
diff --git a/metadata/md5-cache/dev-util/patdiff-0.15.0 b/metadata/md5-cache/dev-util/patdiff-0.15.0
index f6285fa69be9..64c4cac0e027 100644
--- a/metadata/md5-cache/dev-util/patdiff-0.15.0
+++ b/metadata/md5-cache/dev-util/patdiff-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/patdiff
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/core_unix:0/0.15 dev-ml/patience_diff:0/0.15 dev-ml/pcre-ocaml:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/patdiff/archive/v0.15.0.tar.gz -> patdiff-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=35ea0cde28c4d46bccec3188a4c5bf70
+_md5_=c418ad169bf764c7fe29a3dc0c3bd45e
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 8163e1739ffb..ad1573ee5deb 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/performous-1.1-r3 b/metadata/md5-cache/games-arcade/performous-1.1-r3
deleted file mode 100644
index cfa2010f976d..000000000000
--- a/metadata/md5-cache/games-arcade/performous-1.1-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/help2man sys-devel/gettext songs? ( app-arch/unzip ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-libs/boost:= dev-libs/glib:2 dev-libs/libxml2:2 gnome-base/librsvg:2 media-gfx/imagemagick:0= media-libs/libepoxy media-libs/libpng:0= media-libs/libsdl2[joystick,video] media-libs/portaudio sys-libs/zlib media-video/ffmpeg virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango midi? ( media-libs/portmidi ) webcam? ( media-libs/opencv )
-DESCRIPTION=SingStar GPL clone
-EAPI=7
-HOMEPAGE=https://performous.org/
-INHERIT=cmake desktop xdg-utils
-IUSE=midi songs tools webcam
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 songs? ( CC-BY-NC-SA-2.5 CC-BY-NC-ND-2.5 )
-RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 dev-libs/boost:= dev-libs/glib:2 dev-libs/libxml2:2 gnome-base/librsvg:2 media-gfx/imagemagick:0= media-libs/libepoxy media-libs/libpng:0= media-libs/libsdl2[joystick,video] media-libs/portaudio sys-libs/zlib media-video/ffmpeg virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango midi? ( media-libs/portmidi ) webcam? ( media-libs/opencv )
-SLOT=0
-SRC_URI=https://github.com/performous/performous/archive/1.1.tar.gz -> performous-1.1.tar.gz songs? ( mirror://sourceforge/performous/ultrastar-songs-restricted-3.zip mirror://sourceforge/performous/ultrastar-songs-jc-1.zip mirror://sourceforge/performous/ultrastar-songs-libre-3.zip mirror://sourceforge/performous/ultrastar-songs-shearer-1.zip )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c29bd1236052f4f73f4e6d595389e112
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index aa8ec1e916ed..40ea7db3fce0 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/libsdl2-2.26.2 b/metadata/md5-cache/media-libs/libsdl2-2.26.2
index 8cb6868a740f..c32df3a28444 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.26.2
+++ b/metadata/md5-cache/media-libs/libsdl2-2.26.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.libsdl.org/
 INHERIT=autotools flag-o-matic multilib-minimal
 IUSE=alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus doc fcitx4 gles1 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86
 LICENSE=ZLIB
 RDEPEND=virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) fcitx4? ( app-i18n/fcitx:4 ) gles1? ( media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles1] ) gles2? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles2] ) ibus? ( app-i18n/ibus ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kms? ( >=x11-libs/libdrm-2.4.82[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.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gbm(+)] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=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(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pipewire? ( media-video/pipewire:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208:=[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.20[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl(+),gles2,wayland] >=x11-libs/libxkbcommon-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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-6.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) vulkan? ( media-libs/vulkan-loader )
 REQUIRED_USE=alsa? ( sound ) fcitx4? ( dbus ) gles1? ( video ) gles2? ( video ) haptic? ( joystick ) ibus? ( dbus ) jack? ( sound ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) sndio? ( sound ) vulkan? ( video ) wayland? ( gles2 ) xscreensaver? ( X )
 SLOT=0
 SRC_URI=https://www.libsdl.org/release/SDL2-2.26.2.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=f7c87aa7c729b25d15d42fc59ddce287
+_md5_=701097fa917c79ef0449f52563fccbb2
diff --git a/metadata/md5-cache/media-libs/netpbm-10.86.36 b/metadata/md5-cache/media-libs/netpbm-10.86.36
index 43566a27f842..04ce436380a2 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.86.36
+++ b/metadata/md5-cache/media-libs/netpbm-10.86.36
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://netpbm.sourceforge.net/
 INHERIT=flag-o-matic multilib toolchain-funcs
 IUSE=jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain
 RDEPEND=dev-lang/perl jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-turbo:=[static-libs?] ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:= ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 )
 SLOT=0/stable
 SRC_URI=https://dev.gentoo.org/~ceamac/media-libs/netpbm/netpbm-10.86.36.tar.xz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=35923b2bc3516454e20b7b4ebabfd07e
+_md5_=251b72063834966d87526841d9d4b07f
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 96ae86e2785b..53cdba429204 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.9.2 b/metadata/md5-cache/net-fs/cvmfs-2.9.2
deleted file mode 100644
index 30b49add09c2..000000000000
--- a/metadata/md5-cache/net-fs/cvmfs-2.9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile config configure install prepare setup test
-DEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= <dev-libs/leveldb-1.23:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= virtual/pkgconfig
-DESCRIPTION=HTTP read-only file system for distributing software
-EAPI=7
-HOMEPAGE=https://cernvm.cern.ch/fs/
-INHERIT=cmake linux-info bash-completion-r1
-IUSE=server
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= <dev-libs/leveldb-1.23:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
-SLOT=0
-SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.9.2/source.tar.gz -> cvmfs-2.9.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f15e8cec8b32fe53403b06e16370122e
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index b25da76b2700..ccf35ebdde03 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.7.11 b/metadata/md5-cache/net-vpn/tor-0.4.7.11
deleted file mode 100644
index 446c78cdd27c..000000000000
--- a/metadata/md5-cache/net-vpn/tor-0.4.7.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install setup unpack
-DEPEND=dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) test? ( dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) || ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) )
-DESCRIPTION=Anonymizing overlay network for TCP
-EAPI=8
-HOMEPAGE=https://www.torproject.org/
-INHERIT=python-any-r1 readme.gentoo-r1 systemd verify-sig
-IUSE=caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd verify-sig
-KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos
-LICENSE=BSD GPL-2
-RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.4.7.11.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.7.11.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.7.11.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.7.11.tar.gz.sha256sum.asc )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=804d3fe742c396489a1ef3a50a218a3d
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.7.12 b/metadata/md5-cache/net-vpn/tor-0.4.7.12
deleted file mode 100644
index 2087abe8c6a7..000000000000
--- a/metadata/md5-cache/net-vpn/tor-0.4.7.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-tor-20221213 ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install setup unpack
-DEPEND=dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) test? ( dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) || ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) )
-DESCRIPTION=Anonymizing overlay network for TCP
-EAPI=8
-HOMEPAGE=https://www.torproject.org/
-INHERIT=python-any-r1 readme.gentoo-r1 systemd verify-sig
-IUSE=caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd verify-sig
-KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos
-LICENSE=BSD GPL-2
-RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.4.7.12.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.7.12.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.7.12.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.7.12.tar.gz.sha256sum.asc )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=a52915d75e730c085a0b75355404dba4
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 11588fc744d3..a47e949fefbc 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/libigl-2.3.0 b/metadata/md5-cache/sci-libs/libigl-2.3.0
deleted file mode 100644
index ad3239f908a7..000000000000
--- a/metadata/md5-cache/sci-libs/libigl-2.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3
-DESCRIPTION=A simple C++ geometry processing library
-EAPI=7
-HOMEPAGE=https://libigl.github.io/
-INHERIT=cmake
-IUSE=static-libs
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2+ MPL-2.0
-RDEPEND=dev-cpp/eigen:3
-SLOT=0
-SRC_URI=https://github.com/libigl/libigl/archive/v2.3.0.tar.gz -> libigl-2.3.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7ec41e73bf0800b2202dad25524d96eb
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index bef4ef5c56ce..39060b2aa9d1 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/arb-2.19.0 b/metadata/md5-cache/sci-mathematics/arb-2.19.0
deleted file mode 100644
index fa49219c82d0..000000000000
--- a/metadata/md5-cache/sci-mathematics/arb-2.19.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
-DESCRIPTION=C library for arbitrary-precision interval arithmetic
-EAPI=7
-HOMEPAGE=https://fredrikj.net/arb/
-INHERIT=cmake
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/fredrik-johansson/arb/archive/2.19.0.tar.gz -> arb-2.19.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b7de4320a8e61e0af2323ed68b1268e3
diff --git a/metadata/md5-cache/sci-mathematics/arb-2.21.0 b/metadata/md5-cache/sci-mathematics/arb-2.21.0
deleted file mode 100644
index 8578176d3e34..000000000000
--- a/metadata/md5-cache/sci-mathematics/arb-2.21.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
-DESCRIPTION=C library for arbitrary-precision interval arithmetic
-EAPI=7
-HOMEPAGE=https://fredrikj.net/arb/
-INHERIT=cmake
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/fredrik-johansson/arb/archive/2.21.0.tar.gz -> arb-2.21.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8594329b40a38e47f2f4fd829151d24b
diff --git a/metadata/md5-cache/sci-mathematics/arb-2.22.1 b/metadata/md5-cache/sci-mathematics/arb-2.22.1
deleted file mode 100644
index 16b52ee973dc..000000000000
--- a/metadata/md5-cache/sci-mathematics/arb-2.22.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
-DESCRIPTION=C library for arbitrary-precision interval arithmetic
-EAPI=7
-HOMEPAGE=https://fredrikj.net/arb/
-INHERIT=cmake
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= sci-mathematics/flint:=
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=https://github.com/fredrik-johansson/arb/archive/2.22.1.tar.gz -> arb-2.22.1.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=04c9673e63bc0032e7eb5c6b86f4fcaf
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index cf77a1d21e25..afa7dcd32735 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/texinfo-7.0.2 b/metadata/md5-cache/sys-apps/texinfo-7.0.2
index 90239ae66d4c..a79588942c0a 100644
--- a/metadata/md5-cache/sys-apps/texinfo-7.0.2
+++ b/metadata/md5-cache/sys-apps/texinfo-7.0.2
@@ -12,4 +12,4 @@ RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper
 SLOT=0
 SRC_URI=mirror://gnu/texinfo/texinfo-7.0.2.tar.xz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=466a765f06e1ed7f1c53ca9c4c09a773
+_md5_=b695d0b9ff17c1440d3447ddbde999ec
diff --git a/metadata/md5-cache/sys-apps/texinfo-9999 b/metadata/md5-cache/sys-apps/texinfo-9999
new file mode 100644
index 000000000000..8e8a88ab4055
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/texinfo-9999
@@ -0,0 +1,14 @@
+BDEPEND=>=sys-devel/autoconf-2.62 >=sys-devel/automake-1.16 sys-devel/libtool nls? ( >=sys-devel/gettext-0.19.6 ) >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure prepare unpack
+DEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper virtual/perl-Encode standalone? ( >=dev-lang/perl-5.8.1 ) !standalone? ( >=dev-lang/perl-5.8.1:= ) nls? ( virtual/libintl )
+DESCRIPTION=The GNU info program and utilities
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/texinfo/
+INHERIT=flag-o-matic toolchain-funcs git-r3
+IUSE=nls +standalone static
+LICENSE=GPL-3+
+PROPERTIES=live
+RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper virtual/perl-Encode standalone? ( >=dev-lang/perl-5.8.1 ) !standalone? ( >=dev-lang/perl-5.8.1:= ) nls? ( virtual/libintl )
+SLOT=0
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=b695d0b9ff17c1440d3447ddbde999ec
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 15a12e03491f..20f0abcbe1a4 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/ndctl-75 b/metadata/md5-cache/sys-block/ndctl-75
new file mode 100644
index 000000000000..83c8d03dcd46
--- /dev/null
+++ b/metadata/md5-cache/sys-block/ndctl-75
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-text/asciidoc app-text/xmlto ) sys-devel/libtool virtual/pkgconfig virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=dev-libs/iniparser:0= dev-libs/json-c:= sys-apps/keyutils:= sys-apps/kmod:= sys-apps/util-linux:= virtual/libudev:= systemd? ( sys-apps/systemd:= )
+DESCRIPTION=Helper tools and libraries for managing non-volatile memory on Linux
+EAPI=8
+HOMEPAGE=https://github.com/pmem/ndctl
+INHERIT=udev meson bash-completion-r1
+IUSE=doc systemd test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT CC0-1.0
+RDEPEND=dev-libs/iniparser:0= dev-libs/json-c:= sys-apps/keyutils:= sys-apps/kmod:= sys-apps/util-linux:= virtual/libudev:= systemd? ( sys-apps/systemd:= )
+RESTRICT=!test? ( test ) test
+SLOT=0/6
+SRC_URI=https://github.com/pmem/ndctl/archive/v75.tar.gz -> ndctl-75.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=78a8b9a830facf6bb595b760bcce006d
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 486d56ef15d2..d7926dfa837e 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-15.0.7-r1 b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
index 54e5efdba701..3c41248f0987 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.7-r1
+++ b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs
 IUSE=debug doc +extra ieee-long-double +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-toolchain-symlinks:15 ~sys-devel/clang-runtime-15.0.7
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ~sys-devel/llvm-15.0.7:15=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/clang-common-15.0.7 llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.7[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.7[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.7[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.7[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.7[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.7[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.7[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.7[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.7[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.7[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.7[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.7[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.7[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.7[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.7[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.7[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.7[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.7[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.7[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.7[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.7[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.7[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.7[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.7[llvm_targets_SPIRV] )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15g1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b2185c0605b4f1318c16996cf1ddbdab
+_md5_=3e646151719e54ab3a13f00bca949c38
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r1 b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r1
index 8bb65d98a227..1dd7060cf892 100644
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r1
+++ b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://llvm.org/
 IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
 INHERIT=bash-completion-r1 llvm.org
 IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind hardened stricter verify-sig
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.7 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=dbe1353b0a82211e65da30d31144f39c
+_md5_=d11045b952d8a882336822602939b0e5
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-15.0.7 b/metadata/md5-cache/sys-devel/clang-runtime-15.0.7
index 80609be0dd00..67990ebb92ad 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-15.0.7
+++ b/metadata/md5-cache/sys-devel/clang-runtime-15.0.7
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://clang.llvm.org/
 INHERIT=multilib-build
 IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-15.0.7:15.0.7[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-15.0.7:15.0.7[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-15.0.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(-)?] ) openmp? ( >=sys-libs/libomp-15.0.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(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=15.0.7
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=9bd86f819f97815b92303ec5863990f0
+_md5_=84951cb4bde111ec59900c38b6777b9e
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.7 b/metadata/md5-cache/sys-devel/lld-15.0.7
index 1858e3f229ed..42d2d4f151f4 100644
--- a/metadata/md5-cache/sys-devel/lld-15.0.7
+++ b/metadata/md5-cache/sys-devel/lld-15.0.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1
 IUSE=debug test test verify-sig
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=>=sys-devel/lld-toolchain-symlinks-15-r2:15
 RDEPEND=~sys-devel/llvm-15.0.7 sys-libs/zlib:= !sys-devel/lld:0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=258c4c644e3c1daf399da44bea6fc39d
+_md5_=f406f13a9ffb6273afe34e860eaf9283
diff --git a/metadata/md5-cache/sys-devel/llvm-15.0.7 b/metadata/md5-cache/sys-devel/llvm-15.0.7
index 25c6fa1553a3..a6cff76fdf0b 100644
--- a/metadata/md5-cache/sys-devel/llvm-15.0.7
+++ b/metadata/md5-cache/sys-devel/llvm-15.0.7
@@ -6,7 +6,7 @@ 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 verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:15 binutils-plugin? ( >=sys-devel/llvmgold-15 )
 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
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4dc011d6e3688a22dfafe9c3c93dfda0
+_md5_=4b2595b5031ae1631b75f2509ce5a7a2
diff --git a/metadata/md5-cache/sys-devel/llvm-common-15.0.7 b/metadata/md5-cache/sys-devel/llvm-common-15.0.7
index 3983d825a1f7..8de6d82ae403 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-15.0.7
+++ b/metadata/md5-cache/sys-devel/llvm-common-15.0.7
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=llvm.org
 IUSE=verify-sig
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
 _eclasses_=llvm.org	12d27b4e19e005f9ddba29e8c408758c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=0e45aee3b0844413dd8757e5781fa39a
+_md5_=29f96569e5107a0ca343c8accaa2d360
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 18541679d61f..cdf1148d3645 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/fswatch-1.17.1 b/metadata/md5-cache/sys-fs/fswatch-1.17.1
new file mode 100644
index 000000000000..7b040da5dcb5
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fswatch-1.17.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=cross-platform file change monitor with multiple backends
+EAPI=8
+HOMEPAGE=https://github.com/emcrisostomo/fswatch
+INHERIT=toolchain-funcs
+IUSE=nls static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0/13
+SRC_URI=https://github.com/emcrisostomo/fswatch/releases/download/1.17.1/fswatch-1.17.1.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=fd72dd42a480c5ae945172dc255613d3
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 62465e84cd14..a50eff632c14 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-15.0.7 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
index 85d8b5941b0e..33acd23b17d2 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
+++ b/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+abi_x86_32 abi_x86_64 +clang debug test verify-sig
-KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a7a1726b6eb3c7ce9a4dbf043af8aa6a
+_md5_=53e39020c8d23997da8e61e17fdb8a19
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
index a10df5bc91b0..e38ee7464d90 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
 IUSE=+abi_x86_32 abi_x86_64 +clang debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test verify-sig
-KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5ab39d65547c31a477507f96309a43e6
+_md5_=4a6c28dfb8b0a1aa66ce2850011b96dd
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index bdc70b93bf14..1cd28bd12896 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -1,6 +1,6 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( dev-lang/perl ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) perl? ( dev-lang/perl ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) perl? ( dev-lang/perl ) test? ( dev-lang/perl ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
@@ -9,9 +9,9 @@ IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 PROPERTIES=live
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) perl? ( dev-lang/perl ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep app-alternatives/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) perl? ( dev-lang/perl ) test? ( dev-lang/perl ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep app-alternatives/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0d20c7d55b67366d1ed444180d621df3
+_md5_=338fdd95fad2eb35574209b9662e012e
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7 b/metadata/md5-cache/sys-libs/libcxx-15.0.7
index a3f441e9a11d..f75392ee09f4 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://libcxx.llvm.org/
 INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+clang +libcxxabi static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 ~arm arm64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-15.0.7[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
 REQUIRED_USE=test? ( clang )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=057c36f3d911d6a9b86cc09b395173e3
+_md5_=7f5a8fba7d5d2d43189bfb259f861a89
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1 b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
index ac162602590d..0223720100c3 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://libcxx.llvm.org/
 INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+clang +libcxxabi static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-15.0.7[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
 REQUIRED_USE=test? ( clang )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r1.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=707dd2dc4fd9c45cd778935abdd070ef
+_md5_=b7314dafc4760edc84c9672522bb8542
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
index 64d1c1f5041b..95aae7d531dc 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
+++ b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://libcxxabi.llvm.org/
 INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+clang static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 ~arm arm64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ca1b0a5d039f4b92fba089b93817d539
+_md5_=462e3f649f8df58db11379d6fa9c34ff
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.7 b/metadata/md5-cache/sys-libs/libomp-15.0.7
index d3bb8c3d6707..7d0f7f087c89 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.7
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://openmp.llvm.org
 INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-any-r1
 IUSE=debug hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-15.0.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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ee0dc22feb60737648d9996952efb445
+_md5_=570eb673181badef2bc4aef19404143e
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
index e3bb53864d0a..85b1650e7bab 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
 INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+clang debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	2573b2f563461fd232f4587523e5144b	llvm.org	12d27b4e19e005f9ddba29e8c408758c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6da1edc0a414f824973655f4bbd5d600
+_md5_=0304c4cd124df43254ba42ff0fa5e262
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index b04e658e8239..eb329dd6e7a2 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14966 BLAKE2B 687a7b166f711e4c3c75d588b8febb4831fac9bee694b4222597007a9b433fee3a5aa6e187f1fc35937c84f642d144e511d63be549688dfd15f1839a5369d701 SHA512 bd9169c0f73f3e95819cf527d7df79adcfc029e6bfc752f29b75c7be14518984914e4ae2cb94e42a6398dc1af3b2a3e52070736093238502bb4eced7f5775b16
-TIMESTAMP 2023-01-26T18:39:49Z
+TIMESTAMP 2023-01-27T00:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPSyPVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPTHVlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBwmg/+J02mvDZSmYaUsHtDd2vPCahMiQntgqvMerITJ3Aj52b/xoUp3YMVCi2E
-GXfrM7ghyzJJnkARH3rlbpGIgzjzoywLwyc+8LZxAgvGPOx0D6ppppmCJlLbWd3e
-986O/H4Bb+dzfJg+kpg/FPPR0b/jrf1MPCrKAYgJvBRdxqv8e/PKL8LNwqLHdTTh
-N0cLMTkoNEd0B6w5ROQObg/I2R7C2LMvan8YpOkwbRvLo0U89fzr6oBsKsg0wSH4
-JplV+oFsKTG4muqhHtk1s/hD+56Sp7KTF/24F2Mbct5lvQXPsBHq09EoLfWPMTVE
-b8qzeZm0HOoN2Tm5FwAJM91ONmUPRhP5liS6bfw6Pt6/pgTrjEuiHbFPARiD7LvL
-jYvyn69jqRvzw9XLFM1VLEGJ5Lt/36EjpN8acHJf9MruXLPbs93WC1DFcpE+9Ruz
-s1jvZ9PfOA3dmNsb8TgvqMXwS1OyGgXF+8sojHYz7vD1lWRfprqgpNebeRsEoZae
-2FYGnp/xVHat/Rzv4YlMhqo+7YI14EPdrKxq7oJyb4FXzOXpxWJVPCAa7q0IzqgM
-EDgH0KhWIzoKU7iSniLMrnAMWVk2lIrM5jM18iYT+OlcexQR0YFNlauM6Ua+rHok
-U14KVuaDqZW/DLIsAkyHN/6hj4614nFY0S9esgnucjAioL6aDYU=
-=f/1O
+klDYyxAArIcHGMmC+MyyXCF0Ts4lKUgq6dPek0yFfEI4IyX+Ck4+/DF3BubUjE9D
+fVOaA3EzsaJfNb69W07mnhvKgM3Z+KUkdeZ8xn9PBn9unNhliDa/xQkKjscuXR86
+gy7QEfabkSeBbAPNgaQjSw/h/zJJp7TBr0wZtxl8hATk9yR6W+/th5xKOfoXa7kB
+wdq1sQXIxWDQ9j3q7yx6sJtkFT/jf+JvJev+dMmsKX7T3qAyBkYQdMxe3fEVv3zy
+bisqO7KC5r87i6Zj/kh3oG4l9W62CrDP+nZtSR4th2uCo7rAiFoSFNLlZOBgbd+R
+pC92v++aVLfU8PkB3hUDvtnUI4c3H2L6+dm9lMA2NVyA62JrUzblshWJC1EtWZQ5
+ydD6uaf6RPdn/Lq9BjPV5Ql4+PrDLSCQHjd0XJtETXI4Wzx163ax2zgmC85Xw/+6
+s1DgSeT3AQ5eMus8WoGCwXw+GVcUuTIh2aLIIgRQt+BbDInQFXKzKHsulYM1soK7
+E7vLi75t007yOTNxk5foZlM2DiSLj4WK+I+10BqWMUbJacTYWE+xaFrOqH88OVWf
+lZiKkjWTP3iwri9fl4OqeSnKXYPkAiLJswERVTCsOvaTWifzbAphKFz5hUC7QEIl
+34MRpQYNv05CmXnbd+pnut5yyMGoqPFCt3PH0Aq80AC1OmyEl7s=
+=GkPy
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 4e4f35779613..8b42546ba3f6 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 26 Jan 2023 18:39:47 +0000
+Fri, 27 Jan 2023 00:39:51 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d07234747595..789ff1bf8839 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jan 26 06:39:46 PM UTC 2023
+Fri Jan 27 12:39:50 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ddce3670a362..833c287936df 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 26 Jan 2023 18:45:01 +0000
+Fri, 27 Jan 2023 00:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e7650443b0e2..a191ce971467 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-767f330dc943c2fcab1e7a38f91655b8028164d0 1674757018 2023-01-26T18:16:58+00:00
+3d40adc41670353ede797ddc59b705f0164d45b4 1674779360 2023-01-27T00:29:20+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 276fb529e1de..0f54856e5100 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1674758401 Thu 26 Jan 2023 06:40:01 PM UTC
+1674780001 Fri 27 Jan 2023 12:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 4e4f35779613..4d50e00150bb 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 26 Jan 2023 18:39:47 +0000
+Fri, 27 Jan 2023 00:39:50 +0000
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index e369b61c0aa2..8bff01a9b1bc 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index 64ccc11f28bc..a89dcb8e22d4 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,8 +1,6 @@
 AUX cvmfs-2.7.2-builtins.patch 3672 BLAKE2B 80c5851c45150384a2c40b962f1e58b2bde5e1111c3b8c9f18aef126569ffd13461408abacd29d6990db3c5633e987440da34a09ecfb0193ec8e3e1d6c3c2328 SHA512 f064cf7d9c8cbbfec68fc67bac4c91c7266b8eabc0be28b30ce8402d39a1a95d15ef9c929a7ef5f887e3058914717c1906e2f0b749fec89475a7a68b1a7f1d54
 AUX cvmfs-2.7.2-find-package.patch 1412 BLAKE2B c66a614a1aa7451ecac2cceb892c370db94d715e2ce97ddad22fbc16e85c8c602a2c561ae859e2eccb973144bd803d279029a14f9f591f641265ac9e89e89aa1 SHA512 3a525c50165c83a7079f7d1b51441e7a1e6c230ac76d742b7833506c98f13685339dcf86d1c8697086b195ff33775996e2f9d6e0d825cbdedc190aaa3ea427d0
 AUX cvmfs-2.9.2-include-ctime.patch 274 BLAKE2B c0c0aebb4e9b8bef114c06a3fbd2a6aa535ee469ce6b3967bc9cff4743eac9e923c6a4cde74cbd7e988aff70022fc151f7745230d7517d09060e8d62f2bfef91 SHA512 1518dee2b016b5c7bf8c99e0f86a5da87d5dcd37a3d25f6dfb5afc0906ea41e67747dd37360a7e6da8557f8e4aa8587c317a4f105c4954b227aeb28190524ef9
-DIST cvmfs-2.9.2.tar.gz 70806074 BLAKE2B aeb7a246331e2e8453285582934e4da337ff6730f5b826db907b76773968b89138e9e7cc43d7422b5e7588e81b97e7dc0c0f5ea03e6bde89d55297cbab75f70c SHA512 7742678a227a22a8e17bbdba21e68b0e188ccae8e483906cae005d15ff465f60b407f5fc29183b0272ca9572c3512ffc9596b4c9dda764e6adf5edcec97d4547
 DIST cvmfs-2.9.4.tar.gz 70494380 BLAKE2B 615834c37f555e70ef5530bed02ac6593ca2b403b6bb27ce97316a58350f387571a2f0c7dada585d80fc0300319fb532e4d89f1efb8bb0dcc42e15ad7efb4ab6 SHA512 1150816bdb56ebe1ed886040d6a0bbcb61cba07122f3dc01307d14fa40942f8d4aca5d66a9a21388bd68cdee67b6818088cc5022f794b754968348357f510fff
-EBUILD cvmfs-2.9.2.ebuild 2363 BLAKE2B 8bb21a5aebe78cdc4235d846750247c09a7b15561bf952e10e03d9ba5c6d06c3b1732f73256cbe1ca56b3473a70267352752d7de2704f9ec0c65b2c06c9c44c0 SHA512 3c7da2d9dee7910795db22ea0ceb3d593bae9284e584020d2ef05923b524dbe16ef718ba1edddab2cbb4cf5951d48cdb8485f22748b5c58890376bfe42bf4465
 EBUILD cvmfs-2.9.4.ebuild 2363 BLAKE2B a34659b2ab8baab45598cf15f3b527f21c7175c6de9a17c617b138a53b98f1a001d13338cb7edd169980e131085cc01c577a77bf2f48ae20a3df015279dd1ca7 SHA512 2b48e0420b28f4368158366fac7debbc1f9c83df2eb6e12fea11febb38ed8f44f9e843a44fb33ba91fb3b09533c7d41cce6d44adf1a27f8d3af7e8cbe11b7c84
 MISC metadata.xml 1332 BLAKE2B ad7f06c80b66cf55f6734da058bd21efc10fc8c02165da01c1b5a96f81f4ba0c0f874768482ed271560ae711e862c2b4fea5a92aa09763d45a9a103574409cad SHA512 9fab3df5e006e4b34cbf22b4f9b6f5235d4c1937f8b1e69a41637988c48f2ba583f988c9fff07ccfc7b285ddc9058ca08f660d22211b97cf06a580b3794b27a7
diff --git a/net-fs/cvmfs/cvmfs-2.9.2.ebuild b/net-fs/cvmfs/cvmfs-2.9.2.ebuild
deleted file mode 100644
index a6349928b3c2..000000000000
--- a/net-fs/cvmfs/cvmfs-2.9.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info bash-completion-r1
-
-DESCRIPTION="HTTP read-only file system for distributing software"
-HOMEPAGE="https://cernvm.cern.ch/fs/"
-SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE="server"
-
-CDEPEND="
-	acct-group/cvmfs
-	acct-user/cvmfs
-	app-arch/libarchive
-	dev-cpp/gtest
-	dev-cpp/sparsehash
-	dev-db/sqlite:3=
-	<dev-libs/leveldb-1.23:0=
-	dev-libs/openssl:0=
-	dev-libs/protobuf:0=
-	net-dns/c-ares:0=
-	net-libs/pacparser:0=
-	net-misc/curl:0[adns]
-	sys-apps/attr
-	sys-fs/fuse:0=
-	sys-fs/fuse:3=
-	sys-libs/libcap:0=
-	sys-libs/zlib:0=
-"
-
-RDEPEND="${CDEPEND}
-	app-admin/sudo
-	net-fs/autofs
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-		"${FILESDIR}"/${PN}-2.7.2-builtins.patch
-		"${FILESDIR}"/${PN}-2.7.2-find-package.patch
-		"${FILESDIR}"/${PN}-2.9.2-include-ctime.patch
-)
-
-pkg_setup() {
-	if use server; then
-		CONFIG_CHECK="~OVERLAY_FS"
-		ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	# gentoo stuff
-	rm bootstrap.sh || die
-	sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die
-	sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
-		CMakeLists.txt || die
-	eapply_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILTIN_EXTERNALS=OFF
-		-DBUILD_CVMFS=ON
-		-DBUILD_LIBCVMFS=OFF # static library used only for development
-		-DBUILD_DOCUMENTATION=OFF
-		-DBUILD_GEOAPI=OFF # only used for stratum 1 servers
-		-DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
-		-DBUILD_PRELOADER=OFF # special purpose utility for HPCs
-		-DBUILD_RECEIVER=OFF # for distributed publishers only
-		-DBUILD_SERVER=$(usex server)
-		-DINSTALL_BASH_COMPLETION=OFF
-		-DINSTALL_MOUNT_SCRIPTS=ON
-		-DINSTALL_PUBLIC_KEYS=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs_config
-	bashcomp_alias cvmfs_config cvmfs_server
-	dodoc doc/*.md
-	keepdir /var/lib/cvmfs
-	use server && keepdir /var/lib/cvmfs-server
-}
-
-pkg_config() {
-	einfo "Setting up CernVM-FS client"
-	cvmfs_config setup
-	einfo "Now edit ${EROOT}/etc/cvmfs/default.local"
-	einfo "and restart the autofs service"
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 1d8079f59b27..20625fca18c5 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 18d8cedcae06..50505b95e359 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -4,16 +4,8 @@ AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c19
 AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c50b0521b99cb80e9b793a78de3de0e0e89d56553c32f3a6566015dd2c4fd77c812577f6f637d7a SHA512 fa3a6f52dc733d27f954299cfb32fc813ef731e1d124096450f7b53f0e4fce9f41cf48b66651d1f5383c18bdca8a87d6bbe03c65dc8a5f9a58660bb8db0040a1
 AUX tor.service 1050 BLAKE2B 7f6553b9f4b928f0c924d73ee6f9df8a99ee75ec1801f6b865a7d8e40ff30290bf836907b561586d0f429b7ddf05286ab51974d207906a0fe52cb2fbcc8e160f SHA512 786481b20d7cab9696656c5136ff74c9c2aaa73ca3d63b163a294b9b3c4b628da387cb5ec3ada81277ca81cff16ead5162f3b4d64cb0d773c22f2e4607c3194b
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
-DIST tor-0.4.7.11.tar.gz 7983705 BLAKE2B 2d743e7d0aea63e76f6e24aa235792af8691fde419f56bbdf8c6ee865250a09ec06454ec84abac8ba47e3d61a363c937fc050376172d3ec6b0815998d1c8679e SHA512 318377916880310438aa9804d1ea0154c5416d6b13988c4ff7f2e65fd38c94e2cd6c53252fd76a4dcb488f452837468e19197bf5feee4020e3c1927a76ed2937
-DIST tor-0.4.7.11.tar.gz.sha256sum 86 BLAKE2B 1e49ba88ae21af6589a9815603ee375cc0dc85fcd8dd5a5f52cd44659438874ae9d10b09b7f15cadd2c30d2e8012a27be4233dcb19195d4627f19a59ccf68d0b SHA512 cfdae54a70dc0d8eb0eaf8b8c9902a7dd8bc8d597a678d5a0bf431c3e09a8b56206b70b6f9207e3c06e1ba11913b25b81d7c269e49cde5f297ff7b165a3348a9
-DIST tor-0.4.7.11.tar.gz.sha256sum.asc 716 BLAKE2B 2336ff3869b3a759626cd68c0c931dbdb6cf5b13e7a99e2dcc1c784e3832ba2f0314c1c2f3a9e5ccaba3f20d7aab9b9c918373194290769e358cbb5411323012 SHA512 b5e3c82378bc18268d6d4523787e12ece39246cc0f035fd1aedc50c2182d1ba3d2a8f8817a3dada2cd60acabb78f604f06ab347b92c6f42a82f260cc49285c2c
-DIST tor-0.4.7.12.tar.gz 8009573 BLAKE2B 13e9a796d9e5b024aa01b9aaab389b580df41641013721e4c2821cfee4edc6fb562d997be70ecc3908ac5e43187978b1be63f78ac72c73e8ea3617d6b5cf1ea9 SHA512 b97a6cc3fd3353cc1cdbb47df6d8895d0f730967083171795be56ffab4660c9a0f8f73ce83a98eff1fbd0793bae28c987d53c29f57fc5e0f26dddc30c197abb2
-DIST tor-0.4.7.12.tar.gz.sha256sum 86 BLAKE2B 0402bdf641c8142f91df7a80ad726ce3a1eeb3265f385b5b818440e6c25a5424db467714baee0dfaaf61edf482814a1de5c4d53fd4d61a26c194037a71928580 SHA512 c9a197bb563b05632cc5bfe4dfe5d2dd02427591816997726e2fbc9ec94b17d52295f33c946bea51ac6a2ef76d94a14b9e96daf951eeab57a8ee0d7d513c62c1
-DIST tor-0.4.7.12.tar.gz.sha256sum.asc 716 BLAKE2B c148062a35e232d08cd1e0971e467cddee7836932984f778ab923ff38e717c2a8f3985ff63591002b179eaeb12e04b066366a2a3ed76e00d436a76f0eacaea67 SHA512 afa1208758f0b385cea36660db4739353237b5a4608c374db9115e3584ba96bdabe18ea811752a847eb3e5012919c9f3ed06129f1ec40465d18dc27de4b961fc
 DIST tor-0.4.7.13.tar.gz 8031948 BLAKE2B 338a0a541423f27f594a091307b5edeafc9826bb651c2bd050f3282c9355d9d43d1ef4791f3c98a37dc4c0f64bc40925ea1c1e32cbdff78b1a7308df501f279a SHA512 0900416887afbb24f7b72e6ef181b7b01308d1bb35c37736f3b13e06810a07febf9f47fadd9ff6c0e73204d93b49545e4e2516906eb3ba74398ad2b299f530be
 DIST tor-0.4.7.13.tar.gz.sha256sum 86 BLAKE2B 339db9869bfe485cbd328fe942cc23e60c08ad67fc2d9e7927ed3c9f3b606192e5efac34013c5bf0b0e8b26e957dcf8b586e1cc0a0c27756b8b3d823af37fdee SHA512 ec1d19fa662255df5dd575ba943f4ccb30d9dfa49ff656cdfa73df2d24248b52a3bfd715f4d3efe11d8129968b0e06e3c75e8d82416e1807020ebf65f65401a0
 DIST tor-0.4.7.13.tar.gz.sha256sum.asc 716 BLAKE2B 968a3852293ab9bcadac626862c9dc360b17de5afd00af7c46358fa2adfc03b55c02dfe029e9427efba999f553489a04388b395e8fb8fe16325e0895663c2deb SHA512 eb78e8369941d8de833e3616a9a1c1e59b0d3dde918353e2f4fa5eb5da09f038238c46f5e180844bd3cba1211a9daa6d60e9ddb5690998e27a6b7d1616aa20cc
-EBUILD tor-0.4.7.11.ebuild 3182 BLAKE2B bcb0a67222e5d174e2e97a3d6c2cdc29797ba42500e82b8e7be228c646e298b354f072a0c33941a390e14efc8bb4c1a8069f8699aaea8b665eb3da108dacfdda SHA512 57a1d5b55ebffbfe78689b8eac2d4fb42a87fb04562f8bab6047fc9664563ff39d3ff85d8069117b682b042bf37468c62eb61e13612e7825a72d645bcd329e58
-EBUILD tor-0.4.7.12.ebuild 3182 BLAKE2B 8eb79b7b7e93f2de8abf11dc9183af08d4ec3c3e4adb62822164cc3e60cd3c6cf9b3e3aa631af56dd28f213d5e9d13235961260e460d20174cbc839baf46c242 SHA512 7c3a35a5cc34c03c1221272088e82d1004f4917a19de4fcbf1169a07c53dd58f21f0b2eadd44fdf6b1757d3f8f11fd5de6635780e7af085e8fa2fd6821a7cfd0
 EBUILD tor-0.4.7.13.ebuild 3182 BLAKE2B 8eb79b7b7e93f2de8abf11dc9183af08d4ec3c3e4adb62822164cc3e60cd3c6cf9b3e3aa631af56dd28f213d5e9d13235961260e460d20174cbc839baf46c242 SHA512 7c3a35a5cc34c03c1221272088e82d1004f4917a19de4fcbf1169a07c53dd58f21f0b2eadd44fdf6b1757d3f8f11fd5de6635780e7af085e8fa2fd6821a7cfd0
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/tor-0.4.7.11.ebuild b/net-vpn/tor/tor-0.4.7.11.ebuild
deleted file mode 100644
index 1607de5e6b5e..000000000000
--- a/net-vpn/tor/tor-0.4.7.11.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit python-any-r1 readme.gentoo-r1 systemd verify-sig
-
-MY_PV="$(ver_rs 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="https://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
-	verify-sig? (
-		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum
-		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.asc
-	)"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
-fi
-IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
-RESTRICT="!test? ( test )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
-
-BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 )"
-DEPEND="
-	dev-libs/libevent:=[ssl]
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	man? ( app-text/asciidoc )
-	dev-libs/openssl:0=[-bindist(-)]
-	lzma? ( app-arch/xz-utils )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
-	systemd? ( sys-apps/systemd )
-	zstd? ( app-arch/zstd )"
-RDEPEND="
-	acct-user/tor
-	acct-group/tor
-	${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-# bug #764260
-DEPEND+="
-	test? (
-		${DEPEND}
-		${PYTHON_DEPS}
-	)"
-
-DOCS=()
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-)
-
-# EAPI 8 tries to append it but it doesn't exist here
-# bug #831311 etc
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_detached ${MY_PF}.tar.gz.sha256sum{,.asc}
-		verify-sig_verify_unsigned_checksums \
-			${MY_PF}.tar.gz.sha256sum sha256 ${MY_PF}.tar.gz
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-src_configure() {
-	use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING )
-	export ac_cv_lib_cap_cap_init=$(usex caps)
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--disable-all-bugs-are-fatal \
-		--enable-system-torrc \
-		--disable-android \
-		--disable-html-manual \
-		--disable-libfuzzer \
-		--enable-missing-doc-warnings \
-		--disable-module-dirauth \
-		--enable-pic \
-		--disable-restart-debugging \
-		--disable-zstd-advanced-apis  \
-		$(use_enable man asciidoc) \
-		$(use_enable man manpage) \
-		$(use_enable lzma) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable server module-relay) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage) \
-		$(use_enable zstd)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r9 tor
-	systemd_dounit "${FILESDIR}"/tor.service
-
-	keepdir /var/lib/tor
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r2 torrc
-}
diff --git a/net-vpn/tor/tor-0.4.7.12.ebuild b/net-vpn/tor/tor-0.4.7.12.ebuild
deleted file mode 100644
index 5f40c3f7c6e0..000000000000
--- a/net-vpn/tor/tor-0.4.7.12.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit python-any-r1 readme.gentoo-r1 systemd verify-sig
-
-MY_PV="$(ver_rs 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="https://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
-	verify-sig? (
-		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum
-		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.asc
-	)"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
-fi
-IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
-RESTRICT="!test? ( test )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
-
-BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20221213 )"
-DEPEND="
-	dev-libs/libevent:=[ssl]
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	man? ( app-text/asciidoc )
-	dev-libs/openssl:0=[-bindist(-)]
-	lzma? ( app-arch/xz-utils )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
-	systemd? ( sys-apps/systemd )
-	zstd? ( app-arch/zstd )"
-RDEPEND="
-	acct-user/tor
-	acct-group/tor
-	${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-# bug #764260
-DEPEND+="
-	test? (
-		${DEPEND}
-		${PYTHON_DEPS}
-	)"
-
-DOCS=()
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-)
-
-# EAPI 8 tries to append it but it doesn't exist here
-# bug #831311 etc
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_detached ${MY_PF}.tar.gz.sha256sum{,.asc}
-		verify-sig_verify_unsigned_checksums \
-			${MY_PF}.tar.gz.sha256sum sha256 ${MY_PF}.tar.gz
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-src_configure() {
-	use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING )
-	export ac_cv_lib_cap_cap_init=$(usex caps)
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--disable-all-bugs-are-fatal \
-		--enable-system-torrc \
-		--disable-android \
-		--disable-html-manual \
-		--disable-libfuzzer \
-		--enable-missing-doc-warnings \
-		--disable-module-dirauth \
-		--enable-pic \
-		--disable-restart-debugging \
-		--disable-zstd-advanced-apis  \
-		$(use_enable man asciidoc) \
-		$(use_enable man manpage) \
-		$(use_enable lzma) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable server module-relay) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage) \
-		$(use_enable zstd)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r9 tor
-	systemd_dounit "${FILESDIR}"/tor.service
-
-	keepdir /var/lib/tor
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r2 torrc
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a6aeff955980..73bf2a774f61 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 075b3782a5df..6551af4f652f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -958,68 +958,6 @@ dev-qt/qtwebsockets:6
 # should update to that. #841437
 ~sci-physics/bullet-3.22b
 
-# Alfredo Tupone <tupone@gentoo.org> (2022-04-27)
-# New release of janestreet packages need to tested
-dev-ml/sexplib0:0/0.15
-dev-ml/sexplib:0/0.15
-dev-ml/base:0/0.15
-dev-ml/stdio:0/0.15
-dev-ml/ppx_sexp_conv:0/0.15
-dev-ml/ppx_enumerate:0/0.15
-dev-ml/ppx_compare:0/0.15
-dev-ml/ppx_hash:0/0.15
-dev-ml/ppx_cold:0/0.15
-dev-ml/parsexp:0/0.15
-dev-ml/ppx_base:0/0.15
-dev-ml/ppx_fields_conv:0/0.15
-dev-ml/ppx_here:0/0.15
-dev-ml/ppx_let:0/0.15
-dev-ml/ppx_sexp_message:0/0.15
-dev-ml/ppx_sexp_value:0/0.15
-dev-ml/ppx_assert:0/0.15
-dev-ml/ppx_optcomp:0/0.15
-dev-ml/time_now:0/0.15
-dev-ml/ppx_inline_test:0/0.15
-dev-ml/ppx_bench:0/0.15
-dev-ml/splittable_random:0/0.15
-dev-ml/base_quickcheck:0/0.15
-dev-ml/ppx_bin_prot:0/0.15
-dev-ml/ppx_custom_printf:0/0.15
-dev-ml/ppx_disable_unused_warnings:0/0.15
-dev-ml/ppx_expect:0/0.15
-dev-ml/ppx_fixed_literal:0/0.15
-dev-ml/ppx_log:0/0.15
-dev-ml/ppx_module_timer:0/0.15
-dev-ml/ppx_optional:0/0.15
-dev-ml/ppx_stable:0/0.15
-dev-ml/ppx_string:0/0.15
-dev-ml/typerep:0/0.15
-dev-ml/ppx_typerep_conv:0/0.15
-dev-ml/variantslib:0/0.15
-dev-ml/ppx_variants_conv:0/0.15
-dev-ml/ppx_jane:0/0.15
-dev-ml/int_repr:0/0.15
-dev-ml/base_bigstring:0/0.15
-dev-ml/ppx_js_style:0/0.15
-dev-ml/core:0/0.15
-dev-ml/core_kernel:0/0.15
-dev-ml/sexp_pretty:0/0.15
-dev-ml/expect_test_helpers_core:0/0.15
-dev-ml/timezone:0/0.15
-dev-ml/core_unix:0/0.15
-dev-ml/textutils_kernel:0/0.15
-dev-ml/textutils:0/0.15
-dev-ml/async_kernel:0/0.15
-dev-ml/protocol_version_header:0/0.15
-dev-ml/async_rpc_kernel:0/0.15
-dev-ml/async_unix:0/0.15
-dev-ml/async:0/0.15
-dev-ml/async_extra:0/0.15
-dev-ml/core_bench:0/0.15
-dev-ml/patience_diff:0/0.15
-dev-util/patdiff:0/0.15
-=dev-ml/alcotest-1.6.0*
-
 # Maciej Barć <xgqt@gentoo.org> (2022-02-20)
 # Masked for testing, builds and passes tests but randomly segfaults,
 # meaningless backtrace, debugging (flags, symbols) do not help
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0e388eb20929..5b7018036945 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2934,7 +2934,6 @@ games-arcade/moleinvasion:music - Download and install the music files
 games-arcade/oshu:osu-skin - Include more complete osu-skin (other is minimal)
 games-arcade/performous:midi - Enable MIDI I/O support
 games-arcade/performous:songs - Install a few demo songs
-games-arcade/performous:tools - Enable building of song extraction utilities for SingStar and Guitar Hero
 games-arcade/performous:webcam - Enable Webcam support
 games-arcade/tuxanci:physfs - Use dev-games/physfs instead of dev-libs/libzip to load compressed data
 games-board/cockatrice:client - Build with client
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 16d77e79781f..7139e2593dd7 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/libigl/Manifest b/sci-libs/libigl/Manifest
index 5066fe0d9d32..7de7212b57a3 100644
--- a/sci-libs/libigl/Manifest
+++ b/sci-libs/libigl/Manifest
@@ -1,5 +1,3 @@
-DIST libigl-2.3.0.tar.gz 1132299 BLAKE2B f6a61666aafff76ce004d99191ae52d625fc2960909802c02a7359c6a81767315a2109a8878964da7a4ad9cc0121471d42ed6ec25bc9cdcbdb100b0b7d174eb4 SHA512 41fbb3660e61457c3d6c52de4d17e0bfa56eb48eab82013c8095ce753c24ecff389365f91dbcf316cc422c09f713745251e32bddf4deff23fe5e428b9797da19
 DIST libigl-2.4.0.tar.gz 1124759 BLAKE2B c2ba37192f2603a3ab0052aeb14f7706322364183c297af38ea88af8937bc7d76f0e3cc248a8e88c6bf2ad7ce2d9568d6e446a60c5da905fd4a235a706c4289c SHA512 f9e19c6d9a7fa2afe12c0a4042c3cc46606413d7f79b20e2464021fc0c5d9730e0ab2c192e5b4f161f3bc3a42a654929a2e77baac44c3eddad486f709cf909a1
-EBUILD libigl-2.3.0.ebuild 1141 BLAKE2B bde255c8870ef283bd2d22a99cb2bd73ea5e48cf5f829c7c28628d60e621f5c60bbc871f91bd8936060f69bba42e243e5f4c05dbf8925c38d07accb5f530b383 SHA512 a5f2a847a92fbdb35f280947bda4314c14797b73422e3286ddcde7ac206a479762aa51634e83594577bec0feff8e6098ff603fd605522fa95bec5ef723202e5d
 EBUILD libigl-2.4.0.ebuild 1256 BLAKE2B 4d028689ff87ca6c452aa2f869074f829d227d3c2361d8dc0d22a23e9af5542eeb541b873d6f59f4fa12ccd6eeedb941339499f194fadf7814d3e3e6a069fc79 SHA512 0fa15852c8020ae8b04a9c8990526cd331279680e572a64cbadf2e06b19a83b8b63f9050673fe41dc0e124903f0e0f911ca75dea64bdead40a85664f92ce1e50
 MISC metadata.xml 880 BLAKE2B 24a2217c24e20564edd4b2021f05a217e10fb6114398e3c01382de650cf2e567f67525972d104b46b437bb933a7e737c309793298e0d7624bdd7f1f5890d9af4 SHA512 a53c2e1472fab941fc5c967b39253eadb43896c600244f5dd8e5591fd073fa0ec03de98bc8c8aefab9eaefaf0a62a5843237a5cdc72d15deda439b77488ac895
diff --git a/sci-libs/libigl/libigl-2.3.0.ebuild b/sci-libs/libigl/libigl-2.3.0.ebuild
deleted file mode 100644
index 3b0dfd878e96..000000000000
--- a/sci-libs/libigl/libigl-2.3.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A simple C++ geometry processing library"
-HOMEPAGE="https://libigl.github.io/"
-SRC_URI="https://github.com/libigl/libigl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="dev-cpp/eigen:3"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBIGL_BUILD_TESTS=OFF
-		-DLIBIGL_BUILD_TUTORIALS=OFF
-		-DLIBIGL_SKIP_DOWNLOAD=ON
-		-DLIBIGL_USE_STATIC_LIBRARY=$(usex static-libs)
-		-DLIBIGL_WITH_CGAL=OFF
-		-DLIBIGL_WITH_COMISO=OFF
-		-DLIBIGL_WITH_EMBREE=OFF
-		-DLIBIGL_WITH_MATLAB=OFF
-		-DLIBIGL_WITH_MOSEK=OFF
-		-DLIBIGL_WITH_OPENGL=OFF
-		-DLIBIGL_WITH_OPENGL_GLFW=OFF
-		-DLIBIGL_WITH_OPENGL_GLFW_IMGUI=OFF
-		-DLIBIGL_WITH_PNG=OFF
-		-DLIBIGL_WITH_PREDICATES=OFF
-		-DLIBIGL_WITH_PYTHON=OFF
-		-DLIBIGL_WITH_TETGEN=OFF
-		-DLIBIGL_WITH_TRIANGLE=OFF
-		-DLIBIGL_WITH_XML=OFF
-	)
-	cmake_src_configure
-}
-
-src_install() {
-		cmake_src_install
-
-		# Install won't install all headers
-		insinto /usr/include/
-		doins -r include/igl
-}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index c8f0b27471d4..3458ab847b2f 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index a52dcb3990e6..e645ff5804a1 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -1,12 +1,3 @@
-AUX arb-2.18.0-multilib-strict.patch 590 BLAKE2B 7f438139ff5f0a19db074ea3bfab064da968424520bc81af242b58675657a7cacce0921076cb5525e00e2d6c33f2b75ed898ffdba7ce730855b09f2b7f8863a1 SHA512 ec9de9a642dd4cb859460132ed597474df4eb2b3f28cdf3ebcb5109fedc2866eda91b0d301149d94f71dd67c105a1dda3d0aed94dcfe34c9ff9fc4083ee6817c
-AUX arb-2.21.0-gamma_fmpq-testfix.patch 2291 BLAKE2B 019af88d2e8c56cd9fcab960fd8fca6f0fdb74e69e72866edcd437700761768c78bd0cfa925ed9bac1c33e4e7c958bfca7939b7cef7c1b7186537dd0573e5414 SHA512 fe40677a95996f54121379e5bef0921e13923be80c68a7821177b371d71d4847e4ed903f3bc0c266c6c6de7fae9ede7cbaa59d5927b4bdb3cc7e58d588aaad68
-AUX arb-2.21.0-qa-warning-fix.patch 541 BLAKE2B 22d701fc07e2c3b8ad3fa0603204d7d35a9c9182b6ba9ced2d786866f8a15a4dd07c97a2702d723de98f5e264a5ca107ad24dc99095e46485fb75696114c6909 SHA512 5addd977a49fa5e9ec9847b07a3043d78ce7d7df5d6947ae895dd345424fa1941335e7a3691cee1497036e33b47fe1858e42b07277629956fe0299c4034b2d79
-DIST arb-2.19.0.tar.gz 1606463 BLAKE2B 85d832113ae42737a460198cbf485f825a9435963a888c0d0ab87b7ed7277d158480b573fd8ace42484dd4767bf4f1a372f637cfff01f18c105fd2b62d0d019e SHA512 199d1a26edd01e3b30f7aef69a9ae29456e3db384037744a1e073007ddb93a248873dfe83f3e48f9de58a9d17ebd7dc9a22a058f4adf766599d01d7eb17db204
-DIST arb-2.21.0.tar.gz 1842021 BLAKE2B 1ab3c4d18eb1918eaee9ea9aff68d82fc33a136ff5612e5173bf0cc29e5753f2c002256d68ae7983b5677d5082ab6849c68755e7544cee24144ca4e84e4d8411 SHA512 e441f8325d3095f1d568ebf9018520aedb25b6a066678e870942efcc8ac005dbf10cdffe42bc4fdbce3ba3ac397241c1d92fb54556e444243bd56dd3d5d72664
-DIST arb-2.22.1.tar.gz 1906319 BLAKE2B a302fe35ce5820f8cd7f98831906e9a114e120e6cfd24f42c9d76c9cb67cb232bf9b6b369801d201536552daa8cb7310bbabb7f8924a67d416ada4d37d1fcee1 SHA512 e5092b1b3f828d21a5e18722004aac5af4268b4bdce1d2a7e858485ca59ed77b32661678e229e7a44ebd29678aebe9e6b591f0dd3e1a9751460fc5d72980d0c4
 DIST arb-2.23.0.tar.gz 1989841 BLAKE2B cab9892b903a1f61ac7b37e0a0ee6c78ff78a4ad442ae12f42ad741cf6e251c1ab74b370dc6b912f75d2558a5baa248567e79d4ae90f8d98e16551d6ea90601f SHA512 cd15c1adc1c8a6b7cd7b98f5d32afec3b04f6849998cd8586924a6ebb5fe1a1a6efc250fa7fc1d346b2331daa02a4d07133ee58edeae3cc6684d306c8b78c4ae
-EBUILD arb-2.19.0.ebuild 749 BLAKE2B 05815e6f1635924824d5173ad0558627b5c98923b384d4f0dd2d369b7158acb0923f2f82d7d9ec29cb3f48cb30a402afe3adb3850d60ea60af5d95e4d1633dca SHA512 d7d9d2e1dd92cdc541de0212722b12c2db5eca27b00684f24af34d0829e1de91ecdafb731880d2eda177d363929e3bee3aa68f8a41f277f88b17a1554de01974
-EBUILD arb-2.21.0.ebuild 792 BLAKE2B 1275d14673cb09b748d2dd206f030e2fee431798adf27e629008a73301498d901e8815d5f5908e2b06d878f1ee17082e8138f8070e93d2e275d8c6a1440515d8 SHA512 105fec72bda06488fef22c77988aae8bbdc519256a703694fd2d4939bad4c000766a5c10b25e7739952e4fa927fee7ee4a1f7d4fb8c948ee243892763c6c60f3
-EBUILD arb-2.22.1.ebuild 695 BLAKE2B 09c5a3ff1b4f7a8c431fb275d6b2d709553f2008f2c6cbfe95f85d3ca330c668f245eea49592bef746700cf28d37eaa0854599f58b5f1d971a40816d507682d7 SHA512 bdcf866da232e6faca68816826a7f4f517cddb903d958426cdf3c6f131975fd27677b769538aa7ded7b2cdaa614de51525ae24172baf0fd722262476420e2bf6
 EBUILD arb-2.23.0.ebuild 708 BLAKE2B 2db9a821f5194f4bee19bb8077fcd0ad846cfd467f40350ab91385703a5a0115e22c65d4c6cdcc21120cbabfdad4da162f8aa5506d5a0b6a280e1bf382a04f0f SHA512 0a239c628bf48138b57d2404e33d2cc4c9de7b097bea4161f141c9d0472833c0756590e3ab03fed9e1a5b1156a95cbd3ef680d85dc0da89f68334524d4aab2f5
 MISC metadata.xml 1108 BLAKE2B a2e3c1cf3f6c710c9b3e6fbf629101c3dccc9ae60c80da0d08853669019d7a2a03bb276dbe078cb6cb5ce6060ef7139a3658481d61a6d5e6d25f0cc1593be344 SHA512 2865a818ec7ffb77afc1c849fc960c2c39ec3bf6586b5f67e5c5037c6b6836fff0390224f27b1251a613d07107cf164ca11e05ec2f6988b629bd7e3a476e4854
diff --git a/sci-mathematics/arb/arb-2.19.0.ebuild b/sci-mathematics/arb/arb-2.19.0.ebuild
deleted file mode 100644
index a841702944c9..000000000000
--- a/sci-mathematics/arb/arb-2.19.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-inherit cmake
-
-DESCRIPTION="C library for arbitrary-precision interval arithmetic"
-HOMEPAGE="https://fredrikj.net/arb/"
-SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="GPL-2+"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	sci-mathematics/flint:="
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.18.0-multilib-strict.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-	)
-
-	cmake_src_configure
-}
diff --git a/sci-mathematics/arb/arb-2.21.0.ebuild b/sci-mathematics/arb/arb-2.21.0.ebuild
deleted file mode 100644
index 6d7c604056cd..000000000000
--- a/sci-mathematics/arb/arb-2.21.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-inherit cmake
-
-DESCRIPTION="C library for arbitrary-precision interval arithmetic"
-HOMEPAGE="https://fredrikj.net/arb/"
-SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="GPL-2+"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	sci-mathematics/flint:="
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gamma_fmpq-testfix.patch"
-	"${FILESDIR}/${P}-qa-warning-fix.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-	)
-
-	cmake_src_configure
-}
diff --git a/sci-mathematics/arb/arb-2.22.1.ebuild b/sci-mathematics/arb/arb-2.22.1.ebuild
deleted file mode 100644
index 0c54365c8935..000000000000
--- a/sci-mathematics/arb/arb-2.22.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-inherit cmake
-
-DESCRIPTION="C library for arbitrary-precision interval arithmetic"
-HOMEPAGE="https://fredrikj.net/arb/"
-SRC_URI="https://github.com/fredrik-johansson/arb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="GPL-2+"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	sci-mathematics/flint:="
-
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-	)
-
-	cmake_src_configure
-}
diff --git a/sci-mathematics/arb/files/arb-2.18.0-multilib-strict.patch b/sci-mathematics/arb/files/arb-2.18.0-multilib-strict.patch
deleted file mode 100644
index e45dec9f3742..000000000000
--- a/sci-mathematics/arb/files/arb-2.18.0-multilib-strict.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ec806fe..d6136a8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -136,10 +136,12 @@ if(NOT MSVC)
-     target_link_libraries(arb m)
- endif()
- 
-+include(GNUInstallDirs)
-+
- install(TARGETS arb
--            RUNTIME DESTINATION bin
--            ARCHIVE DESTINATION lib
--            LIBRARY DESTINATION lib
-+            RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
-+            ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
-+            LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
-         )
- 
- foreach (FOLDER ${FOLDERS})
diff --git a/sci-mathematics/arb/files/arb-2.21.0-gamma_fmpq-testfix.patch b/sci-mathematics/arb/files/arb-2.21.0-gamma_fmpq-testfix.patch
deleted file mode 100644
index 179ba8887f32..000000000000
--- a/sci-mathematics/arb/files/arb-2.21.0-gamma_fmpq-testfix.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 450435a84a40acc1871cd84f1caf2ea47c11a18c Mon Sep 17 00:00:00 2001
-From: fredrik <fredrik.johansson@gmail.com>
-Date: Tue, 28 Sep 2021 12:07:45 +0200
-Subject: [PATCH] fix (hopefully) spurious test failures for gamma_fmpq
-
----
- arb_hypgeom/gamma_fmpq.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/arb_hypgeom/gamma_fmpq.c b/arb_hypgeom/gamma_fmpq.c
-index 996a87e5..ee750d0d 100644
---- a/arb_hypgeom/gamma_fmpq.c
-+++ b/arb_hypgeom/gamma_fmpq.c
-@@ -529,22 +529,22 @@ arb_hypgeom_gamma_fmpq_outward(arb_t y, const fmpq_t x, slong prec)
- 
-     if (q == 1 || q == 2 || q == 3 || q == 4 || q == 6)
-     {
--        arb_hypgeom_gamma_small_frac(t, p, q, prec);
-+        arb_hypgeom_gamma_small_frac(t, p, q, prec + 4 * (m != 0));
-     }
-     else
-     {
--        arb_hypgeom_gamma_fmpq_hyp(t, a, prec);
-+        arb_hypgeom_gamma_fmpq_hyp(t, a, prec + 4 * (m != 0));
-     }
- 
-     /* argument reduction */
-     if (m >= 0)
-     {
--        arb_rising_fmpq_ui(u, a, m, prec);
-+        arb_rising_fmpq_ui(u, a, m, prec + 4);
-         arb_mul(y, t, u, prec);
-     }
-     else
-     {
--        arb_rising_fmpq_ui(u, x, -m, prec);
-+        arb_rising_fmpq_ui(u, x, -m, prec + 4);
-         arb_div(y, t, u, prec);
-     }
- 
-@@ -602,7 +602,7 @@ arb_hypgeom_gamma_fmpq_taylor(arb_t y, const fmpq_t x, slong prec)
-     }
- 
-     arb_set_fmpq(t, a, prec + 4);
--    success = arb_hypgeom_gamma_taylor(t, t, 0, prec);
-+    success = arb_hypgeom_gamma_taylor(t, t, 0, prec + 4);
- 
-     if (success)
-     {
-@@ -611,12 +611,12 @@ arb_hypgeom_gamma_fmpq_taylor(arb_t y, const fmpq_t x, slong prec)
- 
-         if (m >= 0)
-         {
--            arb_rising_fmpq_ui(u, a, m, prec);
-+            arb_rising_fmpq_ui(u, a, m, prec + 4);
-             arb_mul(y, t, u, prec);
-         }
-         else
-         {
--            arb_rising_fmpq_ui(u, x, -m, prec);
-+            arb_rising_fmpq_ui(u, x, -m, prec + 4);
-             arb_div(y, t, u, prec);
-         }
- 
-@@ -684,7 +684,7 @@ arb_hypgeom_gamma_fmpq(arb_t y, const fmpq_t x, slong prec)
-         wp = (slong) fmpz_bits(fmpq_numref(x)) - (slong) fmpz_bits(fmpq_denref(x));
-         wp = FLINT_MAX(wp, 0);
-         wp = FLINT_MIN(wp, 4 * prec);
--        wp += prec;
-+        wp += prec + 4;
- 
-         arb_set_fmpq(y, x, wp);
- 
diff --git a/sci-mathematics/arb/files/arb-2.21.0-qa-warning-fix.patch b/sci-mathematics/arb/files/arb-2.21.0-qa-warning-fix.patch
deleted file mode 100644
index dd5440f938de..000000000000
--- a/sci-mathematics/arb/files/arb-2.21.0-qa-warning-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From d271652d3124c9e65a97df310a141c607a0b5ee5 Mon Sep 17 00:00:00 2001
-From: fredrik <fredrik.johansson@gmail.com>
-Date: Wed, 29 Sep 2021 19:55:34 +0200
-Subject: [PATCH] add missing include
-
----
- acb_poly/lgamma_series.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/acb_poly/lgamma_series.c b/acb_poly/lgamma_series.c
-index 504b0cb4..d50ffb9f 100644
---- a/acb_poly/lgamma_series.c
-+++ b/acb_poly/lgamma_series.c
-@@ -10,6 +10,7 @@
- */
- 
- #include "acb_poly.h"
-+#include "acb_hypgeom.h"
- 
- void
- _acb_log_rising_correct_branch(acb_t t,
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e9f4f85b7a7d..30056a5a909c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 6f995b996ee6..4fd1e4261844 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -7,5 +7,6 @@ DIST texinfo-7.0.2.tar.xz 4875424 BLAKE2B 23737cc800392c949add14c1d0a01a294e8c22
 EBUILD texinfo-6.8.ebuild 1717 BLAKE2B 0ce639bd82dac4bcc580415852c093773954c2f33a811133fcb4ee8361e30935b40ba2796bfe807f848bbebe3acf5985fb549f11dfc6d90dbcb397ab0fc959ea SHA512 017f861563fe14381776c7fb62b79b8a99059e63d0f752a4b8dc71559ba57c6c56307ef751bea42b01c1afd3ebfface75c108be260f920f1a1fc6e3ffd72c40f
 EBUILD texinfo-7.0.1-r1.ebuild 1990 BLAKE2B 873fe91105270820749a7313358bc96a9a63f38d9a95f3fccaf7f3babbbcc5f8908ed5f4d00a9fe24778a0644945f0049480845bf57ed8d15493fa24fe118d85 SHA512 7b7c81df07471d4a84de9151d18a753cd581677495ad445306214d647ef9a0ac05ef56b83387584526706728d0e831f882b38fcf909e3d5ac57ddffa203d0d18
 EBUILD texinfo-7.0.1.ebuild 1787 BLAKE2B e275a3450fe2ce726647a347066e0a7730b4a3fdaa8b931f18c56e6b36b3e847773960eb541349e9b85499c52fba3b80c9d2f1ea8a05790106bde3dafde22e82 SHA512 9cdaf80221be13e539633430915a193532c86ce9d9db8db5c7ba573afffcb6f153dfa922fea0ea5d05aba5919941a04de55cfc8c1377f71f6757d24a5d54e2ab
-EBUILD texinfo-7.0.2.ebuild 1883 BLAKE2B 267880406a158a289ed4b6d8ca42aec74531e19cb1914fd2dcdf6be69d0851a143bc8f6b76ad69fbef087727fb3ba78b32fbfa6c803ed5c181897a3c2892ad7d SHA512 961c76ba06977d91bcd38d673230b1fe70350282539e02d3c9a37d5575e510f1ef17d56f00e39fb76bdfde73532a6166d542630da7d6c4ae68a7cde1bacdb62f
+EBUILD texinfo-7.0.2.ebuild 2199 BLAKE2B fee1baa92960369a505a575d04d42676cb9fd833962c71987785a2192c92816476daa4f02427b79cdf8be755c7e2420460c4188adacdf3c3d1afcc1322e0844d SHA512 c59ea9f01268ba1c3bec0fdb31af6e68764dfdd3a5cd44680523b5fac767874ffae253db19e58be22b50f0c4920842f34fb6e2af03fd3fd831b093a321f6c3ec
+EBUILD texinfo-9999.ebuild 2199 BLAKE2B fee1baa92960369a505a575d04d42676cb9fd833962c71987785a2192c92816476daa4f02427b79cdf8be755c7e2420460c4188adacdf3c3d1afcc1322e0844d SHA512 c59ea9f01268ba1c3bec0fdb31af6e68764dfdd3a5cd44680523b5fac767874ffae253db19e58be22b50f0c4920842f34fb6e2af03fd3fd831b093a321f6c3ec
 MISC metadata.xml 588 BLAKE2B 4e5549f1b07df4c081d2cc03691f0f8ba13c0f8f86807a7e5e87ea618080895a2714f169e9a1294226e71207ed88586a027092a328ab618f417ae3a74ac2586b SHA512 343c287a2c0c7f7bcbd5a40373c0aebe718d46042947abcb8364fed0aeb6dd7e585e9d226ef5bfb0084074d085510e802faf3a3c08b1489ed35556b6c14d1015
diff --git a/sys-apps/texinfo/texinfo-7.0.2.ebuild b/sys-apps/texinfo/texinfo-7.0.2.ebuild
index 2e06ad1a4026..ab957b84c675 100644
--- a/sys-apps/texinfo/texinfo-7.0.2.ebuild
+++ b/sys-apps/texinfo/texinfo-7.0.2.ebuild
@@ -12,11 +12,21 @@ inherit flag-o-matic toolchain-funcs
 DESCRIPTION="The GNU info program and utilities"
 HOMEPAGE="https://www.gnu.org/software/texinfo/"
 
-if [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git"
+	REGEN_BDEPEND="
+		>=sys-devel/autoconf-2.62
+		>=sys-devel/automake-1.16
+		sys-devel/libtool
+	"
+elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
+	REGEN_BDEPEND=""
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	REGEN_BDEPEND=""
 fi
 
 LICENSE="GPL-3+"
@@ -34,12 +44,17 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${REGEN_BDEPEND}
 	nls? ( >=sys-devel/gettext-0.19.6 )
 "
 
 src_prepare() {
 	default
 
+	if [[ ${PV} == 9999 ]]; then
+		./autogen.sh || die
+	fi
+
 	# Needed if a patch touches install-info.c
 	#touch man/install-info.1 || die
 
diff --git a/sys-apps/texinfo/texinfo-9999.ebuild b/sys-apps/texinfo/texinfo-9999.ebuild
new file mode 100644
index 000000000000..ab957b84c675
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-9999.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: if your package uses the texi2dvi utility, it must depend on the
+# virtual/texi2dvi package to pull in all the right deps.  The tool is not
+# usable out-of-the-box because it requires the large tex packages.
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU info program and utilities"
+HOMEPAGE="https://www.gnu.org/software/texinfo/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git"
+	REGEN_BDEPEND="
+		>=sys-devel/autoconf-2.62
+		>=sys-devel/automake-1.16
+		sys-devel/libtool
+	"
+elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
+	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
+	REGEN_BDEPEND=""
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	REGEN_BDEPEND=""
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="nls +standalone static"
+
+RDEPEND="
+	!=app-text/tetex-2*
+	>=sys-libs/ncurses-5.2-r2:=
+	virtual/perl-Data-Dumper
+	virtual/perl-Encode
+	standalone? ( >=dev-lang/perl-5.8.1 )
+	!standalone?  ( >=dev-lang/perl-5.8.1:= )
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${REGEN_BDEPEND}
+	nls? ( >=sys-devel/gettext-0.19.6 )
+"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		./autogen.sh || die
+	fi
+
+	# Needed if a patch touches install-info.c
+	#touch man/install-info.1 || die
+
+	if use prefix ; then
+		sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die
+		touch {doc,man}/{texi2dvi,texi2pdf,pdftexi2dvi}.1 || die
+	fi
+}
+
+src_configure() {
+	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions
+	# bug #622576
+	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}"
+	local -x PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
+
+	use static && append-ldflags -static
+
+	local myeconfargs=(
+		--cache-file="${S}"/config.cache
+		$(use_enable nls)
+		$(use_enable !standalone perl-xs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index b154f40cca74..879aa901c513 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/ndctl/Manifest b/sys-block/ndctl/Manifest
index 47faf949c544..e4499235c279 100644
--- a/sys-block/ndctl/Manifest
+++ b/sys-block/ndctl/Manifest
@@ -1,6 +1,8 @@
 AUX ndctl-71.1-bash-completion-configure.patch 1717 BLAKE2B 167bc8e1bdb8fb9c31451c7ca7ed0edd28ecdc03185a06d96b125a604b34816df1927788d5208d229704778c356d26cd41b2d031af29e66686d0dbd0c2206f74 SHA512 b688bc49e413cb41c0b611f304a91f074a99fbcd60393c18d36435a7e3fa0a4326bf2107ff731adda96d0f14b57cf37d265de6156e903f43beec225cf8a7474f
 DIST ndctl-71.1.tar.gz 330512 BLAKE2B 582f29fb649f33a48b5412bfefc15de2b1f765b27251d1b8a472d8c7705d671acbd6bf646f737baf8556d8fda39db68242f44e11225d7305e95f5d2ec5931f31 SHA512 92fb06ca64455775ce0b89ba0846f70235e02fe3502e2a8a55a858f76f87cb90ae98f5bf01620e5884f667ea78ee2bee2cd9e7a85ffa8f8d9c456e9282ca9ebc
 DIST ndctl-72.1.tar.gz 365324 BLAKE2B 2e061bd1357c0b422f728e8624106d93e9eed2f5c7795428b0c61d041ab45569aa8bb6eb52544360ad538be85f3b7f84f8c9ab1037a8ca5498c2e1a13fa22186 SHA512 7304e23121c99457fa6e22a399fb636f6a66d6d07b090463ec41e424687b06e7e8a1a18623ab9dd5783aaccfa09ff964e3477b63aaa4614ac60f6e6050452f12
+DIST ndctl-75.tar.gz 415393 BLAKE2B f9081b09c2f4ad8a6bc9c53e792b8a49992c7089af09e39917efe0fceea800d81665a31bf14c8e2f6f83c57d1dccebb4513b9bb556a3e81c19c75fbc67e1d7e3 SHA512 0af960e43a363711fbdb5152bb670022bd9b2f6a269c153dd88dca4ad2dcc215679c354ebcc758e9376867462f82c21aebe62bc62ca27333dedf3a818f34b272
 EBUILD ndctl-71.1-r2.ebuild 1250 BLAKE2B 32a258fed028d6f3f17259b3377283373fc364c407bd6e925d4e15fda59402475f1a812d9a79656dccf7984cdbb0715a3b6ed118f466a1933b9d3037d1ae502f SHA512 a6b3797439595ed62a73e598d938d3c6213855e8771ee1b9e3d51ff2d6dfa5ccb70f110006ab26eb54fdd0c4d000b00ec55970eb2458db51d4d6484fbcb5666f
 EBUILD ndctl-72.1.ebuild 1400 BLAKE2B 7e02ccfdf667d270256678c3dd8afe0518b509144578ca32c823a49d49f163172f889fcbff25894ef05b2bd17b6f8828abd376a2da86dbf1c51c99e688a7be0a SHA512 965f02e6ac8d466e0b4e221a9557c30eb2b569287de8f9d4bbb5982da0d143f45a1d7fa72560d4933594ac65d881380ec7a0b4991e4fe71175198cdb91d3644d
+EBUILD ndctl-75.ebuild 1372 BLAKE2B a1639041550fa11087a0bedd32ab8a0c75d5bfdcbe19f253715d3aa503b1008d1c373c5fc33185453fc425f0fcbba3144c382196fe70c4cf13db74898704874f SHA512 8507e9155fbf638fd2d0802a7b3cb7d57f32c80ff76651a68a86042c975b70fb14248ad8b51ce984953e632850341a6a1a361d8d644dbb9a2347091262cd995c
 MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/sys-block/ndctl/ndctl-75.ebuild b/sys-block/ndctl/ndctl-75.ebuild
new file mode 100644
index 000000000000..6c45f09b498f
--- /dev/null
+++ b/sys-block/ndctl/ndctl-75.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit udev meson bash-completion-r1
+
+DESCRIPTION="Helper tools and libraries for managing non-volatile memory on Linux"
+HOMEPAGE="https://github.com/pmem/ndctl"
+SRC_URI="https://github.com/pmem/ndctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC0-1.0"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc systemd test"
+
+DEPEND="
+	dev-libs/iniparser:0=
+	dev-libs/json-c:=
+	sys-apps/keyutils:=
+	sys-apps/kmod:=
+	sys-apps/util-linux:=
+	virtual/libudev:=
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+# tests require root access
+RESTRICT+=" test"
+
+DOCS=(
+	README.md
+	CONTRIBUTING.md
+)
+
+src_configure() {
+	local -a emesonargs=(
+		$(meson_feature systemd)
+		$(meson_feature doc docs)
+		-Dasciidoctor=disabled
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		-Drootprefix=/usr
+		-Drootlibdir="/usr/$(get_libdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# upstream doesn't install udev rules unless using systemd
+	use systemd || udev_dorules daxctl/90-daxctl-device.rules
+
+	bashcomp_alias ndctl daxctl
+	bashcomp_alias ndctl cxl
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index bf5705887e1f..507ce1518728 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 9affae626031..9bc94c7dbccb 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -10,7 +10,7 @@ EBUILD clang-common-13.0.1.ebuild 593 BLAKE2B f7d78facc226d949240f31d10bb01f6a2b
 EBUILD clang-common-14.0.6.ebuild 541 BLAKE2B 87b158e874cf600e23591a8095e0edb4d30d4482600ef8fe38984e9ba9559e6e2226107cd482f355d950392a6a452e1a8ae79d297d5afc3951a7f1c8f6227b5f SHA512 1bd0481468c278f131ec9f87243927b60a59752f4229450559bf8016e9599155a52593810fcdc1cf0aecd4aa1529e8df300d95123a53de18eb326152caafbbef
 EBUILD clang-common-15.0.6-r1.ebuild 4633 BLAKE2B 97a3579b763c713d2484bdea899f42848afc7c73f6857ef9898a9958db8c8e54438a395cc6372735b797583da6919a69ef343585335dd47140fba4dad7f63162 SHA512 f8c49366042ee08c198ad9df000a2fd33597e5a50b15472dee0b078d3775be087c6e0f58e1a0b50ddd605a6f73f37361603e6e5da69d65f7c749c454bd525a70
 EBUILD clang-common-15.0.6.ebuild 3509 BLAKE2B 70910eaf42d62c4e570f87d5eeef778c1457ed37832fd90978992e16437d1af48e70d5393fe4193055d048fea0cde3836782828560b6d65f288b5ed2dc056cdc SHA512 d2a107dde9888e718e087653ddf42d51c39f78ce348d3e9932e3db73ccebee4877aac3fca2ab9fb63028cefda30cd5c764e381b70abbf09e509a1de5f5cf7f44
-EBUILD clang-common-15.0.7-r1.ebuild 4630 BLAKE2B 29400cc225377c0275c99c0672259e9f82648d8486b54f18989364800403007fc01c441e214588e1be4f1ba6bcafbd057f34ff548d887cbf7a512b6c4106bbd6 SHA512 e7d21dae1ab884d01a9761dbc15eea3f857d7eb44422e6cf3c76aabf00ca9a936c8398e70616ce1a80bd05ba7322f73f219a35893dd99bf9cd9576fb7ce8bc52
+EBUILD clang-common-15.0.7-r1.ebuild 4626 BLAKE2B edaacc5b0fed376e342377e2e433838ddf150dc77aea27f32a172e2b23219d9fc3e01ec3cf8e0efb3991987a34b79ab857b9687856bc97119f97eb7e6d8adeb6 SHA512 8ff4b1129e45271e4281813e0bb970e19d74bbe560eb63238eaabeec11a1907cbe24a7252cfcad5fa566c49d95c85212507c1eb0b7be093d6ad2995d966025d4
 EBUILD clang-common-16.0.0.9999.ebuild 4686 BLAKE2B c2bf510db70a7708d56746c035eebe20b332ace167138ae5260375dc5bfe15e2b8478692636cca60cebd9ebc2e418324377e3d17ebb49db7e30ecd6ad11e6db3 SHA512 abb81468747c4f83554c35792f6fd1e282b0edfa02a34157c0594cefef42b91c95092b35a88b7b4b7abfb17bff95029065b86f2c2724df5badb5924f915fd63e
 EBUILD clang-common-16.0.0_pre20230107-r1.ebuild 4692 BLAKE2B 0628160af123d42ea6cc9a2d39d0115ccc3d0f4461f2bc3b13946d3fb587a100092df73ba512aa016bf359283cf8790cf465cdbf7a230f1cd02e536d570424cd SHA512 08f8ef115f59f74a3b845af7563dbd43819c4fb37ed27a2fc0c65ce3c0f7c7e61eb3617b1e8c54c598d5cff0a1b8988d0ed32f8fa40c6b4428545a5f8f1bf05a
 EBUILD clang-common-17.0.0.9999.ebuild 4686 BLAKE2B c2bf510db70a7708d56746c035eebe20b332ace167138ae5260375dc5bfe15e2b8478692636cca60cebd9ebc2e418324377e3d17ebb49db7e30ecd6ad11e6db3 SHA512 abb81468747c4f83554c35792f6fd1e282b0edfa02a34157c0594cefef42b91c95092b35a88b7b4b7abfb17bff95029065b86f2c2724df5badb5924f915fd63e
diff --git a/sys-devel/clang-common/clang-common-15.0.7-r1.ebuild b/sys-devel/clang-common/clang-common-15.0.7-r1.ebuild
index 247a1fd78cc0..651827d21197 100644
--- a/sys-devel/clang-common/clang-common-15.0.7-r1.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.7-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld llvm-libunwind
 	hardened stricter
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 27825d9dee70..1884b9a83558 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,7 +1,7 @@
 EBUILD clang-runtime-13.0.1.ebuild 704 BLAKE2B a75c3997e7f744e1c50f7672bcd3564229fb1b55b8e2a5dac7ca38e8d390d61b76df6dec7134356ddf6487b63adb613ec7484240681f6c5cec9d7fe41912c353 SHA512 a1d245b587ec92bdca8b557d7e821d5f217bb1866a4804539305068d946c42355b1e84e3491d238b549c24822ad60aa872f761ef4418895b13d68f7574fef9f8
 EBUILD clang-runtime-14.0.6.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e71056309690ad1c8e92543e64025bd5e009eac35018ec22b2c0f80c12f3a527cc7e0bfe4ec1bfcb2dd9dea54106abf46b13e5592 SHA512 580efee12fe0e53447f5644fad248ebded8ae6cd8cb5871cb38bb3148091886b6fb9a57ac712d3158d5c3fc38c043b0bfbf62fc550a609752a42c23e605b0ded
 EBUILD clang-runtime-15.0.6.ebuild 759 BLAKE2B d7b481faffc4da0a6dc1b4e708322cd17cd497dc75363bdb89e7fbb1ecb2aecd9cbf91bdf816505476c7aca2ec7b6fb9ef178705e6b77361d21a7a270404a70a SHA512 8128acfc92b1601e93ffca1fd4233456f8a28fbc4cc65a1782da25df48abd3af82d0128b31f12b966ca02ab1eafcd28016c4443d9c7f1d28bc3f951cfff5e07f
-EBUILD clang-runtime-15.0.7.ebuild 763 BLAKE2B dcc213da138eba69d6448a2efde37cc152dec69d976ac762876e351d3b5201d4ccfa61701a60dc44d390af9f96bece61232c43f7a48d293f056c8d7d14f0a05d SHA512 a05caa795dbf989eaa879c4ade40eed748eb1fc483eabdcc00fd21348befd6c4fea4989ea3b8fa181453c9045a71b0adf94432cac6af9cbd7b5e5866ad7cefbe
+EBUILD clang-runtime-15.0.7.ebuild 759 BLAKE2B d7b481faffc4da0a6dc1b4e708322cd17cd497dc75363bdb89e7fbb1ecb2aecd9cbf91bdf816505476c7aca2ec7b6fb9ef178705e6b77361d21a7a270404a70a SHA512 8128acfc92b1601e93ffca1fd4233456f8a28fbc4cc65a1782da25df48abd3af82d0128b31f12b966ca02ab1eafcd28016c4443d9c7f1d28bc3f951cfff5e07f
 EBUILD clang-runtime-16.0.0.9999.ebuild 1369 BLAKE2B a25d32189f78e993706138f339ad0645e3042bd283ddc26b4189c117ea2368d0a1c2b09c2f5f538112bcad65fc14dc0d29f16e4d6ff98e3401c3bdb74d59d750 SHA512 c37860675576d51047f5347400753a19469ea0e2e6ff49a3a5ba6e35f5b33372c06ee2ac1e82aa4a681f35e8c186a1ff8eb25a9eccd0ee35e5ab3d57873f40e0
 EBUILD clang-runtime-16.0.0_pre20230107.ebuild 1357 BLAKE2B 8bffc2e195aea4f0c5c13d8f730dbf7cf5afade08d6ca9915addb9a148d4fa28d01331461adc16221840095a8b94d997795e25fb01c68ca6260b24471abd2747 SHA512 cd391453ef4a5ef739d9897b25fc1899062c20e23dbb1bfa4ef33ada3a697ffaedaf6956ba82fd114b8f24a5c8de3d255b5d114c545968f0689bd6cb38b64ba6
 EBUILD clang-runtime-17.0.0.9999.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
diff --git a/sys-devel/clang-runtime/clang-runtime-15.0.7.ebuild b/sys-devel/clang-runtime/clang-runtime-15.0.7.ebuild
index 680ab355b34b..c4f7620e1212 100644
--- a/sys-devel/clang-runtime/clang-runtime-15.0.7.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-15.0.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://clang.llvm.org/"
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 34b87fe4927a..0725fa31f3f7 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -17,7 +17,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD clang-13.0.1.ebuild 11294 BLAKE2B 260d3fed4578927cf654a3f364466a4d40da4526c4bb73438a63392105d07974a380a3a2cba1f1b2bfa3c99545e1e423a4953a15c58af81d860a02fcb7212d34 SHA512 ebb91165ea8a3f661c8d8cabca3aba073b6021d9bfc42ad5dd5e9d177c532c5aa1be9b403e9199ff3a4aaef339340d9113126ded20643463f28f5137038eab9d
 EBUILD clang-14.0.6-r1.ebuild 11719 BLAKE2B 116c47c61ca5f55544a886a81f1c443ab0d81d525d3e0e2137fed1aa8a872d0dfa5b0e9734ede6832cccabf141f8f788672c717f4e8c66df95ec0065cf5f1e79 SHA512 f27cd603fa3b02b9a3cad09231472a7047c2d6cb057a9b85a5ca7a9de93e7ec2c35e578cd50dd187886cb34f8fa88e32d3cf7f51c0c019b7b2ad232a127a8f38
 EBUILD clang-15.0.6-r1.ebuild 11954 BLAKE2B 1f83a038f9632948caf8cd8fc598337a09960405755b37480a7eaf5767b252b07ab096e3b920c76e68f5f3cc1d72cfd41fbdcc9e47a7ce7c2175f2a2e7933b50 SHA512 dc11d666bfcb47b79b41cabd974943eef0598d2116c7c01ded2c578b37afa7c93749b79b21a71504b2a684de4e6a2dfcb4b3f5f250b79c95b5a3287dbf5da685
-EBUILD clang-15.0.7-r1.ebuild 12118 BLAKE2B cbb85fac45eb3669bb7281601a590483e465bdeedbc4029e4a677fa795649e9ed0b73b440e34c46dcb8c1178d79ff0122735db5e5d4159ba6fb1224ac5dee0c3 SHA512 39fe00af7cd31f471868dad51426159f22914943a9f66ebb431a332d188cfc865f9f64173fdf42f1fad3ef4304b4c4e65546baf21317d8835631a66434c3605e
+EBUILD clang-15.0.7-r1.ebuild 12114 BLAKE2B a5a741792ec216d7942597dc6eb4e0c868738698cc4894a2053ba3acf23e347941079b67ba1c0d87fcdc37db4b72be0d30ff6a9870e3a716fe6127ebbb0b7770 SHA512 defb873f69065300f6c1eeb766b23aad7deb4ee1ef5d8de9b6d748c0cd524b58aa45a635f79ad833da8bcce537de9ca1a4c3ee62f57c6cd596f7f35a96471731
 EBUILD clang-16.0.0.9999.ebuild 11809 BLAKE2B fea22fa24054a45527d9bdd7b1fefda36eb7ad345cce748ca6ee3e7e200b63331d39dfc7149051a91e9874e42aadfb0019b56418a2201f8f494bf0903f47e526 SHA512 e4e3d20b3ca0a9692d132999b84879921837f084875eb07ca88423afb11684d6702f094be6833270650c00372e320c0986db2faf28c76ccccd1095614728d52f
 EBUILD clang-16.0.0_pre20230107.ebuild 11888 BLAKE2B 46d7463ac2022887874a597d172497b1e04b715c326eb629c5fde978bf36ca0229be7d06f333647a7d392c7bcfead3a8ecefedb2848689b5f0713e50193aace4 SHA512 de47068ccb31519b4eb8f782d5a81379d667913b39c59128eb4c0c22a4d82cf3818547bf393d18d392aa7f2309c0aabc4434986328cf55272bac86037f657c5f
 EBUILD clang-17.0.0.9999.ebuild 11809 BLAKE2B fea22fa24054a45527d9bdd7b1fefda36eb7ad345cce748ca6ee3e7e200b63331d39dfc7149051a91e9874e42aadfb0019b56418a2201f8f494bf0903f47e526 SHA512 e4e3d20b3ca0a9692d132999b84879921837f084875eb07ca88423afb11684d6702f094be6833270650c00372e320c0986db2faf28c76ccccd1095614728d52f
diff --git a/sys-devel/clang/clang-15.0.7-r1.ebuild b/sys-devel/clang/clang-15.0.7-r1.ebuild
index 1d5eb6cb7f0f..b7b9a4e0a274 100644
--- a/sys-devel/clang/clang-15.0.7-r1.ebuild
+++ b/sys-devel/clang/clang-15.0.7-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}g1"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x64-macos"
 IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index c2c4727bca27..3ec033dcfad0 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -9,7 +9,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD lld-13.0.1-r1.ebuild 2003 BLAKE2B 2fed1597f869a715267d27db0ce1a713e9a5dc65bddd21a1ef5be08e2ac756dc04d3db49d5b01c9781161da2a4bf100cd5fc01d772a2ac1819aec1e24408f9c7 SHA512 b690f7092574da74300d3ff36764a6a3b1dc722e1600c0d1d6712eb21052825994fe1c2aaf2db0359466657ac83083f1e617cbc89fc8f0d2c8fff2b6a5bdd948
 EBUILD lld-14.0.6-r1.ebuild 2009 BLAKE2B 4db1dfc9b1997d31cc68240ae0b05afeae5a6b1cb24a0eb2012bc28b2ac8c0da4b532d270d070db5fd401717320a74b006628c19a12c787e2f9ba2dc24eb25b1 SHA512 73b2f0e7b27497ce9037cd10503b328378ff9a2e32cd36e6e264f5423cd05732da4ea2ef97b637fc344a4f3d5d3597c60dda29dba7eb509391c176d32d53a427
 EBUILD lld-15.0.6.ebuild 2094 BLAKE2B 1994e3430ea215e4c8aa54f84e1c845c3bf1dfa164b6c1ba785bcba027bf7e4c422c8fe58a31f5910fbce067a1091b889caf95067c6c213ffe5de0f0dda1d18a SHA512 9c25a149905220c3cd9d5ffc0f1c80481394433f0e87d76455f6f4ee50d1e43c9399e262e21f3095edfc261f670b7fc10f35a11b9dddb1bc8d3d10f151c70f66
-EBUILD lld-15.0.7.ebuild 2096 BLAKE2B 05c9cc595fc4cd76c3922e13d46a5ee55b6c1f6b6cfba4075853bfdcb18f677813d0134c50a4961bb1c3479c70703839271e064198b1b7a7d5975e03faec8359 SHA512 0861bea09fa77035577010783261ec857cffe1f75ee691163c3aae2d8493701cbd5ae0246ac30c096a0f39e6eb9d967d1e7a9ed4b3014f4b56482c6e0ec66681
+EBUILD lld-15.0.7.ebuild 2094 BLAKE2B 1994e3430ea215e4c8aa54f84e1c845c3bf1dfa164b6c1ba785bcba027bf7e4c422c8fe58a31f5910fbce067a1091b889caf95067c6c213ffe5de0f0dda1d18a SHA512 9c25a149905220c3cd9d5ffc0f1c80481394433f0e87d76455f6f4ee50d1e43c9399e262e21f3095edfc261f670b7fc10f35a11b9dddb1bc8d3d10f151c70f66
 EBUILD lld-16.0.0.9999.ebuild 2029 BLAKE2B 65cf3f20ddf1a4e3c9019df2fb9afc6bca038d88dbd29bbd7ea6c767e68ec2b824f4be6b04139bf98211177c30db0fd9ed5f351e0207d1530382c6fb618a3d19 SHA512 69eb8e93fd5f28789dca326dbbb658c4060b57ccdeae7e12aec5d842aeb944748a167983b67c00a98972cfff7350ac54ffe381db54c3d7a18e7970ca0190bf34
 EBUILD lld-16.0.0_pre20230107.ebuild 2029 BLAKE2B 65cf3f20ddf1a4e3c9019df2fb9afc6bca038d88dbd29bbd7ea6c767e68ec2b824f4be6b04139bf98211177c30db0fd9ed5f351e0207d1530382c6fb618a3d19 SHA512 69eb8e93fd5f28789dca326dbbb658c4060b57ccdeae7e12aec5d842aeb944748a167983b67c00a98972cfff7350ac54ffe381db54c3d7a18e7970ca0190bf34
 EBUILD lld-17.0.0.9999.ebuild 2029 BLAKE2B 65cf3f20ddf1a4e3c9019df2fb9afc6bca038d88dbd29bbd7ea6c767e68ec2b824f4be6b04139bf98211177c30db0fd9ed5f351e0207d1530382c6fb618a3d19 SHA512 69eb8e93fd5f28789dca326dbbb658c4060b57ccdeae7e12aec5d842aeb944748a167983b67c00a98972cfff7350ac54ffe381db54c3d7a18e7970ca0190bf34
diff --git a/sys-devel/lld/lld-15.0.7.ebuild b/sys-devel/lld/lld-15.0.7.ebuild
index f0051722d795..7bccf83c3662 100644
--- a/sys-devel/lld/lld-15.0.7.ebuild
+++ b/sys-devel/lld/lld-15.0.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 15ccd401292a..0e28fdfb232c 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -9,7 +9,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD llvm-common-13.0.1.ebuild 607 BLAKE2B 01e55167e8a1a1568105090883f42c0c56c496eaa3ae179d1e44acd1d2f59977a6ce0d4d9c5bbbec38df5afc5cce7aff77a38c1618d415f431c4a413ea90bbf1 SHA512 4a5370e4e43bc5268ab32bcf4ae328890aeeab293da8fe74f3b52504ce57e5adc36de5240ff91e54a35f1f48840df7d821fd94600b1193c676c55590379bb8fe
 EBUILD llvm-common-14.0.6.ebuild 602 BLAKE2B ef26d6ac2606e9a316ddcce442da1762f578ade0346ba2a947fdace5e2020e8841c63d173e42506d23abf6efc062a2edfac0be98a3eefe1f7a29c88702e9f1d5 SHA512 789dad6fdcf9a930ddc1046e7e98ebc1e05b2dd3713bb1ec5b8a5711690d779691c91d1000d9776720b21ed241d2f12c0ae9a8dba0e6a17d0ddf563cdfbe657f
 EBUILD llvm-common-15.0.6.ebuild 601 BLAKE2B 3dd38d17640ed52ff0be26db026475a9d0e7e1acebe95043bc6e0e63e32ff4f03c5637a9dcce25987f673962447feb4aa015f8b5b5cb33553dc1a4f843b75399 SHA512 e8a93a72d06810cface48cce2d8f8a890cdf009939a96350a23fe407b064c05a3016c663d11a3866dc2dd0fd87599b5ac234895c8c42c902e9b0cdb37dba7b62
-EBUILD llvm-common-15.0.7.ebuild 605 BLAKE2B f83530f458a4f6fbb7435b05766b0bcf1eee46c3bf63d1b6ad3174ff54f8fe4ae419b8089f128f5970fd32ec89c562b1dca8dd744a91a7918b1b65985ac488a5 SHA512 f14f431d3a716623d6224dc81ff144efd5e70ef39ce9eca8c69bbaeee12bd44878b20a657003577e02b8ec4dfb3deaa1e3b0da90a7898068a43994871619c781
+EBUILD llvm-common-15.0.7.ebuild 601 BLAKE2B 3dd38d17640ed52ff0be26db026475a9d0e7e1acebe95043bc6e0e63e32ff4f03c5637a9dcce25987f673962447feb4aa015f8b5b5cb33553dc1a4f843b75399 SHA512 e8a93a72d06810cface48cce2d8f8a890cdf009939a96350a23fe407b064c05a3016c663d11a3866dc2dd0fd87599b5ac234895c8c42c902e9b0cdb37dba7b62
 EBUILD llvm-common-16.0.0.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
 EBUILD llvm-common-16.0.0_pre20230107.ebuild 530 BLAKE2B 8475e3b53197e4d4632f635af86038889c0e93161819f3b655a570f8b3b774f392a786c67320845ca7be620bcd22acfd0349ec9376435deff1f4333c993abeb3 SHA512 2f899fd29442895532c45eb8c97e1bdf19aaef19406382b81ebad16cb9eb6d4181a637a10d090060557f1d0b33dc579828c2c5c5d5ad02d0c5a4a3cca256caef
 EBUILD llvm-common-17.0.0.9999.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
diff --git a/sys-devel/llvm-common/llvm-common-15.0.7.ebuild b/sys-devel/llvm-common/llvm-common-15.0.7.ebuild
index ffd4c56b4ee0..5c69c0a3337c 100644
--- a/sys-devel/llvm-common/llvm-common-15.0.7.ebuild
+++ b/sys-devel/llvm-common/llvm-common-15.0.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	!sys-devel/llvm:0
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 3c19bdb47a19..50297d1f90bc 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -17,7 +17,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD llvm-13.0.1.ebuild 12004 BLAKE2B 4e04c4b85e2b3c739fd69895ad0ef5b6d029319da6982f1719ca162ac6b9dec2793526b6c9a9ed7a74c66975d1dea15f7759731e11b56a372dc2165b54082529 SHA512 4bcc027ed659cfa4831995b62c3276eb67c38bffa63fa8b161251bc482c1a4fbd5d139a542bb302c4187a89da0153728a10bb60b1c441b74584d0137364ec65d
 EBUILD llvm-14.0.6-r2.ebuild 12379 BLAKE2B 878f5723404dd8b85e874c8b8cd83ec3da07ddb4b38c1129d74eb838518cb0cc2db52370bca3065af6329b19b8f3741c6cb64ecb2a0ca6506560ebab122d2e8b SHA512 35dfcb42c1d4a477541c4433ab69cb38e25c55d9061133381660eea5cdff8c2b9b4683eb9fd310b909544dab322cf9c85565c0f3df3453ce1f993c36874599a9
 EBUILD llvm-15.0.6-r1.ebuild 12550 BLAKE2B f89218a5d755507c1595f94b718cb8386ff5277dcc4afe178746319ae26a2cb3512799b14e9c1bdc0ed8a229d6bf34dbb07f338437454ff46e0d08084c4bc309 SHA512 ece3b64ea97b1d61a074ac9e715dc7252b827c538876f2a8b2b2c72c675d999309e07b26ad05a6e15297020320762ce3bcc4860403c7eee9ece6141aadee9a4b
-EBUILD llvm-15.0.7.ebuild 12551 BLAKE2B 0014e0a01a46bb1f8c640500d92ba3c8977b504561881a056a8c76ca61971404f74e2de45ad3683326d64afe5f72f58814aaacc17fb2a31c95acea3656abd3b6 SHA512 0e1b829b57ccc0932ca37b279c505e0a879a02216abbe76a69a54aff26b59dd887a68a941dd145d6fea2a908b790a9baf16de79b04c1a6ee5336beb38380debd
+EBUILD llvm-15.0.7.ebuild 12547 BLAKE2B 614c03ba1864eb535f1c3685d09d639de6222d20711023bff39b6ab257114ad2fc5a7565f8227829d057ec65ca157ee9dcfd16bb40cec5b0fa6abfbf11ea6654 SHA512 8580f74800122d1d0b7c8114f8555fdbab6291daf20c15ae9fc125a58b203f7ccd7bbcb4fb7aea9181b9abc0e296c7b91417a15a4c50a31b4c65f01c7fba17c8
 EBUILD llvm-16.0.0.9999.ebuild 12342 BLAKE2B 2ee8d346c927e1e32242b2ae5146cbcc0280030197d24e72908064403646975497bd469f14d1a46d5c93823e22b757b074f3215593fef68429060e733a2006ba SHA512 09b426cce2ffd6e56b354b7ec0d5ed4ef69fb16b7bd20f1afb1c05239cc106daae1c9246e5b24b29f88654a2a4bc7f4a907d55cead98aafed34465af84b6007d
 EBUILD llvm-16.0.0_pre20230107.ebuild 12348 BLAKE2B cab528b783d40bcfa24127b9d777374b163844a37b706162933f3020c36cec79263b29e3cb356d1f702467705322c8daff1d01f6c32018524bbc5e1e8f9d4459 SHA512 5ca3ef40d6ef141c733a09b8492e1cf5724ee826ab4e63d8055289a7955a88270b863dc2782cf313e4ea852129bfe95d0aa8b9a755df61303963ce8277f28655
 EBUILD llvm-17.0.0.9999.ebuild 12342 BLAKE2B 2ee8d346c927e1e32242b2ae5146cbcc0280030197d24e72908064403646975497bd469f14d1a46d5c93823e22b757b074f3215593fef68429060e733a2006ba SHA512 09b426cce2ffd6e56b354b7ec0d5ed4ef69fb16b7bd20f1afb1c05239cc106daae1c9246e5b24b29f88654a2a4bc7f4a907d55cead98aafed34465af84b6007d
diff --git a/sys-devel/llvm/llvm-15.0.7.ebuild b/sys-devel/llvm/llvm-15.0.7.ebuild
index 6395244fbe29..1b490e20948d 100644
--- a/sys-devel/llvm/llvm-15.0.7.ebuild
+++ b/sys-devel/llvm/llvm-15.0.7.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="
 	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
 	xml z3 zstd
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index f1e266974a90..f3074d5825b2 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/fswatch/Manifest b/sys-fs/fswatch/Manifest
index 24c3c63dee49..ee91b18c5e2a 100644
--- a/sys-fs/fswatch/Manifest
+++ b/sys-fs/fswatch/Manifest
@@ -1,3 +1,5 @@
 DIST fswatch-1.16.0.tar.gz 844804 BLAKE2B 55527e7d38421f16a9d2c51b5455b73de54220d280233d905a02d192bc374ef91b02c0d68dcd1c1ed6a29351421df0cd0ee9fad50bb98ec9c9018088a6064d4b SHA512 80100b92f5acef503436bbb684f07f5b692099a7eee0970a61c04670de67cd9bfa7942af40b348236dd97fc4d02fcd6a081b96486332efbd06500379c1eff806
+DIST fswatch-1.17.1.tar.gz 853852 BLAKE2B 0d4d6a350325d4c7cc4ed4277e640d3fa4bfade5ec92b1c27abee9b506f34a024abadfbd5f002fdb3afd80a4ae432a071dd94c664123f447167ded6d5dbbaf9d SHA512 8d98b12e538026545052763961fe7d8147809958c25921bc30f43ba0d63c7f63a00c4b8412bbb63e3d1a0807687f8821f20e2667ee716b439cfb254ce346ccad
 EBUILD fswatch-1.16.0.ebuild 606 BLAKE2B 4c469be305113213dccdf9b92286a679f6fe546f323f248597c0756fd04805cea0ff75fecdbc50dae332ddbda448d8b9decfdf348f23cb3577cf272a6daefac3 SHA512 f9d79eb8f231893b5566d30d96a38ded99573bb804afe688003b7e92d97024e427d85f848b0f34f585c057dfcacbd04b71e93ac847ebde1e7ea05c12dc90ccc1
+EBUILD fswatch-1.17.1.ebuild 609 BLAKE2B bc1f93a0e505a4ae016bc6c1695fa70b9f3991e1cfa18fbc64c2fc575297ce88a99d110a5cb1d3396e5b874adbb9fb8e14f519c12c877cda3b3a47f3f7fefe46 SHA512 b6ad17653ee142ff52bdeacf2dc868543f46a88785b7aa961dc85cf03a6ddb995fa55ea8d0fc8ad97d82bb09f04f4906b546f44670b255553695cf3377e30b85
 MISC metadata.xml 301 BLAKE2B b95dd29fe1d5053e7028e57c5f6a714c91be48fa9cc80403ab912a3a8fdef3f524d2f7ff2d08828c1ee0ebd216aa79c7cd78423589fcaa8a28776bc2a9f7983a SHA512 729816d569cc9295c9aadbdd21aa9ac01816d6bb6e052c160d8c85b877c77f962f79975930149d459084a8c2af2f81eeabd7c00350ccf25b91dfcf76ba8dc81a
diff --git a/sys-fs/fswatch/fswatch-1.17.1.ebuild b/sys-fs/fswatch/fswatch-1.17.1.ebuild
new file mode 100644
index 000000000000..1ff71d7d6e2d
--- /dev/null
+++ b/sys-fs/fswatch/fswatch-1.17.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="cross-platform file change monitor with multiple backends"
+HOMEPAGE="https://github.com/emcrisostomo/fswatch"
+SRC_URI="https://github.com/emcrisostomo/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/13"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="nls static-libs"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index eb941b2f5253..6c41662819ac 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 1ceda0e54a28..9326ab957fdf 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -13,7 +13,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD compiler-rt-sanitizers-13.0.1.ebuild 6369 BLAKE2B 6c3f934fe38caca16161992ec09283ccda42751573b29ed920fab09d210fd415367b41bcd77f8069a711db320a1421067d0da75d5e1fc44a9087c7fa4dfcba9e SHA512 c98e47504210e68f8fee17d2c1bc2ec85073234d46a830751faf58444fe8af473b8b419653165b900ff1ad5d0c81d3f9cd7e4cb40f9de412c44cacfce8c5395a
 EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6381 BLAKE2B d6b9d293aedc2488beaa0e181b4a3501c2436f275d449f043af0315bd9951d88233b71258300fa9f6409272ed3b75f6657791b526270f2b62ac462b43e10b95a SHA512 658e7ca3a6a099b7f903123915b7ca4ec1c2b35292b8187ef8389283cc4c03c2cbc08ec5032e264f49f52675d9257389f4fe9032ad576a36ae6a4e5bd9e8fa92
 EBUILD compiler-rt-sanitizers-15.0.6.ebuild 6433 BLAKE2B 2d2b4fa03ac907778c4b1d90e0a3e8b686385fb517e8933d51d7cb22d833b40d3d0fb42971accb96b4e933c35cf961b4cd4bf75878220738632c6828d884664b SHA512 34f5038a9dc9a4274a9e3c2f91837f458c85ecf75a66a2de0845994904450c85d4ef2617ccdb5414d1a99b70ae44c155dc311f312dad4e11bccd212a1009e926
-EBUILD compiler-rt-sanitizers-15.0.7.ebuild 6435 BLAKE2B 2b6e18266fc3c20a52a5e081f85084a311f7c758f4de26345d6cfe67ff27b4d83afb9f21b470abcfc820db873abb8318078afd203a09dedfce3fd1d51272d9c1 SHA512 2bf645266b69bc94bb9a3aa412c75799314ba5197f3c6f64fc8a04eb2e68567c585421210cb58c4df32264ec2ce8a4eb2045bd393bb360d18be1104b19f766b6
+EBUILD compiler-rt-sanitizers-15.0.7.ebuild 6433 BLAKE2B 2d2b4fa03ac907778c4b1d90e0a3e8b686385fb517e8933d51d7cb22d833b40d3d0fb42971accb96b4e933c35cf961b4cd4bf75878220738632c6828d884664b SHA512 34f5038a9dc9a4274a9e3c2f91837f458c85ecf75a66a2de0845994904450c85d4ef2617ccdb5414d1a99b70ae44c155dc311f312dad4e11bccd212a1009e926
 EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6248 BLAKE2B 8548074a3b572bc5b19e9a70ed91225678172cb43b71ad501811d3741367c56f1ffe0e1b528934f620e7d8a30bd1fc463ada54113bea16c322f1d821a8503756 SHA512 8825b15e4965e58365a96517831120e1d5c02130f83cc1150b7a107142782cee74830d3dc0234453291d0f487789cd005303d47269381ad45356e4fd779decf5
 EBUILD compiler-rt-sanitizers-16.0.0_pre20230107.ebuild 6254 BLAKE2B cf7575a46a8678ff6ed69bb3e5863b062948af66bee98d60be8e728d30095ee34272b5a89d99bb31ee6ae87e3831cbb8120bc9f62ce0a0662caf42126582aa72 SHA512 da6daf348f285fe8c56d707fe185318647eb08bc6decc614d4b7f690f729fe4ae5580bc9d216aeb2a18881a729ed50cacf2d32a591c768ccc095e43969ac7b6b
 EBUILD compiler-rt-sanitizers-17.0.0.9999.ebuild 6248 BLAKE2B 8548074a3b572bc5b19e9a70ed91225678172cb43b71ad501811d3741367c56f1ffe0e1b528934f620e7d8a30bd1fc463ada54113bea16c322f1d821a8503756 SHA512 8825b15e4965e58365a96517831120e1d5c02130f83cc1150b7a107142782cee74830d3dc0234453291d0f487789cd005303d47269381ad45356e4fd779decf5
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7.ebuild
index f3e4ff3ebbeb..e5fe7115aaf8 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_VERSION}"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
 IUSE+=" +libfuzzer +memprof +orc +profile +xray"
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 473f65444910..3cbda70ef506 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -13,7 +13,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD compiler-rt-13.0.1.ebuild 3880 BLAKE2B 218087fa112daef84de0e0a28126b7fb19e71a6206279a856c1d0b97232125a695f2349bf9c5bae51ceaa4bdbb1c5a4d086c047675d3b8601854f8ca1009f88a SHA512 689f563143daa17b9d319c9af2f8d1501e1ba1c80bb528dfbf2f63de26b9f17e30a3071ec363c3f4e65ba0063c366eb944b23431f6a0e05988d3a91a5a2679ad
 EBUILD compiler-rt-14.0.6-r1.ebuild 4247 BLAKE2B 53a61ea821f52d45691acce10f2aa6155606930796f142a18683b7259357ad770552de88d11115f9a97c77975c4866e2082fcfb770ad6ded5ec6d70393aabbc2 SHA512 bbfdc05c22f3750b0f8c9a84118b70beff97fc360c5c133ad58bdfe78762320cdbb0b170f6154eb5098bc9dc2ecb2643871c8ce85162c47235cf1408d5ef67e9
 EBUILD compiler-rt-15.0.6.ebuild 4259 BLAKE2B 2d7636f409dedb9bc78e77312355ca3859adbd108cb0d6001c2d9cab89b09847003d4148d013332ce93292678743a9b7197791d51048758d351292b8d53c833f SHA512 ebe6fbaaf6ff68d5f12f61f8e9d02608321b3e4db9ccf7be43e7a43de7c6600a1a506e48bf1468ca16b0d3ea894a5603b3f468a9ded7cbfa76145c7c8b8ec20e
-EBUILD compiler-rt-15.0.7.ebuild 4261 BLAKE2B 7ffbcac72b4725f9c3e2c34f21e9dba653b3936ab6a0b35bbb240046d223fa88a4ec926b4b74b12dcbe455d58f44dcf3959293ce0dc6fcf1d16df5c047ada2ac SHA512 0b9fb3674b3b8fa9b1a26832a99833bc0aa62ddcd273154a72bea95038ce4fe433704a25851a8b018571674da4071afc554f701cdf0829a723bcff689c677bf6
+EBUILD compiler-rt-15.0.7.ebuild 4259 BLAKE2B 2d7636f409dedb9bc78e77312355ca3859adbd108cb0d6001c2d9cab89b09847003d4148d013332ce93292678743a9b7197791d51048758d351292b8d53c833f SHA512 ebe6fbaaf6ff68d5f12f61f8e9d02608321b3e4db9ccf7be43e7a43de7c6600a1a506e48bf1468ca16b0d3ea894a5603b3f468a9ded7cbfa76145c7c8b8ec20e
 EBUILD compiler-rt-16.0.0.9999.ebuild 4164 BLAKE2B 332c450aab09115e23d14304e1f1bfa8c9482ced7acff7d6b80ac09d88f6d5a1481f090c837a7876bc264e3f1451b3bc5f285a71a38a7bf64ad3845299ca9b59 SHA512 7dcaae258434c5cce6b225c49b71e1987ac5af36f83ce25962ade4b2c836f13034fb54fed2723e7d089dc77b20159c0dd04c67f9a6928b62550d594db7f98cc2
 EBUILD compiler-rt-16.0.0_pre20230107.ebuild 4170 BLAKE2B 5c863321f73c784ae997fe46377fc6525ece43664cd41c8a8178aa764f820788c6b8072a99f0d79246721cbfdbba99cb06faacf93509246a94242af35f6820b7 SHA512 2eb75d0677db0d1ff130849651dae53c2f180a78e8103f012e4c4dc6d967db533b4457647221aa85a26adbb04c936ccbe18d5ad29a571554773049951e5b8de1
 EBUILD compiler-rt-17.0.0.9999.ebuild 4164 BLAKE2B 332c450aab09115e23d14304e1f1bfa8c9482ced7acff7d6b80ac09d88f6d5a1481f090c837a7876bc264e3f1451b3bc5f285a71a38a7bf64ad3845299ca9b59 SHA512 7dcaae258434c5cce6b225c49b71e1987ac5af36f83ce25962ade4b2c836f13034fb54fed2723e7d089dc77b20159c0dd04c67f9a6928b62550d594db7f98cc2
diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.7.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.7.ebuild
index fdb5d24f5895..284371357cd2 100644
--- a/sys-libs/compiler-rt/compiler-rt-15.0.7.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-15.0.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_VERSION}"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 334c14052cf7..b0a863371bb7 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -44,5 +44,5 @@ EBUILD glibc-2.35-r11.ebuild 50176 BLAKE2B a7999672c0039cb7ef79fd84b13ea7d8d752a
 EBUILD glibc-2.36-r5.ebuild 50776 BLAKE2B 941d7227f97f3b40f4940f6b791c4edfb96fad11372956221087e617f5db911477744a94af2a74e0d904e67dd1c277080117af1a57813787e43d6b269cbba5ca SHA512 2aa182a93210851f63ec9cd166b367fd00543752f96ddf01bfab9b373ee4bc75ff2a14e2ef7a2cdcc46776e16c1ddddd6f1749705bc7eddddb9392d34c9c702d
 EBUILD glibc-2.36-r6.ebuild 51211 BLAKE2B c3068112c6fdfdec604eda6c4bd12edeeeda2a39ae5b80f49e2c241b1691b53a42cb64d0aaec645f4bf9f9c540b8d481fcfd157480521223d51a69ec74cd0b89 SHA512 14c227b102305b7684d67c460e75a50d8261bc288996dacc99e24eabe8ba85c991ba4ad5d4ffbf63bb3065d0ed53220ed68b08ddb95283975ffef35d9231cd0c
 EBUILD glibc-2.36-r7.ebuild 51211 BLAKE2B 9f831c3c41797211c6d308680f74e2d327ab7acf1101327300fcd1d6ea1d5c07ed53709e559736d279b5d8b6d9f7c6350874a90d11d8366c484faf41d5254cf2 SHA512 e3550dbd1cf0a15aa5aff0d15ca2a685bbe00b8bd2c15116f2d20a66d8de0b5db0d7d5d363586357d1f97d5c099d3e67a66cf58b33e4adddb57df36949398631
-EBUILD glibc-9999.ebuild 51212 BLAKE2B cef32d2017ccffba18fe4a03541f045e4ec23afe864bb6ef9f19e488c457e9bef5b36635720c4487e7acca2d49fbde015917472628ca3936162895277b4c3f87 SHA512 ee00ce6dea723e196423879a54bf6ff015a8dc82917c499caa3cb4b64c7cc005ad596f0421d103ffc81aafaa3f39503686ae683374dc82966b2a56a768eee863
+EBUILD glibc-9999.ebuild 51347 BLAKE2B 9b518069136a2a7ee7482cb4459e2456bd6299dadced3d14c8e04d1d2a62ba400a1a7f6bb7f22c7f66c1ca719e624420d86faa5ceb18c80f812e9138f39d4174 SHA512 03579d6c504e4835923e04bc881dd96b038799d3adb2491522055ae1c63faf465a8a7d3fa21b4591b57b980200e5f4ba26f4686add872d42534101397996a22f
 MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 33d217dc1787..413594ad57c4 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -111,6 +111,7 @@ BDEPEND="
 		sys-apps/grep
 		app-alternatives/awk
 	)
+	test? ( dev-lang/perl )
 "
 COMMON_DEPEND="
 	gd? ( media-libs/gd:2= )
@@ -119,6 +120,7 @@ COMMON_DEPEND="
 		caps? ( sys-libs/libcap )
 	) )
 	perl? ( dev-lang/perl )
+	test? ( dev-lang/perl )
 	suid? ( caps? ( sys-libs/libcap ) )
 	selinux? ( sys-libs/libselinux )
 	systemtap? ( dev-util/systemtap )
@@ -1015,7 +1017,8 @@ glibc_do_configure() {
 		# up a Perl from outside the prefix instead. configure will fail to
 		# execute Perl during configure if we're cross-compiling a prefix, but
 		# it will just disable mtrace in that case.
-		ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl no)"
+		# Note: mtrace is needed by the test suite.
+		ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl no))"
 
 		# locale data is arch-independent
 		# https://bugs.gentoo.org/753740
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index cb2378e83782..db5ffaeec766 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -12,8 +12,8 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD libcxx-13.0.1.ebuild 6768 BLAKE2B 36c10303fd96a4e4abc70f7fca2b1206cb32ecb4130061ac13ca29970c68d3ef5540b00dafd34c03f2052ee8c099f20d561c4572ffc65b73ea6dd5ace6aba4b5 SHA512 c067b3c184667dad0deb3c2fd345de4f863ee1d4583f883b9a848d61a980b13c707bc434454b98fc815d234a1975ab5fc76c0fc28ebcf54fb5868918b12dc593
 EBUILD libcxx-14.0.6.ebuild 6948 BLAKE2B b8f0793a4542a76b789ae6c3cfc392bdba7c8d033a6d41328cd32754af3affb663b87f8811cf53fcc3be9e2bcb9f8691a64bd613b26bfd8b5c99a9c11e9c57ee SHA512 d280604fe14e1488a1b9538ec7da100639024e34ed65c5efe11c7fd563073ded3655d302e61b1b657766ec2b3fc78d2192f905377b3f5d55fcf20ecba58262b3
 EBUILD libcxx-15.0.6.ebuild 5281 BLAKE2B 91ef259e7e911d759553378e78dadac1f69a8d890eaec9572d987674b22943b07ae83bd6c7fa6f0968da0bb14709436117ca6beb7786fa329dfebb268273e0fd SHA512 038ccd5504bbb990f8b6bf35ed64ca197a84f14e2860e277bd488693e583474332c73afd1a48911786b6352373a1f09763899d2408907ada836a992cb733ed43
-EBUILD libcxx-15.0.7-r1.ebuild 5309 BLAKE2B 87b16f3addc329c525aa20df47136ac7861ff3eb36068a59ed1ceac02dbabb6868a567f472414097cc53ca66d61aba18e3f76210b3493ae77bd5506e0cc2f4f4 SHA512 e624c00e20fde34715ce3a76b1fc5c6f2635ed288bd587025e001c0539d0ed360a7ae46e84369cdfcc95d9363aa27b749349a28cfdd85d8af2abf042a105e000
-EBUILD libcxx-15.0.7.ebuild 5284 BLAKE2B 8e9a2e1fc743fc131ed0835e522fb6534fa63ed61a1edcfc601258293ec8740eb5b2642442ee2fb44612e5f9edafcfc8ead1a1a8f4e572b089081c429b78449f SHA512 c71b195a7da2b855d0cc0af16d470687fb9e7cddb16d22970b8c8c575bafbe0c23e182f625b6424893318fd27f9b148b57450aefbc1e5e5968ab72afb0149657
+EBUILD libcxx-15.0.7-r1.ebuild 5307 BLAKE2B e67fddd39b63b876011f09b93bbf9f77c184ad74c325cfe25add294aaa3aba6293d2c5d6324dcf89644ee04afad8a46bba5c5ea8db944d07e2954fa4cab1e8bf SHA512 48667b4e2b65210309812a869cf448635ec344549c26359118988156e418a08881413eddefc74e69d1744aa3d53abd8737d765e55aa1e44cae990292b4e392ec
+EBUILD libcxx-15.0.7.ebuild 5281 BLAKE2B 91ef259e7e911d759553378e78dadac1f69a8d890eaec9572d987674b22943b07ae83bd6c7fa6f0968da0bb14709436117ca6beb7786fa329dfebb268273e0fd SHA512 038ccd5504bbb990f8b6bf35ed64ca197a84f14e2860e277bd488693e583474332c73afd1a48911786b6352373a1f09763899d2408907ada836a992cb733ed43
 EBUILD libcxx-16.0.0.9999.ebuild 5238 BLAKE2B d31f97c2b6fad3c8b357cf1d9c2bbcf52fcf8ddef4cd5e52a1e5a8d413751441032cc964eeb4ea3509e3ee16aab6342dcbd38a9b7e7d9299021834e834054c37 SHA512 4c7f95ca928f5d7dcada11ae250a0468a3797bf024985635eaf815dab7341863bd7add87abd459e49a2fa0b19b12ae87cfe6d5799780f1594130eb134e4347ff
 EBUILD libcxx-16.0.0_pre20230107.ebuild 5244 BLAKE2B 293399fe1fc0f91f115697a27d265f422e1c9535e0cfad5087a3faa3a9660e4e4210acf61bb4863d9c3fb4899eb23d74ceb8d6103da405eed47cb9157a413305 SHA512 c7ec13ea1c4a6e867fce9971b6fcfc4ab4c862f36a67c8b0484ebfe7708f0455310b9475c581ac1d635344db2a544eedf5649b0633900b10000f1ee0e9f065b9
 EBUILD libcxx-17.0.0.9999.ebuild 5238 BLAKE2B d31f97c2b6fad3c8b357cf1d9c2bbcf52fcf8ddef4cd5e52a1e5a8d413751441032cc964eeb4ea3509e3ee16aab6342dcbd38a9b7e7d9299021834e834054c37 SHA512 4c7f95ca928f5d7dcada11ae250a0468a3797bf024985635eaf815dab7341863bd7add87abd459e49a2fa0b19b12ae87cfe6d5799780f1594130eb134e4347ff
diff --git a/sys-libs/libcxx/libcxx-15.0.7-r1.ebuild b/sys-libs/libcxx/libcxx-15.0.7-r1.ebuild
index 705ae5fa64ac..7fc94c670538 100644
--- a/sys-libs/libcxx/libcxx-15.0.7-r1.ebuild
+++ b/sys-libs/libcxx/libcxx-15.0.7-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="+clang +libcxxabi static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxx/libcxx-15.0.7.ebuild b/sys-libs/libcxx/libcxx-15.0.7.ebuild
index 2c4d2841dd23..c8284848d512 100644
--- a/sys-libs/libcxx/libcxx-15.0.7.ebuild
+++ b/sys-libs/libcxx/libcxx-15.0.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~riscv sparc x86 ~x64-macos"
 IUSE="+clang +libcxxabi static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 83309c7c53ac..7b50560ce5de 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -9,7 +9,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD libcxxabi-13.0.1.ebuild 3468 BLAKE2B 2f0f4469527be7df50173cd1be4c4e4f0640e5a452493ee302e0271ea506b06916c0cfd321be861dd760eb9c1eb1fd270709d52030334fda5db8875f886b8119 SHA512 0bd3ae225e63c8dd761cc6f2c1b43cee8f80a254f9104dd12d8affda81e306788cc8134160193474a06f730758fab844d74ceee5cf5bbd775d89265e2da2bec7
 EBUILD libcxxabi-14.0.6.ebuild 3384 BLAKE2B 71c0a0a1765bdfcc6829d5ac3a1e260f541cb6a4a8b1557db6d6fd17d540dcaa85df21ddae645afd72a620f1b52c42dd8d8d18bb0983b853059f4d598c9ef6ae SHA512 c7a8b74eaf423d166ff5eb8fdd7e7a124c6c0caebdc4f22cd542c7f08e3eb3906e6c3c2a1895cebc74eaef07e90c47721965873888ee4c0a46a8be72bf5fe6ef
 EBUILD libcxxabi-15.0.6.ebuild 2909 BLAKE2B a1aafff6c1499a13f5301819477c822ad16c32442d47d1ca04e343c8a56a7936dc1c4a8e8c75394bf2d77adcd91cefb4264e5ff0e15212a2df703fab0b1631de SHA512 9cfa80c345874e87e0adfa96b2e9382252f8ab989eb651133531e0ab86f29ac759f0485f017703c344dd21cf35f063c410160106dbbed4ccf29562b1621bee20
-EBUILD libcxxabi-15.0.7.ebuild 2912 BLAKE2B ba4e69ea0c00659c9c2d70b002d3f663c7b5ea0d441ac284b5cdad52426b4ba4f793edfac046ec66db69ba1e0d176a3f3d2e3123f80c82dc3353aee24a1128d4 SHA512 2a09a2791f80f40bcadfb0257cd1648df42801cf363a96ceb5054a88dea0975d0bf4ca87cee6e7029ccb42575afd36217c6d72286588aa5fc809766dca4bc1ec
+EBUILD libcxxabi-15.0.7.ebuild 2909 BLAKE2B a1aafff6c1499a13f5301819477c822ad16c32442d47d1ca04e343c8a56a7936dc1c4a8e8c75394bf2d77adcd91cefb4264e5ff0e15212a2df703fab0b1631de SHA512 9cfa80c345874e87e0adfa96b2e9382252f8ab989eb651133531e0ab86f29ac759f0485f017703c344dd21cf35f063c410160106dbbed4ccf29562b1621bee20
 EBUILD libcxxabi-16.0.0.9999.ebuild 2866 BLAKE2B 8eb6ad38adec95b1dfda64dfff47255bd19841975520320f9842ddd79b1162674dcc933d167585ed6f497c5b54095d8aa96b0af9335f1fa8bfb27619668f0c91 SHA512 be61b1a89549b0d531795483e350924ffc03f85bf0fb2f5fbf75a743d56e8da95598fb4f114ce2c3ffa903254dbbe35f171aacad7ce3cd5f358ca1d763d4934e
 EBUILD libcxxabi-16.0.0_pre20230107.ebuild 2872 BLAKE2B 9a0dd0aa38b9e6229d49c96c4a7b97cfba583702c0fcd620cd570a9e2428b59ac0f1aa02153aba54c0a9187f07fd2ff85aec9e4df072d2f64f5af371c54a9b28 SHA512 85ad4be182dee73e514ed4d69ae6ad570c0854a79ed2d5660c86ed12f794ab6107564d6d46ee79933e3690f79a81bc573afa9cd194548dd9c68347bea4c79b17
 EBUILD libcxxabi-17.0.0.9999.ebuild 2866 BLAKE2B 8eb6ad38adec95b1dfda64dfff47255bd19841975520320f9842ddd79b1162674dcc933d167585ed6f497c5b54095d8aa96b0af9335f1fa8bfb27619668f0c91 SHA512 be61b1a89549b0d531795483e350924ffc03f85bf0fb2f5fbf75a743d56e8da95598fb4f114ce2c3ffa903254dbbe35f171aacad7ce3cd5f358ca1d763d4934e
diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.7.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.7.ebuild
index 491cc1777449..1b6f8964e39a 100644
--- a/sys-libs/libcxxabi/libcxxabi-15.0.7.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-15.0.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~riscv sparc x86 ~x64-macos"
 IUSE="+clang static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 6dccbbb5235c..44f7bc10bdec 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -11,7 +11,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD libomp-13.0.1.ebuild 3907 BLAKE2B 6004ffd9d6b183b99bc9f2117e7db2aef65bce75cad55b9bcdbe4447fcaf23a9535b270f08d29d4c574fcba86a656eb6ea5db82439f7ba51610b43b74e5db405 SHA512 acbac5e01f2acb6621b7c1c6f3cb774320884794058128399d0e5d1fcef3b18404346f5f707a318dbad0d5f9ca07474ffcbc06a8d092b9bfeb0793bc5cdb21f2
 EBUILD libomp-14.0.6-r1.ebuild 3917 BLAKE2B d92540af690dd622122ad1a4ed2548afa141f1254fbe9a9b3d34286b36f0fa70ccaf915f218c1bea8c68377ea20724db9443d365e2e5f290707f444d3ff47ca5 SHA512 433ae63716103af5aa493c7dbae43f10003cac95abaae579dcb61cba6390da4b9b3fc921e410ba899719bd170fa153a7b3d66c8776c37fd074066173c1fea160
 EBUILD libomp-15.0.6.ebuild 3400 BLAKE2B f3861589a39fa019f47e103225606b5ad3b889222ea0d46f3d955524c5de77d4e0a1c12d3ac426e53ee46824e7de240cad4fc931cf0b239e492417b8159ccabb SHA512 89f27e3bfbcd801eeab05b42d4e20d2adac99b800eeacb1ad27c44505aaed12a1e5a3e17953844f986c084a3928b30083736f3a51689c5c26bbf4ac5a4f21c19
-EBUILD libomp-15.0.7.ebuild 3402 BLAKE2B 48ac63e915561c6235da93aae91848d6b916df843698f41ef6ea9e7444e83148d228bb97d1d6b3d34479d93cc5bc5703875cd1513e2056455d0cf80f5d7d8076 SHA512 f4dbd56f368db9be8fd939ae78da49a62da80b557d999fcb400f24aaf515d8c8d8ca59ce005b2f68a9e26cb6cfdd4ab0e6e5f395851d1b5b83d8e22540cf7ab0
+EBUILD libomp-15.0.7.ebuild 3400 BLAKE2B f3861589a39fa019f47e103225606b5ad3b889222ea0d46f3d955524c5de77d4e0a1c12d3ac426e53ee46824e7de240cad4fc931cf0b239e492417b8159ccabb SHA512 89f27e3bfbcd801eeab05b42d4e20d2adac99b800eeacb1ad27c44505aaed12a1e5a3e17953844f986c084a3928b30083736f3a51689c5c26bbf4ac5a4f21c19
 EBUILD libomp-16.0.0.9999.ebuild 3769 BLAKE2B a5c3ebbfd36869cb4ab676d40f374391e394cee4e2eb2d77c4cdf605ec4b36736621fd7883c3a509922c8140f235ced7b3e6e6267510c771c53271647bd2e5b1 SHA512 c1b55fa30e12c856830fb31e02f31b23c2f64741b8da46a8ac1982718064b6203754919fbfaa99e7850503b325263ec987b87aac0c6955d3b712399548ab13a5
 EBUILD libomp-16.0.0_pre20230107.ebuild 3450 BLAKE2B c698732a256b4236436f8228e334d2f34885fb1093aa5afa8d2e069a1d7dce169756ec29d15b0dabd355bdb1f657af67eef776ec31bb184d9252600eb582a5a7 SHA512 a5117c5017f593e8801f471ad9c359f2cb31b72323195bec42c0759d49fd497dd69f3b1af27db474b63ea07306ac57a68d040cd3c94b9588dc64a1c9134ab964
 EBUILD libomp-17.0.0.9999.ebuild 3769 BLAKE2B a5c3ebbfd36869cb4ab676d40f374391e394cee4e2eb2d77c4cdf605ec4b36736621fd7883c3a509922c8140f235ced7b3e6e6267510c771c53271647bd2e5b1 SHA512 c1b55fa30e12c856830fb31e02f31b23c2f64741b8da46a8ac1982718064b6203754919fbfaa99e7850503b325263ec987b87aac0c6955d3b712399548ab13a5
diff --git a/sys-libs/libomp/libomp-15.0.7.ebuild b/sys-libs/libomp/libomp-15.0.7.ebuild
index 5675f2c31cd2..46dfae21f41d 100644
--- a/sys-libs/libomp/libomp-15.0.7.ebuild
+++ b/sys-libs/libomp/libomp-15.0.7.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 IUSE="
 	debug hwloc offload ompt test
 	llvm_targets_AMDGPU llvm_targets_NVPTX
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index f61b10ce3fa3..040bb5dc55ee 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -10,7 +10,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD llvm-libunwind-13.0.1-r1.ebuild 3772 BLAKE2B 55db31f560c6e4cc6c6acb703f9df7dd3e0e691c2d0d8c15660a89c4e41ad0ff7b1c515a440567f4cc5842e07f296d8042dc71ba1380f250dfd1ab93608444cc SHA512 f0efdfb6bf2e7ec8c41863b475e9646171d7c1da075e4298e47d101da5338c5c7945b98c2c3178d27f6e9eee565691f04a2fa2145584c7b66a3c98dd7afa21f6
 EBUILD llvm-libunwind-14.0.6-r1.ebuild 3161 BLAKE2B ba7b19ed2bc77b52eee0b04d938541d2eb4053b65a641e55e54ebac85adcd432fa60b2b484003890bc96be83d61410bb58c2f3a86f12a7c574044a8e10427db9 SHA512 11854f9ef2a552a96e51c618958e553d4cd4affc78312845a223d0fe6d2ff62e8f8b2b3c29ad4a093b08a6df63b230f21b9ef6b63440058322f6a00f160df3e4
 EBUILD llvm-libunwind-15.0.6.ebuild 3032 BLAKE2B 9b47e894db1a764f3eca3135f4caba68261953f4433af017b7bb53181e345ad26c570733f997022c53c9ef49a0a3b823188d92cfcc16a2113825d767b1ffab2a SHA512 0b68480fb2a8e5a351574e81fbcff824cd324754ed40378f06fec12fedbba94a921043d72db6ecc37f8b0680b7f518bbbd8d63f69ce8d84f86ca522653d293fb
-EBUILD llvm-libunwind-15.0.7.ebuild 3035 BLAKE2B 7de6b49a238c89643ac36539cc74523d0260c07b136f07ee605469360530c502d23c1d9c3cec2c0b926ba62e882525243817ef6fe3195eeb9d4833c6f7c2a5d1 SHA512 8ca4ed6f38e8e2abf887553a4bf71a580eae2c9497a3716c2cab74671736e4171a393e03ccf9ddbffdb9108341f9fb84f6cb06a908061c7d9db37b6bd581dcd8
+EBUILD llvm-libunwind-15.0.7.ebuild 3032 BLAKE2B 9b47e894db1a764f3eca3135f4caba68261953f4433af017b7bb53181e345ad26c570733f997022c53c9ef49a0a3b823188d92cfcc16a2113825d767b1ffab2a SHA512 0b68480fb2a8e5a351574e81fbcff824cd324754ed40378f06fec12fedbba94a921043d72db6ecc37f8b0680b7f518bbbd8d63f69ce8d84f86ca522653d293fb
 EBUILD llvm-libunwind-16.0.0.9999.ebuild 2978 BLAKE2B 9143fac20e5d73511c56e8015c4758075bf62329b64428b9244812f2fe5fa32772c9ad29e3e7beb1aaa2ff3ef70ee69f9673c0becf7df09f4e2fc5d348c03512 SHA512 b790b15702e2ba0367c771d58dfe975f7b97bb6a90acca97d1180b1b3ba44893575bc92ee1cfe037c308b3191f3d1b8309a0a658cd8617b0993bfa8ce4630d97
 EBUILD llvm-libunwind-16.0.0_pre20230107.ebuild 2984 BLAKE2B 89f6251c89eb54defcddf231cbc4c34005b5d0421e2886b2eebcc1a8f98f88271357e6efac8a46b8d4616912611bf7c935c7cd60b15a6b42f74e3bbedcd629a2 SHA512 d4b223d191f0d0bcd19805050e3e770dc7faf4e68031f329deb085bd1562d278e2eea3f040405526025711d6ac4b390497ecf329f4ab31a00c3edf53186cc2fd
 EBUILD llvm-libunwind-17.0.0.9999.ebuild 2978 BLAKE2B 9143fac20e5d73511c56e8015c4758075bf62329b64428b9244812f2fe5fa32772c9ad29e3e7beb1aaa2ff3ef70ee69f9673c0becf7df09f4e2fc5d348c03512 SHA512 b790b15702e2ba0367c771d58dfe975f7b97bb6a90acca97d1180b1b3ba44893575bc92ee1cfe037c308b3191f3d1b8309a0a658cd8617b0993bfa8ce4630d97
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.7.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.7.ebuild
index 959b973d6483..4623b458be97 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.7.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="+clang debug static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@koprulu.sector>	2023-01-27 01:57:18 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-01-27 01:57:18 +0000
commit	2db43213e5c343995f4b9fb977726fe42ebdac67 (patch)
tree	6707366d284d46256ffc9490ab6d2940a83cd0ae
parent	236302aac694377916670b7769f941e3f1dd0bbc (diff)