update md5-cache, drop some no longer used ebuilds

62 files changed, 48 insertions, 1165 deletions

diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
deleted file mode 100644
index f9c73776..00000000
--- a/app-emulation/virt-manager/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST virt-manager-4.0.0.tar.gz 3096236 BLAKE2B cf6ae282c6a351aab832a06387bf9daf9093c8cce3688cf0597f33d037db875638429a5320ffe28d8d860c83484ba5d6a02a8dc758c98914fa2af483552dede8 SHA512 115dc3feb499bb2f1f6df537bffe150d23b9b568fe8047d43577a138ff9b9180b10259dde3476136cdc85750576da1104e81a8c2f5761b4f2a89852467761f81
diff --git a/app-emulation/virt-manager/files/virt-manager-4.0.0-setuptools-61-fix.patch b/app-emulation/virt-manager/files/virt-manager-4.0.0-setuptools-61-fix.patch
deleted file mode 100644
index ace16902..00000000
--- a/app-emulation/virt-manager/files/virt-manager-4.0.0-setuptools-61-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c6fc4524d4448259ea85f93f85898b64a4380154 Mon Sep 17 00:00:00 2001
-From: Peter Alfredsen <crabbedhaloablution@icloud.com>
-Date: Tue, 5 Apr 2022 22:04:20 +0200
-Subject: [PATCH] setup: add bits for setuptools-61
-
-Quoting https://github.com/pypa/setuptools/issues/3227
-"Setuptools >= 61, intentionally changes the way packages are built in the
- sensec that it will try to find files and fail if something is weird.
-
- Empty packages (like this one), are asked to explicitly add packages=[]
- to their configuration.
-
- This intentional change in behaviour is described in
- https://setuptools.pypa.io/en/latest/history.html#v61-0-0."
-
-Bug: https://bugs.gentoo.org/836645
-Signed-off-by: Peter Alfredsen <crabbedhaloablution@icloud.com>
----
- setup.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/setup.py b/setup.py
-index e95acd39..7e47e7c7 100755
---- a/setup.py
-+++ b/setup.py
-@@ -547,4 +547,5 @@ setuptools.setup(
-     },
- 
-     distclass=VMMDistribution,
-+    packages=[],
- )
--- 
-2.35.1
-
diff --git a/app-emulation/virt-manager/virt-manager-4.0.0-r10.ebuild b/app-emulation/virt-manager/virt-manager-4.0.0-r10.ebuild
deleted file mode 100644
index b5d47432..00000000
--- a/app-emulation/virt-manager/virt-manager-4.0.0-r10.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-DISTUTILS_SINGLE_IMPL=1
-
-DISTUTILS_USE_SETUPTOOLS=no
-inherit gnome2 distutils-r1 optfeature
-
-DESCRIPTION="A graphical tool for administering virtual machines"
-HOMEPAGE="https://virt-manager.org https://github.com/virt-manager/virt-manager"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gtk policykit sasl"
-
-RDEPEND="${PYTHON_DEPS}
-	app-cdr/cdrtools
-	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	$(python_gen_cond_dep '
-		dev-libs/libxml2[python,${PYTHON_USEDEP}]
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/libvirt-python-6.10.0[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	')
-	>=sys-libs/libosinfo-0.2.10[introspection]
-	gtk? (
-		gnome-base/dconf
-		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
-		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
-		policykit? ( sys-auth/polkit[introspection] )
-		sys-apps/dbus[X]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/gtksourceview:4[introspection]
-		x11-libs/vte:2.91[introspection]
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-python/docutils"
-
-DOCS=( README.md NEWS.md )
-
-# Doesn't seem to play nicely in a sandboxed environment.
-RESTRICT="test"
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	eapply "${FILESDIR}/virt-manager-4.0.0-setuptools-61-fix.patch"
-}
-
-python_configure() {
-	esetup.py configure --default-graphics=spice
-}
-
-python_install() {
-	esetup.py install
-}
-
-src_install() {
-	local DISTUTILS_ARGS=( --no-update-icon-cache --no-compile-schemas )
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	if use gtk; then
-		gnome2_pkg_preinst
-
-		cd "${ED}" || die
-		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null || die)
-	else
-		rm -r "${ED}/usr/share/virt-manager/ui/" || die
-		rm -r "${ED}/usr/share/virt-manager/icons/" || die
-		rm -r "${ED}/usr/share/icons/" || die
-		rm -r "${ED}/usr/share/applications/virt-manager.desktop" || die
-		rm -r "${ED}/usr/bin/virt-manager" || die
-	fi
-}
-
-pkg_postinst() {
-	use gtk && gnome2_pkg_postinst
-	optfeature "SSH_ASKPASS program implementation" lxqt-base/lxqt-openssh-askpass net-misc/ssh-askpass-fullscreen net-misc/x11-ssh-askpass
-	optfeature "QEMU host support" app-emulation/qemu[usbredir,spice]
-}
diff --git a/metadata/md5-cache/app-admin/vasile-2.1812.2 b/metadata/md5-cache/app-admin/vasile-2.1812.2
index b35bd240..a40987b7 100644
--- a/metadata/md5-cache/app-admin/vasile-2.1812.2
+++ b/metadata/md5-cache/app-admin/vasile-2.1812.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sys-apps/gentoo-functions dev-libs/libisoburn dev-vcs/git sys-boot/grub:2 sys-kernel/dkms sys-fs/mtools sys-fs/squashfs-tools
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=3ec7b82666dc2011df404e7cb4d1ca4f
diff --git a/metadata/md5-cache/app-emulation/steam-1.0.0.71 b/metadata/md5-cache/app-emulation/steam-1.0.0.71
index e6d664b3..b091e90d 100644
--- a/metadata/md5-cache/app-emulation/steam-1.0.0.71
+++ b/metadata/md5-cache/app-emulation/steam-1.0.0.71
@@ -8,5 +8,5 @@ LICENSE=custom
 RDEPEND=dev-util/desktop-file-utils gnome-extra/zenity media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] net-misc/curl[abi_x86_32(-)] sys-apps/dbus[abi_x86_32(-),X] sys-apps/gentoo-functions virtual/ttf-fonts x11-libs/gdk-pixbuf[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] x11-themes/hicolor-icon-theme
 SLOT=0
 SRC_URI=http://repo.steampowered.com/steam/pool/steam/s/steam/steam_1.0.0.71.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2c76571aeeae4f7731214cf6d2d7c5c0
diff --git a/metadata/md5-cache/app-emulation/virt-manager-4.0.0-r10 b/metadata/md5-cache/app-emulation/virt-manager-4.0.0-r10
deleted file mode 100644
index 24ec56dc..00000000
--- a/metadata/md5-cache/app-emulation/virt-manager-4.0.0-r10
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-python/docutils test? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] dev-python/argcomplete[python_targets_python3_8(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/libxml2[python,python_targets_python3_9(-)] dev-python/argcomplete[python_targets_python3_9(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/libxml2[python,python_targets_python3_10(-)] dev-python/argcomplete[python_targets_python3_10(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] policykit? ( sys-auth/polkit[introspection] ) sys-apps/dbus[X] x11-libs/gtk+:3[introspection] x11-libs/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] dev-python/argcomplete[python_targets_python3_8(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/libxml2[python,python_targets_python3_9(-)] dev-python/argcomplete[python_targets_python3_9(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/libxml2[python,python_targets_python3_10(-)] dev-python/argcomplete[python_targets_python3_10(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] policykit? ( sys-auth/polkit[introspection] ) sys-apps/dbus[X] x11-libs/gtk+:3[introspection] x11-libs/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] )
-DESCRIPTION=A graphical tool for administering virtual machines
-EAPI=8
-HOMEPAGE=https://virt-manager.org https://github.com/virt-manager/virt-manager
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2 distutils-r1 optfeature
-IUSE=gtk policykit sasl test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] dev-python/argcomplete[python_targets_python3_8(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/libxml2[python,python_targets_python3_9(-)] dev-python/argcomplete[python_targets_python3_9(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/libxml2[python,python_targets_python3_10(-)] dev-python/argcomplete[python_targets_python3_10(-)] >=dev-python/libvirt-python-6.10.0[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?] policykit? ( sys-auth/polkit[introspection] ) sys-apps/dbus[X] x11-libs/gtk+:3[introspection] x11-libs/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-4.0.0.tar.gz
-_eclasses_=distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=548320e1bca236ed3ee9320453ce3a67
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-6.1.18.142142-r2 b/metadata/md5-cache/app-emulation/virtualbox-bin-6.1.18.142142-r2
index a68c8849..3d0e6da5 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-6.1.18.142142-r2
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-6.1.18.142142-r2
@@ -10,5 +10,5 @@ RDEPEND=!!app-emulation/virtualbox !!app-emulation/virtualbox-additions !!app-em
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/6.1.18/VirtualBox-6.1.18-142142-Linux_amd64.run ) https://download.virtualbox.org/virtualbox/6.1.18/Oracle_VM_VirtualBox_Extension_Pack-6.1.18-142142.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.18-142142.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	unpacker	697382d119fd3d195f110b7979184285	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	unpacker	697382d119fd3d195f110b7979184285	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=526d57e7b1ad2778a4084202af28743f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.18 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.18
index 05836149..256cf27b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.18
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.18
@@ -8,5 +8,5 @@ KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=acct-group/vboxusers ~sys-kernel/virtualbox-modules-dkms-6.1.18
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=18205a6228da4d6e111cb89b5936003b
diff --git a/metadata/md5-cache/app-misc/redcore-live-314-r4 b/metadata/md5-cache/app-misc/redcore-live-314-r4
index b69a840f..7875f90f 100644
--- a/metadata/md5-cache/app-misc/redcore-live-314-r4
+++ b/metadata/md5-cache/app-misc/redcore-live-314-r4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=aafbb135192b59c711cc2ddbb91f0bd1
diff --git a/metadata/md5-cache/app-misc/redcore-skel-314-r6 b/metadata/md5-cache/app-misc/redcore-skel-314-r6
index 10bab96e..ec809eb7 100644
--- a/metadata/md5-cache/app-misc/redcore-skel-314-r6
+++ b/metadata/md5-cache/app-misc/redcore-skel-314-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-fonts/roboto x11-themes/material-icon-theme x11-themes/numix-icon-theme x11-themes/numix-icon-theme-circle x11-themes/redcore-theme x11-themes/redcore-artwork-community x11-themes/redcore-artwork-core x11-themes/redcore-artwork-grub
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=36b400361eb2f3e6736fc6299e3da4df
diff --git a/metadata/md5-cache/app-portage/sisyphus-4.2107.0-r4 b/metadata/md5-cache/app-portage/sisyphus-4.2107.0-r4
index 9d4b5806..99baeafd 100644
--- a/metadata/md5-cache/app-portage/sisyphus-4.2107.0-r4
+++ b/metadata/md5-cache/app-portage/sisyphus-4.2107.0-r4
@@ -11,5 +11,5 @@ PDEPEND=qt5? ( ~app-portage/sisyphus-qt-4.2107.0 )
 PROPERTIES=live
 RDEPEND=dev-lang/python[sqlite] app-portage/portage-utils python_single_target_python3_8? ( app-portage/gentoolkit[python_targets_python3_8(-)] dev-python/animation[python_targets_python3_8(-)] dev-python/GitPython[python_targets_python3_8(-)] dev-python/typer[python_targets_python3_8(-)] dev-python/typing-extensions[python_targets_python3_8(-)] dev-python/urllib3[python_targets_python3_8(-)] dev-python/wget[python_targets_python3_8(-)] sys-apps/portage[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-portage/gentoolkit[python_targets_python3_9(-)] dev-python/animation[python_targets_python3_9(-)] dev-python/GitPython[python_targets_python3_9(-)] dev-python/typer[python_targets_python3_9(-)] dev-python/typing-extensions[python_targets_python3_9(-)] dev-python/urllib3[python_targets_python3_9(-)] dev-python/wget[python_targets_python3_9(-)] sys-apps/portage[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-portage/gentoolkit[python_targets_python3_10(-)] dev-python/animation[python_targets_python3_10(-)] dev-python/GitPython[python_targets_python3_10(-)] dev-python/typer[python_targets_python3_10(-)] dev-python/typing-extensions[python_targets_python3_10(-)] dev-python/urllib3[python_targets_python3_10(-)] dev-python/wget[python_targets_python3_10(-)] sys-apps/portage[python_targets_python3_10(-)] ) sys-apps/gentoo-functions
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=de3cc5cb28502e1665beffcf5fc0e15d
diff --git a/metadata/md5-cache/app-portage/sisyphus-qt-4.2107.0-r2 b/metadata/md5-cache/app-portage/sisyphus-qt-4.2107.0-r2
index 387b19dd..7944b140 100644
--- a/metadata/md5-cache/app-portage/sisyphus-qt-4.2107.0-r2
+++ b/metadata/md5-cache/app-portage/sisyphus-qt-4.2107.0-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-lang/python[sqlite] ~app-portage/sisyphus-4.2107.0 app-misc/tmux python_single_target_python3_8? ( dev-python/PyQt5[designer,gui,widgets,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[designer,gui,widgets,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[designer,gui,widgets,python_targets_python3_10(-)] )
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=58d15e7bac70d4fb5ff9aabb4a865c51
diff --git a/metadata/md5-cache/app-text/simplenote-2.6.0 b/metadata/md5-cache/app-text/simplenote-2.6.0
index a82e5e0b..a534b9d7 100644
--- a/metadata/md5-cache/app-text/simplenote-2.6.0
+++ b/metadata/md5-cache/app-text/simplenote-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/nss media-libs/alsa-lib x11-libs/gtk+:2 x11-libs/libXtst x11-li
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=https://github.com/Automattic/simplenote-electron/releases/download/v2.6.0/Simplenote-linux-2.6.0-amd64.deb
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6944def2f979a4a54e6c2898ff410ae8
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-qt5-0.9.3_pre20160218-r2 b/metadata/md5-cache/dev-libs/libdbusmenu-qt5-0.9.3_pre20160218-r2
index 446de7b2..ac3809ce 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-qt5-0.9.3_pre20160218-r2
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-qt5-0.9.3_pre20160218-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz
-_eclasses_=cmake-utils	9e91c7445357e208267f5ab7e693d456	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake-utils	9e91c7445357e208267f5ab7e693d456	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=fcb31881c55a860d1e756ea75cc1072e
diff --git a/metadata/md5-cache/dev-python/animation-0.0.5-r2 b/metadata/md5-cache/dev-python/animation-0.0.5-r2
index 30ba4521..30a57bfe 100644
--- a/metadata/md5-cache/dev-python/animation-0.0.5-r2
+++ b/metadata/md5-cache/dev-python/animation-0.0.5-r2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/bprinty/animation/archive/0.0.5.tar.gz -> animation-0.0.5.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ef26ff79ee4330438e2b74142947572e
diff --git a/metadata/md5-cache/dev-python/sh-1.12.14-r4 b/metadata/md5-cache/dev-python/sh-1.12.14-r4
index 9efb899b..868b9fa0 100644
--- a/metadata/md5-cache/dev-python/sh-1.12.14-r4
+++ b/metadata/md5-cache/dev-python/sh-1.12.14-r4
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_target
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/amoffat/sh/archive/1.12.14.tar.gz -> sh-1.12.14.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a8b08f6462162c17bdc48d6a6620db4a
diff --git a/metadata/md5-cache/dev-python/typer-0.2.1-r2 b/metadata/md5-cache/dev-python/typer-0.2.1-r2
index 5d813796..e1a658d8 100644
--- a/metadata/md5-cache/dev-python/typer-0.2.1-r2
+++ b/metadata/md5-cache/dev-python/typer-0.2.1-r2
@@ -11,5 +11,5 @@ RDEPEND=<dev-python/click-8[python_targets_python3_8(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/tiangolo/typer/archive/0.2.1.tar.gz -> typer-0.2.1.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=967436eb0f5c38ff86ca2c921bf3b73e
diff --git a/metadata/md5-cache/dev-python/wget-2.2-r2 b/metadata/md5-cache/dev-python/wget-2.2-r2
index 7ae8f9fb..96d3dfd5 100644
--- a/metadata/md5-cache/dev-python/wget-2.2-r2
+++ b/metadata/md5-cache/dev-python/wget-2.2-r2
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	64c5b9cc381383c9c1ef74fb199293ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=57e7c1eee9c2b32043fc9b4df5177b92
diff --git a/metadata/md5-cache/mail-client/mailspring-1.9.2-r1 b/metadata/md5-cache/mail-client/mailspring-1.9.2-r1
index dc826528..a36ef65c 100644
--- a/metadata/md5-cache/mail-client/mailspring-1.9.2-r1
+++ b/metadata/md5-cache/mail-client/mailspring-1.9.2-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libsecret app-text/htmltidy dev-cpp/ctemplate dev-libs/nss dev
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=https://github.com/Foundry376/Mailspring/releases/download/1.9.2/mailspring-1.9.2-amd64.deb
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=8fe159037f081af11479ea12332d5646
diff --git a/metadata/md5-cache/media-tv/sopcast-3.2.6-r2 b/metadata/md5-cache/media-tv/sopcast-3.2.6-r2
index a396d4f4..c95a440d 100644
--- a/metadata/md5-cache/media-tv/sopcast-3.2.6-r2
+++ b/metadata/md5-cache/media-tv/sopcast-3.2.6-r2
@@ -10,5 +10,5 @@ RDEPEND=amd64? ( sys-libs/libstdc++-v3[multilib] ) x86? ( >=virtual/libstdc++-3.
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://download.sopcast.com/download/sp-auth.tgz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=319b93ad4d9a54a6486005825e98dba2
diff --git a/metadata/md5-cache/net-libs/gtk-vnc-1.3.0-r10 b/metadata/md5-cache/net-libs/gtk-vnc-1.3.0-r10
deleted file mode 100644
index 03bc048d..00000000
--- a/metadata/md5-cache/net-libs/gtk-vnc-1.3.0-r10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-lang/perl-5 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gdk-pixbuf-2.36.0:2 >=dev-libs/libgcrypt-1.8.0:0= >=net-libs/gnutls-3.6.0:0= >=sys-libs/zlib-1.2.11 sasl? ( >=dev-libs/cyrus-sasl-2.1.27 ) >=x11-libs/gtk+-3.22.0:3[introspection?] >=x11-libs/cairo-1.15.0 >=x11-libs/libX11-1.6.5 pulseaudio? ( >=media-sound/pulseaudio-11.0 ) introspection? ( >=dev-libs/gobject-introspection-1.56.0:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=VNC viewer widget for GTK
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/gtk-vnc
-INHERIT=gnome.org vala meson python-any-r1 xdg
-IUSE=+introspection pulseaudio sasl +vala
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gdk-pixbuf-2.36.0:2 >=dev-libs/libgcrypt-1.8.0:0= >=net-libs/gnutls-3.6.0:0= >=sys-libs/zlib-1.2.11 sasl? ( >=dev-libs/cyrus-sasl-2.1.27 ) >=x11-libs/gtk+-3.22.0:3[introspection?] >=x11-libs/cairo-1.15.0 >=x11-libs/libX11-1.6.5 pulseaudio? ( >=media-sound/pulseaudio-11.0 ) introspection? ( >=dev-libs/gobject-introspection-1.56.0:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gtk-vnc/1.3/gtk-vnc-1.3.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1e6892982fa34912befa6870af8f0ff1
diff --git a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r2 b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r2
index 55b2fa5e..0d1d62e2 100644
--- a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r2
+++ b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r2
@@ -9,5 +9,5 @@ LICENSE=Broadcom
 RDEPEND=~sys-kernel/broadcom-sta-dkms-6.30.223.271
 RESTRICT=mirror
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=e2e483db554c46770a340ecf694ee38c
diff --git a/metadata/md5-cache/net-wireless/rtl8821cu-5.8.1 b/metadata/md5-cache/net-wireless/rtl8821cu-5.8.1
index 141cc90d..8f9f4376 100644
--- a/metadata/md5-cache/net-wireless/rtl8821cu-5.8.1
+++ b/metadata/md5-cache/net-wireless/rtl8821cu-5.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=~sys-kernel/rtl8821cu-dkms-5.8.1
 RESTRICT=mirror
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5c712349e00e70562a46640c37fe3a7e
diff --git a/metadata/md5-cache/sys-apps/lsb-release-1.4-r11 b/metadata/md5-cache/sys-apps/lsb-release-1.4-r11
index 99a261de..8ccdab5a 100644
--- a/metadata/md5-cache/sys-apps/lsb-release-1.4-r11
+++ b/metadata/md5-cache/sys-apps/lsb-release-1.4-r11
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/lsb/lsb-release-1.4.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=e13665cbb5192aa6e91548180e492bdd
diff --git a/metadata/md5-cache/sys-boot/etcher-1.5.116 b/metadata/md5-cache/sys-boot/etcher-1.5.116
index 992090ff..fb930a19 100644
--- a/metadata/md5-cache/sys-boot/etcher-1.5.116
+++ b/metadata/md5-cache/sys-boot/etcher-1.5.116
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/nss gnome-base/gconf media-libs/alsa-lib sys-apps/lsb-release x
 RESTRICT=mirror strip
 SLOT=0
 SRC_URI=https://github.com/balena-io/etcher/releases/download/v1.5.116/balena-etcher-electron_1.5.116_amd64.deb
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=45d952aaf937b91d0b2a7b81c4efb85e
diff --git a/metadata/md5-cache/sys-boot/unetbootin-static-625-r2 b/metadata/md5-cache/sys-boot/unetbootin-static-625-r2
index 4028b445..6f844d6a 100644
--- a/metadata/md5-cache/sys-boot/unetbootin-static-625-r2
+++ b/metadata/md5-cache/sys-boot/unetbootin-static-625-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/p7zip media-libs/libpng-compat:1.2
 SLOT=0
 SRC_URI=http://redcorelinux.org/distfiles/unetbootin-static-625.tar.bz2
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4e1bd68cdb07cb66d2bf03125d80a222
diff --git a/metadata/md5-cache/sys-fs/vhba-20190831-r2 b/metadata/md5-cache/sys-fs/vhba-20190831-r2
index ce3c27af..149c761b 100644
--- a/metadata/md5-cache/sys-fs/vhba-20190831-r2
+++ b/metadata/md5-cache/sys-fs/vhba-20190831-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=~sys-kernel/vhba-dkms-20190831 virtual/udev
 SLOT=0
 SRC_URI=mirror://sourceforge/cdemu/vhba-module-20190831.tar.bz2
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=dda87fa577aea4fe8b368cebc1884032
diff --git a/metadata/md5-cache/sys-kernel/bbswitch-dkms-0.8-r1 b/metadata/md5-cache/sys-kernel/bbswitch-dkms-0.8-r1
index 683ec2be..5bb67361 100644
--- a/metadata/md5-cache/sys-kernel/bbswitch-dkms-0.8-r1
+++ b/metadata/md5-cache/sys-kernel/bbswitch-dkms-0.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=sys-kernel/dkms
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz -> bbswitch-0.8.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a9f758def9df1da8194a19614660ee8f
diff --git a/metadata/md5-cache/sys-kernel/broadcom-sta-dkms-6.30.223.271-r5 b/metadata/md5-cache/sys-kernel/broadcom-sta-dkms-6.30.223.271-r5
index 78c918cd..041181a5 100644
--- a/metadata/md5-cache/sys-kernel/broadcom-sta-dkms-6.30.223.271-r5
+++ b/metadata/md5-cache/sys-kernel/broadcom-sta-dkms-6.30.223.271-r5
@@ -10,5 +10,5 @@ RDEPEND=sys-kernel/dkms
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz )
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=32fe46a315a917792378ef85cec854c4
diff --git a/metadata/md5-cache/sys-kernel/dkms-2.3-r1 b/metadata/md5-cache/sys-kernel/dkms-2.3-r1
index 2f4fdbec..8baab4ba 100644
--- a/metadata/md5-cache/sys-kernel/dkms-2.3-r1
+++ b/metadata/md5-cache/sys-kernel/dkms-2.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://github.com/dell/dkms/archive/2.3.tar.gz -> dkms-2.3.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=69da8e8c3a724bf9041f7ec3cf7b14d7
diff --git a/metadata/md5-cache/sys-kernel/dracut-048-r10 b/metadata/md5-cache/sys-kernel/dracut-048-r10
index 6321544d..ecc91f75 100644
--- a/metadata/md5-cache/sys-kernel/dracut-048-r10
+++ b/metadata/md5-cache/sys-kernel/dracut-048-r10
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/kmod-23[tools] virtual/pkgconfig virtual/udev cryptsetup? ( s
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-048.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7edb9c945ce2f6730debd4c5247c9180
diff --git a/metadata/md5-cache/sys-kernel/linux-image-redcore-5.14.21 b/metadata/md5-cache/sys-kernel/linux-image-redcore-5.14.21
index db9750c7..1c7188c5 100644
--- a/metadata/md5-cache/sys-kernel/linux-image-redcore-5.14.21
+++ b/metadata/md5-cache/sys-kernel/linux-image-redcore-5.14.21
@@ -11,5 +11,5 @@ RDEPEND=app-arch/lz4 app-arch/xz-utils sys-devel/autoconf sys-devel/bc sys-devel
 RESTRICT=binchecks strip mirror
 SLOT=5.14.21
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.21.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d7a8245f1da7ea21fe92fcb9654e8298
diff --git a/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-5.15.53 b/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-5.15.53
index 556374f4..d51cac41 100644
--- a/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-5.15.53
+++ b/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-5.15.53
@@ -11,5 +11,5 @@ RDEPEND=app-arch/lz4 app-arch/xz-utils sys-devel/autoconf sys-devel/bc sys-devel
 RESTRICT=binchecks strip mirror
 SLOT=5.15.53
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.53.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=48d74c1755ff002cfa439b32c2c5c028
diff --git a/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-legacy-5.10.129 b/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-legacy-5.10.129
index 679fd7d3..f75737ea 100644
--- a/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-legacy-5.10.129
+++ b/metadata/md5-cache/sys-kernel/linux-image-redcore-lts-legacy-5.10.129
@@ -11,5 +11,5 @@ RDEPEND=app-arch/lz4 app-arch/xz-utils sys-devel/autoconf sys-devel/bc sys-devel
 RESTRICT=binchecks strip mirror
 SLOT=5.10.129
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.129.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=e7b55e8c43011a7fa608bb3cdca6a1a3
diff --git a/metadata/md5-cache/sys-kernel/linux-sources-redcore-5.14.21 b/metadata/md5-cache/sys-kernel/linux-sources-redcore-5.14.21
index 2604111b..4a4091ef 100644
--- a/metadata/md5-cache/sys-kernel/linux-sources-redcore-5.14.21
+++ b/metadata/md5-cache/sys-kernel/linux-sources-redcore-5.14.21
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 app-arch/xz-utils sys-devel/autoconf sys-devel/bc sys-devel
 RESTRICT=strip mirror
 SLOT=5.14.21
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.21.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=8b5e6c4c2415043b3ea288d3f38919d8
diff --git a/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-5.15.53 b/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-5.15.53
index fe9dd894..46d319de 100644
--- a/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-5.15.53
+++ b/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-5.15.53
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 app-arch/xz-utils sys-devel/autoconf sys-devel/bc sys-devel
 RESTRICT=strip mirror
 SLOT=5.15.53
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.53.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=ae6d423a2f2364e521788bea9d86dc7a
diff --git a/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-legacy-5.10.129 b/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-legacy-5.10.129
index 2614f687..c9bada97 100644
--- a/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-legacy-5.10.129
+++ b/metadata/md5-cache/sys-kernel/linux-sources-redcore-lts-legacy-5.10.129
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 app-arch/xz-utils sys-devel/autoconf sys-devel/bc sys-devel
 RESTRICT=strip mirror
 SLOT=5.10.129
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.129.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5816158d21633f88061462b812ea9579
diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.103.01 b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.103.01
index c1ac684d..9215363e 100644
--- a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.103.01
+++ b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.103.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2 NVIDIA-r2
 RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-legacy-dkms
 SLOT=0
 SRC_URI=amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/470.103.01/NVIDIA-Linux-x86_64-470.103.01.run )
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4877cba8e9c34ad8a2ff1cfd47be0f1c
diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-legacy-dkms-390.147 b/metadata/md5-cache/sys-kernel/nvidia-drivers-legacy-dkms-390.147
index 3037d5e1..2c5ba19b 100644
--- a/metadata/md5-cache/sys-kernel/nvidia-drivers-legacy-dkms-390.147
+++ b/metadata/md5-cache/sys-kernel/nvidia-drivers-legacy-dkms-390.147
@@ -9,5 +9,5 @@ LICENSE=GPL-2 NVIDIA-r2
 RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-dkms
 SLOT=0
 SRC_URI=amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/390.147/NVIDIA-Linux-x86_64-390.147.run )
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=85c16e3e6bd9d110a90a9cf35f8ce0b4
diff --git a/metadata/md5-cache/sys-kernel/rtl8821cu-dkms-5.8.1 b/metadata/md5-cache/sys-kernel/rtl8821cu-dkms-5.8.1
index 4743c0c7..558631cc 100644
--- a/metadata/md5-cache/sys-kernel/rtl8821cu-dkms-5.8.1
+++ b/metadata/md5-cache/sys-kernel/rtl8821cu-dkms-5.8.1
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-kernel/dkms
 RESTRICT=mirror
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2b2ddaa6389d230c8db815f7a0477f9e
diff --git a/metadata/md5-cache/sys-kernel/vhba-dkms-20190831 b/metadata/md5-cache/sys-kernel/vhba-dkms-20190831
index a89af159..ef653acf 100644
--- a/metadata/md5-cache/sys-kernel/vhba-dkms-20190831
+++ b/metadata/md5-cache/sys-kernel/vhba-dkms-20190831
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=sys-kernel/dkms
 SLOT=0
 SRC_URI=mirror://sourceforge/cdemu/vhba-module-20190831.tar.bz2
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6cbe228eb17f246abf90151fb4647858
diff --git a/metadata/md5-cache/sys-kernel/virtualbox-modules-dkms-6.1.18-r1 b/metadata/md5-cache/sys-kernel/virtualbox-modules-dkms-6.1.18-r1
index 0f59f96e..45f65ced 100644
--- a/metadata/md5-cache/sys-kernel/virtualbox-modules-dkms-6.1.18-r1
+++ b/metadata/md5-cache/sys-kernel/virtualbox-modules-dkms-6.1.18-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/ethtool sys-kernel/dkms
 SLOT=0
 SRC_URI=http://archive.ubuntu.com/ubuntu/pool/multiverse/v/virtualbox/virtualbox-dkms_6.1.18-dfsg-2_amd64.deb
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=f46d763c1a1c81f72ddae938a8590c41
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.103.01 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.103.01
index 3124cdf3..0a20eee5 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.103.01
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.103.01
@@ -11,5 +11,5 @@ RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc X? ( >=x11-libs/libvdp
 REQUIRED_USE=tools? ( X )
 SLOT=0
 SRC_URI=amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/470.103.01/NVIDIA-Linux-x86_64-470.103.01.run )
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	portability	d33a77692bb47e8227f27e17fb9c3c05	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	portability	d33a77692bb47e8227f27e17fb9c3c05	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=b99afc09351dceaf344cc86bc9564ba1
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-legacy-390.147 b/metadata/md5-cache/x11-drivers/nvidia-drivers-legacy-390.147
index 5f6d1904..4a2bbef5 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-legacy-390.147
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-legacy-390.147
@@ -12,5 +12,5 @@ RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc X? ( >=x11-libs/libvdp
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/390.147/NVIDIA-Linux-x86_64-390.147.run )
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	portability	d33a77692bb47e8227f27e17fb9c3c05	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	portability	d33a77692bb47e8227f27e17fb9c3c05	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=ef40703191930a0fd31b0ab0ffc609a2
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205-r10 b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205-r10
deleted file mode 100644
index be5559db..00000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205-r10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=xspice? ( app-emulation/spice python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 >=app-emulation/spice-protocol-0.12.0 x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
-DESCRIPTION=QEMU QXL paravirt video driver
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl
-INHERIT=autotools python-single-r1 xorg-3
-IUSE=xspice python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=xspice? ( app-emulation/spice python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
-REQUIRED_USE=xspice? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~slashbeast/distfiles/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205.tar.xz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	32313e7e2fbfba8f62a99ef923fc923c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	d2463997f7fda5cfc20b4c390039a361
-_md5_=f83d1ac524c39d0d88408bca5d6ad788
diff --git a/metadata/md5-cache/x11-misc/nvidia-settings-470.103.01 b/metadata/md5-cache/x11-misc/nvidia-settings-470.103.01
index 56a81e2b..dfa11d5c 100644
--- a/metadata/md5-cache/x11-misc/nvidia-settings-470.103.01
+++ b/metadata/md5-cache/x11-misc/nvidia-settings-470.103.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings-legacy
 SLOT=0
 SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/470.103.01.tar.gz -> nvidia-settings-470.103.01.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7328851830b7018c9f0ab80e5584ddb7
diff --git a/metadata/md5-cache/x11-misc/nvidia-settings-legacy-390.147 b/metadata/md5-cache/x11-misc/nvidia-settings-legacy-390.147
index 010a4c08..e828ddbb 100644
--- a/metadata/md5-cache/x11-misc/nvidia-settings-legacy-390.147
+++ b/metadata/md5-cache/x11-misc/nvidia-settings-legacy-390.147
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings ~x11-drivers/nvidia-drivers-legacy-390.147:0
 SLOT=0
 SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/390.147.tar.gz -> nvidia-settings-legacy-390.147.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6f44d95f419359984f2f80e9e65cb7e1
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-share-1337 b/metadata/md5-cache/x11-misc/pcmanfm-qt-share-1337
index 404de3d9..5f03758b 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-share-1337
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-share-1337
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=net-fs/samba
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a302911d0267b329677368bde7553011
diff --git a/metadata/md5-cache/x11-themes/material-icon-theme-1337-r2 b/metadata/md5-cache/x11-themes/material-icon-theme-1337-r2
index a6d45aeb..301bc3e6 100644
--- a/metadata/md5-cache/x11-themes/material-icon-theme-1337-r2
+++ b/metadata/md5-cache/x11-themes/material-icon-theme-1337-r2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 PROPERTIES=live
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ea671a52dc802603cb455cd6bb374aee
diff --git a/metadata/md5-cache/x11-themes/redcore-artwork-calamares-314-r3 b/metadata/md5-cache/x11-themes/redcore-artwork-calamares-314-r3
index 4252db09..28e746e9 100644
--- a/metadata/md5-cache/x11-themes/redcore-artwork-calamares-314-r3
+++ b/metadata/md5-cache/x11-themes/redcore-artwork-calamares-314-r3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-admin/calamares
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2ac5a0f8e32774db8920ff5d94574806
diff --git a/metadata/md5-cache/x11-themes/redcore-artwork-community-314-r3 b/metadata/md5-cache/x11-themes/redcore-artwork-community-314-r3
index c2e9b959..3ce37e34 100644
--- a/metadata/md5-cache/x11-themes/redcore-artwork-community-314-r3
+++ b/metadata/md5-cache/x11-themes/redcore-artwork-community-314-r3
@@ -7,5 +7,5 @@ INHERIT=eutils git-r3
 KEYWORDS=amd64 x86
 PROPERTIES=live
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7827dd4a3f3fb65fd8a0f9dc16da2c24
diff --git a/metadata/md5-cache/x11-themes/redcore-artwork-core-314 b/metadata/md5-cache/x11-themes/redcore-artwork-core-314
index 822a43ef..c7d4541a 100644
--- a/metadata/md5-cache/x11-themes/redcore-artwork-core-314
+++ b/metadata/md5-cache/x11-themes/redcore-artwork-core-314
@@ -10,5 +10,5 @@ LICENSE=CCPL-Attribution-ShareAlike-3.0
 PROPERTIES=live
 RDEPEND=sys-apps/findutils sys-boot/plymouth >=x11-themes/hicolor-icon-theme-0.10 splash? ( sys-kernel/dracut[splash] )
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=cfa47e88f70bca750fc2c50f44f51049
diff --git a/metadata/md5-cache/x11-themes/redcore-artwork-grub-1337-r4 b/metadata/md5-cache/x11-themes/redcore-artwork-grub-1337-r4
index 90f6acbc..45a7a729 100644
--- a/metadata/md5-cache/x11-themes/redcore-artwork-grub-1337-r4
+++ b/metadata/md5-cache/x11-themes/redcore-artwork-grub-1337-r4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=CCPL-Attribution-ShareAlike-3.0
 PROPERTIES=live
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=770ea2536353996f92294d4d3686d89e
diff --git a/metadata/md5-cache/x11-themes/redcore-theme-1337-r1 b/metadata/md5-cache/x11-themes/redcore-theme-1337-r1
index bd5eafdc..0cce882b 100644
--- a/metadata/md5-cache/x11-themes/redcore-theme-1337-r1
+++ b/metadata/md5-cache/x11-themes/redcore-theme-1337-r1
@@ -9,5 +9,5 @@ LICENSE=GPLv3
 PROPERTIES=live
 RDEPEND=x11-themes/gtk-engines-murrine x11-themes/gtk-engines-unico
 SLOT=0
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=016344f98820f3ed7f927fbcca882234
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index d1633b43..30e946db 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -6,7 +6,6 @@ app-admin/vasile 2.1812.2: Versatile Advanced Script for ISO and Latest Enchantm
 app-emulation/linux-steam-integration 0.7.3-r2: Helper for enabling better Steam integration on Linux
 app-emulation/steam 1.0.0.71: Digital distribution client bootstrap package
 app-emulation/steam-native-runtime 1.0.0.71-r1: Native replacement for the Steam runtime using system libraries
-app-emulation/virt-manager 4.0.0-r10: A graphical tool for administering virtual machines
 app-emulation/virtualbox-bin 6.1.18.142142-r2: Family of powerful x86 virtualization products for enterprise and home use
 app-emulation/virtualbox-modules 6.1.18: Kernel Modules for Virtualbox
 app-misc/calamares-config-redcore 314-r6: Redcore Linux Calamares modules config
@@ -35,7 +34,6 @@ media-tv/sopcast 3.2.6-r2: SopCast free P2P Internet TV binary
 media-video/guvcview 2.0.6-r10: Simple Qt5 or GTK+3 interface for capturing and viewing video from v4l2 devices
 media-video/mpv 0.34.1-r10: Media player based on MPlayer and mplayer2
 media-video/nvidia_video_sdk 6.0.1-r10: NVIDIA Video Codec SDK
-net-libs/gtk-vnc 1.3.0-r10: VNC viewer widget for GTK
 net-libs/libnm-glib 1.18.10-r2: Legacy NetworkManager glib and util libraries
 net-libs/webkit-gtk 2.34.1-r100: Open source web browser engine
 net-wireless/broadcom-sta 6.30.223.271-r2: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver
@@ -91,7 +89,6 @@ x11-base/xorg-server 21.1.3-r100: X.Org X servers
 x11-base/xwayland 22.1.2-r100: Standalone X server running under Wayland
 x11-drivers/nvidia-drivers 470.103.01: NVIDIA Accelerated Graphics Driver
 x11-drivers/nvidia-drivers-legacy 390.147: NVIDIA Accelerated Graphics Driver
-x11-drivers/xf86-video-qxl 0.1.5_p20200205-r10: QEMU QXL paravirt video driver
 x11-libs/gtk+ 2.24.33-r10 3.24.29-r10: Gimp ToolKit +
 x11-misc/nvidia-prime 314: NVIDIA Prime Render Offload configuration and utilities
 x11-misc/nvidia-settings 470.103.01: NVIDIA Linux X11 Settings Utility
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
deleted file mode 100644
index 33c4db82..00000000
--- a/net-libs/gtk-vnc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gtk-vnc-1.3.0.tar.xz 220488 BLAKE2B ea5070cc396fe4ef52fe980b766658f1a4f82eb7dec52856ab79836363c8fdb48827d52c0df7edb2c943f5087fcfd87898aa43457f7cbf5a544a4c7063f84f3d SHA512 ff25c19a1cbd4588990f1f3a2448fd2e0b694b933ca1a7be9565188db78055efe13f90ad1243bf8237d6a29d38987d7b3e77344e50d09191207b09200b01f5df
diff --git a/net-libs/gtk-vnc/files/8da5e173ebdccbca60387ef2347c629be3c78dff.patch b/net-libs/gtk-vnc/files/8da5e173ebdccbca60387ef2347c629be3c78dff.patch
deleted file mode 100644
index 93f02b3f..00000000
--- a/net-libs/gtk-vnc/files/8da5e173ebdccbca60387ef2347c629be3c78dff.patch
+++ /dev/null
@@ -1,693 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 299113a3fc24f58d3d3f3a01bb47bb3830a5f2a4..bf72f13eb256c48bd99146a47b118c16addac9e0 100644
---- a/meson.build
-+++ b/meson.build
-@@ -133,10 +133,10 @@ gtk_vnc_version_check_flags = gvnc_version_check_flags + [
-   '-DGDK_VERSION_MAX_ALLOWED=@0@'.format(gtk_min_version_symbol),
- ]
- 
--subproject('keycodemapdb')
-+keycodemapdb = subproject('keycodemapdb')
- 
--keymapgen = files('subprojects/keycodemapdb/tools/keymap-gen')
--keymapcsv = files('subprojects/keycodemapdb/data/keymaps.csv')
-+keymapgen = find_program('keymap-gen')
-+keymapcsv = keycodemapdb.get_variable('keymaps_csv')
- 
- 
- gnome = import('gnome')
-diff --git a/src/meson.build b/src/meson.build
-index 247c59759a7422d939c9625d976ec8d1a9143bd7..67fa8b9333324587d2c9ec07f11c398ab862f7bb 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -336,9 +336,10 @@ foreach keymap: keymaps
-   cmd = [
-     python,
-     keymapgen,
-+    'code-map',
-     '--lang', 'glib2',
-     '--varname', varname,
--    'code-map', keymapcsv, keymap, 'qnum'
-+    keymapcsv, keymap, 'qnum'
-   ]
-   gtk_vnc_sources += custom_target(
-     target,
-#diff --git a/subprojects/keycodemapdb b/subprojects/keycodemapdb
-#index 6280c94f306df6a20bbc100ba15a5a81af0366e6..e15649b83a78f89f57205927022115536d2c1698 160000
-#--- a/subprojects/keycodemapdb
-#+++ b/subprojects/keycodemapdb
-#@@ -1 +1 @@
-#-Subproject commit 6280c94f306df6a20bbc100ba15a5a81af0366e6
-#+Subproject commit e15649b83a78f89f57205927022115536d2c1698
-diff --git a/subprojects/keycodemapdb/meson.build b/subprojects/keycodemapdb/meson.build
-index eb9416b3e6c374579e11427a38b4240434b1b1fe..6d263aa454e1c905f8366619f1a856ae82dec825 100644
---- a/subprojects/keycodemapdb/meson.build
-+++ b/subprojects/keycodemapdb/meson.build
-@@ -1 +1,6 @@
--project('keycodemapdb')
-+project('keycodemapdb', meson_version: '>=0.46.0')
-+
-+keymap_gen = find_program('tools/keymap-gen')
-+meson.override_find_program('keymap-gen', keymap_gen)
-+
-+keymaps_csv = files('data/keymaps.csv')
-diff -ru a/subprojects/keycodemapdb.old/data/keymaps.csv b/subprojects/keycodemapdb/data/keymaps.csv
---- a/subprojects/keycodemapdb.old/data/keymaps.csv	2021-11-17 04:24:01.168825600 -0600
-+++ b/subprojects/keycodemapdb/data/keymaps.csv	2022-07-10 10:19:10.152573436 -0500
-@@ -144,19 +144,19 @@
- KEY_KPDOT,83,ANSI_KeypadDecimal,0x41,0x53,0x71,0x71,99,VK_DECIMAL,0x6e,83,83,XK_KP_Decimal,0xffae,NumpadDecimal,KPDL,kp_decimal,0x32,0x41
- KEY_KPDOT,83,ANSI_KeypadDecimal,0x41,0x53,0x71,0x71,99,VK_DECIMAL,0x6e,83,83,XK_KP_Decimal,0xffae,NumpadDecimal,KPDC,kp_decimal,0x32,0x41
- ,84,,,0x54,,,,,,,,,,,,,,
--KEY_ZENKAKUHANKAKU,85,,,0x76,0x5f,,148,,,,,,,Lang5,HZTG,,,
--KEY_102ND,86,,,0x56,0x61,0x13,100,VK_OEM_102,0xe1,86,86,,,IntlBackslash,LSGT,less,0x7c,
-+KEY_ZENKAKUHANKAKU,85,,,0x76,0x5f,,148,,,,,XK_Zenkaku_Hankaku,0xff2a,Lang5,HZTG,,,
-+KEY_102ND,86,,,0x56,0x61,0x13,100,VK_OEM_102,0xe2,86,86,XK_backslash,0x005c,IntlBackslash,LSGT,less,0x7c,
- KEY_F11,87,F11,0x67,0x57,0x78,0x56,68,VK_F11,0x7a,87,87,XK_F11,0xffc8,F11,FK11,f11,0x09,0x67
- KEY_F12,88,F12,0x6f,0x58,0x07,0x5e,69,VK_F12,0x7b,88,88,XK_F12,0xffc9,F12,FK12,f12,0x0b,0x6f
--KEY_RO,89,,,0x73,0x51,,135,,,,,,,IntlRo,AB11,ro,,
--KEY_KATAKANA,90,JIS_Kana,0x68,0x78,0x63,,146,VK_KANA,0x15,,,,,Katakana,KATA,,,
--KEY_KATAKANA,90,JIS_Kana,0x68,0x78,0x63,,146,VK_KANA,0x15,,,,,Lang3,KATA,,,
--KEY_HIRAGANA,91,,,0x77,0x62,0x87,147,,,,,,,Hiragana,HIRA,hiragana,,
--KEY_HIRAGANA,91,,,0x77,0x62,0x87,147,,,,,,,Lang4,HIRA,hiragana,,
--KEY_HENKAN,92,,,0x79,0x64,0x86,138,,,,,,,Convert,HENK,henkan,,
--KEY_KATAKANAHIRAGANA,93,,,0x70,0x13,0x87,136,,,0xc8,0xc8,,,KanaMode,HKTG,katakanahiragana,,
--KEY_MUHENKAN,94,,,0x7b,0x67,0x85,139,,,,,,,NonConvert,NFER,muhenkan,,
--KEY_MUHENKAN,94,,,0x7b,0x67,0x85,139,,,,,,,NonConvert,MUHE,muhenkan,,
-+KEY_RO,89,JIS_Underscore,0x5e,0x73,0x51,,135,VK_OEM_102,0xe2,0xcb,0x73,XK_underscore,0x005f,IntlRo,AB11,ro,,
-+KEY_KATAKANA,90,,,0x78,0x63,,146,VK_KANA,0x15,,,XK_Katakana,0xff26,Katakana,KATA,,,
-+KEY_KATAKANA,90,,,0x78,0x63,,146,VK_KANA,0x15,,,XK_Katakana,0xff26,Lang3,KATA,,,
-+KEY_HIRAGANA,91,,,0x77,0x62,0x87,147,,,,,XK_Hiragana,0xff25,Hiragana,HIRA,hiragana,,
-+KEY_HIRAGANA,91,,,0x77,0x62,0x87,147,,,,,XK_Hiragana,0xff25,Lang4,HIRA,hiragana,,
-+KEY_HENKAN,92,,,0x79,0x64,0x86,138,VK_CONVERT,0x1c,0x79,0x79,XK_Henkan,0xff23,Convert,HENK,henkan,,
-+KEY_KATAKANAHIRAGANA,93,,,0x70,0x13,0x87,136,VK_OEM_COPY,0xf2,0xc8,0x70,XK_Hiragana_Katakana,0xff27,KanaMode,HKTG,katakanahiragana,,
-+KEY_MUHENKAN,94,,,0x7b,0x67,0x85,139,VK_NONCONVERT,0x1d,0x7b,0x7b,XK_Muhenkan,0xff22,NonConvert,NFER,muhenkan,,
-+KEY_MUHENKAN,94,,,0x7b,0x67,0x85,139,VK_NONCONVERT,0x1d,0x7b,0x7b,XK_Muhenkan,0xff22,NonConvert,MUHE,muhenkan,,
- KEY_KPJPCOMMA,95,JIS_KeypadComma,0x5f,0x5c,0x27,,140,,,,,XK_KP_Separator,0xffac,,KPSP,,,
- KEY_KPJPCOMMA,95,JIS_KeypadComma,0x5f,0x5c,0x27,,140,,,,,XK_KP_Separator,0xffac,,JPCM,,,
- KEY_KPENTER,96,ANSI_KeypadEnter,0x4c,0xe01c,0xe05a,0x79,88,,,0x64,0x64,XK_KP_Enter,0xff8d,NumpadEnter,KPEN,kp_enter,0x5a,0x4c
-@@ -192,9 +192,11 @@
- KEY_SCALE,120,,,0xe00b,,,,,,,,,,,I128,,,
- KEY_KPCOMMA,121,,,0x7e,0x6d,,133,VK_SEPARATOR??,0x6c,,,,,NumpadComma,KPCO,kp_comma,,
- KEY_KPCOMMA,121,,,0x7e,0x6d,,133,VK_SEPARATOR??,0x6c,,,,,NumpadComma,I129,,,
--KEY_HANGEUL,122,,,,,,144,VK_HANGEUL,0x15,,,,,,HNGL,,,
--KEY_HANJA,123,,,0xe00d,,,145,VK_HANJA,0x19,,,,,,HJCV,,,
--KEY_YEN,124,JIS_Yen,0x5d,0x7d,0x6a,0x5d,137,,,0x7d,0x7d,,,IntlYen,AE13,yen,,
-+KEY_HANGEUL,122,JIS_Kana,0x68,0x72,,,144,VK_HANGEUL,0x15,,0x71,,,Lang1,HNGL,lang1,,
-+KEY_HANGEUL,122,JIS_Kana,0x68,0x72,,,144,VK_IME_ON,0x16,,0x71,,,Lang1,HNGL,lang1,,
-+KEY_HANJA,123,JIS_Eisu,0x66,0x71,,,145,VK_HANJA,0x19,,0x72,,,Lang2,HJCV,lang2,,
-+KEY_HANJA,123,JIS_Eisu,0x66,0x71,,,145,VK_IME_OFF,0x1A,,0x72,,,Lang2,HJCV,lang2,,
-+KEY_YEN,124,JIS_Yen,0x5d,0x7d,0x6a,0x5d,137,VK_OEM_5,0xdc,0x7d,0x7d,,,IntlYen,AE13,yen,,
- KEY_LEFTMETA,125,Command,0x37,0xe05b,0xe01f,0x8b,227,VK_LWIN,0x5b,0x6b,0x6b,XK_Meta_L,0xffe7,MetaLeft,LMTA,meta_l,0x78,0x37
- KEY_LEFTMETA,125,Command,0x37,0xe05b,0xe01f,0x8b,227,VK_LWIN,0x5b,0x6b,0x6b,XK_Meta_L,0xffe7,MetaLeft,LWIN,meta_l,0x78,0x37
- KEY_RIGHTMETA,126,RightCommand,0x36,0xe05c,0xe027,0x8c,231,VK_RWIN,0x5c,0x6c,0x6c,XK_Meta_R,0xffe8,MetaRight,RMTA,meta_r,0x7a,0x37
-@@ -250,8 +252,8 @@
- KEY_CONFIG,171,,,0xe001,,,,,,,,,,,I179,,,
- KEY_HOMEPAGE,172,,,0xe032,0xe03a,0x97,,VK_BROWSER_HOME,0xac,,,,,BrowserHome,I180,ac_home,,
- KEY_REFRESH,173,,,0xe067,0xe020,,250,VK_BROWSER_REFRESH,0xa8,,,,,BrowserRefresh,I181,ac_refresh,,
--KEY_EXIT,174,,,0x71,,,,,,,,,,,I182,,,
--KEY_MOVE,175,,,0x72,,,,,,,,,,,I183,,,
-+KEY_EXIT,174,,,,,,,,,,,,,,I182,,,
-+KEY_MOVE,175,,,,,,,,,,,,,,I183,,,
- KEY_EDIT,176,,,0xe008,,,247,,,,,,,,I184,,,
- KEY_SCROLLUP,177,,,0x75,,,245,,,,,,,,I185,,,
- KEY_SCROLLDOWN,178,,,0xe00f,,,246,,,,,,,,I186,,,
-diff -ru a/subprojects/keycodemapdb.old/README b/subprojects/keycodemapdb/README
---- a/subprojects/keycodemapdb.old/README	2021-11-17 04:24:01.167825700 -0600
-+++ b/subprojects/keycodemapdb/README	2022-07-10 10:19:10.152573436 -0500
-@@ -85,6 +85,7 @@
-  - GLib2 (standard C, but with GLib2 data types)
-  - Python
-  - Perl
-+ - Rust
- 
- 
- Usage
-diff -ru a/subprojects/keycodemapdb.old/tests/Makefile b/subprojects/keycodemapdb/tests/Makefile
---- a/subprojects/keycodemapdb.old/tests/Makefile	2021-11-17 04:24:01.168825600 -0600
-+++ b/subprojects/keycodemapdb/tests/Makefile	2022-07-10 10:19:10.152573436 -0500
-@@ -1,4 +1,4 @@
--TESTS := stdc stdc++ python2 python3 javascript
-+TESTS := stdc stdc++ python2 python3 javascript rust
- 
- check: $(TESTS)
- 	@set -e; for fn in $(TESTS); do \
-@@ -19,37 +19,37 @@
-              osx.h osx.c osx_name.h osx_name.c
- 	$(CC) -Wall -o $@ $(filter %.c, $^)
- osx2win32.c: $(SOURCES)
--	$(GEN) --lang stdc code-map $(DATA) osx win32 > $@
-+	$(GEN) code-map --lang stdc $(DATA) osx win32 > $@
- osx2win32.h: $(SOURCES)
--	$(GEN) --lang stdc-header code-map $(DATA) osx win32 > $@
-+	$(GEN) code-map --lang stdc-header $(DATA) osx win32 > $@
- osx2win32_name.c: $(SOURCES)
--	$(GEN) --lang stdc name-map $(DATA) osx win32 > $@
-+	$(GEN) name-map --lang stdc $(DATA) osx win32 > $@
- osx2win32_name.h: $(SOURCES)
--	$(GEN) --lang stdc-header name-map $(DATA) osx win32 > $@
-+	$(GEN) name-map --lang stdc-header $(DATA) osx win32 > $@
- osx2xkb.c: $(SOURCES)
--	$(GEN) --lang stdc code-map $(DATA) osx xkb > $@
-+	$(GEN) code-map --lang stdc $(DATA) osx xkb > $@
- osx2xkb.h: $(SOURCES)
--	$(GEN) --lang stdc-header code-map $(DATA) osx xkb > $@
-+	$(GEN) code-map --lang stdc-header $(DATA) osx xkb > $@
- osx2xkb_name.c: $(SOURCES)
--	$(GEN) --lang stdc name-map $(DATA) osx xkb > $@
-+	$(GEN) name-map --lang stdc $(DATA) osx xkb > $@
- osx2xkb_name.h: $(SOURCES)
--	$(GEN) --lang stdc-header name-map $(DATA) osx xkb > $@
-+	$(GEN) name-map --lang stdc-header $(DATA) osx xkb > $@
- html2win32.c: $(SOURCES)
--	$(GEN) --lang stdc code-map $(DATA) html win32 > $@
-+	$(GEN) code-map --lang stdc $(DATA) html win32 > $@
- html2win32.h: $(SOURCES)
--	$(GEN) --lang stdc-header code-map $(DATA) html win32 > $@
-+	$(GEN) code-map --lang stdc-header $(DATA) html win32 > $@
- html2win32_name.c: $(SOURCES)
--	$(GEN) --lang stdc name-map $(DATA) html win32 > $@
-+	$(GEN) name-map --lang stdc $(DATA) html win32 > $@
- html2win32_name.h: $(SOURCES)
--	$(GEN) --lang stdc-header name-map $(DATA) html win32 > $@
-+	$(GEN) name-map --lang stdc-header $(DATA) html win32 > $@
- osx.c: $(SOURCES)
--	$(GEN) --lang stdc code-table $(DATA) osx > $@
-+	$(GEN) code-table --lang stdc $(DATA) osx > $@
- osx.h: $(SOURCES)
--	$(GEN) --lang stdc-header code-table $(DATA) osx > $@
-+	$(GEN) code-table --lang stdc-header $(DATA) osx > $@
- osx_name.c: $(SOURCES)
--	$(GEN) --lang stdc name-table $(DATA) osx > $@
-+	$(GEN) name-table --lang stdc $(DATA) osx > $@
- osx_name.h: $(SOURCES)
--	$(GEN) --lang stdc-header name-table $(DATA) osx > $@
-+	$(GEN) name-table --lang stdc-header $(DATA) osx > $@
- 
- stdc++: stdc++.cc osx2win32.hh osx2win32.cc osx2win32_name.hh osx2win32_name.cc \
-              osx2xkb.hh osx2xkb.cc osx2xkb_name.hh osx2xkb_name.cc \
-@@ -57,58 +57,58 @@
-              osx.hh osx.cc osx_name.hh osx_name.cc
- 	$(CXX) -Wall -std=c++11 -o $@ $(filter %.cc, $^)
- osx2win32.cc: $(SOURCES)
--	$(GEN) --lang stdc++ code-map $(DATA) osx win32 > $@
-+	$(GEN) code-map --lang stdc++ $(DATA) osx win32 > $@
- osx2win32.hh: $(SOURCES)
--	$(GEN) --lang stdc++-header code-map $(DATA) osx win32 > $@
-+	$(GEN) code-map --lang stdc++-header $(DATA) osx win32 > $@
- osx2win32_name.cc: $(SOURCES)
--	$(GEN) --lang stdc++ name-map $(DATA) osx win32 > $@
-+	$(GEN) name-map --lang stdc++ $(DATA) osx win32 > $@
- osx2win32_name.hh: $(SOURCES)
--	$(GEN) --lang stdc++-header name-map $(DATA) osx win32 > $@
-+	$(GEN) name-map --lang stdc++-header $(DATA) osx win32 > $@
- osx2xkb.cc: $(SOURCES)
--	$(GEN) --lang stdc++ code-map $(DATA) osx xkb > $@
-+	$(GEN) code-map --lang stdc++ $(DATA) osx xkb > $@
- osx2xkb.hh: $(SOURCES)
--	$(GEN) --lang stdc++-header code-map $(DATA) osx xkb > $@
-+	$(GEN) code-map --lang stdc++-header $(DATA) osx xkb > $@
- osx2xkb_name.cc: $(SOURCES)
--	$(GEN) --lang stdc++ name-map $(DATA) osx xkb > $@
-+	$(GEN) name-map --lang stdc++ $(DATA) osx xkb > $@
- osx2xkb_name.hh: $(SOURCES)
--	$(GEN) --lang stdc++-header name-map $(DATA) osx xkb > $@
-+	$(GEN) name-map --lang stdc++-header $(DATA) osx xkb > $@
- html2win32.cc: $(SOURCES)
--	$(GEN) --lang stdc++ code-map $(DATA) html win32 > $@
-+	$(GEN) code-map --lang stdc++ $(DATA) html win32 > $@
- html2win32.hh: $(SOURCES)
--	$(GEN) --lang stdc++-header code-map $(DATA) html win32 > $@
-+	$(GEN) code-map --lang stdc++-header $(DATA) html win32 > $@
- html2win32_name.cc: $(SOURCES)
--	$(GEN) --lang stdc++ name-map $(DATA) html win32 > $@
-+	$(GEN) name-map --lang stdc++ $(DATA) html win32 > $@
- html2win32_name.hh: $(SOURCES)
--	$(GEN) --lang stdc++-header name-map $(DATA) html win32 > $@
-+	$(GEN) name-map --lang stdc++-header $(DATA) html win32 > $@
- osx.cc: $(SOURCES)
--	$(GEN) --lang stdc++ code-table $(DATA) osx > $@
-+	$(GEN) code-table --lang stdc++ $(DATA) osx > $@
- osx.hh: $(SOURCES)
--	$(GEN) --lang stdc++-header code-table $(DATA) osx > $@
-+	$(GEN) code-table --lang stdc++-header $(DATA) osx > $@
- osx_name.cc: $(SOURCES)
--	$(GEN) --lang stdc++ name-table $(DATA) osx > $@
-+	$(GEN) name-table --lang stdc++ $(DATA) osx > $@
- osx_name.hh: $(SOURCES)
--	$(GEN) --lang stdc++-header name-table $(DATA) osx > $@
-+	$(GEN) name-table --lang stdc++-header $(DATA) osx > $@
- 
- python2: osx2win32.py osx2win32_name.py \
-          osx2xkb.py osx2xkb_name.py \
-          html2win32.py html2win32_name.py \
-          osx.py osx_name.py
- osx2win32.py: $(SOURCES)
--	$(GEN) --lang python2 code-map $(DATA) osx win32 > $@
-+	$(GEN) code-map --lang python2 $(DATA) osx win32 > $@
- osx2win32_name.py: $(SOURCES)
--	$(GEN) --lang python2 name-map $(DATA) osx win32 > $@
-+	$(GEN) name-map --lang python2 $(DATA) osx win32 > $@
- osx2xkb.py: $(SOURCES)
--	$(GEN) --lang python2 code-map $(DATA) osx xkb > $@
-+	$(GEN) code-map --lang python2 $(DATA) osx xkb > $@
- osx2xkb_name.py: $(SOURCES)
--	$(GEN) --lang python2 name-map $(DATA) osx xkb > $@
-+	$(GEN) name-map --lang python2 $(DATA) osx xkb > $@
- html2win32.py: $(SOURCES)
--	$(GEN) --lang python2 code-map $(DATA) html win32 > $@
-+	$(GEN) code-map --lang python2 $(DATA) html win32 > $@
- html2win32_name.py: $(SOURCES)
--	$(GEN) --lang python2 name-map $(DATA) html win32 > $@
-+	$(GEN) name-map --lang python2 $(DATA) html win32 > $@
- osx.py: $(SOURCES)
--	$(GEN) --lang python2 code-table $(DATA) osx > $@
-+	$(GEN) code-table --lang python2 $(DATA) osx > $@
- osx_name.py: $(SOURCES)
--	$(GEN) --lang python2 name-table $(DATA) osx > $@
-+	$(GEN) name-table --lang python2 $(DATA) osx > $@
- 
- javascript: node_modules/babel-core \
-             node_modules/babel-plugin-transform-es2015-modules-commonjs \
-@@ -121,21 +121,42 @@
- node_modules/babel-plugin-transform-es2015-modules-commonjs:
- 	npm install babel-plugin-transform-es2015-modules-commonjs
- osx2win32.js: $(SOURCES)
--	$(GEN) --lang js code-map $(DATA) osx win32 > $@
-+	$(GEN) code-map --lang js $(DATA) osx win32 > $@
- osx2win32_name.js: $(SOURCES)
--	$(GEN) --lang js name-map $(DATA) osx win32 > $@
-+	$(GEN) name-map --lang js $(DATA) osx win32 > $@
- osx2xkb.js: $(SOURCES)
--	$(GEN) --lang js code-map $(DATA) osx xkb > $@
-+	$(GEN) code-map --lang js $(DATA) osx xkb > $@
- osx2xkb_name.js: $(SOURCES)
--	$(GEN) --lang js name-map $(DATA) osx xkb > $@
-+	$(GEN) name-map --lang js $(DATA) osx xkb > $@
- html2win32.js: $(SOURCES)
--	$(GEN) --lang js code-map $(DATA) html win32 > $@
-+	$(GEN) code-map --lang js $(DATA) html win32 > $@
- html2win32_name.js: $(SOURCES)
--	$(GEN) --lang js name-map $(DATA) html win32 > $@
-+	$(GEN) name-map --lang js $(DATA) html win32 > $@
- osx.js: $(SOURCES)
--	$(GEN) --lang js code-table $(DATA) osx > $@
-+	$(GEN) code-table --lang js $(DATA) osx > $@
- osx_name.js: $(SOURCES)
--	$(GEN) --lang js name-table $(DATA) osx > $@
-+	$(GEN) name-table --lang js $(DATA) osx > $@
-+
-+rust: osx2win32.rs osx2win32_name.rs \
-+      osx2xkb.rs osx2xkb_name.rs \
-+      html2win32.rs html2win32_name.rs \
-+      osx.rs osx_name.rs
-+osx2win32.rs: $(SOURCES)
-+	$(GEN) code-map --lang rust $(DATA) osx win32 > $@
-+osx2win32_name.rs: $(SOURCES)
-+	$(GEN) name-map --lang rust $(DATA) osx win32 > $@
-+osx2xkb.rs: $(SOURCES)
-+	$(GEN) code-map --lang rust $(DATA) osx xkb > $@
-+osx2xkb_name.rs: $(SOURCES)
-+	$(GEN) name-map --lang rust $(DATA) osx xkb > $@
-+html2win32.rs: $(SOURCES)
-+	$(GEN) code-map --lang rust $(DATA) html win32 > $@
-+html2win32_name.rs: $(SOURCES)
-+	$(GEN) name-map --lang rust $(DATA) html win32 > $@
-+osx.rs: $(SOURCES)
-+	$(GEN) code-table --lang rust $(DATA) osx > $@
-+osx_name.rs: $(SOURCES)
-+	$(GEN) name-table --lang rust $(DATA) osx > $@
- 
- clean:
- 	rm -rf node_modules
-diff -ru a/subprojects/keycodemapdb.old/tools/keymap-gen b/subprojects/keycodemapdb/tools/keymap-gen
---- a/subprojects/keycodemapdb.old/tools/keymap-gen	2021-11-17 04:24:01.170825700 -0600
-+++ b/subprojects/keycodemapdb/tools/keymap-gen	2022-07-10 10:19:10.155906857 -0500
-@@ -508,7 +508,7 @@
-     def _array_code_entry(self, value, name):
-         raise NotImplementedError()
- 
--    def generate_name_docs(self, varname, database, mapname):
-+    def generate_name_docs(self, title, subtitle, database, mapname):
-         if mapname not in database.mapname:
-             raise Exception("Unknown map %s, expected one of %s" % (
-                             mapname, ", ".join(database.mapname.keys())))
-@@ -517,10 +517,12 @@
-         keys.sort()
-         names = [database.mapname[Database.MAP_LINUX].get(key, "unnamed") for key in keys]
- 
--        if varname is None:
--            varname = mapname
-+        if title is None:
-+            title = mapname
-+        if subtitle is None:
-+            subtitle = "Docs for %s" % mapname
- 
--        self._array_start_name_doc(varname, mapname)
-+        self._array_start_name_doc(title, subtitle, mapname)
- 
-         for i in range(len(keys)):
-             key = keys[i]
-@@ -530,7 +532,7 @@
-         self._array_end()
- 
- 
--    def generate_code_docs(self, varname, database, mapname):
-+    def generate_code_docs(self, title, subtitle, database, mapname):
-         if mapname not in database.mapfrom:
-             raise Exception("Unknown map %s, expected one of %s" % (
-                             mapname, ", ".join(database.mapfrom.keys())))
-@@ -545,10 +547,12 @@
-             names = database.mapname[Database.MAP_LINUX]
-             namemap = Database.MAP_LINUX
- 
--        if varname is None:
--            varname = mapname
-+        if title is None:
-+            title = mapname
-+        if subtitle is None:
-+            subtitle = "Docs for %s" % mapname
- 
--        self._array_start_code_doc(varname, mapname, namemap)
-+        self._array_start_code_doc(title, subtitle, mapname, namemap)
- 
-         for i in range(len(keys)):
-             key = keys[i]
-@@ -748,6 +752,54 @@
-     def __init__(self):
-         super(StdCppHeaderLanguageGenerator, self).__init__("unsigned short", "char *", "unsigned int")
- 
-+
-+class RustLanguageGenerator(LanguageSrcGenerator):
-+
-+    def _boilerplate(self, lines):
-+        print("//")
-+        for line in lines:
-+            print("// %s" % line)
-+        print("//")
-+
-+    def _array_start(self, varname, length, defvalue, fromtype, totype):
-+        if fromtype == self.TYPE_ENUM:
-+            raise NotImplementedError("Enums not supported as source in Rust generator")
-+
-+        totypename = "&str" if totype == self.TYPE_STRING else "u16"
-+        if fromtype != self.TYPE_STRING:
-+            print("pub static %s: &[%s] = &[" % (varname.upper(), totypename))
-+        else:
-+            print("pub static %s: phf::Map<&str, %s> = phf::phf_map! {" %
-+                  (varname.upper(), totypename))
-+
-+    def _array_end(self, fromtype, totype):
-+        if fromtype != self.TYPE_STRING:
-+            print("];")
-+        else:
-+            print("};")
-+
-+    def _array_entry(self, index, value, comment, fromtype, totype):
-+        none = "\"\"" if totype == self.TYPE_STRING else "0"
-+        if fromtype == self.TYPE_INT:
-+            if value is None:
-+                print("  %s, // %s" % (none, comment))
-+            elif totype == self.TYPE_INT:
-+                print("  0x%x, // %s" % (value, comment))
-+            elif totype == self.TYPE_ENUM:
-+                print("  %s, // %s" % (value, comment))
-+            else:
-+                print("  \"%s\", // %s" % (value, comment))
-+        else:
-+            if value is None:
-+                print("  \"%s\" => %s, // %s" % (index, none, comment))
-+            elif totype == self.TYPE_INT:
-+                print("  \"%s\" => 0x%x, // %s" % (index, value, comment))
-+            elif totype == self.TYPE_ENUM:
-+                print("  \"%s\" => %s, // %s" % (index, value, comment))
-+            else:
-+                print("  \"%s\" => \"%s\", // %s" % (index, value, comment))
-+
-+
- class PythonLanguageGenerator(LanguageSrcGenerator):
- 
-     def _boilerplate(self, lines):
-@@ -872,10 +924,10 @@
-             print("# %s" % line)
-         print("#")
- 
--    def _array_start_name_doc(self, varname, namemap):
-+    def _array_start_name_doc(self, title, subtitle, namemap):
-         print("=head1 NAME")
-         print("")
--        print("%s" % varname)
-+        print("%s - %s" % (title, subtitle))
-         print("")
-         print("=head1 DESCRIPTION")
-         print("")
-@@ -884,10 +936,10 @@
-         print("=over 4")
-         print("")
- 
--    def _array_start_code_doc(self, varname, codemap, namemap):
-+    def _array_start_code_doc(self, title, subtitle, codemap, namemap):
-         print("=head1 NAME")
-         print("")
--        print("%s" % varname)
-+        print("%s - %s" % (title, subtitle))
-         print("")
-         print("=head1 DESCRIPTION")
-         print("")
-@@ -912,6 +964,63 @@
-         print("Key name %s" % name)
-         print("")
- 
-+class RSTLanguageGenerator(LanguageDocGenerator):
-+
-+    def _boilerplate(self, lines):
-+        print("..")
-+        for line in lines:
-+            print("   %s" % line)
-+        print("")
-+
-+    def _array_start_name_doc(self, title, subtitle, namemap):
-+        print("=" * len(title))
-+        print(title)
-+        print("=" * len(title))
-+        print("")
-+        print("-" * len(subtitle))
-+        print(subtitle)
-+        print("-" * len(subtitle))
-+        print("")
-+        print(":Manual section: 7")
-+        print(":Manual group: Virtualization Support")
-+        print("")
-+        print("DESCRIPTION")
-+        print("===========")
-+        print("List of %s key code names, with corresponding key code values" % namemap)
-+        print("")
-+
-+    def _array_start_code_doc(self, title, subtitle, codemap, namemap):
-+        print("=" * len(title))
-+        print(title)
-+        print("=" * len(title))
-+        print("")
-+        print("-" * len(subtitle))
-+        print(subtitle)
-+        print("-" * len(subtitle))
-+        print("")
-+        print(":Manual section: 7")
-+        print(":Manual group: Virtualization Support")
-+        print("")
-+        print("DESCRIPTION")
-+        print("===========")
-+        print("List of %s key code values, with corresponding %s key code names" % (codemap, namemap))
-+        print("")
-+
-+    def _array_end(self):
-+        print("")
-+
-+    def _array_name_entry(self, value, name):
-+        print("* %s" % name)
-+        print("")
-+        print("  Key value %d (0x%x)" % (value, value))
-+        print("")
-+
-+    def _array_code_entry(self, value, name):
-+        print("* %d (0x%x)" % (value, value))
-+        print("")
-+        print("  Key name %s" % name)
-+        print("")
-+
- SRC_GENERATORS = {
-     "stdc": StdCLanguageGenerator(),
-     "stdc-header": StdCHeaderLanguageGenerator(),
-@@ -923,19 +1032,21 @@
-     "python3": PythonLanguageGenerator(),
-     "perl": PerlLanguageGenerator(),
-     "js": JavaScriptLanguageGenerator(),
-+    "rust": RustLanguageGenerator(),
- }
- DOC_GENERATORS = {
-     "pod": PodLanguageGenerator(),
-+    "rst": RSTLanguageGenerator(),
- }
- 
- def code_map(args):
-     database = Database()
-     database.load(args.keymaps)
- 
--    cliargs = ["keymap-gen", "--lang=%s" % args.lang]
-+    cliargs = ["keymap-gen", "code-map", "--lang=%s" % args.lang]
-     if args.varname is not None:
-         cliargs.append("--varname=%s" % args.varname)
--    cliargs.extend(["code-map", "keymaps.csv", args.frommapname, args.tomapname])
-+    cliargs.extend(["keymaps.csv", args.frommapname, args.tomapname])
-     SRC_GENERATORS[args.lang].generate_header(database, " ".join(cliargs))
- 
-     SRC_GENERATORS[args.lang].generate_code_map(args.varname, database, args.frommapname, args.tomapname)
-@@ -944,10 +1055,10 @@
-     database = Database()
-     database.load(args.keymaps)
- 
--    cliargs = ["keymap-gen", "--lang=%s" % args.lang]
-+    cliargs = ["keymap-gen", "code-table", "--lang=%s" % args.lang]
-     if args.varname is not None:
-         cliargs.append("--varname=%s" % args.varname)
--    cliargs.extend(["code-table", "keymaps.csv", args.mapname])
-+    cliargs.extend(["keymaps.csv", args.mapname])
-     SRC_GENERATORS[args.lang].generate_header(database, " ".join(cliargs))
- 
-     SRC_GENERATORS[args.lang].generate_code_table(args.varname, database, args.mapname)
-@@ -956,10 +1067,10 @@
-     database = Database()
-     database.load(args.keymaps)
- 
--    cliargs = ["keymap-gen", "--lang=%s" % args.lang]
-+    cliargs = ["keymap-gen", "name-map", "--lang=%s" % args.lang]
-     if args.varname is not None:
-         cliargs.append("--varname=%s" % args.varname)
--    cliargs.extend(["name-map", "keymaps.csv", args.frommapname, args.tomapname])
-+    cliargs.extend(["keymaps.csv", args.frommapname, args.tomapname])
-     SRC_GENERATORS[args.lang].generate_header(database, " ".join(cliargs))
- 
-     SRC_GENERATORS[args.lang].generate_name_map(args.varname, database, args.frommapname, args.tomapname)
-@@ -969,10 +1080,10 @@
-     database.load(args.keymaps)
- 
- 
--    cliargs = ["keymap-gen", "--lang=%s" % args.lang]
-+    cliargs = ["keymap-gen", "name-table", "--lang=%s" % args.lang]
-     if args.varname is not None:
-         cliargs.append("--varname=%s" % args.varname)
--    cliargs.extend(["name-table", "keymaps.csv", args.mapname])
-+    cliargs.extend(["keymaps.csv", args.mapname])
-     SRC_GENERATORS[args.lang].generate_header(database, " ".join(cliargs))
- 
-     SRC_GENERATORS[args.lang].generate_name_table(args.varname, database, args.mapname)
-@@ -982,26 +1093,30 @@
-     database.load(args.keymaps)
- 
- 
--    cliargs = ["keymap-gen", "--lang=%s" % args.lang]
--    if args.varname is not None:
--        cliargs.append("--varname=%s" % args.varname)
--    cliargs.extend(["code-docs", "keymaps.csv", args.mapname])
-+    cliargs = ["keymap-gen", "code-docs", "--lang=%s" % args.lang]
-+    if args.title is not None:
-+        cliargs.append("--title=%s" % args.title)
-+    if args.subtitle is not None:
-+        cliargs.append("--subtitle=%s" % args.subtitle)
-+    cliargs.extend(["keymaps.csv", args.mapname])
-     DOC_GENERATORS[args.lang].generate_header(database, " ".join(cliargs))
- 
--    DOC_GENERATORS[args.lang].generate_code_docs(args.varname, database, args.mapname)
-+    DOC_GENERATORS[args.lang].generate_code_docs(args.title, args.subtitle, database, args.mapname)
- 
- def name_docs(args):
-     database = Database()
-     database.load(args.keymaps)
- 
- 
--    cliargs = ["keymap-gen", "--lang=%s" % args.lang]
--    if args.varname is not None:
--        cliargs.append("--varname=%s" % args.varname)
--    cliargs.extend(["name-docs", "keymaps.csv", args.mapname])
-+    cliargs = ["keymap-gen", "name-docs", "--lang=%s" % args.lang]
-+    if args.title is not None:
-+        cliargs.append("--title=%s" % args.title)
-+    if args.subtitle is not None:
-+        cliargs.append("--subtitle=%s" % args.subtitle)
-+    cliargs.extend(["keymaps.csv", args.mapname])
-     DOC_GENERATORS[args.lang].generate_header(database, " ".join(cliargs))
- 
--    DOC_GENERATORS[args.lang].generate_name_docs(args.varname, database, args.mapname)
-+    DOC_GENERATORS[args.lang].generate_name_docs(args.title, args.subtitle, database, args.mapname)
- 
- def usage():
-     print ("Please select a command:")
-@@ -1011,43 +1126,62 @@
- def main():
-     parser = argparse.ArgumentParser()
- 
--    parser.add_argument("--lang", default="stdc",
--                        help="Output language, (src=%s, doc=%s)" % (
--                            ",".join(SRC_GENERATORS.keys()),
--                            ",".join(DOC_GENERATORS.keys())))
--    parser.add_argument("--varname", default=None,
--                        help="Data variable name")
--
-     subparsers = parser.add_subparsers(help="sub-command help")
- 
-     codemapparser = subparsers.add_parser("code-map", help="Generate a mapping between code tables")
-+    codemapparser.add_argument("--varname", default=None, help="Data variable name")
-+    codemapparser.add_argument("--lang", default="stdc",
-+                        help="Output language (%s)" % (
-+                            ",".join(SRC_GENERATORS.keys())))
-     codemapparser.add_argument("keymaps", help="Path to keymap CSV data file")
-     codemapparser.add_argument("frommapname", help="Source code table name")
-     codemapparser.add_argument("tomapname", help="Target code table name")
-     codemapparser.set_defaults(func=code_map)
- 
-     codetableparser = subparsers.add_parser("code-table", help="Generate a flat code table")
-+    codetableparser.add_argument("--lang", default="stdc",
-+                        help="Output language (%s)" % (
-+                            ",".join(SRC_GENERATORS.keys())))
-+    codetableparser.add_argument("--varname", default=None, help="Data variable name")
-     codetableparser.add_argument("keymaps", help="Path to keymap CSV data file")
-     codetableparser.add_argument("mapname", help="Code table name")
-     codetableparser.set_defaults(func=code_table)
- 
-     namemapparser = subparsers.add_parser("name-map", help="Generate a mapping to names")
-+    namemapparser.add_argument("--lang", default="stdc",
-+                        help="Output language (%s)" % (
-+                            ",".join(SRC_GENERATORS.keys())))
-+    namemapparser.add_argument("--varname", default=None, help="Data variable name")
-     namemapparser.add_argument("keymaps", help="Path to keymap CSV data file")
-     namemapparser.add_argument("frommapname", help="Source code table name")
-     namemapparser.add_argument("tomapname", help="Target name table name")
-     namemapparser.set_defaults(func=name_map)
- 
-     nametableparser = subparsers.add_parser("name-table", help="Generate a flat name table")
-+    nametableparser.add_argument("--lang", default="stdc",
-+                        help="Output language, (%s)" % (
-+                            ",".join(SRC_GENERATORS.keys())))
-+    nametableparser.add_argument("--varname", default=None, help="Data variable name")
-     nametableparser.add_argument("keymaps", help="Path to keymap CSV data file")
-     nametableparser.add_argument("mapname", help="Name table name")
-     nametableparser.set_defaults(func=name_table)
- 
-     codedocsparser = subparsers.add_parser("code-docs", help="Generate code documentation")
-+    codedocsparser.add_argument("--lang", default="pod",
-+                        help="Output language (%s)" % (
-+                            ",".join(DOC_GENERATORS.keys())))
-+    codedocsparser.add_argument("--title", default=None, help="Document title")
-+    codedocsparser.add_argument("--subtitle", default=None, help="Document subtitle")
-     codedocsparser.add_argument("keymaps", help="Path to keymap CSV data file")
-     codedocsparser.add_argument("mapname", help="Code table name")
-     codedocsparser.set_defaults(func=code_docs)
- 
-     namedocsparser = subparsers.add_parser("name-docs", help="Generate name documentation")
-+    namedocsparser.add_argument("--lang", default="pod",
-+                        help="Output language (%s)" % (
-+                            ",".join(DOC_GENERATORS.keys())))
-+    namedocsparser.add_argument("--title", default=None, help="Document title")
-+    namedocsparser.add_argument("--subtitle", default=None, help="Document subtitle")
-     namedocsparser.add_argument("keymaps", help="Path to keymap CSV data file")
-     namedocsparser.add_argument("mapname", help="Name table name")
-     namedocsparser.set_defaults(func=name_docs)
diff --git a/net-libs/gtk-vnc/files/8da5e173ebdccbca60387ef2347c629be3c78dff.patch1 b/net-libs/gtk-vnc/files/8da5e173ebdccbca60387ef2347c629be3c78dff.patch1
deleted file mode 100644
index fdcaa5c0..00000000
--- a/net-libs/gtk-vnc/files/8da5e173ebdccbca60387ef2347c629be3c78dff.patch1
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 299113a3fc24f58d3d3f3a01bb47bb3830a5f2a4..bf72f13eb256c48bd99146a47b118c16addac9e0 100644
---- a/meson.build
-+++ b/meson.build
-@@ -133,10 +133,10 @@ gtk_vnc_version_check_flags = gvnc_version_check_flags + [
-   '-DGDK_VERSION_MAX_ALLOWED=@0@'.format(gtk_min_version_symbol),
- ]
- 
--subproject('keycodemapdb')
-+keycodemapdb = subproject('keycodemapdb')
- 
--keymapgen = files('subprojects/keycodemapdb/tools/keymap-gen')
--keymapcsv = files('subprojects/keycodemapdb/data/keymaps.csv')
-+keymapgen = find_program('keymap-gen')
-+keymapcsv = keycodemapdb.get_variable('keymaps_csv')
- 
- 
- gnome = import('gnome')
-diff --git a/src/meson.build b/src/meson.build
-index 247c59759a7422d939c9625d976ec8d1a9143bd7..67fa8b9333324587d2c9ec07f11c398ab862f7bb 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -336,9 +336,10 @@ foreach keymap: keymaps
-   cmd = [
-     python,
-     keymapgen,
-+    'code-map',
-     '--lang', 'glib2',
-     '--varname', varname,
--    'code-map', keymapcsv, keymap, 'qnum'
-+    keymapcsv, keymap, 'qnum'
-   ]
-   gtk_vnc_sources += custom_target(
-     target,
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.3.0-r10.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.3.0-r10.ebuild
deleted file mode 100644
index 9fbe209f..00000000
--- a/net-libs/gtk-vnc/gtk-vnc-1.3.0-r10.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome.org vala meson python-any-r1 xdg
-
-DESCRIPTION="VNC viewer widget for GTK"
-HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="+introspection pulseaudio sasl +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gdk-pixbuf-2.36.0:2
-	>=dev-libs/libgcrypt-1.8.0:0=
-	>=net-libs/gnutls-3.6.0:0=
-	>=sys-libs/zlib-1.2.11
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.27 )
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	>=x11-libs/cairo-1.15.0
-	>=x11-libs/libX11-1.6.5
-	pulseaudio? ( >=media-sound/pulseaudio-11.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.56.0:= )
-"
-# Keymap databases code is generated with python3; configure picks up $PYTHON exported from python-any-r1_pkg_setup
-# perl for pod2man
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=( "${FILESDIR}"/8da5e173ebdccbca60387ef2347c629be3c78dff.patch )
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature introspection)
-		$(meson_feature pulseaudio)
-		$(meson_feature sasl)
-		-Dwith-coroutine=auto # gthread on windows, libc ucontext elsewhere; neither has extra deps
-		$(meson_feature vala with-vala)
-	)
-	meson_src_configure
-}
diff --git a/x11-drivers/xf86-video-qxl/Manifest b/x11-drivers/xf86-video-qxl/Manifest
deleted file mode 100644
index 54b4c990..00000000
--- a/x11-drivers/xf86-video-qxl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xf86-video-qxl-0.1.5_p20200205.tar.xz 137452 BLAKE2B 1639a393dadcba251a8fe761d52112d51c29e70960524785343379ec088e69c5e2cbd1a9710d72c749dc8b7303b3eceb545fbaec82d5d22613f8ebb0a4e7aca8 SHA512 9a2ba4aa7ef61d3ea0043ff1e3a8f312b7fe00f707045bcb4e4fc1189786b9aba2b6e44696f47e7c215485044f6c953f831ed4da48d4098cd7b62555c74a79f8
diff --git a/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build.patch b/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build.patch
deleted file mode 100644
index b4f9024a..00000000
--- a/x11-drivers/xf86-video-qxl/files/xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-https://bugs.gentoo.org/827652
-https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl/-/merge_requests/6
-
-From 4b083ede3c4a827a84295ff223e34ee3c2e581b2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?=
- <zboszor@gmail.com>
-Date: Sat, 28 Aug 2021 15:38:40 +0200
-Subject: [PATCH] Fix a build  error with Xorg master
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Use xf86ReturnOptValBool() in get_bool_option() instead of
-options[option_index].value.bool to fix a compiler error with
-current Xorg xserver master branch.
-
-Also use xf86GetOptValInteger() in get_int_option() and
-xf86GetOptValString() in get_str_option() for consistency.
-
-The change causes a slight performance drop during option parsing
-because the passed-in index_value is no longer used as an index
-into the options array.
-
-Instead, it's used as a token now for the standard option getter
-functions which works since the index_value to the get_*_option()
-functions are identical to the value of options[n].token in the
-passed-in OptionInfoRec array.
-
-Also rename "int option_index" to "int token" for clarity in all
-three functions.
-
-Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
---- a/src/qxl_option_helpers.c
-+++ b/src/qxl_option_helpers.c
-@@ -10,31 +10,32 @@
- 
- #include "qxl_option_helpers.h"
- 
--int get_int_option(OptionInfoPtr options, int option_index,
-+int get_int_option(OptionInfoPtr options, int token,
-                    const char *env_name)
- {
-+    int value;
-     if (env_name && getenv(env_name)) {
-         return atoi(getenv(env_name));
-     }
--    return options[option_index].value.num;
-+    return xf86GetOptValInteger(options, token, &value) ? value : 0;
- }
- 
--const char *get_str_option(OptionInfoPtr options, int option_index,
-+const char *get_str_option(OptionInfoPtr options, int token,
-                            const char *env_name)
- {
-     if (getenv(env_name)) {
-         return getenv(env_name);
-     }
--    return options[option_index].value.str;
-+    return xf86GetOptValString(options, token);
- }
- 
--int get_bool_option(OptionInfoPtr options, int option_index,
-+int get_bool_option(OptionInfoPtr options, int token,
-                      const char *env_name)
- {
-     const char* value = getenv(env_name);
- 
-     if (!value) {
--        return options[option_index].value.bool;
-+        return xf86ReturnOptValBool(options, token, FALSE);
-     }
-     if (strcmp(value, "0") == 0 ||
-         strcasecmp(value, "off") == 0 ||
---- a/src/qxl_option_helpers.h
-+++ b/src/qxl_option_helpers.h
-@@ -4,13 +4,13 @@
- #include <xf86Crtc.h>
- #include <xf86Opt.h>
- 
--int get_int_option(OptionInfoPtr options, int option_index,
-+int get_int_option(OptionInfoPtr options, int token,
-                    const char *env_name);
- 
--const char *get_str_option(OptionInfoPtr options, int option_index,
-+const char *get_str_option(OptionInfoPtr options, int token,
-                            const char *env_name);
- 
--int get_bool_option(OptionInfoPtr options, int option_index,
-+int get_bool_option(OptionInfoPtr options, int token,
-                      const char *env_name);
- 
- #endif // OPTION_HELPERS_H
-GitLab
diff --git a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205-r10.ebuild b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205-r10.ebuild
deleted file mode 100644
index adc74580..00000000
--- a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205-r10.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools python-single-r1 xorg-3
-
-DESCRIPTION="QEMU QXL paravirt video driver"
-SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
-S="${WORKDIR}"
-
-KEYWORDS="amd64 x86"
-IUSE="xspice"
-REQUIRED_USE="xspice? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	xspice? (
-		app-emulation/spice
-		${PYTHON_DEPS}
-	)
-	x11-base/xorg-server[-minimal]
-	>=x11-libs/libdrm-2.4.46"
-DEPEND="
-	${RDEPEND}
-	>=app-emulation/spice-protocol-0.12.0
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.1.5_p20200205-xorg-21.0-build.patch
-)
-
-pkg_setup() {
-	use xspice && python-single-r1_pkg_setup
-	xorg-3_pkg_setup
-}
-
-src_prepare() {
-	xorg-3_src_prepare
-	eautoreconf
-
-	use xspice && python_fix_shebang scripts
-}
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable xspice)
-	)
-	xorg-3_src_configure
-}